From 3402732f1c15010f98b90006f2006573a6b36b6b Mon Sep 17 00:00:00 2001 From: Johannes Löthberg Date: Sun, 16 Nov 2014 19:53:52 +0100 Subject: pacman-git: Add Arch pacman.conf and makepkg.conf --- .SRCINFO | 9 ++-- PKGBUILD | 28 ++++++++---- makepkg.conf | 140 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ pacman.conf | 99 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 264 insertions(+), 12 deletions(-) create mode 100644 makepkg.conf create mode 100644 pacman.conf diff --git a/.SRCINFO b/.SRCINFO index bb8f21f..e4f9ee9 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -5,7 +5,6 @@ pkgbase = pacman-git pkgver = 4.1.2.r475.gbd744d0 pkgrel = 1 url = http://www.archlinux.org/pacman/ - arch = i686 arch = x86_64 license = GPL checkdepends = python2 @@ -23,12 +22,16 @@ pkgbase = pacman-git provides = libalpm.so conflicts = pacman conflicts = pacman-contrib - options = !libtool - options = !strip + options = strip + options = debug backup = etc/pacman.conf backup = etc/makepkg.conf source = git://projects.archlinux.org/pacman.git + source = pacman.conf + source = makepkg.conf sha1sums = SKIP + sha1sums = 3c1bddf27602e02fb57801c0ea7313b3869acc92 + sha1sums = f2ef3115adaf2aa5c13a1ab7e948c21028451465 pkgname = pacman-git diff --git a/PKGBUILD b/PKGBUILD index b9f78f2..d72bb6a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,25 +4,29 @@ pkgrel=1 pkgdesc="A library-based package manager with dependency support. git version." url="http://www.archlinux.org/pacman/" -arch=('i686' 'x86_64') +arch=('x86_64') license=('GPL') depends=('bash' 'curl' 'gpgme' 'libarchive' 'pacman-mirrorlist') -makedepends=('git' 'asciidoc') optdepends=('fakeroot: for makepkg usage as normal user') +makedepends=('git' 'asciidoc') checkdepends=('python2' 'fakechroot') provides=("pacman=$pkgver" 'pacman-contrib' 'libalpm.so') conflicts=('pacman' 'pacman-contrib') -options=('!libtool' '!strip') +options=('strip' 'debug') backup=(etc/pacman.conf etc/makepkg.conf) -source=(git://projects.archlinux.org/pacman.git) +source=(git://projects.archlinux.org/pacman.git + pacman.conf + makepkg.conf) -sha1sums=('SKIP') +sha1sums=('SKIP' + '3c1bddf27602e02fb57801c0ea7313b3869acc92' + 'f2ef3115adaf2aa5c13a1ab7e948c21028451465') pkgver() { cd pacman @@ -55,15 +59,19 @@ package() { cd pacman make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C contrib install + + # install Arch specific stuff + install -dm755 "$pkgdir"/etc + install -m644 "$srcdir"/pacman.conf "$pkgdir"/etc/ + install -m644 "$srcdir"/makepkg.conf "$pkgdir"/etc/ # set things correctly in the default conf file sed -i "$pkgdir/etc/makepkg.conf" \ - -e "s|@CARCH[@]|$CARCH|g" \ + -e "s|@CARCH[@]|x86_64|g" \ -e "s|@CHOST[@]|x86_64-unknown-linux-gn|g" \ -e "s|@CARCHFLAGS[@]|-march=x86-64 |g" - # contrib - make DESTDIR="$pkgdir" -C contrib install install -Dm644 contrib/PKGBUILD.vim "$pkgdir"/usr/share/vim/vimfiles/syntax/PKGBUILD.vim install -dm755 "$pkgdir"/usr/share/vim/vimfiles/ftdetect @@ -73,9 +81,11 @@ package() { # install completion files rm -r "$pkgdir"/etc/bash_completion.d install -Dm644 contrib/bash_completion "$pkgdir"/usr/share/bash-completion/completions/pacman + install -Dm644 contrib/zsh_completion "$pkgdir"/usr/share/zsh/site-functions/_pacman + for f in makepkg pacman-key; do ln -s pacman "$pkgdir"/usr/share/bash-completion/completions/"$f" done - install -Dm644 contrib/zsh_completion "$pkgdir"/usr/share/zsh/site-functions/_pacman + install -Dm644 contrib/PKGBUILD.vim "$pkgdir"/usr/share/vim/vimfiles/syntax/PKGBUILD.vim } diff --git a/makepkg.conf b/makepkg.conf new file mode 100644 index 0000000..0d0f053 --- /dev/null +++ b/makepkg.conf @@ -0,0 +1,140 @@ +# +# /etc/makepkg.conf +# + +######################################################################### +# SOURCE ACQUISITION +######################################################################### +# +#-- The download utilities that makepkg should use to acquire sources +# Format: 'protocol::agent' +DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' + 'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u' + 'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u' + 'rsync::/usr/bin/rsync --no-motd -z %u %o' + 'scp::/usr/bin/scp -C %u %o') + +# Other common tools: +# /usr/bin/snarf +# /usr/bin/lftpget -c +# /usr/bin/wget + +######################################################################### +# ARCHITECTURE, COMPILE FLAGS +######################################################################### +# +CARCH="@CARCH@" +CHOST="@CHOST@" + +#-- Compiler and Linker Flags +# -march (or -mcpu) builds exclusively for an architecture +# -mtune optimizes for an architecture, but builds for whole processor family +CPPFLAGS="-D_FORTIFY_SOURCE=2" +CFLAGS="@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4" +CXXFLAGS="@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4" +LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro" +#-- Make Flags: change this for DistCC/SMP systems +#MAKEFLAGS="-j2" +#-- Debugging flags +DEBUG_CFLAGS="-g -fvar-tracking-assignments" +DEBUG_CXXFLAGS="-g -fvar-tracking-assignments" + +######################################################################### +# BUILD ENVIRONMENT +######################################################################### +# +# Defaults: BUILDENV=(fakeroot !distcc color !ccache check !sign) +# A negated environment option will do the opposite of the comments below. +# +#-- fakeroot: Allow building packages as a non-root user +#-- distcc: Use the Distributed C/C++/ObjC compiler +#-- color: Colorize output messages +#-- ccache: Use ccache to cache compilation +#-- check: Run the check() function if present in the PKGBUILD +#-- sign: Generate PGP signature file +# +BUILDENV=(fakeroot !distcc color !ccache check !sign) +# +#-- If using DistCC, your MAKEFLAGS will also need modification. In addition, +#-- specify a space-delimited list of hosts running in the DistCC cluster. +#DISTCC_HOSTS="" +# +#-- Specify a directory for package building. +#BUILDDIR=/tmp/makepkg + +######################################################################### +# GLOBAL PACKAGE OPTIONS +# These are default values for the options=() settings +######################################################################### +# +# Default: OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !upx !debug) +# A negated option will do the opposite of the comments below. +# +#-- strip: Strip symbols from binaries/libraries +#-- docs: Save doc directories specified by DOC_DIRS +#-- libtool: Leave libtool (.la) files in packages +#-- staticlibs: Leave static library (.a) files in packages +#-- emptydirs: Leave empty directories in packages +#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip +#-- purge: Remove files specified by PURGE_TARGETS +#-- upx: Compress binary executable files using UPX +#-- debug: Add debugging flags as specified in DEBUG_* variables +# +OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !upx !debug) + +#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 +INTEGRITY_CHECK=(md5) +#-- Options to be used when stripping binaries. See `man strip' for details. +STRIP_BINARIES="--strip-all" +#-- Options to be used when stripping shared libraries. See `man strip' for details. +STRIP_SHARED="--strip-unneeded" +#-- Options to be used when stripping static libraries. See `man strip' for details. +STRIP_STATIC="--strip-debug" +#-- Manual (man and info) directories to compress (if zipman is specified) +MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) +#-- Doc directories to remove (if !docs is specified) +DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) +#-- Files to be removed from all packages (if purge is specified) +PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) + +######################################################################### +# PACKAGE OUTPUT +######################################################################### +# +# Default: put built package and cached source in build directory +# +#-- Destination: specify a fixed directory where all packages will be placed +#PKGDEST=/home/packages +#-- Source cache: specify a fixed directory where source files will be cached +#SRCDEST=/home/sources +#-- Source packages: specify a fixed directory where all src packages will be placed +#SRCPKGDEST=/home/srcpackages +#-- Log files: specify a fixed directory where all log files will be placed +#LOGDEST=/home/makepkglogs +#-- Packager: name/email of the person or organization building packages +#PACKAGER="John Doe " +#-- Specify a key to use for package signing +#GPGKEY="" + +######################################################################### +# COMPRESSION DEFAULTS +######################################################################### +# +COMPRESSGZ=(gzip -c -f -n) +COMPRESSBZ2=(bzip2 -c -f) +COMPRESSXZ=(xz -c -z -) +COMPRESSLRZ=(lrzip -q) +COMPRESSLZO=(lzop -q) +COMPRESSZ=(compress -c -f) + +######################################################################### +# EXTENSION DEFAULTS +######################################################################### +# +# WARNING: Do NOT modify these variables unless you know what you are +# doing. +# +PKGEXT='.pkg.tar.xz' +SRCEXT='.src.tar.gz' + +# vim: set ft=sh ts=2 sw=2 et: diff --git a/pacman.conf b/pacman.conf new file mode 100644 index 0000000..f43fe39 --- /dev/null +++ b/pacman.conf @@ -0,0 +1,99 @@ +# +# /etc/pacman.conf +# +# See the pacman.conf(5) manpage for option and repository directives + +# +# GENERAL OPTIONS +# +[options] +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +#CacheDir = /var/cache/pacman/pkg/ +#LogFile = /var/log/pacman.log +#GPGDir = /etc/pacman.d/gnupg/ +HoldPkg = pacman glibc +#XferCommand = /usr/bin/curl -C - -f %u > %o +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#CleanMethod = KeepInstalled +#UseDelta = 0.7 +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options +#UseSyslog +#Color +#TotalDownload +CheckSpace +#VerbosePkgLists + +# By default, pacman accepts packages signed by keys that its local keyring +# trusts (see pacman-key and its man page), as well as unsigned packages. +SigLevel = Required DatabaseOptional +LocalFileSigLevel = Optional +#RemoteFileSigLevel = Required + +# NOTE: You must run `pacman-key --init` before first using pacman; the local +# keyring can then be populated with the keys of all official Arch Linux +# packagers with `pacman-key --populate archlinux`. + +# +# REPOSITORIES +# - can be defined here or included from another file +# - pacman will search repositories in the order defined here +# - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. +# + +# The testing repositories are disabled by default. To enable, uncomment the +# repo name header and Include lines. You can add preferred servers immediately +# after the header, and they will be used before the default mirrors. + +#[testing] +#Include = /etc/pacman.d/mirrorlist + +[core] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +#[community-testing] +#Include = /etc/pacman.d/mirrorlist + +[community] +Include = /etc/pacman.d/mirrorlist + +# If you want to run 32 bit applications on your x86_64 system, +# enable the multilib repositories as required here. + +#[multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +#[multilib] +#Include = /etc/pacman.d/mirrorlist + +# An example of a custom package repository. See the pacman manpage for +# tips on creating your own repositories. +#[custom] +#SigLevel = Optional TrustAll +#Server = file:///home/custompkgs -- cgit v1.2.3-70-g09d2