simplify bundle name

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

diff --git a/sbuild-wrapper.sh b/sbuild-wrapper.sh
index c410dcb18b66f9074bd01c38a471468f4cd4fd8d..91da408b870a1977b185d76ca0f4c3b263076b9f 100755 (executable)
--- a/sbuild-wrapper.sh
+++ b/sbuild-wrapper.sh
@@ -2,7 +2,7 @@
 #
 #  - automate builds with sbuild and dinstall the result
 #
 #
 #  - automate builds with sbuild and dinstall the result
 #

-# Copyright (c) 2008 martin f. krafft <madduck@debian.org>
+# Copyright (c) 2008–2010 martin f. krafft <madduck@debian.org>

 # Released under the terms of the Artistic Licence 2.0.
 #
 set -eu
 # Released under the terms of the Artistic Licence 2.0.
 #
 set -eu


@@ -10,7 +10,11 @@ set -eu
 ME="${0##*/}"
 
 BUILDDIR="$(mktemp -dt $ME.XXXXXXXX)"
 ME="${0##*/}"
 
 BUILDDIR="$(mktemp -dt $ME.XXXXXXXX)"

-trap "cd /tmp && rm -r '$BUILDDIR'" 0
+cleanup() {
+  cd /tmp && rm -r "$BUILDDIR"
+  trap - 1 2 3 4 5 6 7 8 10 11 12 13 14 15
+}
+trap cleanup 1 2 3 4 5 6 7 8 10 11 12 13 14 15

 
 BUNDLE_DIR="${TMPDIR:-/tmp}"
 TARGET_DIR="$PWD"
 
 BUNDLE_DIR="${TMPDIR:-/tmp}"
 TARGET_DIR="$PWD"


@@ -24,6 +28,9 @@ dinstall() {
 print_bundle_location() {
   echo "Bundle available at $@ ."
 }
 print_bundle_location() {
   echo "Bundle available at $@ ."
 }

+postbuild() {
+  :
+}

 
 KEYID=
 
 
 KEYID=
 


@@ -65,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


@@ -119,6 +127,7 @@ esac
 dcmd cp "${schangesfile##*/}" "$BUILDDIR"
 schangesfile="$schangesfile_basename"
 
 dcmd cp "${schangesfile##*/}" "$BUILDDIR"
 schangesfile="$schangesfile_basename"
 

+OLDPWD="$PWD"

 cd "$BUILDDIR"
 
 dcmd "$dscfile_basename" | while read f; do
 cd "$BUILDDIR"
 
 dcmd "$dscfile_basename" | while read f; do


@@ -126,9 +135,17 @@ dcmd "$dscfile_basename" | while read f; do
 
   case "$f" in
     *.tar.gz|*.tar.bz2|*.tar.lzma|*.tar.xz)
 
   case "$f" in
     *.tar.gz|*.tar.bz2|*.tar.lzma|*.tar.xz)

-      last_version="$(apt-cache madison $packagename | sed -rne "s,.+(\<${upstream_version}[^[:space:]]+).*,\1,p")"
-      echo "I: fetching missing tarball for $upstream_version (from $last_version)…" >&2
-      apt-get --tar-only --only-source source "${packagename}=${last_version}"
+      if [ -f "$OLDPWD/$f" ]; then
+        echo "I: using existing tarball for $upstream_version…" >&2
+        cp $OLDPWD/$f $f
+      else
+        last_version="$(apt-cache madison $packagename | sed -rne "s,.+(\<${upstream_version}[^[:space:]]+).*,\1,p")"
+        echo "I: fetching missing tarball for $upstream_version (from $last_version)…" >&2
+        if ! apt-get --tar-only --only-source source "${packagename}=${last_version}"; then
+          echo "E: I do not know how to obtain the file: $f" >&2
+          exit 1
+        fi
+      fi

       ;;
     *)
       echo "E: I do not know how to obtain the file: $f" >&2
       ;;
     *)
       echo "E: I do not know how to obtain the file: $f" >&2


@@ -137,34 +154,62 @@ 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
+
+if [ "$binonly" = 0 ]; then
+  sbuild_args_sourceful="--source --arch-all"
+fi

 
 

-sbuild $sbuild_args --arch="$arch" --dist="$dist" --keyid=$KEYID \
-  "$dscfile_basename"
+if [ "$arch" = all ]; then
+  arch="$(schroot -l | sed -rne 's,^sid-([^-]+).*,\1,p' | uniq | tr '\n' ' ')"
+fi

 
 

-changesfile="${packagenameversion}_${arch}.changes"
+for a in $arch; do
+  echo "I: building $packagenameversion for $a/$dist…" >&2

 
 

-#mergechanges "$schangesfile" "$changesfile" > temp-combined.changes
-#mv temp-combined.changes "$changesfile"
-#changestool "$changesfile" updatechecksums
+  sbuild $sbuild_args $sbuild_args_sourceful \
+    --arch="$a" --dist="$dist" --keyid=$KEYID \
+    "$dscfile_basename"

 
 

-#sign_changes_file "$changesfile"
+  changesfile="${packagenameversion}_${a}.changes"

 
 

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

 
 

-DATESTR="$(date +%Y.%m.%d.%H%M%S)"
-BUILD_PREFIX="${packagenameversion}_${arch}.${DATESTR}"
+  # subsequent iterations should be binonly
+  sbuild_args_sourceful=

 
 

-mv current "${BUILD_PREFIX}".buildlog
-rm -f current-*
+  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"

 
 

-bundle="${BUNDLE_DIR}/${BUILD_PREFIX}".bundle.tar
-tar -chf "$bundle" *
-chmod 644 "$bundle"
+  echo "I: done building $packagenameversion for $a/$dist" >&2
+done

 
 

-rm -r "$BUILDDIR"
-trap - 0
+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"
 
 print_bundle_location "$bundle"
 

+cleanup
+

 exit 0
 exit 0