commitpkg: Added split package support

All packages created by the PKGBUILD are uploaded to the staging directory.
The output and svn commit messages uses pkgbase instead of pkgname.

Signed-off-by: Eric Bélanger <snowmaniscool@gmail.com>
[Allan: minor fix for existing issue]
Signed-off-by: Allan McRae <allan@archlinux.org>

Makefile

@@ -1,14 +1,38 @@
 all:
 
 install:
-	# extrapkg/checkpkg and friends
+	# commitpkg/checkpkg and friends
 	mkdir -p $(DESTDIR)/usr/bin
 	install -m 755 checkpkg $(DESTDIR)/usr/bin
-	install -m 755 extrapkg $(DESTDIR)/usr/bin
+	install -m 755 commitpkg $(DESTDIR)/usr/bin
-	ln -s extrapkg $(DESTDIR)/usr/bin/corepkg
+	ln -sf commitpkg $(DESTDIR)/usr/bin/extrapkg
-	ln -s extrapkg $(DESTDIR)/usr/bin/testingpkg
+	ln -sf commitpkg $(DESTDIR)/usr/bin/corepkg
-	ln -s extrapkg $(DESTDIR)/usr/bin/unstablepkg
+	ln -sf commitpkg $(DESTDIR)/usr/bin/testingpkg
+	ln -sf commitpkg $(DESTDIR)/usr/bin/communitypkg
+	# arch{co,release,rm}
+	install -m 755 archco $(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 -m 755 mkarchroot $(DESTDIR)/usr/sbin
 	install -m 755 makechrootpkg $(DESTDIR)/usr/sbin
+	#Additional packaging helper scripts
+	install -m 755 lddd $(DESTDIR)/usr/bin
+	install -m 755 finddeps $(DESTDIR)/usr/bin
+
+uninstall:
+	# remove all files we installed
+	rm $(DESTDIR)/usr/bin/checkpkg
+	rm $(DESTDIR)/usr/bin/commitpkg
+	rm $(DESTDIR)/usr/bin/extrapkg
+	rm $(DESTDIR)/usr/bin/corepkg
+	rm $(DESTDIR)/usr/bin/testingpkg
+	rm $(DESTDIR)/usr/bin/communitypkg
+	rm $(DESTDIR)/usr/sbin/mkarchroot
+	rm $(DESTDIR)/usr/sbin/makechrootpkg
+	rm $(DESTDIR)/usr/bin/lddd
+	rm $(DESTDIR)/usr/bin/finddeps
+	rm $(DESTDIR)/usr/bin/archco
+	rm $(DESTDIR)/usr/bin/archrelease
+	rm $(DESTDIR)/usr/bin/archrm

archco

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [ "$1" = "" ]; then
+	echo "Usage: archco <package name> [<package name>]"
+	exit 1
+fi
+
+for i in "$@"; do
+     svn co svn+ssh://gerolde.archlinux.org/srv/svn-packages/$i
+done

archrelease

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+if [ "$1" = "" ]; then
+    echo "Usage: archrelease <repo>"
+    exit 1
+fi
+
+if [ ! -f "PKGBUILD" ]; then
+    echo "archrelease: PKGBUILD not found"
+    exit 1
+fi
+
+if [ "$(basename $(readlink -f .))" != "trunk" ]; then
+    echo "archrelease: Not in a package trunk dir"
+    exit 1
+fi
+
+if [ ! -d ../repos/$1 ]; then
+    pushd ..
+    [ -d repos ] || mkdir repos
+    svn copy -r HEAD trunk repos/$1
+    svn commit -m "archrelease: new repo $1"
+    pushd repos/$1
+    svnmerge init
+    svn commit -F svnmerge-commit-message.txt
+    rm svnmerge-commit-message.txt
+    popd
+    popd
+else
+    svnmerge merge ../repos/$1
+    pushd ..
+    if [ -f trunk/svnmerge-commit-message.txt ]; then
+        svn commit -F trunk/svnmerge-commit-message.txt
+        if [ $? -ne 0 ]; then
+            # The user is going to have to clean things up a bit
+            echo "*** ATTENTION: There was a problem merging the package changes ***"
+            echo "To fix it, edit the conflicting files in repos/$1 (the ones that are C in svn status)."
+            echo "Once you have resolved conflicts, execute 'svn resolved <path to file>' to tell svn the error was resolved."
+            echo "Then to finish the merge commit, execute 'svn commit -F trunk/svnmerge-commit-message.txt' and, if there are no problems, delete trunk/svnmerge-commit-message.txt"
+            exit $?
+        fi
+        rm trunk/svnmerge-commit-message.txt
+    else
+        echo "Nothing to commit"
+    fi
+    popd
+fi
+

archrm

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+if [ "$1" = "" ]; then
+	echo "Usage: archrm <path to checkout>"
+	exit 1
+fi
+
+# FIXME: Check if there are uncommited changes
+#pushd $1
+#
+#popd
+
+rm -rf $1

checkpkg

@@ -1,6 +1,17 @@
 #!/bin/bash
 
-source /etc/makepkg.conf
+# Source makepkg.conf; fail if it is not found
+if [ -r "/etc/makepkg.conf" ]; then
+	source "/etc/makepkg.conf"
+else
+    echo "/etc/makepkg.conf not found!"
+    exit 1
+fi
+
+# Source user-specific makepkg.conf overrides
+if [ -r ~/.makepkg.conf ]; then
+	source ~/.makepkg.conf
+fi
 
 strip_url() {
 	echo $1 | sed 's|^.*://.*/||g'
@@ -13,21 +24,20 @@ fi
 
 source PKGBUILD
 
-pkgfile=${pkgname}-${pkgver}-${pkgrel}-${CARCH}.pkg.tar.gz
+pkgfile=${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
-oldstylepkgfile=${pkgname}-${pkgver}-${pkgrel}.pkg.tar.gz
+oldstylepkgfile=${pkgname}-${pkgver}-${pkgrel}${PKGEXT}
 
-if [ ! -f $pkgfile ]; then
+if [ -f "$(pwd)/$pkgfile" ]; then
-	if [ -f $PKGDEST/$pkgfile ]; then
+    pkgfile=$(pwd)/$pkgfile
-		pkgfile=$PKGDEST/$pkgfile
+elif [ -f "$PKGDEST/$pkgfile" ]; then
-		oldstylepkgfile=$PKGDEST/$oldstylepkgfile
+    pkgfile=$PKGDEST/$pkgfile
-	elif [ -f $oldstylepkgfile ]; then
+elif [ -f "$(pwd)/$oldstylepkgfile" ]; then
-		pkgfile=$oldstylepkgfile
+    pkgfile=$(pwd)/$oldstylepkgfile
-	elif [ -f $PKGDEST/$oldstylepkgfile ]; then
+elif [ -f "$PKGDEST/$oldstylepkgfile" ]; then
-		pkgfile=$PKGDEST/$oldstylepkgfile
+    pkgfile=$PKGDEST/$oldstylepkgfile
-	else
+else
-		echo "File $pkgfile doesn't exist"
+    echo "File \"$pkgfile\" doesn't exist"
-		exit 1
+    exit 1
-	fi
 fi
 
 tmp=`pacman -Spd --noconfirm $pkgname`
@@ -41,7 +51,7 @@ pkgurl=`echo $tmp | rev | cut -d ' ' -f 1 | rev`
 
 oldpkg=`strip_url $pkgurl`
 
-if [ "$oldpkg" = "$pkgfile" ]; then
+if [ "$(basename $oldpkg)" = "$(basename $pkgfile)" ]; then
 	echo "The built package is the one in the repo right now!"
 	exit 1
 fi
@@ -54,8 +64,8 @@ if [ ! -f $oldpkg ]; then
 	fi
 fi
 
-tar tzf $oldpkg > filelist-old
+bsdtar tf $oldpkg > filelist-old
-tar tzf $pkgfile > filelist
+bsdtar tf "$pkgfile" > filelist
 
 sort -o filelist filelist
 sort -o filelist-old filelist-old
@@ -65,7 +75,7 @@ diff filelist-old filelist
 if diff filelist-old filelist | grep '\.so\.' > /dev/null 2>&1; then
 	mkdir -p pkg
 	cd pkg
-	tar xzf ../$pkgfile > /dev/null
+	bsdtar xf "$pkgfile" > /dev/null
 	for i in `diff ../filelist-old ../filelist | grep \> | grep \.so\. | awk '{print $2}'`; do
 		echo -n "${i}: "
 		objdump -p $i | grep SONAME
@@ -73,3 +83,5 @@ if diff filelist-old filelist | grep '\.so\.' > /dev/null 2>&1; then
 else
 	echo "No filename differences"
 fi
+
+# vim:ft=sh:ts=4:sw=4:et:

commitpkg

@@ -0,0 +1,119 @@
+#!/bin/bash
+
+# Source makepkg.conf; fail if it is not found
+if [ -r "/etc/makepkg.conf" ]; then
+	source "/etc/makepkg.conf"
+else
+    echo "/etc/makepkg.conf not found!"
+    exit 1
+fi
+
+# Source user-specific makepkg.conf overrides
+if [ -r ~/.makepkg.conf ]; then
+	source ~/.makepkg.conf
+fi
+
+cmd=$(basename $0)
+
+if [ ! -f PKGBUILD ]; then
+    echo "No PKGBUILD file"
+    exit 1
+fi
+
+if [ -z "$CARCH" ]; then
+    echo "CARCH must be set to a recognized value!"
+    exit 1
+fi
+
+source PKGBUILD
+pkgbase=${pkgbase:-${pkgname[0]}}
+
+for _pkgname in ${pkgname[@]}; do
+    pkgfile=${_pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
+    anypkgfile=${_pkgname}-${pkgver}-${pkgrel}-any${PKGEXT}
+
+    if [ ! -f $pkgfile ]; then
+	if [ -f $PKGDEST/$pkgfile ]; then
+            pkgfile=$PKGDEST/$pkgfile
+	elif [ -f $anypkgfile ]; then
+	    pkgfile=$anypkgfile
+	    CARCH=any
+	elif [ -f $PKGDEST/$anypkgfile ]; then
+	    pkgfile=$PKGDEST/$anypkgfile
+	    CARCH=any
+	else
+            echo "File $pkgfile doesn't exist"
+            exit 1
+	fi
+    fi
+
+# set up repo-specific opts depending on how we were called
+    server="gerolde.archlinux.org"
+    if [ "$cmd" == "extrapkg" ]; then
+	repo="extra"
+    elif [ "$cmd" == "corepkg" ]; then
+	repo="core"
+    elif [ "$cmd" == "testingpkg" ]; then
+	repo="testing"
+    elif [ "$cmd" == "communitypkg" ]; then
+	repo="community"
+	server="aur.archlinux.org"
+    else
+	if [ $# -eq 0 ]; then
+            echo "usage: commitpkg <reponame> [-l limit] [commit message]"
+            exit 1
+	fi
+	repo="$1"
+	shift
+    fi
+
+# see if any limit options were passed, we'll send them to SCP
+    unset scpopts
+    if [ "$1" = "-l" ]; then
+	scpopts="$1 $2"
+	shift 2
+    fi
+
+# combine what we know into a variable
+    uploadto="staging/${repo}/$(basename ${pkgfile})"
+    scp ${scpopts} "${pkgfile}" "${server}:${uploadto}"
+    if [ "$(md5sum "${pkgfile}" | cut -d' ' -f1)" != "$(ssh ${server} md5sum "${uploadto}" | cut -d' ' -f1)" ]; then
+	echo "File got corrupted during upload, cancelled."
+	exit 1
+    else
+	echo "File integrity okay."
+    fi
+
+    if [ $? -ne 0 ]; then
+	echo "Cancelled"
+	exit 1
+    fi
+    echo "===> Uploaded $pkgfile"
+done
+
+if [ "$1" != "" ]; then
+    svn commit -m "upgpkg: $pkgbase $pkgver-$pkgrel
+    $1" > /dev/null
+    if [ $? -ne 0 ]; then
+        echo "Cancelled"
+        exit 1
+    fi
+    echo "===> Commited with \"upgpkg: $pkgbase $pkgver-$pkgrel
+    $1\" message"
+else
+    svn commit >/dev/null
+    if [ $? -ne 0 ]; then
+        echo "Cancelled"
+        exit 1
+    fi
+    echo "===> Commited with \"upgpkg: $pkgbase $pkgver-$pkgrel\" message"
+fi
+
+archrelease $repo-$CARCH
+if [ $? -ne 0 ]; then
+    echo "Cancelled"
+    exit 1
+fi
+echo "===> Tagged for $repo-$CARCH"
+
+# vim:ft=sh:ts=4:sw=4:et:

commitpkg2any

@@ -0,0 +1,33 @@
+#!/bin/bash
+# This script commits an existing package as an 'any'
+# package. It is simply to help aid in the conversion
+# to any-based packages
+
+if [ $# -ne 1 ]; then
+    echo "Syntax: $(basename $0) <repo>"
+    exit 1
+fi
+
+repo=$1
+
+source PKGBUILD
+
+sed -i 's|^arch=.\+$|arch=(any)|' PKGBUILD
+
+svn commit -m "upgpkg: $pkgname $pkgver-$pkgrel
+    Converted to arch=any" > /dev/null
+
+archrelease $repo-any
+if [ $? -ne 0 ]; then
+    echo "Cancelled"
+    exit 1
+fi
+echo "===> Tagged for $repo-any"
+
+pushd ..
+svn rm $repo-i686
+svn rm $repo-x86_64
+svn commit -m "removed $repo-i686 and $repo-x86_64 for $pkgname"
+popd
+
+echo "Don't forget to run \"/arch/db-update $repo\" on gerolde"

communityco

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [ "$1" = "" ]; then
+	echo "Usage: communityco <package name> [<package name>]"
+	exit 1
+fi
+
+for i in "$@"; do
+     svn co svn+ssh://aur.archlinux.org/srv/svn-packages/$i
+done

extrapkg

@@ -1,103 +0,0 @@
-#!/bin/bash
-
-source /etc/makepkg.conf
-
-cmd=`basename $0`
-
-if [ ! -f PKGBUILD ]; then
-	echo "No PKGBUILD file"
-	exit 1
-fi
-
-source PKGBUILD
-pkgfile=${pkgname}-${pkgver}-${pkgrel}-${CARCH}.pkg.tar.gz
-oldstylepkgfile=${pkgname}-${pkgver}-${pkgrel}.pkg.tar.gz
-
-if [ ! -f $pkgfile ]; then
-	if [ -f $PKGDEST/$pkgfile ]; then
-		pkgfile=$PKGDEST/$pkgfile
-		oldstylepkgfile=$PKGDEST/$oldstylepkgfile
-	elif [ -f $oldstylepkgfile ]; then
-		pkgfile=$oldstylepkgfile
-	elif [ -f $PKGDEST/$oldstylepkgfile ]; then
-		pkgfile=$PKGDEST/$oldstylepkgfile
-	else
-		echo "File $pkgfile doesn't exist"
-		exit 1
-	fi
-fi
-
-if [ "$cmd" == "extrapkg" ]; then
-	repo="extra"
-	tag="CURRENT"
-elif [ "$cmd" == "corepkg" ]; then
-	repo="core"
-	tag="CURRENT"
-elif [ "$cmd" == "testingpkg" ]; then
-	repo="testing"
-	tag="TESTING"
-elif [ "$cmd" == "unstablepkg" ]; then
-	repo="unstable"
-	tag="CURRENT"
-elif [ "$cmd" == "communitypkg" ]; then
-	repo="community"
-	tag="CURRENT"
-fi
-
-# see if any limit options were passed, we'll send them to SCP
-unset scpopts
-if [ "$1" = "-l" ]; then
-	scpopts="$1 $2"
-	shift 2
-fi
-
-if [ "$repo" != "community" ]; then
-	scp ${scpopts} ${pkgfile} archlinux.org:staging/$repo/add
-	if [ "$(md5sum ${pkgfile} | cut -d' ' -f1)" != "$(ssh archlinux.org md5sum staging/${repo}/add/$(basename ${pkgfile}) | cut -d' ' -f1)" ]; then
-		echo "File got corrupted during upload, cancelled."
-	exit 1
-	else
-		echo "File integrity okay."
-	fi
-else
-	if [ ! -f ~/.tupkg ]; then
-	   echo "Must configure tupkg via ~/.tupkg, cancelled"
-	   exit 1
-	fi
-	if [ "$(basename $pkgfile)" != "$(basename $oldstylepkgfile)" ]; then
-		echo "Renaming makepkg3 package for compatability"
-		mv $pkgfile $oldstylepkgfile
-		pkgfile=$oldstylepkgfile
-	fi
-	tupkg $pkgfile
-fi
-if [ $? -ne 0 ]; then
-	echo "Cancelled"
-	exit 1
-fi
-echo "===> Uploaded $pkgfile"
-
-if [ "$1" != "" ]; then
-cvs commit -m "upgpkg: $pkgname $pkgver-$pkgrel
-$1" > /dev/null
-if [ $? -ne 0 ]; then
-	echo "Cancelled"
-	exit 1
-fi
-echo "===> Commited with \"upgpkg: $pkgname $pkgver-$pkgrel
-$1\" message"
-else
-cvs commit -m "upgpkg: $pkgname $pkgver-$pkgrel" > /dev/null
-if [ $? -ne 0 ]; then
-	echo "Cancelled"
-	exit 1
-fi
-echo "===> Commited with \"upgpkg: $pkgname $pkgver-$pkgrel\" message"
-fi
-
-cvs tag -c -F -R $tag > /dev/null
-if [ $? -ne 0 ]; then
-	echo "Cancelled"
-	exit 1
-fi
-echo "===> Tagged as $tag"

finddeps

@@ -0,0 +1,41 @@
+#!/bin/bash
+#
+# finddeps - find packages that depend on a given depname
+#
+
+if [ "$1" = "" ]; then
+    echo "usage: finddeps <depname>"
+    echo ""
+    echo "Find packages that depend on a given depname."
+    echo "Run this script from the top-level directory of your ABS tree."
+    echo ""
+    exit 0
+fi
+
+match=$1
+tld=$(pwd)
+
+for d in $(find . -type d); do
+    cd $d
+    if [ -f PKGBUILD ]; then
+        unset pkgname depends makedepends
+        . PKGBUILD
+        for dep in "${depends[@]}"; do
+            # lose the version comaparator, if any
+            depname=${dep%%[<>=]*}
+            if [ "$depname" = "$match" ]; then
+                echo "$d (depends)"
+            fi
+        done
+        for dep in "${makedepends[@]}"; do
+            # lose the version comaparator, if any
+            depname=${dep%%[<>=]*}
+            if [ "$depname" = "$match" ]; then
+                echo "$d (makedepends)"
+            fi
+        done
+    fi
+    cd $tld
+done
+
+# vim:ft=sh:ts=4:sw=4:et:

lddd

@@ -0,0 +1,47 @@
+#!/bin/sh
+#
+# lddd - find broken library links on your machine
+#
+
+ifs=$IFS
+IFS=':'
+
+libdirs="/lib:/usr/lib:/opt/qt/lib:/opt/kde/lib:/usr/lib/libfakeroot:/opt/NX/lib"
+extras=
+
+TEMPDIR=$(mktemp /tmp/lddd-script.XXXX)
+rm $TEMPDIR
+mkdir -p $TEMPDIR
+
+echo " Go out and drink some tea, this will take a while :) ..."
+#  Check ELF binaries in the PATH and specified dir trees.
+for tree in $PATH $libdirs $extras
+do
+    echo DIR $tree
+
+    #  Get list of files in tree.
+    files=$(find $tree -type f ! -name '*.a' ! -name '*.la' ! -name '*.py*' ! -name '*.txt' ! -name '*.h' ! -name '*.ttf' ! -name '*.rb' ! -name '*.ko' ! -name '*.pc' ! -name '*.enc' ! -name '*.cf' ! -name '*.def' ! -name '*.rules' ! -name '*.cmi' ! -name  '*.mli' ! -name '*.ml' ! -name '*.cma' ! -name '*.cmx' ! -name '*.cmxa' ! -name '*.pod' ! -name '*.pm' ! -name '*.pl' ! -name '*.al' ! -name '*.tcl' ! -name '*.bs' ! -name '*.o' ! -name '*.png' ! -name '*.gif' ! -name '*.cmo' ! -name '*.cgi' ! -name '*.defs' ! -name '*.conf' ! -name '*_LOCALE' ! -name 'Compose' ! -name '*_OBJS' ! -name '*.msg' ! -name '*.mcopclass' ! -name '*.mcoptype')
+    IFS=$ifs
+    for i in $files
+    do
+        if [ `file $i | grep -c 'ELF'` -ne 0 ]; then
+            #  Is an ELF binary.
+            if [ `ldd $i 2>/dev/null | grep -c 'not found'` -ne 0 ]; then
+                #  Missing lib.
+                echo "$i:" >> $TEMPDIR/raw.txt
+                ldd $i 2>/dev/null | grep 'not found' >> $TEMPDIR/raw.txt
+            fi
+        fi
+    done
+done
+grep '^/' $TEMPDIR/raw.txt | sed -e 's/://g' >> $TEMPDIR/affected-files.txt
+# invoke pacman
+for i in $(cat $TEMPDIR/affected-files.txt); do
+    pacman -Qo $i | awk '{print $4,$5}' >> $TEMPDIR/pacman.txt
+done
+# clean list
+sort -u $TEMPDIR/pacman.txt >> $TEMPDIR/possible-rebuilds.txt
+
+echo "Files saved to $TEMPDIR"
+
+# vim:ft=sh:ts=4:sw=4:et:

makechrootpkg

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/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.
@@ -10,91 +10,202 @@
 
 FORCE="n"
 RUN=""
-MAKEPKG_ARGS="-Ss"
+MAKEPKG_ARGS="-sr"
+REPACK=""
+LAYER="rw"
+WORKDIR=$PWD
 
-chrootdir="$CHROOT_SHELL"
+update_first="0"
+clean_first="0"
+install_pkg=""
+add_to_db=0
+
+chrootdir=""
 
 APPNAME=$(basename "${0}")
 
-if [ ! -f PKGBUILD ]; then
+usage ()
-	echo "This must be run in the directory of a built package."
+{
-	exit 1
+    echo "usage ${APPNAME} [options] -r <chrootdir> [--] [makepkg args]"
-fi
+    echo " Run this script in a PKGBUILD dir to build a package inside a"
-source PKGBUILD
+    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, rw, union} but only 'root' is required"
+    echo " by default. The rest 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 rw layer 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 shell to use"
+    echo "-I <pkg>   Install a package into the rw layer of the chroot"
+    echo "-l <layer> The directory to use as the rw layer of the union"
+    echo "           Useful for maintain multiple layers. Default: rw"
+    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) LAYER="$OPTARG" ;;
+        *) MAKEPKG_ARGS="$MAKEPKG_ARGS -$arg $OPTARG" ;;
+    esac
+done
+
+#Get rid of trailing / in chrootdir
+[ "$chrootdir" != "/" ] && chrootdir=$(echo $chrootdir | sed 's#/$##')
+
+# 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
 
-usage ()
+if [ ! -f PKGBUILD ]; then
-{
+    echo "This must be run in a directory containing a PKGBUILD."
-    echo "usage ${APPNAME} [-h] [-c CHROOT_SHELL] [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_SHELL environment variable is used to determine where"
-    echo " your chroot shell is. The shell consists of the following"
-    echo " directories: \$CHROOT_SHELL/{root, rw, union} but only 'root' is"
-    echo " required by default. The rest will be created as needed"
-    echo ""
-    echo "The chroot shell 'root' directory must be created via the following"
-    echo "command:"
-    echo "    mkarchroot \$CHROOT_SHELL base base-devel sudo"
-    echo ""
-    echo "Default makepkg args: $MAKEPKG_ARGS"
     exit 1
-}
+fi
-
+source PKGBUILD
-while getopts 'c:h' arg; do
-    case "${arg}" in
-        c) chrootdir="$OPTARG" ;;
-        h|?) usage ;;
-        *) MAKEPKG_ARGS="$MAKEPKG_ARGS -$arg $OPTARG" ;;
-    esac
-done
 
 if [ ! -d "$chrootdir" ]; then
-    echo "No \$CHROOT_SHELL defined, or invalid path"
+    echo "No chroot dir defined, or invalid path '$chrootdir'"
     exit 1
 fi
 
 if [ ! -d "$chrootdir/root" ]; then
-    echo "Missing \$CHROOT_SHELL root directory."
+    echo "Missing chroot dir root directory."
-    echo "Try using: mkarchroot \$CHROOT_SHELL base base-devel sudo"
+    echo "Try using: mkarchroot $chrootdir/root base base-devel sudo"
     usage
 fi
 
-[ -d "$chrootdir/rw" ] || mkdir "$chrootdir/rw"
+[ -d "$chrootdir/$LAYER" -a "$clean_first" -eq "1" ] && rm -rf "$chrootdir/$LAYER/"
+[ -d "$chrootdir/$LAYER" ] || mkdir "$chrootdir/$LAYER"
 [ -d "$chrootdir/union" ] || mkdir "$chrootdir/union"
 
-function cleanup ()
+cleanup ()
 {
     echo "cleaning up unioned mounts"
+    umount "$chrootdir/union/pkgdest" 2>/dev/null
+    umount "$chrootdir/union/srcdest" 2>/dev/null
     umount "$chrootdir/union"
 }
 
 uniondir="$chrootdir/union"
 echo "building union chroot"
-modprobe -q unionfs
+grep -Fq aufs /proc/filesystems
-mount -t unionfs none -o "dirs=$chrootdir/rw=rw:$chrootdir/root=ro" "$uniondir"
+if [ $? -ne 0 ]; then
+    modprobe -q aufs
+    if [ $? -ne 0 ]; then
+        echo "ERROR: No aufs available. Abandon ship!" && exit 1
+    fi
+fi
+mount -t aufs none -o "dirs=$chrootdir/$LAYER=rw:$chrootdir/root=ro" "$uniondir"
 trap 'cleanup' 0 1 2 15
 
+if [ -n "$install_pkg" ]; then
+    pkgname="$(basename "$install_pkg")"
+    echo "installing '$pkgname' in chroot"
+    cp "$install_pkg" "$uniondir/$pkgname"
+    mkarchroot -r "pacman -U /$pkgname" "$uniondir"
+    ret=$?
+    rm "$uniondir/$pkgname"
+    #exit early, we've done all we need to
+    exit $ret
+fi
+
+if [ $update_first -eq 1 ]; then
+    echo "updating chroot"
+    mkarchroot -r "pacman -Syu --noconfirm" "$uniondir"
+fi
+
 echo "moving build files to chroot"
 [ -d "$uniondir/build" ] || mkdir "$uniondir/build"
 
+if [ "$REPACK" != "1" ]; then
+    #Remove anything in there UNLESS -R (repack) was passed to makepkg
+    rm -rf "$uniondir/build/"*
+fi
+
+source $uniondir/etc/makepkg.conf
+
+[ -d "$uniondir/pkgdest" ] || mkdir "$uniondir/pkgdest"
+if ! grep "PKGDEST=/pkgdest" "$uniondir/etc/makepkg.conf" >/dev/null 2>&1; then
+    echo "Setting PKGDEST in makepkg.conf"
+    echo "PKGDEST=/pkgdest" >> "$uniondir/etc/makepkg.conf"
+fi
+
+[ -d "$uniondir/srcdest" ] || mkdir "$uniondir/srcdest"
+if ! grep "SRCDEST=/srcdest" "$uniondir/etc/makepkg.conf" >/dev/null 2>&1; then
+    echo "Setting SRCDEST in makepkg.conf"
+    echo "SRCDEST=/srcdest" >> "$uniondir/etc/makepkg.conf"
+fi
+
+chown -R nobody "$uniondir/build"
+chown -R nobody "$uniondir/srcdest"
+chown -R nobody "$uniondir/pkgdest"
+
+# Copy PKGBUILD and sources
 source PKGBUILD
 cp PKGBUILD "$uniondir/build/"
 for f in ${source[@]}; do
-    if [ -f "$f" ]; then
+    basef=$(echo $f | sed 's|::.*||' | sed 's|^.*://.*/||g')
-        cp "$f" "$uniondir/build/"
+    if [ -f "$basef" ]; then
+        cp "$basef" "$uniondir/srcdest/"
+    elif [ -f "$SRCDEST/$basef" ]; then
+        cp "$SRCDEST/$basef" "$uniondir/srcdest/"
     fi
 done
 
+install_files=$(grep "install=" PKGBUILD)
+for pkg in ${pkgname[@]}; do
+    install_files+=' '
+    install_files+=$(echo $install_files |sed "s/\$pkgname/$pkg/"|sed "s/\${pkgname}/$pkg/")
+done
+
+install_files=$(eval echo $install_files |tr '[:blank:]' '\n'|sort |uniq)
+
+for f in $install_files;do
+    install="${f#"install="}"
+    if [ "$install" != "" -a -f "$install" ]; then
+        cp "$install" "$uniondir/build/"
+    fi
+done
+
+if [ -f "ChangeLog" ]; then
+    cp ChangeLog "$uniondir/build/"
+fi
+
 if ! grep "^nobody" "$uniondir/etc/sudoers" >/dev/null 2>&1; then
     echo "allowing 'nobody' sudo rights in the chroot"
-    echo "nobody	ALL=(ALL) NOPASSWD: ALL" >> $uniondir/etc/sudoers
+    touch "$uniondir/etc/sudoers"
+    echo "nobody	ALL=(ALL) NOPASSWD: ALL" >> "$uniondir/etc/sudoers"
+    chmod 440 "$uniondir/etc/sudoers"
 fi
 
 #This is a little gross, but this way the script is recreated every time in the
@@ -103,12 +214,61 @@ fi
 #!/bin/bash
 export LANG=$LOCALE
 cd /build
-sudo -u nobody makepkg "$MAKEPKG_ARGS"
+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/*${PKGEXT} > /pkgdest/namcap.log
+exit 0
 EOF
 ) > "$uniondir/chrootbuild"
 chmod +x "$uniondir/chrootbuild"
 
-./mkarchroot -r "/chrootbuild" "$uniondir"
+if mkarchroot -r "/chrootbuild" "$uniondir"; then
+    source ${WORKDIR}/PKGBUILD
 
-# TODO move relevant files here
+    for _pkgname in ${pkgname[@]}; do
-echo "build complete... check \$CHROOT_SHELL/build for build results"
+        pkgfile="${chrootdir}"/union/pkgdest/${_pkgname}-*${PKGEXT}
+
+	if [ -n "$add_to_db" -a -e "$pkgfile" ]; then
+            [ -d "${chrootdir}/union/repo" ] || mkdir -p "${chrootdir}/union/repo"
+            pushd "${chrootdir}/union/repo" >/dev/null
+            cp "$pkgfile" .
+            repo-add repo.db.tar.${DB_COMPRESSION} ${_pkgname}-${pkgver}-${pkgrel}-*${PKGEXT}
+            popd >/dev/null
+	fi
+
+	if [ -e $pkgfile ]; then
+            if [ -n "$PKGDEST" ]; then
+		echo "Moving completed ${_pkgname} package file to ${PKGDEST}"
+		mv $pkgfile "${PKGDEST}"
+            else
+		echo "Moving completed ${_pkgname} package file to ${WORKDIR}"
+		mv $pkgfile "${WORKDIR}"
+            fi
+	fi
+    done
+
+    for f in ${chrootdir}/union/srcdest/*; do
+        [ -e "$f" ] || continue
+        if [ -n "$SRCDEST" ]; then
+            echo "Moving downloaded source file $(basename $f) to ${SRCDEST}"
+            mv "$f" "${SRCDEST}"
+        else
+            echo "Moving downloaded source file $(basename $f) to ${WORKDIR}"
+            mv "$f" "${WORKDIR}"
+        fi
+    done
+else
+    #just in case. We returned 1, make sure we fail
+    touch ${chrootdir}/union/build/BUILD_FAILED
+fi
+
+if [ -e ${chrootdir}/union/build/BUILD_FAILED ]; then
+    echo "Build failed, check $chrootdir/$LAYER/build"
+    rm ${chrootdir}/union/build/BUILD_FAILED
+else
+    rm -rf ${chrootdir}/union/build/*
+    echo "Build complete"
+fi
+
+# vim:ft=sh:ts=4:sw=4:et:

mkarchroot

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/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.
@@ -10,6 +10,7 @@
 
 FORCE="n"
 RUN=""
+NOCOPY="n"
 
 working_dir=""
 
@@ -23,15 +24,21 @@ usage ()
     echo "    -r <app>      Run 'app' within the context of the chroot"
     echo "    -u            Update the chroot via pacman"
     echo "    -f            Force overwrite of files in the working-dir"
+    echo "    -C <file>     location of a pacman config file"
+    echo "    -M <file>     location of a makepkg config file"
+    echo "    -n            do not copy config files into the chroot"
     echo "    -h            This message"
     exit $1
 }
 
-while getopts 'r:ufh' arg; do
+while getopts 'r:ufhC:M:' arg; do
     case "${arg}" in
         r) RUN="$OPTARG" ;;
         u) RUN="pacman -Syu" ;;
         f) FORCE="y" ;;
+        C) pac_conf="$OPTARG" ;;
+        M) makepkg_conf="$OPTARG" ;;
+        n) NOCOPY="y" ;;
         h|?) usage 0 ;;
         *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
@@ -44,7 +51,7 @@ fi
 
 shift $(($OPTIND - 1))
 
-if [ "$RUN" == "" -a $# -lt 2 ]; then
+if [ "$RUN" = "" -a $# -lt 2 ]; then
     echo "you must specify a directory and one or more packages"
     usage 1
 elif [ $# -lt 1 ]; then
@@ -59,7 +66,7 @@ shift 1
 
 # {{{ functions 
 
-function chroot_mount ()
+chroot_mount ()
 {
     echo "mounting sysfs : /sys"
     [ -e "${working_dir}/sys" ] || mkdir "${working_dir}/sys"
@@ -80,7 +87,17 @@ function chroot_mount ()
     trap 'chroot_umount' 0 1 2 15
 }
 
-function chroot_umount ()
+copy_hostconf ()
+{
+    echo "copying mtab : /etc/mtab"
+    cp /etc/mtab "${working_dir}/etc/mtab"
+
+    echo "copying resolv.conf : /etc/resolv.conf"
+    cp /etc/resolv.conf "${working_dir}/etc/resolv.conf"
+
+}
+
+chroot_umount ()
 {
     echo "cleaning up mounts"
     umount "${working_dir}/proc"
@@ -91,36 +108,40 @@ function chroot_umount ()
 # }}}
 
 if [ "$RUN" != "" ]; then
-# run chroot {{{
+    # run chroot {{{
     #Sanity check
     if [ ! -f "${working_dir}/.arch-chroot" ]; then
         echo "error: '${working_dir}' does not appear to be a Arch chroot"
-        echo "  please build the image using mkarchchroot"
+        echo "  please build the image using mkarchroot"
         exit 1
     fi
 
     chroot_mount
+    copy_hostconf
 
     echo "starting chroot ($RUN)"
-    chroot "${working_dir}" "${RUN}"
+    chroot "${working_dir}" ${RUN}
 
-# }}}
+    # }}}
 else
-# {{{ build chroot
+    # {{{ build chroot
     if [ -e "${working_dir}" -a "${FORCE}" = "n" ]; then
         echo "error: working dir '${working_dir}' already exists - try using -f"
         exit 1
     fi
 
     mkdir -p "${working_dir}/var/lib/pacman/"
+    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 --dbpath=/var/lib/pacman"
     pacargs="$pacargs --cachedir=/var/cache/pacman/pkg"
+    if [ "$pac_conf" != "" ]; then
+        pacargs="$pacargs --config=${pac_conf}"
+    fi
 
     if [ $# -eq 0 ]; then
         echo "no packages to install"
@@ -129,7 +150,7 @@ else
         for i in $@; do echo -e "\t$i"; done
 
         op="-Sy"
-        if [ "$FORCE" == "y" ]; then
+        if [ "$FORCE" = "y" ]; then
             op="${op}f"
         fi
         if ! pacman ${op} ${pacargs} $@; then
@@ -143,14 +164,26 @@ else
         ldconfig -r "${working_dir}"
     fi
 
-    echo "generating default locales"
+    if [ "$pac_conf" != "" -a "$NOCOPY" = "n" ]; then
-    sed -i "s|^#\(.*$LANG\)|\1|g" "${working_dir}/etc/locale.gen"
+        echo "installing custom pacman.conf"
-    chroot "${working_dir}" locale-gen
+        cp ${pac_conf} ${working_dir}/etc/pacman.conf
+    fi
+
+    if [ "$makepkg_conf" != "" -a "$NOCOPY" = "n" ]; then
+        echo "installing custom makepkg.conf"
+        cp ${makepkg_conf} ${working_dir}/etc/makepkg.conf
+    fi
+
+    if [ -e "${working_dir}/etc/locale.gen" ]; then
+        echo "generating default locales from host system"
+        cp /etc/locale.gen "${working_dir}/etc/locale.gen"
+        chroot "${working_dir}" locale-gen
+    fi
 
     if [ ! -e "${working_dir}/.arch-chroot" ]; then
         date +%s > "${working_dir}/.arch-chroot"
     fi
-# }}}
+    # }}}
 fi
 
 # vim:ft=sh:ts=4:sw=4:et:

rebuildpkgs

@@ -0,0 +1,101 @@
+#!/bin/bash
+# This script rebuilds a list of packages in order
+# and reports anything that fails
+# 
+# Due to sudo usage, it is recommended to allow makechrootpkg
+# to be run with NOPASSWD in your sudoers file
+#
+# FIXME
+# Currently uses $(pwd)/rebuilds as the directory for rebuilding...
+# TODO make this work for community too
+
+if [ $# -le 1 ]; then
+    echo "usage: $(basename $0) <chrootdir> <packages to rebuild>"
+    echo "  example: $(basename $0) ~/chroot readline bash foo bar baz"
+    exit 1
+fi
+
+# Source makepkg.conf; fail if it is not found
+if [ -r "/etc/makepkg.conf" ]; then
+	source "/etc/makepkg.conf"
+else
+    echo "/etc/makepkg.conf not found!"
+    exit 1
+fi
+
+die () {
+    echo $@ >&2
+    exit 1
+}
+
+bump_pkgrel () {
+    # Get the current pkgrel from SVN and update the working copy with it
+    # This prevents us from incrementing out of control :)
+    pbuild=".svn/text-base/PKGBUILD.svn-base"
+    oldrel=$(grep "pkgrel=" $pbuild | cut -d= -f2)
+
+    #remove decimals
+    rel=$(echo $oldrel | cut -d. -f1)
+    
+    newrel=$(($rel + 1))
+
+    sed -i "s/pkgrel=$oldrel/pkgrel=$newrel/" PKGBUILD 
+}
+
+pkg_from_pkgbuild () {
+    # we want the sourcing to be done in a subshell so we don't pollute our current namespace
+    export CARCH PKGEXT
+    (. PKGBUILD; echo "$pkgname-$pkgver-$pkgrel-$CARCH$PKGEXT")
+}
+
+chrootdir="$1"; shift
+pkgs="$@"
+
+SVNPATH="svn+ssh://gerolde.archlinux.org/srv/svn-packages"
+
+echo ":: Work will be done in $(pwd)/rebuilds"
+
+REBUILD_ROOT="$(pwd)/rebuilds"
+mkdir -p "$REBUILD_ROOT"
+cd "$REBUILD_ROOT"
+
+/usr/bin/svn co -N $SVNPATH
+
+FAILED=""
+for pkg in $pkgs; do
+    cd "$REBUILD_ROOT/svn-packages"
+
+    echo ":: Building '$pkg'"
+    /usr/bin/svn update "$pkg"
+    if [ ! -d "$pkg/trunk" ]; then
+        FAILED="$FAILED $pkg"
+        echo ":: $pkg does not exist in SVN"
+        continue
+    fi
+    cd "$pkg/trunk/"
+
+    bump_pkgrel
+
+    if ! sudo makechrootpkg -u -d -r "$chrootdir" -- --noconfirm; then
+        FAILED="$FAILED $pkg"
+        echo ":: $pkg Failed!"
+    else
+        pkgfile=$(pkg_from_pkgbuild)
+        if [ -e "$pkgfile" ]; then
+            echo ":: $pkg Complete"
+        else
+            FAILED="$FAILED $pkg"
+            echo ":: $pkg Failed, no package built!"
+        fi
+    fi
+done
+
+cd "$REBUILD_ROOT"
+if [ "$FAILED" != "" ]; then
+    echo "Packages failed:"
+    for pkg in $FAILED; do
+        echo -e "\t$pkg"
+    done
+fi
+
+echo "SVN pkgbumps in svn-packages/ - commit when ready"