]> git.madduck.net Git - code/mbuild.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

fix up arch handling
authormartin f. krafft <madduck@madduck.net>
Sat, 6 Feb 2010 22:44:30 +0000 (23:44 +0100)
committermartin f. krafft <madduck@madduck.net>
Sat, 6 Feb 2010 22:44:30 +0000 (23:44 +0100)
sbuild-wrapper.sh

index 91da408b870a1977b185d76ca0f4c3b263076b9f..5aee0ca3b51546f081f29afd72de412e005ba485 100755 (executable)
@@ -109,8 +109,6 @@ if [ -z "$schangesfile" ]; then
   exit 1
 fi
 
   exit 1
 fi
 
-[ -z "$arch" ] && arch="$DEB_BUILD_ARCH"
-
 dist="$(sed -ne 's,Distribution: ,,p' "$schangesfile")"
 
 schangesfile_basename="${schangesfile##*/}"
 dist="$(sed -ne 's,Distribution: ,,p' "$schangesfile")"
 
 schangesfile_basename="${schangesfile##*/}"
@@ -157,20 +155,37 @@ done
 rm $schangesfile
 unset schangesfile
 
 rm $schangesfile
 unset schangesfile
 
-if [ "$binonly" = 0 ]; then
-  sbuild_args_sourceful="--source --arch-all"
-fi
+[ -z "$arch" ] && arch="$DEB_BUILD_ARCH"
 
 
-if [ "$arch" = all ]; then
-  arch="$(schroot -l | sed -rne 's,^sid-([^-]+).*,\1,p' | uniq | tr '\n' ' ')"
-fi
+target_arch="$(sed -ne 's,^Architecture: ,,p' $dscfile_basename)"
+case "$binonly/$target_arch" in
+  1/all)
+    echo "E: cannot build arch:all packages with -B." >&2
+    exit 1
+    ;;
+  0/all) arch=all;;
+  */any)
+    arch="$(schroot -l | sed -rne 's,^sid-([^-]+).*,\1,p' | uniq | tr '\n' ' ')"
+    if [ "$binonly" = 0 ]; then
+      sbuild_args_sourceful="--source --arch-all"
+    fi
+    ;;
+esac
 
 for a in $arch; do
   echo "I: building $packagenameversion for $a/$dist…" >&2
 
 
 for a in $arch; do
   echo "I: building $packagenameversion for $a/$dist…" >&2
 
-  sbuild $sbuild_args $sbuild_args_sourceful \
-    --arch="$a" --dist="$dist" --keyid=$KEYID \
-    "$dscfile_basename"
+  case "$a" in
+    all)
+      arch_arg=--arch-all
+      a="$DEB_BUILD_ARCH"
+      ;;
+    *) --arch=$a;;
+  esac
+
+  sbuild $sbuild_args $sbuild_args_sourceful $arch_arg \
+    --dist="$dist" --keyid=$KEYID \
+    "$dscfile_basename" || ret=$?
 
   changesfile="${packagenameversion}_${a}.changes"
 
 
   changesfile="${packagenameversion}_${a}.changes"