X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/92b05c85154487f824b37a607c38cad4aa20fe27..0452eefcdebc1264ec736e99220f8f5280c4c855:/bin/mdw-sbuild-server

diff --git a/bin/mdw-sbuild-server b/bin/mdw-sbuild-server
index d04f5a2..705592b 100755
--- a/bin/mdw-sbuild-server
+++ b/bin/mdw-sbuild-server
@@ -137,6 +137,7 @@ case "$#,$1" in
       ## racing with another process, but that's why we're trying in a loop.
       if mkdir "$ver#$nn" >/dev/null 2>&1; then
 	winp=t
+	cd "$ver#$nn"
 	break
       fi
 
@@ -149,6 +150,9 @@ case "$#,$1" in
     ## Make sure we actually succeeded.
     case $winp in t) ;; *) fail "failed to create build directory" ;; esac
 
+    ## Make an empty directory for dependency packages.
+    mkdir -p pkgs/
+
     ## Done.
     echo "$buildroot/$dist#$nn"
     ;;
@@ -171,6 +175,7 @@ case "$#,$1" in
     unset first rest; anyp=nil depp=nil allp=nil
     wantarchs=$(sed -n '/^[Aa]rchitecture:/ s/^[^:]*: *//p' "$dsc")
     : ${wantarchs:=any}
+    unset buildarchs buildarchs_seen=:
 
     ## Work through the available targets assigning builds to them.  This is
     ## actually a little tricky.
@@ -182,6 +187,14 @@ case "$#,$1" in
 	*/*) target=${archs%/*} host=${archs#*/} ;;
 	*) target=$archs host=$archs; t=$suite-$target/$host ;;
       esac
+      case $buildarchs_seen in
+	*:$target:*)
+	  ;;
+	*)
+	  buildarchs=${buildarchs+$buildarchs }$target
+	  buildarchs_seen=$buildarchs_seen$target:
+	  ;;
+      esac
 
       ## Work through the architectures which we can build.
       for arch in $wantarchs; do
@@ -201,7 +214,7 @@ case "$#,$1" in
 	  *)
 	    ## There's at least one architecture-specific package.
 
-	    ## If we don't want to build architecture-specific package then
+	    ## If we don't want to build architecture-specific packages then
 	    ## there's nothing to do.
 	    case $archp in nil) continue ;; esac
 
@@ -236,6 +249,18 @@ case "$#,$1" in
       nil) firstopt="$firstopt --debbuildopt=-A" ;;
     esac
 
+    ## Sort out the additional packages.  This is rather annoying, because
+    ## sbuild(1) does this in a really stupid way.
+    rm -rf pkgs.*
+    for a in $buildarchs; do
+      mkdir pkgs.$a
+      for f in $(dpkg-scanpackages -a$a pkgs/ |
+		    sed -n '/^Filename: /s///p')
+      do
+	ln $f pkgs.$a/
+      done
+    done
+
     ## Build a cheesy makefile to run these in parallel.
     cat >build.mk <<EOF
 ### -*-makefile-*-
@@ -248,6 +273,7 @@ sbuild-wrap = \\
 	suite=\$\${full%%-*} target=\$\${full\#*-}; \\
 	{ echo started >build-status.\$\$full; \\
 	  sbuild \\
+		--extra-package=pkgs.\$\$target/ \\
 		--dist=\$\$suite --build=\$\$host --host=\$\$target \\
 		--chroot=\$\$suite-\$\$host --verbose \$1 \$(DSC); \\
 	  rc=\$\$?; case \$\$rc in \\