more arch-handling fixes

[code/mbuild.git] / sbuild-wrapper.sh

diff --git a/sbuild-wrapper.sh b/sbuild-wrapper.sh
index 9ea51b7c81caf8ce4600f36436fe3770fd52073c..57dcaa68d5f6b933c07647544ff8fac96ffcd22f 100755 (executable)
--- a/sbuild-wrapper.sh
+++ b/sbuild-wrapper.sh
@@ -72,6 +72,7 @@ usage()
 
 binonly=0
 sbuild_args=
 
 binonly=0
 sbuild_args=

+sbuild_args_sourceful=

 schangesfile=
 arch=
 for opt in "$@"; do
 schangesfile=
 arch=
 for opt in "$@"; do


@@ -108,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##*/}"


@@ -153,29 +152,82 @@ dcmd "$dscfile_basename" | while read f; do
   esac
 done
 
   esac
 done
 

-[ "$binonly" = 0 ] && sbuild_args="${sbuild_args:+$sbuild_args }--source --arch-all"
+rm $schangesfile
+unset schangesfile

 
 

-sbuild $sbuild_args --arch="$arch" --dist="$dist" --keyid=$KEYID \
-  "$dscfile_basename"
+[ -z "$arch" ] && arch="$DEB_BUILD_ARCH"

 
 

-changesfile="${packagenameversion}_${arch}.changes"
+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' ' ')"
+    ;;
+esac

 
 

-postbuild "$changesfile"
+if [ "$binonly" = 0 ]; then
+  sbuild_args_sourceful="--source"
+fi

 
 

-dinstall "$dist" "$changesfile"
+for a in $arch; do
+  echo "I: building $packagenameversion for $a/$dist…" >&2

 
 

-DATESTR="$(date +%Y.%m.%d.%H%M%S)"
-BUILD_PREFIX="${packagenameversion}_${arch}.${DATESTR}"
+  case "$a" in
+    all)
+      arch_arg=--arch-all
+      a="$DEB_BUILD_ARCH"
+      ;;
+    *) arch_arg="--arch=$a";;
+  esac

 
 

-mv current "${BUILD_PREFIX}".buildlog
-rm -f current-*
+  sbuild $sbuild_args $sbuild_args_sourceful \
+    $arch_arg --dist="$dist" --keyid=$KEYID \
+    "$dscfile_basename" || ret=$?

 
 

-bundle="${BUNDLE_DIR}/${BUILD_PREFIX}".bundle.tar
-tar -chf "$bundle" *
-chmod 644 "$bundle"
+  changesfile="${packagenameversion}_${a}.changes"

 
 

-cleanup
+  if [ -n "$sbuild_args_sourceful" ]; then
+    schangesfile="${packagenameversion}_source+${changesfile#${packagenameversion}_}"
+    mv "$changesfile" "$schangesfile"
+    changesfile="$schangesfile"
+  fi

 
 

+  # subsequent iterations should be binonly
+  sbuild_args_sourceful=
+
+  echo "I: running post-build hook ($packagenameversion/$a/$dist)…" >&2
+  postbuild "$dist" "$a" "$changesfile"
+  echo "I: running dinstall ($packagenameversion/$a/$dist)…" >&2
+  dinstall "$dist" "$changesfile"
+
+  echo "I: done building $packagenameversion for $a/$dist" >&2
+done
+
+if [ -n "${schangesfile:-}" ]; then
+  sarch="${schangesfile##*_}"; sarch=${sarch%.changes}
+  other_archs="$(for i in *.changes; do
+                   [ "$i" = "$schangesfile" ] && continue
+                   t="${i##*_}"; echo "${t%.changes}"
+                 done)"
+
+  if [ -n "$other_archs" ]; then
+    combined_arch="${sarch}+${other_archs}"
+    mergechanges *.changes > ${packagenameversion}_${combined_arch}.changes
+    arch="$combined_arch"
+  else
+    arch="$sarch"
+  fi
+fi
+
+bundle="${BUNDLE_DIR}/${packagenameversion}_${arch}_bundle.tar.gz"
+tar -chzf "$bundle" *
+chmod 644 "$bundle"

 print_bundle_location "$bundle"
 
 print_bundle_location "$bundle"
 

+cleanup
+

 exit 0
 exit 0