prepare release

This makes it much better readable especially for very large file lists.

Makefile

@@ -1,10 +1,10 @@
-V=0.9.8
+V=0.9.17
 
 all:
 
 install:
 	# commitpkg/checkpkg and friends
-	mkdir -p $(DESTDIR)/usr/bin
+	install -d -m755 $(DESTDIR)/usr/bin
 	install -m 755 checkpkg $(DESTDIR)/usr/bin
 	install -m 755 commitpkg $(DESTDIR)/usr/bin
 	ln -sf commitpkg $(DESTDIR)/usr/bin/extrapkg
@@ -13,19 +13,40 @@ install:
 	ln -sf commitpkg $(DESTDIR)/usr/bin/stagingpkg
 	ln -sf commitpkg $(DESTDIR)/usr/bin/communitypkg
 	ln -sf commitpkg $(DESTDIR)/usr/bin/community-testingpkg
+	ln -sf commitpkg $(DESTDIR)/usr/bin/community-stagingpkg
+	ln -sf commitpkg $(DESTDIR)/usr/bin/multilibpkg
+	ln -sf commitpkg $(DESTDIR)/usr/bin/multilib-testingpkg
 	# arch{co,release,rm}
 	install -m 755 archco $(DESTDIR)/usr/bin
 	install -m 755 communityco $(DESTDIR)/usr/bin
 	install -m 755 archrelease $(DESTDIR)/usr/bin
 	install -m 755 archrm $(DESTDIR)/usr/bin
 	# new chroot tools, only usable by root
-	mkdir -p $(DESTDIR)/usr/sbin
+	install -d -m 755 $(DESTDIR)/usr/sbin
 	install -m 755 mkarchroot $(DESTDIR)/usr/sbin
 	install -m 755 makechrootpkg $(DESTDIR)/usr/sbin
-	#Additional packaging helper scripts
+	install -m 755 archbuild $(DESTDIR)/usr/bin
+	ln -sf archbuild $(DESTDIR)/usr/bin/extra-i686-build
+	ln -sf archbuild $(DESTDIR)/usr/bin/extra-x86_64-build
+	ln -sf archbuild $(DESTDIR)/usr/bin/testing-i686-build
+	ln -sf archbuild $(DESTDIR)/usr/bin/testing-x86_64-build
+	ln -sf archbuild $(DESTDIR)/usr/bin/staging-i686-build
+	ln -sf archbuild $(DESTDIR)/usr/bin/staging-x86_64-build
+	ln -sf archbuild $(DESTDIR)/usr/bin/multilib-build
+	ln -sf archbuild $(DESTDIR)/usr/bin/multilib-testing-build
+	# Additional packaging helper scripts
 	install -m 755 lddd $(DESTDIR)/usr/bin
 	install -m 755 finddeps $(DESTDIR)/usr/bin
 	install -m 755 rebuildpkgs $(DESTDIR)/usr/bin
+	# install default config
+	install -d -m755 $(DESTDIR)/usr/share/devtools
+	install -m 644 makepkg-i686.conf $(DESTDIR)/usr/share/devtools
+	install -m 644 makepkg-x86_64.conf $(DESTDIR)/usr/share/devtools
+	install -m 644 pacman-extra.conf $(DESTDIR)/usr/share/devtools
+	install -m 644 pacman-testing.conf $(DESTDIR)/usr/share/devtools
+	install -m 644 pacman-staging.conf $(DESTDIR)/usr/share/devtools
+	install -m 644 pacman-multilib.conf $(DESTDIR)/usr/share/devtools
+	install -m 644 pacman-multilib-testing.conf $(DESTDIR)/usr/share/devtools
 
 uninstall:
 	# remove all files we installed
@@ -37,8 +58,19 @@ uninstall:
 	rm $(DESTDIR)/usr/bin/stagingpkg
 	rm $(DESTDIR)/usr/bin/communitypkg
 	rm $(DESTDIR)/usr/bin/community-testingpkg
+	rm $(DESTDIR)/usr/bin/community-stagingpkg
+	rm $(DESTDIR)/usr/bin/multilibpkg
+	rm $(DESTDIR)/usr/bin/multilib-testingpkg
 	rm $(DESTDIR)/usr/sbin/mkarchroot
 	rm $(DESTDIR)/usr/sbin/makechrootpkg
+	rm $(DESTDIR)/usr/bin/extra-i686-build
+	rm $(DESTDIR)/usr/bin/extra-x86_64-build
+	rm $(DESTDIR)/usr/bin/testing-i686-build
+	rm $(DESTDIR)/usr/bin/testing-x86_64-build
+	rm $(DESTDIR)/usr/bin/staging-i686-build
+	rm $(DESTDIR)/usr/bin/staging-x86_64-build
+	rm $(DESTDIR)/usr/bin/multilib-build
+	rm $(DESTDIR)/usr/bin/multilib-testing-build
 	rm $(DESTDIR)/usr/bin/lddd
 	rm $(DESTDIR)/usr/bin/finddeps
 	rm $(DESTDIR)/usr/bin/archco
@@ -46,6 +78,13 @@ uninstall:
 	rm $(DESTDIR)/usr/bin/archrm
 	rm $(DESTDIR)/usr/bin/communityco
 	rm $(DESTDIR)/usr/bin/rebuildpkgs
+	rm $(DESTDIR)/usr/share/devtools/makepkg-i686.conf
+	rm $(DESTDIR)/usr/share/devtools/makepkg-x86_64.conf
+	rm $(DESTDIR)/usr/share/devtools/pacman-extra.conf
+	rm $(DESTDIR)/usr/share/devtools/pacman-testing.conf
+	rm $(DESTDIR)/usr/share/devtools/pacman-staging.conf
+	rm $(DESTDIR)/usr/share/devtools/pacman-multilib.conf
+	rm $(DESTDIR)/usr/share/devtools/pacman-multilib-testing.conf
 
 dist:
 	git archive --format=tar --prefix=devtools-$(V)/ $(V) | gzip -9 > devtools-$(V).tar.gz

archbuild

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+base_packages='base base-devel sudo'
+
+cmd="$(basename "${0%-build}")"
+if [ "${cmd%-*}" == 'multilib' ]; then
+        repo="${cmd}"
+        arch='x86_64'
+	base_packages+=' gcc-multilib libtool-multilib'
+else
+	repo=${cmd%-*}
+	arch=${cmd##*-}
+fi
+chroots='/var/tmp/archbuild'
+clean_first=false
+
+usage() {
+	echo "usage $(basename "$0")"
+	echo '    -c         Recreate the chroot before building'
+	echo '    -r <dir>   Create chroots in this directory'
+	exit 1
+}
+
+while getopts 'cr:' arg; do
+	case "${arg}" in
+		c) clean_first=true ;;
+		r) chroots="$OPTARG" ;;
+		*) usage ;;
+	esac
+done
+
+if ${clean_first} || [ ! -d "${chroots}/${repo}-${arch}" ]; then
+	echo "Creating chroot for [${repo}] (${arch})..."
+	sudo rm -rf ${chroots}/${repo}-${arch}
+	sudo mkdir -p ${chroots}/${repo}-${arch}
+	setarch ${arch} sudo mkarchroot \
+		-C /usr/share/devtools/pacman-${repo}.conf \
+		-M /usr/share/devtools/makepkg-${arch}.conf \
+		${chroots}/${repo}-${arch}/root \
+		${base_packages}
+else
+	setarch ${arch} sudo mkarchroot \
+		-u \
+		${chroots}/${repo}-${arch}/root
+fi
+
+echo "Building in chroot for [${repo}] (${arch})..."
+setarch ${arch} sudo makechrootpkg -c -r ${chroots}/${repo}-${arch}

archrelease

@@ -13,7 +13,9 @@ if [ ! -f PKGBUILD ]; then
 	abort 'archrelease: PKGBUILD not found'
 fi
 
-if [ "$(basename $(readlink -f .))" != 'trunk' ]; then
+trunk=$(basename $(pwd))
+
+if [ "$(basename $(dirname $(pwd)))" == "repos" ]; then
 	abort 'archrelease: Not in a package trunk dir'
 fi
 
@@ -27,7 +29,7 @@ if [ -d "repos/${1}" ]; then
 	svn rm --force -q "repos/${1}"
 	svn commit -q -m "archrelease: remove ${1}" || abort
 fi
-svn copy -q -r HEAD trunk "repos/${1}"
-svn commit -q -m "archrelease: copy trunk to ${1}" || abort
+svn copy -q -r HEAD "${trunk}" "repos/${1}"
+svn commit -q -m "archrelease: copy ${trunk} to ${1}" || abort
 popd >/dev/null
 echo 'done'

checkpkg

@@ -27,6 +27,7 @@ if [ "$arch" == 'any' ]; then
 	CARCH='any'
 fi
 
+STARTDIR=$(pwd)
 TEMPDIR=$(mktemp -d /tmp/checkpkg-script.XXXX)
 cd $TEMPDIR
 
@@ -34,14 +35,14 @@ for _pkgname in ${pkgname[@]}; do
 	pkgfile=${_pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
 	oldstylepkgfile=${_pkgname}-${pkgver}-${pkgrel}${PKGEXT}
 
-	if [ -f "$(pwd)/$pkgfile" ]; then
-		pkgfile=$(pwd)/$pkgfile
+	if [ -f "$STARTDIR/$pkgfile" ]; then
+		cp "$STARTDIR/$pkgfile" .
 	elif [ -f "$PKGDEST/$pkgfile" ]; then
-		pkgfile=$PKGDEST/$pkgfile
-	elif [ -f "$(pwd)/$oldstylepkgfile" ]; then
-		pkgfile=$(pwd)/$oldstylepkgfile
+		cp "$PKGDEST/$pkgfile" .
+	elif [ -f "$STARTDIR/$oldstylepkgfile" ]; then
+		cp "$STARTDIR/$oldstylepkgfile" .
 	elif [ -f "$PKGDEST/$oldstylepkgfile" ]; then
-		pkgfile=$PKGDEST/$oldstylepkgfile
+		cp "$PKGDEST/$oldstylepkgfile" .
 	else
 		echo "File \"$pkgfile\" doesn't exist"
 		exit 1
@@ -68,6 +69,8 @@ for _pkgname in ${pkgname[@]}; do
 			cp `echo $pkgurl | sed 's#^file://##'` .
 		elif [ -f $PKGDEST/$oldpkg ]; then
 			cp $PKGDEST/$oldpkg .
+		elif [ -f $STARTDIR/$oldpkg ]; then
+			cp $STARTDIR/$oldpkg .
 		else
 			wget --quiet $pkgurl
 		fi
@@ -79,16 +82,17 @@ for _pkgname in ${pkgname[@]}; do
 	sort -o filelist-$_pkgname filelist-$_pkgname
 	sort -o filelist-$_pkgname-old filelist-$_pkgname-old
 
-	diff filelist-$_pkgname-old filelist-$_pkgname
+	sdiff -s filelist-$_pkgname-old filelist-$_pkgname
 
-	if diff filelist-$_pkgname-old filelist-$_pkgname | grep '\.so\.' > /dev/null 2>&1; then
+	if diff filelist-$_pkgname-old filelist-$_pkgname | grep '\.so' > /dev/null 2>&1; then
 		mkdir -p pkg
 		cd pkg
-		bsdtar xf "$pkgfile" > /dev/null
-		for i in `diff ../filelist-$_pkgname-old ../filelist-$_pkgname | grep \> | grep \.so\. | awk '{print $2}'`; do
+		bsdtar xf ../"$pkgfile" > /dev/null
+		for i in `diff ../filelist-$_pkgname-old ../filelist-$_pkgname | grep \> | grep \.so | awk '{print $2}'`; do
 			echo -n "${i}: "
 			objdump -p $i | grep SONAME
 		done
+		cd ..
 	else
 		echo "No soname differences for $_pkgname."
 	fi

commitpkg

@@ -54,6 +54,15 @@ elif [ "$cmd" == 'communitypkg' ]; then
 elif [ "$cmd" == 'community-testingpkg' ]; then
 	repo='community-testing'
 	server='aur.archlinux.org'
+elif [ "$cmd" == 'community-stagingpkg' ]; then
+	repo='community-staging'
+	server='aur.archlinux.org'
+elif [ "$cmd" == 'multilibpkg' ]; then
+	repo='multilib'
+	server='aur.archlinux.org'
+elif [ "$cmd" == 'multilib-testingpkg' ]; then
+	repo='multilib-testing'
+	server='aur.archlinux.org'
 else
 	if [ $# -eq 0 ]; then
 		abort 'usage: commitpkg <reponame> [-l limit] [commit message]'
@@ -110,7 +119,7 @@ for _arch in ${arch[@]}; do
 		fi
 
 		echo -n 'uploading '
-		rsync -p --chmod 'ug=rw,o=r' -c -h -L --progress $rsyncopts --partial "${pkgfile}" -e ssh $server:staging/$repo || abort
+		rsync -p --chmod 'ug=rw,o=r' -c -h -L --progress $rsyncopts --partial "${pkgfile}" -e ssh "$server:staging/$repo/${pkgfile##*/}" || abort
 	done
 	archrelease $repo-${_arch} || abort
 done

makechrootpkg

@@ -10,7 +10,7 @@
 
 FORCE='n'
 RUN=''
-MAKEPKG_ARGS='-sr'
+MAKEPKG_ARGS='-s --noconfirm'
 REPACK=''
 COPY='copy'
 WORKDIR=$PWD
@@ -87,7 +87,7 @@ if [ "$EUID" != '0' ]; then
 	exit 1
 fi
 
-if [ ! -f PKGBUILD ]; then
+if [ ! -f PKGBUILD -a -z "$install_pkg" ]; then
 	echo 'This must be run in a directory containing a PKGBUILD.'
 	exit 1
 fi
@@ -122,7 +122,7 @@ if [ -n "$install_pkg" ]; then
 fi
 
 if [ $update_first -eq 1 ]; then
-	mkarchroot -r 'pacman -Syu --noconfirm' "$copydir"
+	mkarchroot -u "$copydir"
 fi
 
 [ -d "$copydir/build" ] || mkdir "$copydir/build"
@@ -132,28 +132,43 @@ if [ "$REPACK" != "1" ]; then
 	rm -rf "$copydir/build/"*
 fi
 
-# Get SRC/PKGDEST from makepkg.conf
-if [ -f ~/.makepkg.conf ]; then
-	SRCDEST=$(grep '^SRCDEST=' ~/.makepkg.conf | cut -d= -f2)
-	PKGDEST=$(grep '^PKGDEST=' ~/.makepkg.conf | cut -d= -f2)
+# read .makpekg.conf even if called via sudo
+if [ -n "${SUDO_USER}" ]; then
+	makepkg_conf="/$(eval echo ~${SUDO_USER})/.makepkg.conf"
+else
+	makepkg_conf="~/.makepkg.conf"
 fi
-[ -z ${SRCDEST} ] && SRCDEST=$(grep '^SRCDEST=' /etc/makepkg.conf | cut -d= -f2)
-[ -z ${PKGDEST} ] && PKGDEST=$(grep '^PKGDEST=' /etc/makepkg.conf | cut -d= -f2)
+
+# Get SRC/PKGDEST from makepkg.conf
+if [ -f "${makepkg_conf}" ]; then
+	eval $(grep '^SRCDEST=' "${makepkg_conf}")
+	eval $(grep '^PKGDEST=' "${makepkg_conf}")
+
+	eval $(grep '^MAKEFLAGS=' "${makepkg_conf}")
+	eval $(grep '^PACKAGER=' "${makepkg_conf}")
+fi
+[ -z "${SRCDEST}" ] && eval $(grep '^SRCDEST=' /etc/makepkg.conf)
+[ -z "${PKGDEST}" ] && eval $(grep '^PKGDEST=' /etc/makepkg.conf)
 
 [ -d "$copydir/pkgdest" ] || mkdir "$copydir/pkgdest"
-if ! grep 'PKGDEST=/pkgdest' "$copydir/etc/makepkg.conf" >/dev/null 2>&1; then
-	echo 'PKGDEST=/pkgdest' >> "$copydir/etc/makepkg.conf"
+if ! grep 'PKGDEST="/pkgdest"' "$copydir/etc/makepkg.conf" >/dev/null 2>&1; then
+	echo 'PKGDEST="/pkgdest"' >> "$copydir/etc/makepkg.conf"
 fi
 
 [ -d "$copydir/srcdest" ] || mkdir "$copydir/srcdest"
-if ! grep 'SRCDEST=/srcdest' "$copydir/etc/makepkg.conf" >/dev/null 2>&1; then
-	echo 'SRCDEST=/srcdest' >> "$copydir/etc/makepkg.conf"
+if ! grep 'SRCDEST="/srcdest"' "$copydir/etc/makepkg.conf" >/dev/null 2>&1; then
+	echo 'SRCDEST="/srcdest"' >> "$copydir/etc/makepkg.conf"
 fi
+[ -z "${MAKEFLAGS}" ] && eval $(grep '^MAKEFLAGS=' /etc/makepkg.conf)
+[ -n "${MAKEFLAGS}" ] && echo "MAKEFLAGS='${MAKEFLAGS}'" >> "$copydir/etc/makepkg.conf"
+[ -z "${PACKAGER}" ] && eval $(grep '^PACKAGER=' /etc/makepkg.conf)
+[ -n "${PACKAGER}" ] && echo "PACKAGER='${PACKAGER}'" >> "$copydir/etc/makepkg.conf"
 
 # Set target CARCH as it might be used within the PKGBUILD to select correct sources
-CARCH=$(eval $(grep '^CARCH=' "$copydir/etc/makepkg.conf"))
+eval $(grep '^CARCH=' "$copydir/etc/makepkg.conf")
+export CARCH
 # Copy PKGBUILD and sources
-source PKGBUILD
+source=($(. PKGBUILD; echo ${source[@]}))
 cp PKGBUILD "$copydir/build/"
 for f in ${source[@]}; do
 	basef=$(echo $f | sed 's|::.*||' | sed 's|^.*://.*/||g')
@@ -164,6 +179,7 @@ for f in ${source[@]}; do
 	fi
 done
 
+( . PKGBUILD
 for i in 'changelog' 'install'; do
 	filelist=$(sed -n "s/^[[:space:]]*$i=//p" PKGBUILD)
 	for file in $filelist; do
@@ -174,22 +190,20 @@ for i in 'changelog' 'install'; do
 		fi
 	done
 done
+)
 
 chown -R nobody "$copydir/build"
 chown -R nobody "$copydir/srcdest"
 chown -R nobody "$copydir/pkgdest"
 
-if ! grep "^nobody" "$copydir/etc/sudoers" >/dev/null 2>&1; then
-	touch "$copydir/etc/sudoers"
-	echo 'nobody	ALL=(ALL) NOPASSWD: ALL' >> "$copydir/etc/sudoers"
-	chmod 440 "$copydir/etc/sudoers"
-fi
+echo 'nobody ALL = NOPASSWD: /usr/bin/pacman' > "$copydir/etc/sudoers.d/nobody-pacman"
+chmod 440 "$copydir/etc/sudoers.d/nobody-pacman"
 
 #This is a little gross, but this way the script is recreated every time in the
 #working copy
 (cat <<EOF
 #!/bin/bash
-export LANG=$LOCALE
+export LANG=C
 cd /build
 export HOME=/build
 sudo -u nobody makepkg $MAKEPKG_ARGS || touch BUILD_FAILED
@@ -239,6 +253,4 @@ if [ -e "${copydir}/build/BUILD_FAILED" ]; then
 	echo "Build failed, check $copydir/build"
 	rm "${copydir}/build/BUILD_FAILED"
 	exit 1
-else
-	rm -rf "${copydir}"/build/*
 fi

makepkg-i686.conf

@@ -0,0 +1,115 @@
+#
+# /etc/makepkg.conf
+#
+
+#########################################################################
+# SOURCE ACQUISITION
+#########################################################################
+#
+#-- The download utilities that makepkg should use to acquire sources
+#  Format: 'protocol::agent'
+DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u'
+          'http::/usr/bin/wget -c -t 3 --waitretry=3 -O %o %u'
+          'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u'
+          'rsync::/usr/bin/rsync -z %u %o'
+          'scp::/usr/bin/scp -C %u %o')
+
+# Other common tools:
+# /usr/bin/snarf
+# /usr/bin/lftpget -c
+# /usr/bin/curl
+
+#########################################################################
+# ARCHITECTURE, COMPILE FLAGS
+#########################################################################
+#
+CARCH="i686"
+CHOST="i686-pc-linux-gnu"
+
+#-- Exclusive: will only run on i686
+# -march (or -mcpu) builds exclusively for an architecture
+# -mtune optimizes for an architecture, but builds for whole processor family
+CFLAGS="-march=i686 -mtune=generic -O2 -pipe"
+CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe"
+LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed"
+#-- Make Flags: change this for DistCC/SMP systems
+#MAKEFLAGS="-j2"
+
+#########################################################################
+# BUILD ENVIRONMENT
+#########################################################################
+#
+# Defaults: BUILDENV=(fakeroot !distcc color !ccache)
+#  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
+#
+BUILDENV=(fakeroot !distcc color !ccache)
+#
+#-- 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=""
+
+#########################################################################
+# GLOBAL PACKAGE OPTIONS
+#   These are default values for the options=() settings
+#########################################################################
+#
+# Default: OPTIONS=(strip docs libtool emptydirs zipman purge)
+#  A negated option will do the opposite of the comments below.
+#
+#-- strip:     Strip symbols from binaries/libraries in STRIP_DIRS
+#-- docs:      Save doc directories specified by DOC_DIRS
+#-- libtool:   Leave libtool (.la) 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
+#
+OPTIONS=(strip docs libtool emptydirs zipman purge)
+
+#-- 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})
+#-- Directories to be searched for the strip option (if strip is specified)
+STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin})
+#-- 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
+#-- Packager: name/email of the person or organization building packages
+#PACKAGER="John Doe <john@doe.com>"
+
+#########################################################################
+# 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:

makepkg-x86_64.conf

@@ -0,0 +1,115 @@
+#
+# /etc/makepkg.conf
+#
+
+#########################################################################
+# SOURCE ACQUISITION
+#########################################################################
+#
+#-- The download utilities that makepkg should use to acquire sources
+#  Format: 'protocol::agent'
+DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u'
+          'http::/usr/bin/wget -c -t 3 --waitretry=3 -O %o %u'
+          'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u'
+          'rsync::/usr/bin/rsync -z %u %o'
+          'scp::/usr/bin/scp -C %u %o')
+
+# Other common tools:
+# /usr/bin/snarf
+# /usr/bin/lftpget -c
+# /usr/bin/curl
+
+#########################################################################
+# ARCHITECTURE, COMPILE FLAGS
+#########################################################################
+#
+CARCH="x86_64"
+CHOST="x86_64-unknown-linux-gnu"
+
+#-- Exclusive: will only run on x86_64
+# -march (or -mcpu) builds exclusively for an architecture
+# -mtune optimizes for an architecture, but builds for whole processor family
+CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
+CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
+LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed"
+#-- Make Flags: change this for DistCC/SMP systems
+#MAKEFLAGS="-j2"
+
+#########################################################################
+# BUILD ENVIRONMENT
+#########################################################################
+#
+# Defaults: BUILDENV=(fakeroot !distcc color !ccache)
+#  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
+#
+BUILDENV=(fakeroot !distcc color !ccache)
+#
+#-- 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=""
+
+#########################################################################
+# GLOBAL PACKAGE OPTIONS
+#   These are default values for the options=() settings
+#########################################################################
+#
+# Default: OPTIONS=(strip docs libtool emptydirs zipman purge)
+#  A negated option will do the opposite of the comments below.
+#
+#-- strip:     Strip symbols from binaries/libraries in STRIP_DIRS
+#-- docs:      Save doc directories specified by DOC_DIRS
+#-- libtool:   Leave libtool (.la) 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
+#
+OPTIONS=(strip docs libtool emptydirs zipman purge)
+
+#-- 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})
+#-- Directories to be searched for the strip option (if strip is specified)
+STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin})
+#-- 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
+#-- Packager: name/email of the person or organization building packages
+#PACKAGER="John Doe <john@doe.com>"
+
+#########################################################################
+# 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:

mkarchroot

@@ -34,7 +34,7 @@ usage() {
 while getopts 'r:ufnhC:M:c:' arg; do
 	case "${arg}" in
 		r) RUN="$OPTARG" ;;
-		u) RUN='pacman -Syu' ;;
+		u) RUN='/bin/sh -c "pacman -Syu --noconfirm && (pacman -Qqu >/dev/null && pacman -Su --noconfirm || exit 0)"' ;;
 		f) FORCE='y' ;;
 		C) pac_conf="$OPTARG" ;;
 		M) makepkg_conf="$OPTARG" ;;
@@ -72,6 +72,16 @@ if [ -z "$cache_dir" ]; then
 	unset cache_conf
 fi
 
+if [ -f /etc/pacman.d/mirrorlist ]; then
+	host_mirror=$(pacman -Sdp extra/devtools 2>/dev/null | sed -E 's#(.*/)extra/os/.*#\1$repo/os/$arch#')
+fi
+if [ -z "${host_mirror}" ]; then
+	host_mirror='http://mirrors.kernel.org/archlinux/$repo/os/$arch'
+fi
+if echo "${host_mirror}" | grep -q 'file://'; then
+	host_mirror_path=$(echo "${host_mirror}" | sed -E 's#file://(/.*)/\$repo/os/\$arch#\1#g')
+fi
+
 # {{{ functions 
 
 chroot_mount() {
@@ -82,24 +92,45 @@ chroot_mount() {
 	mount -t proc proc "${working_dir}/proc"
 
 	[ -e "${working_dir}/dev" ] || mkdir "${working_dir}/dev"
-	mount -o bind /dev "${working_dir}/dev"
+	mount -t tmpfs dev "${working_dir}/dev" -o mode=0755,size=10M,nosuid
+	mknod -m 666 "${working_dir}/dev/null" c 1 3
+	mknod -m 666 "${working_dir}/dev/zero" c 1 5
+	mknod -m 600 "${working_dir}/dev/console" c 5 1
+	mknod -m 644 "${working_dir}/dev/random" c 1 8
+	mknod -m 644 "${working_dir}/dev/urandom" c 1 9
+	mknod -m 666 "${working_dir}/dev/tty" c 5 0
+	mknod -m 666 "${working_dir}/dev/tty0" c 4 0
+	mknod -m 666 "${working_dir}/dev/full" c 1 7
+	ln -s /proc/kcore "${working_dir}/dev/core"
+	ln -s /proc/self/fd "${working_dir}/dev/fd"
+	ln -s /proc/self/fd/0 "${working_dir}/dev/stdin"
+	ln -s /proc/self/fd/1 "${working_dir}/dev/stdout"
+	ln -s /proc/self/fd/2 "${working_dir}/dev/stderr"
 
 	[ -e "${working_dir}/dev/shm" ] || mkdir "${working_dir}/dev/shm"
-	mount -t tmpfs shm "${working_dir}/dev/shm"
+	mount -t tmpfs shm "${working_dir}/dev/shm" -o nodev,nosuid,size=128M
 
 	[ -e "${working_dir}/dev/pts" ] || mkdir "${working_dir}/dev/pts"
-	mount -t devpts devpts "${working_dir}/dev/pts"
+	mount -t devpts devpts "${working_dir}/dev/pts" -o newinstance,ptmxmode=666
+	ln -s pts/ptmx "${working_dir}/dev/ptmx"
 
 	[ -e "${cache_dir}" ] || mkdir -p "${cache_dir}"
 	[ -e "${working_dir}/${cache_dir}" ] || mkdir -p "${working_dir}/${cache_dir}"
 	mount -o bind "${cache_dir}" "${working_dir}/${cache_dir}"
 
-	trap 'chroot_umount' 0 1 2 15
+	if [ -n "${host_mirror_path}" ]; then
+		[ -e "${working_dir}/${host_mirror_path}" ] || mkdir -p "${working_dir}/${host_mirror_path}"
+		mount -o bind "${host_mirror_path}" "${working_dir}/${host_mirror_path}"
+		mount -o remount,ro,bind "${host_mirror_path}" "${working_dir}/${host_mirror_path}"
+	fi
+
+	trap 'chroot_umount' EXIT INT QUIT TERM HUP
 }
 
 copy_hostconf () {
-	cp /etc/mtab "${working_dir}/etc/mtab"
+	chroot "${working_dir}" /bin/findmnt -rnu -o SOURCE,TARGET,FSTYPE,OPTIONS > "${working_dir}/etc/mtab"
 	cp /etc/resolv.conf "${working_dir}/etc/resolv.conf"
+	echo "Server = ${host_mirror}" > ${working_dir}/etc/pacman.d/mirrorlist
 }
 
 chroot_umount () {
@@ -109,6 +140,7 @@ chroot_umount () {
 	umount "${working_dir}/dev/shm"
 	umount "${working_dir}/dev"
 	umount "${working_dir}/${cache_dir}"
+	[ -n "${host_mirror_path}" ] && umount "${working_dir}/${host_mirror_path}"
 }
 # }}}
 
@@ -125,7 +157,7 @@ if [ "$RUN" != "" ]; then
 	chroot_mount
 	copy_hostconf
 
-	chroot "${working_dir}" ${RUN}
+	eval chroot "${working_dir}" ${RUN}
 
 	# }}}
 	else
@@ -135,15 +167,12 @@ if [ "$RUN" != "" ]; then
 		exit 1
 	fi
 
-	mkdir -p "${working_dir}/var/lib/pacman/"
+	mkdir -p "${working_dir}/var/lib/pacman/sync"
 	mkdir -p "${working_dir}/etc/"
 
 	chroot_mount
 
-	pacargs='--noconfirm -v ' #--noprogressbar -v
-	pacargs="$pacargs --root=${working_dir}"
-	# pacman takes these as relative to the given root
-	pacargs="$pacargs --cachedir=${cache_dir}"
+	pacargs="--noconfirm --root=${working_dir} --cachedir=${cache_dir}"
 	if [ "$pac_conf" != "" ]; then
 		pacargs="$pacargs --config=${pac_conf}"
 	fi
@@ -172,7 +201,7 @@ if [ "$RUN" != "" ]; then
 	fi
 
 	if [ -e "${working_dir}/etc/locale.gen" ]; then
-		cp /etc/locale.gen "${working_dir}/etc/locale.gen"
+		echo -e 'en_US.UTF-8 UTF-8\nde_DE.UTF-8 UTF-8' > "${working_dir}/etc/locale.gen"
 		chroot "${working_dir}" locale-gen
 	fi
 

pacman-extra.conf

@@ -0,0 +1,79 @@
+#
+# /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
+HoldPkg     = pacman glibc
+# If upgrades are available for these packages they will be asked for first
+SyncFirst   = pacman
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#XferCommand = /usr/bin/curl -C - %u > %o
+#CleanMethod = KeepInstalled
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options (all disabled by default)
+#UseSyslog
+#ShowSize
+#UseDelta
+#TotalDownload
+
+#
+# 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
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#Server = file:///home/custompkgs
+

pacman-multilib-testing.conf

@@ -0,0 +1,87 @@
+#
+# /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
+HoldPkg     = pacman glibc
+# If upgrades are available for these packages they will be asked for first
+SyncFirst   = pacman
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#XferCommand = /usr/bin/curl -C - %u > %o
+#CleanMethod = KeepInstalled
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options (all disabled by default)
+#UseSyslog
+#ShowSize
+#UseDelta
+#TotalDownload
+
+#
+# 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 repository 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]
+#Server = file:///home/custompkgs
+

pacman-multilib.conf

@@ -0,0 +1,84 @@
+#
+# /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
+HoldPkg     = pacman glibc
+# If upgrades are available for these packages they will be asked for first
+SyncFirst   = pacman
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#XferCommand = /usr/bin/curl -C - %u > %o
+#CleanMethod = KeepInstalled
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options (all disabled by default)
+#UseSyslog
+#ShowSize
+#UseDelta
+#TotalDownload
+
+#
+# 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 repository here.
+[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]
+#Server = file:///home/custompkgs
+

pacman-staging.conf

@@ -0,0 +1,85 @@
+#
+# /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
+HoldPkg     = pacman glibc
+# If upgrades are available for these packages they will be asked for first
+SyncFirst   = pacman
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#XferCommand = /usr/bin/curl -C - %u > %o
+#CleanMethod = KeepInstalled
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options (all disabled by default)
+#UseSyslog
+#ShowSize
+#UseDelta
+#TotalDownload
+
+#
+# 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.
+
+[staging]
+Include = /etc/pacman.d/mirrorlist
+
+[testing]
+Include = /etc/pacman.d/mirrorlist
+
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+[community-staging]
+Include = /etc/pacman.d/mirrorlist
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist
+
+[community]
+Include = /etc/pacman.d/mirrorlist
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#Server = file:///home/custompkgs
+

pacman-testing.conf

@@ -0,0 +1,79 @@
+#
+# /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
+HoldPkg     = pacman glibc
+# If upgrades are available for these packages they will be asked for first
+SyncFirst   = pacman
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#XferCommand = /usr/bin/curl -C - %u > %o
+#CleanMethod = KeepInstalled
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options (all disabled by default)
+#UseSyslog
+#ShowSize
+#UseDelta
+#TotalDownload
+
+#
+# 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
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#Server = file:///home/custompkgs
+