bin/mdw-build: Refactor setting options to `mdw-sbuild'.

[profile] / bin / mdw-sbuild-server

diff --git a/bin/mdw-sbuild-server b/bin/mdw-sbuild-server
index a1355b8..d04f5a2 100755 (executable)
--- a/bin/mdw-sbuild-server
+++ b/bin/mdw-sbuild-server
@@ -176,6 +176,13 @@ case "$#,$1" in
     ## actually a little tricky.
     for t in $targets; do
 
+      ## Dissect the target name.
+      suite=${t%%-*} archs=${t#*-}
+      case $archs in
+       */*) target=${archs%/*} host=${archs#*/} ;;
+       *) target=$archs host=$archs; t=$suite-$target/$host ;;
+      esac
+
       ## Work through the architectures which we can build.
       for arch in $wantarchs; do
        case $arch in
@@ -199,7 +206,7 @@ case "$#,$1" in
            case $archp in nil) continue ;; esac
 
            ## If we can't build it then we shouldn't try.
-           if ! dpkg-architecture -a"$os-${t#*-}" -i"$arch"; then
+           if ! dpkg-architecture -a"$os-$target" -i"$arch"; then
              continue
            fi
 
@@ -235,23 +242,38 @@ case "$#,$1" in
 DSC = $dsc
 FIRST = $first
 REST = $rest
-SBUILD = t=\$@; sbuild \\
-       --dist=\$\${t%-*} --arch=\$\${t\#*-} \\
-       --chroot=\$@ --verbose
-TAGLINES = \\
-       while IFS= read -r line; do printf "%s: %s\n" "\$@" "\$\$line"; done
+sbuild-wrap = \\
+       t=\$@; \\
+       host=\$\${t\#\#*/} full=\$\${t%/*}; \\
+       suite=\$\${full%%-*} target=\$\${full\#*-}; \\
+       { echo started >build-status.\$\$full; \\
+         sbuild \\
+               --dist=\$\$suite --build=\$\$host --host=\$\$target \\
+               --chroot=\$\$suite-\$\$host --verbose \$1 \$(DSC); \\
+         rc=\$\$?; case \$\$rc in \\
+           0) echo ok >build-status.\$\$full ;; \\
+           *) echo failed rc=\$\$rc >build-status.\$\$full ;; \\
+         esac; } | \\
+       while IFS= read -r line; do \\
+         printf "%s: %s\n" "\$\$full" "\$\$line"; \\
+       done; \\
+       read st _ <build-status.\$\$full && \\
+       case \$\$st in ok) exit 0 ;; *) exit 1 ;; esac
 all: \$(FIRST) \$(REST)
-\$(FIRST):; \$(SBUILD) $firstopt \$(DSC) | \$(TAGLINES)
-\$(REST):; \$(SBUILD) --no-arch-all \$(DSC) | \$(TAGLINES)
+\$(FIRST):; \$(call sbuild-wrap,$firstopt)
+\$(REST):; \$(call sbuild-wrap,--no-arch-all)
 EOF
 
+    ## Make some marker files to say things are in progress.
+    for i in $first $rest; do echo "starting" >build-status.${i%/*}; done
+
     ## And we're ready to go.
     mkfifo pipeout
     cat pipeout& catpid=$!
     set +e; make -fbuild.mk $parallel $makeopts -k all >pipeout
     rc=$?; set -e
     wait $!
-    rm build.mk pipeout
+    rm build.mk pipeout build-status.*
     find . -maxdepth 1 -type l -exec rm {} \;
     exit $rc
     ;;