From 46c4def0733a78ce08702d188e3e1a141fb07316 Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <archlinux@cryptocrack.de>
Date: Mon, 29 Aug 2011 10:53:50 +0200
Subject: Support non-standard install locations

This build system overhaul allows for adding (define-style) macros to
our scripts. All source files are now suffixed with ".in" to clarify
that they might contain unprocessed defines. The Makefile provides a new
rule to preprocess source files and generate proper output scripts.

Also, add a "@pkgdatadir@" define (as used in GNU Autotools) and use it
instead of hardcoded paths to "/usr/share/devtools" everywhere. We
missed this when adding PREFIX support to the build system in commit
35fc83ce7d8dc26cd424321f2e8638d05da0a6d4.

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
---
 makechrootpkg.in | 305 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 305 insertions(+)
 create mode 100644 makechrootpkg.in

(limited to 'makechrootpkg.in')

diff --git a/makechrootpkg.in b/makechrootpkg.in
new file mode 100644
index 0000000..a60c9fe
--- /dev/null
+++ b/makechrootpkg.in
@@ -0,0 +1,305 @@
+#!/bin/bash
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+FORCE='n'
+RUN=''
+MAKEPKG_ARGS='-s --noconfirm'
+REPACK=''
+WORKDIR=$PWD
+
+update_first='0'
+clean_first='0'
+install_pkg=''
+add_to_db=0
+
+chrootdir=''
+
+APPNAME=$(basename "${0}")
+
+default_copy=$USER
+[[ -n $SUDO_USER ]] && default_copy=$SUDO_USER
+[[ -z $default_copy || $default_copy = root ]] && default_copy=copy
+
+usage() {
+	echo "usage ${APPNAME} [options] -r <chrootdir> [--] [makepkg args]"
+	echo ' Run this script in a PKGBUILD dir to build a package inside a'
+	echo ' clean chroot. All unrecognized arguments passed to this script'
+	echo ' will be passed to makepkg.'
+	echo ''
+	echo ' The chroot dir consists of the following directories:'
+	echo ' <chrootdir>/{root, copy} but only "root" is required'
+	echo ' by default. The working copy will be created as needed'
+	echo ''
+	echo 'The chroot "root" directory must be created via the following'
+	echo 'command:'
+	echo '    mkarchroot <chrootdir>/root base base-devel sudo'
+	echo ''
+	echo "Default makepkg args: $MAKEPKG_ARGS"
+	echo ''
+	echo 'Flags:'
+	echo '-h         This help'
+	echo '-c         Clean the chroot before building'
+	echo '-u         Update the working copy of the chroot before building'
+	echo '           This is useful for rebuilds without dirtying the pristine'
+	echo '           chroot'
+	echo '-d         Add the package to a local db at /repo after building'
+	echo '-r <dir>   The chroot dir to use'
+	echo '-I <pkg>   Install a package into the working copy of the chroot'
+	echo '-l <copy>  The directory to use as the working copy of the chroot'
+	echo '           Useful for maintaining multiple copies.'
+	echo "           Default: $default_copy"
+	exit 1
+}
+
+while getopts 'hcudr:I:l:' arg; do
+	case "${arg}" in
+		h) usage ;;
+		c) clean_first=1 ;;
+		u) update_first=1 ;;
+		d) add_to_db=1 ;;
+		r) chrootdir="$OPTARG" ;;
+		I) install_pkg="$OPTARG" ;;
+		l) copy="$OPTARG" ;;
+		*) MAKEPKG_ARGS="$MAKEPKG_ARGS -$arg $OPTARG" ;;
+	esac
+done
+
+# Canonicalize chrootdir, getting rid of trailing /
+chrootdir=$(readlink -e "$chrootdir")
+
+if [[ ${copy:0:1} = "/" ]]; then
+	copydir=$copy
+else
+	[[ -z $copy ]] && copy=$default_copy
+	copydir="$chrootdir/$copy"
+fi
+
+# Pass all arguments after -- right to makepkg
+MAKEPKG_ARGS="$MAKEPKG_ARGS ${*:$OPTIND}"
+
+# See if -R was passed to makepkg
+for arg in ${*:$OPTIND}; do
+	if [ "$arg" = '-R' ]; then
+		REPACK=1
+		break;
+	fi
+done
+
+if [ "$EUID" != '0' ]; then
+	echo 'This script must be run as root.'
+	exit 1
+fi
+
+if [ ! -f PKGBUILD -a -z "$install_pkg" ]; then
+	echo 'This must be run in a directory containing a PKGBUILD.'
+	exit 1
+fi
+
+if [ ! -d "$chrootdir" ]; then
+	echo "No chroot dir defined, or invalid path '$chrootdir'"
+	exit 1
+fi
+
+if [ ! -d "$chrootdir/root" ]; then
+	echo 'Missing chroot dir root directory.'
+	echo "Try using: mkarchroot $chrootdir/root base base-devel sudo"
+	usage
+fi
+
+umask 0022
+
+# Lock the chroot we want to use. We'll keep this lock until we exit.
+# Note this is the same FD number as in mkarchroot
+exec 9>"$copydir.lock"
+if ! flock -n 9; then
+	echo -n "locking chroot copy '$copy'..."
+	flock 9
+	echo "done"
+fi
+
+if [ ! -d "$copydir" -o "$clean_first" -eq "1" ]; then
+	# Get a read lock on the root chroot to make
+	# sure we don't clone a half-updated chroot
+	exec 8>"$chrootdir/root.lock"
+
+	if ! flock -sn 8; then
+		echo -n "locking clean chroot..."
+		flock -s 8
+		echo "done"
+	fi
+
+	echo -n 'creating clean working copy...'
+	use_rsync=false
+	if type -P btrfs >/dev/null; then
+		[ -d $copydir ] && btrfs subvolume delete "$copydir" &>/dev/null
+		btrfs subvolume snapshot "$chrootdir/root" "$copydir" &>/dev/null || use_rsync=true
+	else
+		use_rsync=true
+	fi
+
+	if $use_rsync; then
+		mkdir -p "$copydir"
+		rsync -a --delete -q -W -x "$chrootdir/root/" "$copydir"
+	fi
+	echo 'done'
+
+	# Drop the read lock again
+	exec 8>&-
+fi
+
+if [ -n "$install_pkg" ]; then
+	pkgname="$(basename "$install_pkg")"
+	cp "$install_pkg" "$copydir/$pkgname"
+	mkarchroot -r "pacman -U /$pkgname --noconfirm" "$copydir"
+	ret=$?
+	rm "$copydir/$pkgname"
+	# Exit early, we've done all we need to
+	exit $ret
+fi
+
+if [ $update_first -eq 1 ]; then
+	mkarchroot -u "$copydir"
+fi
+
+[ -d "$copydir/build" ] || mkdir "$copydir/build"
+
+if [ "$REPACK" != "1" ]; then
+	# Remove anything in there UNLESS -R (repack) was passed to makepkg
+	rm -rf "$copydir/build/"*
+fi
+
+# Read .makepkg.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
+
+# 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"
+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"
+fi
+[ -z "${MAKEFLAGS}" ] && eval $(grep '^MAKEFLAGS=' /etc/makepkg.conf)
+if [ -n "${MAKEFLAGS}" ]; then 
+  sed -i '/^MAKEFLAGS=/d' "$copydir/etc/makepkg.conf"
+  echo "MAKEFLAGS='${MAKEFLAGS}'" >> "$copydir/etc/makepkg.conf"
+fi
+[ -z "${PACKAGER}" ] && eval $(grep '^PACKAGER=' /etc/makepkg.conf)
+if [ -n "${PACKAGER}" ]; then 
+  sed -i '/^PACKAGER=/d' "$copydir/etc/makepkg.conf"
+  echo "PACKAGER='${PACKAGER}'" >> "$copydir/etc/makepkg.conf"
+fi
+
+# Set target CARCH as it might be used within the PKGBUILD to select correct sources
+eval $(grep '^CARCH=' "$copydir/etc/makepkg.conf")
+export CARCH
+# Copy PKGBUILD and sources
+source=($(. PKGBUILD; echo ${source[@]}))
+cp PKGBUILD "$copydir/build/"
+for f in ${source[@]}; do
+	basef=$(echo $f | sed 's|::.*||' | sed 's|^.*://.*/||g')
+	if [ -f "$basef" ]; then
+		cp "$basef" "$copydir/srcdest/"
+	elif [ -f "$SRCDEST/$basef" ]; then
+		cp "$SRCDEST/$basef" "$copydir/srcdest/"
+	fi
+done
+
+( . PKGBUILD
+for i in 'changelog' 'install'; do
+	filelist=$(sed -n "s/^[[:space:]]*$i=//p" PKGBUILD)
+	for file in $filelist; do
+		# evaluate any bash variables used
+		eval file=${file}
+		if [[ -f "$file" ]]; then
+			cp "$file" "$copydir/build/"
+		fi
+	done
+done
+)
+
+chown -R nobody "$copydir/build"
+chown -R nobody "$copydir/srcdest"
+chown -R nobody "$copydir/pkgdest"
+
+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=C
+cd /build
+export HOME=/build
+sudo -u nobody makepkg $MAKEPKG_ARGS || touch BUILD_FAILED
+[ -f BUILD_FAILED ] && exit 1
+which namcap &>/dev/null && namcap /build/PKGBUILD /pkgdest/*.pkg.tar.* > /build/namcap.log
+exit 0
+EOF
+) > "$copydir/chrootbuild"
+chmod +x "$copydir/chrootbuild"
+
+if mkarchroot -r "/chrootbuild" "$copydir"; then
+	for pkgfile in "${copydir}"/pkgdest/*.pkg.tar.*; do
+		[ -e "$pkgfile" ] || continue
+		if [ "$add_to_db" -eq "1" ]; then
+			mkdir -p "${copydir}/repo"
+			pushd "${copydir}/repo" >/dev/null
+			cp "$pkgfile" .
+			repo-add repo.db.tar.gz "$(basename "$pkgfile")"
+			popd >/dev/null
+		fi
+
+		if [ -d "$PKGDEST" ]; then
+			mv "$pkgfile" "${PKGDEST}"
+		else
+			mv "$pkgfile" "${WORKDIR}"
+		fi
+	done
+
+	for l in "${copydir}"/build/{namcap,*-{build,check,package,package_*}}.log; do
+		[ -f "$l" ] && mv "$l" "${WORKDIR}"
+	done
+else
+	#just in case. We returned 1, make sure we fail
+	touch "${copydir}/build/BUILD_FAILED"
+fi
+
+for f in "${copydir}"/srcdest/*; do
+	[ -e "$f" ] || continue
+	if [ -d "$SRCDEST" ]; then
+		mv "$f" "${SRCDEST}"
+	else
+		mv "$f" "${WORKDIR}"
+	fi
+done
+
+if [ -e "${copydir}/build/BUILD_FAILED" ]; then
+	echo "Build failed, check $copydir/build"
+	rm "${copydir}/build/BUILD_FAILED"
+	exit 1
+fi
-- 
cgit v1.2.3-54-g00ecf


From 733668f4ccb42aba30b17811f3c9a1091de64cc2 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Sat, 17 Sep 2011 14:46:10 +0200
Subject: makechrootpkg: Bashify syntax

No functional change. Eliminates unused variables RUN and FORCE.

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
---
 makechrootpkg.in | 224 +++++++++++++++++++++++++++----------------------------
 1 file changed, 111 insertions(+), 113 deletions(-)

(limited to 'makechrootpkg.in')

diff --git a/makechrootpkg.in b/makechrootpkg.in
index a60c9fe..6e1e37e 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -8,27 +8,22 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-FORCE='n'
-RUN=''
-MAKEPKG_ARGS='-s --noconfirm'
-REPACK=''
-WORKDIR=$PWD
-
-update_first='0'
-clean_first='0'
-install_pkg=''
-add_to_db=0
-
-chrootdir=''
-
-APPNAME=$(basename "${0}")
+workdir="$PWD"
+makepkg_args='-s --noconfirm'
+repack=false
+update_first=false
+clean_first=false
+install_pkg=
+add_to_db=false
+chrootdir=
+appname=${0##*/}
 
 default_copy=$USER
 [[ -n $SUDO_USER ]] && default_copy=$SUDO_USER
 [[ -z $default_copy || $default_copy = root ]] && default_copy=copy
 
 usage() {
-	echo "usage ${APPNAME} [options] -r <chrootdir> [--] [makepkg args]"
+	echo "usage $appname [options] -r <chrootdir> [--] [makepkg args]"
 	echo ' Run this script in a PKGBUILD dir to build a package inside a'
 	echo ' clean chroot. All unrecognized arguments passed to this script'
 	echo ' will be passed to makepkg.'
@@ -41,7 +36,7 @@ usage() {
 	echo 'command:'
 	echo '    mkarchroot <chrootdir>/root base base-devel sudo'
 	echo ''
-	echo "Default makepkg args: $MAKEPKG_ARGS"
+	echo "Default makepkg args: $makepkg_args"
 	echo ''
 	echo 'Flags:'
 	echo '-h         This help'
@@ -59,22 +54,22 @@ usage() {
 }
 
 while getopts 'hcudr:I:l:' arg; do
-	case "${arg}" in
+	case "$arg" in
 		h) usage ;;
-		c) clean_first=1 ;;
-		u) update_first=1 ;;
-		d) add_to_db=1 ;;
+		c) clean_first=true ;;
+		u) update_first=true ;;
+		d) add_to_db=true ;;
 		r) chrootdir="$OPTARG" ;;
 		I) install_pkg="$OPTARG" ;;
 		l) copy="$OPTARG" ;;
-		*) MAKEPKG_ARGS="$MAKEPKG_ARGS -$arg $OPTARG" ;;
+		*) makepkg_args="$makepkg_args -$arg $OPTARG" ;;
 	esac
 done
 
 # Canonicalize chrootdir, getting rid of trailing /
 chrootdir=$(readlink -e "$chrootdir")
 
-if [[ ${copy:0:1} = "/" ]]; then
+if [[ ${copy:0:1} = / ]]; then
 	copydir=$copy
 else
 	[[ -z $copy ]] && copy=$default_copy
@@ -82,32 +77,32 @@ else
 fi
 
 # Pass all arguments after -- right to makepkg
-MAKEPKG_ARGS="$MAKEPKG_ARGS ${*:$OPTIND}"
+makepkg_args="$makepkg_args ${*:$OPTIND}"
 
 # See if -R was passed to makepkg
 for arg in ${*:$OPTIND}; do
-	if [ "$arg" = '-R' ]; then
-		REPACK=1
-		break;
+	if [[ $arg = -R ]]; then
+		repack=1
+		break
 	fi
 done
 
-if [ "$EUID" != '0' ]; then
+if (( EUID )); then
 	echo 'This script must be run as root.'
 	exit 1
 fi
 
-if [ ! -f PKGBUILD -a -z "$install_pkg" ]; then
+if [[ ! -f PKGBUILD && -z $install_pkg ]]; then
 	echo 'This must be run in a directory containing a PKGBUILD.'
 	exit 1
 fi
 
-if [ ! -d "$chrootdir" ]; then
+if [[ ! -d $chrootdir ]]; then
 	echo "No chroot dir defined, or invalid path '$chrootdir'"
 	exit 1
 fi
 
-if [ ! -d "$chrootdir/root" ]; then
+if [[ ! -d $chrootdir/root ]]; then
 	echo 'Missing chroot dir root directory.'
 	echo "Try using: mkarchroot $chrootdir/root base base-devel sudo"
 	usage
@@ -124,7 +119,7 @@ if ! flock -n 9; then
 	echo "done"
 fi
 
-if [ ! -d "$copydir" -o "$clean_first" -eq "1" ]; then
+if [[ ! -d $copydir ]] || $clean_first; then
 	# Get a read lock on the root chroot to make
 	# sure we don't clone a half-updated chroot
 	exec 8>"$chrootdir/root.lock"
@@ -138,8 +133,9 @@ if [ ! -d "$copydir" -o "$clean_first" -eq "1" ]; then
 	echo -n 'creating clean working copy...'
 	use_rsync=false
 	if type -P btrfs >/dev/null; then
-		[ -d $copydir ] && btrfs subvolume delete "$copydir" &>/dev/null
-		btrfs subvolume snapshot "$chrootdir/root" "$copydir" &>/dev/null || use_rsync=true
+		[[ -d $copydir ]] && btrfs subvolume delete "$copydir" &>/dev/null
+		btrfs subvolume snapshot "$chrootdir/root" "$copydir" &>/dev/null ||
+			use_rsync=true
 	else
 		use_rsync=true
 	fi
@@ -154,152 +150,154 @@ if [ ! -d "$copydir" -o "$clean_first" -eq "1" ]; then
 	exec 8>&-
 fi
 
-if [ -n "$install_pkg" ]; then
-	pkgname="$(basename "$install_pkg")"
+if [[ -n $install_pkg ]]; then
+	pkgname="${install_pkg##*/}"
 	cp "$install_pkg" "$copydir/$pkgname"
+
 	mkarchroot -r "pacman -U /$pkgname --noconfirm" "$copydir"
 	ret=$?
+
 	rm "$copydir/$pkgname"
+
 	# Exit early, we've done all we need to
 	exit $ret
 fi
 
-if [ $update_first -eq 1 ]; then
-	mkarchroot -u "$copydir"
-fi
+$update_first && mkarchroot -u "$copydir"
 
-[ -d "$copydir/build" ] || mkdir "$copydir/build"
+mkdir -p "$copydir/build"
 
-if [ "$REPACK" != "1" ]; then
-	# Remove anything in there UNLESS -R (repack) was passed to makepkg
-	rm -rf "$copydir/build/"*
-fi
+# Remove anything in there UNLESS -R (repack) was passed to makepkg
+$repack || rm -rf "$copydir"/build/*
 
 # Read .makepkg.conf even if called via sudo
-if [ -n "${SUDO_USER}" ]; then
-	makepkg_conf="/$(eval echo ~${SUDO_USER})/.makepkg.conf"
+if [[ -n $SUDO_USER ]]; then
+	makepkg_conf="$(eval echo ~$SUDO_USER)/.makepkg.conf"
 else
-	makepkg_conf="~/.makepkg.conf"
+	makepkg_conf="$HOME/.makepkg.conf"
 fi
 
 # 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}")
+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
+[[ -z $SRCDEST ]] && eval $(grep '^SRCDEST=' /etc/makepkg.conf)
+[[ -z $PKGDEST ]] && eval $(grep '^PKGDEST=' /etc/makepkg.conf)
+[[ -z $MAKEFLAGS ]] && eval $(grep '^MAKEFLAGS=' /etc/makepkg.conf)
+[[ -z $PACKAGER ]] && eval $(grep '^PACKAGER=' /etc/makepkg.conf)
+
+mkdir -p "$copydir/pkgdest"
+if ! grep -q 'PKGDEST="/pkgdest"' "$copydir/etc/makepkg.conf"; 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
+mkdir -p "$copydir/srcdest"
+if ! grep -q 'SRCDEST="/srcdest"' "$copydir/etc/makepkg.conf"; then
 	echo 'SRCDEST="/srcdest"' >> "$copydir/etc/makepkg.conf"
 fi
-[ -z "${MAKEFLAGS}" ] && eval $(grep '^MAKEFLAGS=' /etc/makepkg.conf)
-if [ -n "${MAKEFLAGS}" ]; then 
-  sed -i '/^MAKEFLAGS=/d' "$copydir/etc/makepkg.conf"
-  echo "MAKEFLAGS='${MAKEFLAGS}'" >> "$copydir/etc/makepkg.conf"
+
+if [[ -n $MAKEFLAGS ]]; then 
+	sed -i '/^MAKEFLAGS=/d' "$copydir/etc/makepkg.conf"
+	echo "MAKEFLAGS='${MAKEFLAGS}'" >> "$copydir/etc/makepkg.conf"
 fi
-[ -z "${PACKAGER}" ] && eval $(grep '^PACKAGER=' /etc/makepkg.conf)
-if [ -n "${PACKAGER}" ]; then 
-  sed -i '/^PACKAGER=/d' "$copydir/etc/makepkg.conf"
-  echo "PACKAGER='${PACKAGER}'" >> "$copydir/etc/makepkg.conf"
+
+if [[ -n $PACKAGER ]]; then 
+	sed -i '/^PACKAGER=/d' "$copydir/etc/makepkg.conf"
+	echo "PACKAGER='${PACKAGER}'" >> "$copydir/etc/makepkg.conf"
 fi
 
 # Set target CARCH as it might be used within the PKGBUILD to select correct sources
 eval $(grep '^CARCH=' "$copydir/etc/makepkg.conf")
 export CARCH
+
 # Copy PKGBUILD and sources
-source=($(. PKGBUILD; echo ${source[@]}))
+source=( $(source PKGBUILD; echo ${source[@]}) )
 cp PKGBUILD "$copydir/build/"
-for f in ${source[@]}; do
-	basef=$(echo $f | sed 's|::.*||' | sed 's|^.*://.*/||g')
-	if [ -f "$basef" ]; then
-		cp "$basef" "$copydir/srcdest/"
-	elif [ -f "$SRCDEST/$basef" ]; then
-		cp "$SRCDEST/$basef" "$copydir/srcdest/"
+for file in "${source[@]}"; do
+	file="${file%%::*}"
+	file="${file##*://*/}"
+	if [[ -f $file ]]; then
+		cp "$file" "$copydir/srcdest/"
+	elif [[ -f $SRCDEST/$file ]]; then
+		cp "$SRCDEST/$file" "$copydir/srcdest/"
 	fi
 done
 
-( . PKGBUILD
-for i in 'changelog' 'install'; do
-	filelist=$(sed -n "s/^[[:space:]]*$i=//p" PKGBUILD)
-	for file in $filelist; do
-		# evaluate any bash variables used
-		eval file=${file}
-		if [[ -f "$file" ]]; then
-			cp "$file" "$copydir/build/"
-		fi
+(
+	source PKGBUILD
+	for i in changelog install; do
+		sed -n "s/^[[:space:]]*$i=//p" PKGBUILD | while IFS= read -r file; do
+			# evaluate any bash variables used
+			eval file="$file"
+			[[ -f $file ]] && cp "$file" "$copydir/build/"
+		done
 	done
-done
 )
 
-chown -R nobody "$copydir/build"
-chown -R nobody "$copydir/srcdest"
-chown -R nobody "$copydir/pkgdest"
+chown -R nobody "$copydir"/{build,pkgdest,srcdest}
 
 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
+# This is a little gross, but this way the script is recreated every time in the
+# working copy
+cat >"$copydir/chrootbuild" <<EOF
 #!/bin/bash
 export LANG=C
-cd /build
 export HOME=/build
-sudo -u nobody makepkg $MAKEPKG_ARGS || touch BUILD_FAILED
-[ -f BUILD_FAILED ] && exit 1
+
+cd /build
+sudo -u nobody makepkg $makepkg_args || touch BUILD_FAILED
+
+[[ -f BUILD_FAILED ]] && exit 1
+
 which namcap &>/dev/null && namcap /build/PKGBUILD /pkgdest/*.pkg.tar.* > /build/namcap.log
+
 exit 0
 EOF
-) > "$copydir/chrootbuild"
 chmod +x "$copydir/chrootbuild"
 
 if mkarchroot -r "/chrootbuild" "$copydir"; then
-	for pkgfile in "${copydir}"/pkgdest/*.pkg.tar.*; do
-		[ -e "$pkgfile" ] || continue
-		if [ "$add_to_db" -eq "1" ]; then
-			mkdir -p "${copydir}/repo"
-			pushd "${copydir}/repo" >/dev/null
+	for pkgfile in "$copydir"/pkgdest/*.pkg.tar.*; do
+		[[ -e $pkgfile ]] || continue
+		if $add_to_db; then
+			mkdir -p "$copydir/repo"
+			pushd "$copydir/repo" >/dev/null
 			cp "$pkgfile" .
-			repo-add repo.db.tar.gz "$(basename "$pkgfile")"
+			repo-add repo.db.tar.gz "${pkgfile##*/}"
 			popd >/dev/null
 		fi
 
-		if [ -d "$PKGDEST" ]; then
-			mv "$pkgfile" "${PKGDEST}"
+		if [[ -d $PKGDEST ]]; then
+			mv "$pkgfile" "$PKGDEST"
 		else
-			mv "$pkgfile" "${WORKDIR}"
+			mv "$pkgfile" "$workdir"
 		fi
 	done
 
-	for l in "${copydir}"/build/{namcap,*-{build,check,package,package_*}}.log; do
-		[ -f "$l" ] && mv "$l" "${WORKDIR}"
+	for l in "$copydir"/build/{namcap,*-{build,check,package,package_*}}.log; do
+		[[ -f $l ]] && mv "$l" "$workdir"
 	done
 else
-	#just in case. We returned 1, make sure we fail
-	touch "${copydir}/build/BUILD_FAILED"
+	# Just in case. We returned 1, make sure we fail
+	touch "$copydir/build/BUILD_FAILED"
 fi
 
-for f in "${copydir}"/srcdest/*; do
-	[ -e "$f" ] || continue
-	if [ -d "$SRCDEST" ]; then
-		mv "$f" "${SRCDEST}"
+for f in "$copydir"/srcdest/*; do
+	[[ -e $f ]] || continue
+	if [[ -d $SRCDEST ]]; then
+		mv "$f" "$SRCDEST"
 	else
-		mv "$f" "${WORKDIR}"
+		mv "$f" "$workdir"
 	fi
 done
 
-if [ -e "${copydir}/build/BUILD_FAILED" ]; then
+if [[ -e $copydir/build/BUILD_FAILED ]]; then
 	echo "Build failed, check $copydir/build"
-	rm "${copydir}/build/BUILD_FAILED"
+	rm "$copydir/build/BUILD_FAILED"
 	exit 1
 fi
-- 
cgit v1.2.3-54-g00ecf


From 004ced2a33c06985d88b424d88facb0d8b1bdd27 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Sat, 17 Sep 2011 14:51:58 +0200
Subject: makechrootpkg: Eliminate appname, only used once

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
---
 makechrootpkg.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'makechrootpkg.in')

diff --git a/makechrootpkg.in b/makechrootpkg.in
index 6e1e37e..5538e95 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -16,14 +16,13 @@ clean_first=false
 install_pkg=
 add_to_db=false
 chrootdir=
-appname=${0##*/}
 
 default_copy=$USER
 [[ -n $SUDO_USER ]] && default_copy=$SUDO_USER
 [[ -z $default_copy || $default_copy = root ]] && default_copy=copy
 
 usage() {
-	echo "usage $appname [options] -r <chrootdir> [--] [makepkg args]"
+	echo "usage ${0##*/} [options] -r <chrootdir> [--] [makepkg args]"
 	echo ' Run this script in a PKGBUILD dir to build a package inside a'
 	echo ' clean chroot. All unrecognized arguments passed to this script'
 	echo ' will be passed to makepkg.'
-- 
cgit v1.2.3-54-g00ecf


From e41deee5e5d471e90b951b1f68db5dc50c343b0c Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Sat, 17 Sep 2011 14:56:49 +0200
Subject: makechrootpkg: Replace $workdir with . ($PWD)

$workdir is never used when we change directory, so it's superfluous.

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
---
 makechrootpkg.in | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'makechrootpkg.in')

diff --git a/makechrootpkg.in b/makechrootpkg.in
index 5538e95..eb23c61 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -8,7 +8,6 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-workdir="$PWD"
 makepkg_args='-s --noconfirm'
 repack=false
 update_first=false
@@ -274,12 +273,12 @@ if mkarchroot -r "/chrootbuild" "$copydir"; then
 		if [[ -d $PKGDEST ]]; then
 			mv "$pkgfile" "$PKGDEST"
 		else
-			mv "$pkgfile" "$workdir"
+			mv "$pkgfile" .
 		fi
 	done
 
 	for l in "$copydir"/build/{namcap,*-{build,check,package,package_*}}.log; do
-		[[ -f $l ]] && mv "$l" "$workdir"
+		[[ -f $l ]] && mv "$l" .
 	done
 else
 	# Just in case. We returned 1, make sure we fail
@@ -291,7 +290,7 @@ for f in "$copydir"/srcdest/*; do
 	if [[ -d $SRCDEST ]]; then
 		mv "$f" "$SRCDEST"
 	else
-		mv "$f" "$workdir"
+		mv "$f" .
 	fi
 done
 
-- 
cgit v1.2.3-54-g00ecf


From 1df679974786fe4282fd675574d92a464c28f7cb Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Sat, 17 Sep 2011 15:05:35 +0200
Subject: makechrootpkg: Always set PKGDEST and SRCDEST

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
---
 makechrootpkg.in | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'makechrootpkg.in')

diff --git a/makechrootpkg.in b/makechrootpkg.in
index eb23c61..1bed6b8 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -188,6 +188,10 @@ fi
 [[ -z $MAKEFLAGS ]] && eval $(grep '^MAKEFLAGS=' /etc/makepkg.conf)
 [[ -z $PACKAGER ]] && eval $(grep '^PACKAGER=' /etc/makepkg.conf)
 
+# Use PKGBUILD directory if PKGDEST or SRCDEST don't exist
+[[ -d $PKGDEST ]] || PKGDEST=.
+[[ -d $SRCDEST ]] || SRCDEST=.
+
 mkdir -p "$copydir/pkgdest"
 if ! grep -q 'PKGDEST="/pkgdest"' "$copydir/etc/makepkg.conf"; then
 	echo 'PKGDEST="/pkgdest"' >> "$copydir/etc/makepkg.conf"
@@ -270,11 +274,7 @@ if mkarchroot -r "/chrootbuild" "$copydir"; then
 			popd >/dev/null
 		fi
 
-		if [[ -d $PKGDEST ]]; then
-			mv "$pkgfile" "$PKGDEST"
-		else
-			mv "$pkgfile" .
-		fi
+		mv "$pkgfile" "$PKGDEST"
 	done
 
 	for l in "$copydir"/build/{namcap,*-{build,check,package,package_*}}.log; do
@@ -287,11 +287,7 @@ fi
 
 for f in "$copydir"/srcdest/*; do
 	[[ -e $f ]] || continue
-	if [[ -d $SRCDEST ]]; then
-		mv "$f" "$SRCDEST"
-	else
-		mv "$f" .
-	fi
+	mv "$f" "$SRCDEST"
 done
 
 if [[ -e $copydir/build/BUILD_FAILED ]]; then
-- 
cgit v1.2.3-54-g00ecf


From b9070bf0b8b6e8f154c718074058dba9c03b01e0 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Sat, 17 Sep 2011 15:14:08 +0200
Subject: makechrootpkg: Use nullglob

Use nullglob instead of checking for existence. If the glob doesn't
match any files, it will be removed instead of staying unexpanded.

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
---
 makechrootpkg.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'makechrootpkg.in')

diff --git a/makechrootpkg.in b/makechrootpkg.in
index 1bed6b8..11fa401 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -8,6 +8,8 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
+shopt -s nullglob
+
 makepkg_args='-s --noconfirm'
 repack=false
 update_first=false
@@ -265,7 +267,6 @@ chmod +x "$copydir/chrootbuild"
 
 if mkarchroot -r "/chrootbuild" "$copydir"; then
 	for pkgfile in "$copydir"/pkgdest/*.pkg.tar.*; do
-		[[ -e $pkgfile ]] || continue
 		if $add_to_db; then
 			mkdir -p "$copydir/repo"
 			pushd "$copydir/repo" >/dev/null
@@ -286,7 +287,6 @@ else
 fi
 
 for f in "$copydir"/srcdest/*; do
-	[[ -e $f ]] || continue
 	mv "$f" "$SRCDEST"
 done
 
-- 
cgit v1.2.3-54-g00ecf


From 7a9f808a0fd80c14b32223fa73d5368294994e49 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Sat, 17 Sep 2011 15:50:30 +0200
Subject: makechrootpkg: Source PKGBUILD only once

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
---
 makechrootpkg.in | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'makechrootpkg.in')

diff --git a/makechrootpkg.in b/makechrootpkg.in
index 11fa401..04893b8 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -219,20 +219,20 @@ eval $(grep '^CARCH=' "$copydir/etc/makepkg.conf")
 export CARCH
 
 # Copy PKGBUILD and sources
-source=( $(source PKGBUILD; echo ${source[@]}) )
 cp PKGBUILD "$copydir/build/"
-for file in "${source[@]}"; do
-	file="${file%%::*}"
-	file="${file##*://*/}"
-	if [[ -f $file ]]; then
-		cp "$file" "$copydir/srcdest/"
-	elif [[ -f $SRCDEST/$file ]]; then
-		cp "$SRCDEST/$file" "$copydir/srcdest/"
-	fi
-done
-
 (
 	source PKGBUILD
+	for file in "${source[@]}"; do
+		file="${file%%::*}"
+		file="${file##*://*/}"
+		if [[ -f $file ]]; then
+			cp "$file" "$copydir/srcdest/"
+		elif [[ -f $SRCDEST/$file ]]; then
+			cp "$SRCDEST/$file" "$copydir/srcdest/"
+		fi
+	done
+
+	# Find all changelog and install files, even inside functions
 	for i in changelog install; do
 		sed -n "s/^[[:space:]]*$i=//p" PKGBUILD | while IFS= read -r file; do
 			# evaluate any bash variables used
-- 
cgit v1.2.3-54-g00ecf


From e66a1f3cd85b22cd5113684acdad50e5c077662e Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Sat, 17 Sep 2011 15:59:57 +0200
Subject: makechrootpkg: Add option to explicitly run namcap

Installs namcap if needed, *after* building the package,
contrary to the former way of having to have namcap installed,
e.g. via makedepends.

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
---
 makechrootpkg.in | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'makechrootpkg.in')

diff --git a/makechrootpkg.in b/makechrootpkg.in
index 04893b8..6bedf03 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -16,6 +16,7 @@ update_first=false
 clean_first=false
 install_pkg=
 add_to_db=false
+run_namcap=false
 chrootdir=
 
 default_copy=$USER
@@ -49,11 +50,12 @@ usage() {
 	echo '-I <pkg>   Install a package into the working copy of the chroot'
 	echo '-l <copy>  The directory to use as the working copy of the chroot'
 	echo '           Useful for maintaining multiple copies.'
+	echo '-n         Run namcap on the package'
 	echo "           Default: $default_copy"
 	exit 1
 }
 
-while getopts 'hcudr:I:l:' arg; do
+while getopts 'hcudr:I:l:n' arg; do
 	case "$arg" in
 		h) usage ;;
 		c) clean_first=true ;;
@@ -62,6 +64,7 @@ while getopts 'hcudr:I:l:' arg; do
 		r) chrootdir="$OPTARG" ;;
 		I) install_pkg="$OPTARG" ;;
 		l) copy="$OPTARG" ;;
+		n) run_namcap=true ;;
 		*) makepkg_args="$makepkg_args -$arg $OPTARG" ;;
 	esac
 done
@@ -259,7 +262,10 @@ sudo -u nobody makepkg $makepkg_args || touch BUILD_FAILED
 
 [[ -f BUILD_FAILED ]] && exit 1
 
-which namcap &>/dev/null && namcap /build/PKGBUILD /pkgdest/*.pkg.tar.* > /build/namcap.log
+if $run_namcap; then
+	pacman -S --needed --noconfirm namcap
+	namcap /build/PKGBUILD /pkgdest/*.pkg.tar.* > /build/namcap.log
+fi
 
 exit 0
 EOF
-- 
cgit v1.2.3-54-g00ecf


From a790c39c7dc3074e26b780054b0fc5a33eaa4a2b Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Sat, 17 Sep 2011 16:47:39 +0200
Subject: makechrootpkg: If chroot is missing, exit instead of usage

I'm not sure why this was handled differently than the other
error conditions.

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
---
 makechrootpkg.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makechrootpkg.in')

diff --git a/makechrootpkg.in b/makechrootpkg.in
index 6bedf03..092f195 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -108,7 +108,7 @@ fi
 if [[ ! -d $chrootdir/root ]]; then
 	echo 'Missing chroot dir root directory.'
 	echo "Try using: mkarchroot $chrootdir/root base base-devel sudo"
-	usage
+	exit 1
 fi
 
 umask 0022
-- 
cgit v1.2.3-54-g00ecf


From a991c9a71f92aa24fd445e6189a6ac07c4ddb77c Mon Sep 17 00:00:00 2001
From: Allan McRae <allan@archlinux.org>
Date: Tue, 27 Sep 2011 14:42:14 +1000
Subject: Always log builds in makechrootpkg

It is very helpful to always log the build output in makechrootpkg
so pass "-L" as a standard option to makepkg.

Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
---
 makechrootpkg.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makechrootpkg.in')

diff --git a/makechrootpkg.in b/makechrootpkg.in
index 092f195..43acc3f 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -10,7 +10,7 @@
 
 shopt -s nullglob
 
-makepkg_args='-s --noconfirm'
+makepkg_args='-s --noconfirm -L'
 repack=false
 update_first=false
 clean_first=false
-- 
cgit v1.2.3-54-g00ecf