X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/abfec7033192f94061714f1d9928c99f17d87ec1..ccd96c4f2fa288f60aa6cbb87e1a83e6ff28c099:/bin/mdw-sbuild

diff --git a/bin/mdw-sbuild b/bin/mdw-sbuild
index be687f6..f9ceee5 100755
--- a/bin/mdw-sbuild
+++ b/bin/mdw-sbuild
@@ -34,8 +34,8 @@ fail_usage () { usage >&2; exit 1; }
 ### Parse options.
 
 bogusp=nil noactp=nil signp=nil
-unset buildopts
-while getopts "haik:nt:" opt; do
+unset buildopts pkgs
+while getopts "haik:np:t:" opt; do
   case $opt in
     h)
       usage
@@ -47,6 +47,7 @@ Options:
 	-i		Build only architecture-neutral packages.
 	-k KEYID	Sign the result using KEYID.
 	-n		Don't actually do the build.
+	-p DIR		Upload additional packages from DIR.
 	-t TARGET	Build in TARGET build environment.
 EOF
       exit 0
@@ -55,6 +56,7 @@ EOF
     i) buildopts="${buildopts+$buildopts }-i" ;;
     k) signp=t keyid=$OPTARG ;;
     n) buildopts="${buildopts+$buildopts }-n" noactp=t ;;
+    p) pkgs=$OPTARG ;;
     t) buildopts="${buildopts+$buildopts }-t$OPTARG" ;;
     *) bogusp=t ;;
   esac
@@ -66,6 +68,7 @@ case $# in
 esac
 case $bogusp in t) fail_usage ;; esac
 case $noactp in t) signp=nil ;; esac
+case ${pkgs-/hack} in /*) ;; *) pkgs=$(pwd)/$pkgs ;; esac
 
 ###--------------------------------------------------------------------------
 ### Main program.
@@ -85,7 +88,7 @@ case ${ver+t} in t) ;; *) fail "can't figure out the package version" ;; esac
 
 ## Build a Debian source package.  Don't sign anything yet.  That will happen
 ## at the end, all in one go.
-dpkg-buildpackage -S -uc -us
+dpkg-buildpackage -S -uc -us -d
 cd ..
 dsc=${pkg}_${ver}.dsc
 [ -f "$dsc" ] || fail "where is my \`.dsc' file?"
@@ -94,12 +97,19 @@ dsc=${pkg}_${ver}.dsc
 ## upload the sources, run the build, and collect the results.
 builddir=$(ssh "$host" mdw-sbuild-server dir "$pkg/$ver")
 dcmd rsync -a "$dsc" "$host:$builddir/"
+case ${pkgs+t} in t) rsync -a "$pkgs/" "$host:$builddir/pkgs/" ;; esac
 set +e; ssh "$host" mdw-sbuild-server $buildopts build "$builddir"
 rc=$?; set -e
 rsync -a "$host:$builddir/" ./
 case $rc in 0) ;; *) exit $rc ;; esac
 
-## Maybe sign the result.
+## Merge the change files together, and maybe sign the result.
+chchch=${pkg}_${ver}_source.changes
+for i in "${pkg}_${ver}"_*.changes; do
+  case " $chchch " in *" $i "*) ;; *) chchch="$chchch $i" ;; esac
+done
+mergechanges -f $chchch
+rm $chchch
 case $signp in
-  t) debsign -k"$keyid" "${pkg}_${ver}_"*.changes ;;
+  t) debsign -k"$keyid" "${pkg}_${ver}_multi.changes" ;;
 esac