]> git.madduck.net Git - code/mbuild.git/blobdiff - sbuild-wrapper.sh

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:

simplify bundle name
[code/mbuild.git] / sbuild-wrapper.sh
index 9ea51b7c81caf8ce4600f36436fe3770fd52073c..91da408b870a1977b185d76ca0f4c3b263076b9f 100755 (executable)
@@ -72,6 +72,7 @@ usage()
 
 binonly=0
 sbuild_args=
+sbuild_args_sourceful=
 schangesfile=
 arch=
 for opt in "$@"; do
@@ -153,29 +154,62 @@ dcmd "$dscfile_basename" | while read f; do
   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"
+if [ "$binonly" = 0 ]; then
+  sbuild_args_sourceful="--source --arch-all"
+fi
 
-changesfile="${packagenameversion}_${arch}.changes"
+if [ "$arch" = all ]; then
+  arch="$(schroot -l | sed -rne 's,^sid-([^-]+).*,\1,p' | uniq | tr '\n' ' ')"
+fi
 
-postbuild "$changesfile"
+for a in $arch; do
+  echo "I: building $packagenameversion for $a/$dist…" >&2
 
-dinstall "$dist" "$changesfile"
+  sbuild $sbuild_args $sbuild_args_sourceful \
+    --arch="$a" --dist="$dist" --keyid=$KEYID \
+    "$dscfile_basename"
 
-DATESTR="$(date +%Y.%m.%d.%H%M%S)"
-BUILD_PREFIX="${packagenameversion}_${arch}.${DATESTR}"
+  changesfile="${packagenameversion}_${a}.changes"
 
-mv current "${BUILD_PREFIX}".buildlog
-rm -f current-*
+  if [ -n "$sbuild_args_sourceful" ]; then
+    schangesfile="${packagenameversion}_source+${changesfile#${packagenameversion}_}"
+    mv "$changesfile" "$schangesfile"
+    changesfile="$schangesfile"
+  fi
 
-bundle="${BUNDLE_DIR}/${BUILD_PREFIX}".bundle.tar
-tar -chf "$bundle" *
-chmod 644 "$bundle"
+  # subsequent iterations should be binonly
+  sbuild_args_sourceful=
 
-cleanup
+  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}
+  combined_arch="$(echo -n "${sarch}+";
+                   for i in *.changes; do
+                     [ "$i" = "$schangesfile" ] && continue
+                     t="${i##*_}"; echo "${t%.changes}"
+                   done)"
+
+  if [ -n "$combined_arch" ]; then
+    mergechanges *.changes > ${packagenameversion}_${combined_arch}.changes
+    arch="$combined_arch"
+  fi
+fi
+
+bundle="${BUNDLE_DIR}/${packagenameversion}_${arch}_bundle.tar.gz"
+tar -chzf "$bundle" *
+chmod 644 "$bundle"
 print_bundle_location "$bundle"
 
+cleanup
+
 exit 0