Move the determination of unique .install files

Move this inside the split packages loop

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>

Makefile

@@ -1,13 +1,20 @@
 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
-	ln -sf extrapkg $(DESTDIR)/usr/bin/corepkg
-	ln -sf extrapkg $(DESTDIR)/usr/bin/testingpkg
-	ln -sf extrapkg $(DESTDIR)/usr/bin/unstablepkg
+	install -m 755 commitpkg $(DESTDIR)/usr/bin
+	ln -sf commitpkg $(DESTDIR)/usr/bin/extrapkg
+	ln -sf commitpkg $(DESTDIR)/usr/bin/corepkg
+	ln -sf commitpkg $(DESTDIR)/usr/bin/testingpkg
+	ln -sf commitpkg $(DESTDIR)/usr/bin/communitypkg
+	ln -sf commitpkg $(DESTDIR)/usr/bin/community-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 -m 755 mkarchroot $(DESTDIR)/usr/sbin
@@ -15,15 +22,23 @@ install:
 	#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
 
 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/unstablepkg
+	rm $(DESTDIR)/usr/bin/communitypkg
+	rm $(DESTDIR)/usr/bin/community-testingpkg
 	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
+	rm $(DESTDIR)/usr/bin/communityco
+	rm $(DESTDIR)/usr/bin/rebuildpkgs

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,55 @@
+#!/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 [ "$(svn diff)" != "" ]; then
+    echo "archrelease: You have not committed your changes yet!"
+    echo "             Please run 'upgpkg' or 'svn commit' first"
+    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
+
+echo "===> Tagged for $1"

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

@@ -23,65 +23,72 @@ if [ ! -f PKGBUILD ]; then
 fi
 
 source PKGBUILD
-
-pkgfile=${pkgname}-${pkgver}-${pkgrel}-${CARCH}.pkg.tar.gz
-oldstylepkgfile=${pkgname}-${pkgver}-${pkgrel}.pkg.tar.gz
-
-if [ -f "$(pwd)/$pkgfile" ]; then
-    pkgfile=$(pwd)/$pkgfile
-elif [ -f "$PKGDEST/$pkgfile" ]; then
-    pkgfile=$PKGDEST/$pkgfile
-elif [ -f "$(pwd)/$oldstylepkgfile" ]; then
-    pkgfile=$(pwd)/$oldstylepkgfile
-elif [ -f "$PKGDEST/$oldstylepkgfile" ]; then
-    pkgfile=$PKGDEST/$oldstylepkgfile
-else
-    echo "File \"$pkgfile\" doesn't exist"
-    exit 1
+if [ "$arch" == "any" ]; then
+    CARCH="any"
 fi
 
-tmp=`pacman -Spd --noconfirm $pkgname`
+for _pkgname in ${pkgname[@]}; do
+    pkgfile=${_pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
+    oldstylepkgfile=${_pkgname}-${pkgver}-${pkgrel}${PKGEXT}
 
-if [ $? -ne 0 ]; then
-	echo "Couldn't download previous package."
+    if [ -f "$(pwd)/$pkgfile" ]; then
+	pkgfile=$(pwd)/$pkgfile
+    elif [ -f "$PKGDEST/$pkgfile" ]; then
+	pkgfile=$PKGDEST/$pkgfile
+    elif [ -f "$(pwd)/$oldstylepkgfile" ]; then
+	pkgfile=$(pwd)/$oldstylepkgfile
+    elif [ -f "$PKGDEST/$oldstylepkgfile" ]; then
+	pkgfile=$PKGDEST/$oldstylepkgfile
+    else
+	echo "File \"$pkgfile\" doesn't exist"
 	exit 1
-fi
+    fi
 
-pkgurl=`echo $tmp | rev | cut -d ' ' -f 1 | rev`
+    tmp=`pacman -Spd --noconfirm $_pkgname`
 
-oldpkg=`strip_url $pkgurl`
-
-if [ "$(basename $oldpkg)" = "$(basename $pkgfile)" ]; then
-	echo "The built package is the one in the repo right now!"
+    if [ $? -ne 0 ]; then
+	echo "Couldn't download previous package for $_pkgname."
 	exit 1
-fi
+    fi
 
-if [ ! -f $oldpkg ]; then
+    pkgurl=`echo $tmp | rev | cut -d ' ' -f 1 | rev`
+
+    oldpkg=`strip_url $pkgurl`
+
+    if [ "$(basename $oldpkg)" = "$(basename $pkgfile)" ]; then
+	echo "The built package ($_pkgname) is the one in the repo right now!"
+	exit 1
+    fi
+
+    if [ ! -f $oldpkg ]; then
 	if echo $pkgurl | grep "^file:///" > /dev/null 2>&1; then
-		cp `echo $pkgurl | sed 's#^file://##'` .
+	    cp `echo $pkgurl | sed 's#^file://##'` .
+	elif [ -f $PKGDEST/$oldpkg ]; then
+	    cp $PKGDEST/$oldpkg .
 	else
-		wget $pkgurl
+	    wget --quiet $pkgurl
 	fi
-fi
+    fi
 
-tar tzf $oldpkg > filelist-old
-tar tzf "$pkgfile" > filelist
+    bsdtar tf $oldpkg > filelist-$_pkgname-old
+    bsdtar tf "$pkgfile" > filelist-$_pkgname
 
-sort -o filelist filelist
-sort -o filelist-old filelist-old
+    sort -o filelist-$_pkgname filelist-$_pkgname
+    sort -o filelist-$_pkgname-old filelist-$_pkgname-old
 
-diff filelist-old filelist
+    diff filelist-$_pkgname-old filelist-$_pkgname
 
-if diff filelist-old filelist | 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
-	tar xzf "$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
+	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
-else
-	echo "No filename differences"
-fi
+    else
+	echo "No filename differences for $_pkgname."
+    fi
+done
 
 # vim:ft=sh:ts=4:sw=4:et:

commitpkg

@@ -0,0 +1,121 @@
+#!/bin/bash
+
+abort() {
+    echo ${1:-"Cancelled"}
+    exit 1
+}
+
+# Verify that a remote file exists and is identical to a local one
+# Usage: package_verify <local path> <remote host> <remote path>
+package_verify() {
+    local remote_checksum=$(ssh $2 openssl sha1 "'$3'" 2>/dev/null |
+                            grep -o '[0-9a-f]\{40\}$')
+    local local_checksum=$(openssl sha1 "$1" | grep -o '[0-9a-f]\{40\}$')
+    if [ -n "$remote_checksum" -a "$remote_checksum" == "$local_checksum" ]; then
+        return 0
+    fi
+    return 1
+}
+
+# Source makepkg.conf; fail if it is not found
+if [ -r "/etc/makepkg.conf" ]; then
+    source "/etc/makepkg.conf"
+else
+    abort "/etc/makepkg.conf not found!"
+fi
+
+# Source user-specific makepkg.conf overrides
+if [ -r ~/.makepkg.conf ]; then
+    source ~/.makepkg.conf
+fi
+
+cmd=$(basename "$0")
+
+if [ ! -f PKGBUILD ]; then
+    abort "No PKGBUILD file"
+fi
+
+source PKGBUILD
+pkgbase=${pkgbase:-$pkgname}
+
+# 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"
+elif [ "$cmd" == "community-testingpkg" ]; then
+    repo="community-testing"
+    server="aur.archlinux.org"
+else
+    if [ $# -eq 0 ]; then
+        abort "usage: commitpkg <reponame> [-l limit] [commit message]"
+    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="-l $2"
+    shift 2
+fi
+
+for _arch in ${arch[@]}; do
+    echo "===> Uploading to staging/$repo for arch=${_arch}"
+    for _pkgname in ${pkgname[@]}; do
+        pkgfile=$_pkgname-$pkgver-$pkgrel-${_arch}$PKGEXT
+
+        if [ ! -f $pkgfile -a -f "$PKGDEST/$pkgfile" ]; then
+            pkgfile="$PKGDEST/$pkgfile"
+        elif [ ! -f $pkgfile ]; then
+            echo "File $pkgfile doesn't exist"
+            # skip to next architecture
+            continue 2
+        fi
+
+        # combine what we know into a variable
+        uploadto=staging/$repo/$(basename "$pkgfile")
+        # don't re-upload the same package (useful for -any sub packages)
+        if ! package_verify "$pkgfile" $server "$uploadto"; then
+            scp $scpopts "$pkgfile" $server:"$uploadto" || abort
+        fi
+        if ! package_verify "$pkgfile" $server "$uploadto"; then
+            abort "File got corrupted during upload, cancelled."
+        else
+            echo "File integrity okay."
+        fi
+        echo "===> Uploaded $pkgfile"
+    done
+
+    if [ -n "$1" ]; then
+        svn commit -m "upgpkg: $pkgbase $pkgver-$pkgrel
+    $1" >/dev/null || abort
+        echo "===> Commited with message:
+  upgpkg: $pkgbase $pkgver-$pkgrel
+      $1"
+    else
+        svn commit || abort
+        echo "===> Commited"
+    fi
+
+    archrelease $repo-${_arch} || abort
+done
+
+if [ "${arch[*]}" == "any" ]; then
+    if [ -d ../repos/$repo-i686 -a -d ../repos/$repo-x86_64 ]; then
+        pushd ../repos/
+        svn rm $repo-i686
+        svn rm $repo-x86_64
+        svn commit -m "removed $repo-i686 and $repo-x86_64 for $pkgname"
+        popd
+    fi
+fi
+
+# vim:ft=sh:ts=4:sw=4:et:

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,116 +0,0 @@
-#!/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
-
-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/$(basename ${pkgfile})
-    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"
-
-# vim:ft=sh:ts=4:sw=4:et:

makechrootpkg

@@ -12,44 +12,58 @@ FORCE="n"
 RUN=""
 MAKEPKG_ARGS="-sr"
 REPACK=""
+LAYER="rw"
 WORKDIR=$PWD
-clean_first="0"
 
-chrootdir="$CHROOT_SHELL"
+update_first="0"
+clean_first="0"
+install_pkg=""
+add_to_db=0
+
+chrootdir=""
 
 APPNAME=$(basename "${0}")
 
 usage ()
 {
-    echo "usage ${APPNAME} [-h] [-c] [-r CHROOT_SHELL] [--] [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."
     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 " 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 -c flag, if specified, will remove all files created by previous"
-    echo "builds using makechrootpkg.  This will ensure a clean chroot is used."
-    echo ""
-    echo "The chroot shell 'root' directory must be created via the following"
+    echo "The chroot 'root' directory must be created via the following"
     echo "command:"
-    echo "    mkarchroot \$CHROOT_SHELL/root base base-devel sudo"
-    echo ""
-    echo "If you have problems passing params to makepkg or need to pass long"
-    echo "options, put -- between the makechrootpkg args and the makepkg args"
+    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 ':r:h:c' arg; do
+while getopts 'hcudr:I:l:' arg; do
     case "${arg}" in
-        r) chrootdir="$OPTARG" ;;
+        h) usage ;;
         c) clean_first=1 ;;
-        h|?) usage ;;
+        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
@@ -80,40 +94,54 @@ fi
 source PKGBUILD
 
 if [ ! -d "$chrootdir" ]; then
-    echo "No \$CHROOT_SHELL defined, or invalid path ($chrootdir)"
+    echo "No chroot dir defined, or invalid path '$chrootdir'"
     exit 1
 fi
 
 if [ ! -d "$chrootdir/root" ]; then
-    echo "Missing \$CHROOT_SHELL root directory."
-    echo "Try using: mkarchroot \$CHROOT_SHELL base base-devel sudo"
+    echo "Missing chroot dir root directory."
+    echo "Try using: mkarchroot $chrootdir/root base base-devel sudo"
     usage
 fi
 
-[ -d "$chrootdir/rw" -a "$clean_first" -eq "1" ] && rm -rf "$chrootdir/rw/" 
-[ -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"
 
 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"
-grep -Fq unionfs /proc/filesystems
+grep -Fq aufs /proc/filesystems
 if [ $? -ne 0 ]; then
-    modprobe -q unionfs
-    if [ $? -ne 0 ];
-        echo "ERROR: No unionfs available. Abandon ship!" && exit 1
+    modprobe -q aufs
+    if [ $? -ne 0 ]; then
+        echo "ERROR: No aufs available. Abandon ship!" && exit 1
     fi
 fi
-mount -t unionfs none -o "dirs=$chrootdir/rw=rw:$chrootdir/root=ro" "$uniondir"
+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"
 
@@ -122,30 +150,13 @@ if [ "$REPACK" != "1" ]; then
     rm -rf "$uniondir/build/"*
 fi
 
-# Copy makepkg.conf and ~/.makepkg.conf into the chroot so packager has
-# all their custom variables set.
-if [ -r "/etc/makepkg.conf" ]; then
-  rm $uniondir/etc/makepkg.conf
-  cp /etc/makepkg.conf $uniondir/etc/makepkg.conf
-fi
-if [ -r ~/.makepkg.conf ]; then
-  cat ~/.makepkg.conf >> $uniondir/etc/makepkg.conf
-fi
-
-source $uniondir/etc/makepkg.conf
-
-# Magic trickery with PKGDEST and SRCDEST, so that the built
-# files end up where they're expected in the _real_ filesystem
-[ -d "$uniondir/srcdest" ] || mkdir "$uniondir/srcdest"
 [ -d "$uniondir/pkgdest" ] || mkdir "$uniondir/pkgdest"
-[ ! -z "$PKGDEST" ] && mount --bind "$PKGDEST" "$uniondir/pkgdest"
-[ ! -z "$SRCDEST" ] && mount --bind "$SRCDEST" "$uniondir/srcdest"
-
 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"
@@ -159,17 +170,35 @@ chown -R nobody "$uniondir/pkgdest"
 source PKGBUILD
 cp PKGBUILD "$uniondir/build/"
 for f in ${source[@]}; do
-    basef=$(basename $f)
+    basef=$(echo $f | sed 's|::.*||' | sed 's|^.*://.*/||g')
     if [ -f "$basef" ]; then
         cp "$basef" "$uniondir/srcdest/"
+    elif [ -f "$SRCDEST/$basef" ]; then
+        cp "$SRCDEST/$basef" "$uniondir/srcdest/"
     fi
 done
-if [ "$install" != "" -a -f "$install" ]; then
-    cp "$install" "$uniondir/build/"
+
+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/")
+    install_files=$(eval echo $install_files |tr '[:blank:]' '\n'|sort |uniq)
+done
+
+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"
+    touch "$uniondir/etc/sudoers"
     echo "nobody	ALL=(ALL) NOPASSWD: ALL" >> "$uniondir/etc/sudoers"
     chmod 440 "$uniondir/etc/sudoers"
 fi
@@ -180,29 +209,63 @@ fi
 #!/bin/bash
 export LANG=$LOCALE
 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/*${PKGEXT} > /pkgdest/namcap.log
+exit 0
 EOF
 ) > "$uniondir/chrootbuild"
 chmod +x "$uniondir/chrootbuild"
 
-mkarchroot -r "/chrootbuild" "$uniondir"
+if mkarchroot -r "/chrootbuild" "$uniondir"; then
 
-if [ -e ${chrootdir}/rw/build/BUILD_FAILED ]; then
-    echo "Build failed, check \$CHROOT_DIR/rw/build"
-    rm ${chrootdir}/rw/build/BUILD_FAILED
-    exit 1
-else	
-    source ${WORKDIR}/PKGBUILD
-    if [ -z "$(mount | grep ${chrootdir}/union/pkgdest)" ]; then
-        echo "Moving completed package file to ${WORKDIR}"
-        mv ${chrootdir}/union/pkgdest/${pkgname}-${pkgver}-${pkgrel}-*.pkg.tar.gz ${WORKDIR}
-    fi
-    if [ -z "$(mount | grep ${chrootdir}/union/srcdest)" ]; then
-        echo "Moving downloaded source files to ${WORKDIR}"
-        mv ${chrootdir}/union/srcdest/* ${WORKDIR}
-    fi
-    rm -rf ${chrootdir}/rw/build/*
-    echo "Build complete"
+    # Source global makepkg.conf for SRCDEST and PKGDEST vars
+    [ -f /etc/makepkg.conf ] && source /etc/makepkg.conf
+    [ -f ~/.makepkg.conf ] && source ~/.makepkg.conf
+
+    for pkgfile in "${chrootdir}"/union/pkgdest/*${PKGEXT}; do
+        [ -e "$pkgfile" ] || continue
+        _pkgname=$(basename "$pkgfile")
+        if [ "$add_to_db" -eq "1" ]; 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"
+                popd >/dev/null
+        fi
+
+        if [ -d "$PKGDEST" ]; then
+            echo "Moving completed ${_pkgname%${PKGEXT}} package file to ${PKGDEST}"
+            mv "$pkgfile" "${PKGDEST}"
+        else
+            echo "Moving completed ${_pkgname%${PKGEXT}} package file to ${WORKDIR}"
+            mv "$pkgfile" "${WORKDIR}"
+        fi
+    done
+
+    for f in "${chrootdir}"/union/srcdest/*; do
+        [ -e "$f" ] || continue
+        if [ -d "$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

@@ -10,6 +10,7 @@
 
 FORCE="n"
 RUN=""
+NOCOPY="n"
 
 working_dir=""
 
@@ -25,6 +26,7 @@ usage ()
     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
 }
@@ -36,6 +38,7 @@ while getopts 'r:ufhC:M:' arg; do
         f) FORCE="y" ;;
         C) pac_conf="$OPTARG" ;;
         M) makepkg_conf="$OPTARG" ;;
+        n) NOCOPY="y" ;;
         h|?) usage 0 ;;
         *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
@@ -161,19 +164,21 @@ else
         ldconfig -r "${working_dir}"
     fi
 
-    if [ "$pac_conf" != "" ]; then
+    if [ "$pac_conf" != "" -a "$NOCOPY" = "n" ]; then
         echo "installing custom pacman.conf"
         cp ${pac_conf} ${working_dir}/etc/pacman.conf
     fi
 
-    if [ "$makepkg_conf" != "" ]; then
+    if [ "$makepkg_conf" != "" -a "$NOCOPY" = "n" ]; then
         echo "installing custom makepkg.conf"
         cp ${makepkg_conf} ${working_dir}/etc/makepkg.conf
     fi
 
-    echo "generating default locales"
-    cp /etc/locale.gen "${working_dir}/etc/locale.gen"
-    chroot "${working_dir}" locale-gen
+    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"

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"