]> 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:

be more verbose about fetching tarballs
[code/mbuild.git] / sbuild-wrapper.sh
index 731e1bd78f5051d6fe21491cd140526dd2f87797..b2ced3796c60d15b8c6220c7d5a6f7e2b3f766fd 100755 (executable)
@@ -10,7 +10,7 @@ set -eu
 ME="${0##*/}"
 
 BUILDDIR="$(mktemp -dt $ME.XXXXXXXX)"
-trap "cd / && rm -R '$BUILDDIR'" 0
+trap "cd /tmp && rm -r '$BUILDDIR'" 0
 
 BUNDLE_DIR="${TMPDIR:-/tmp}"
 TARGET_DIR="$PWD"
@@ -54,24 +54,26 @@ usage()
   echo
   echo "Valid options are:"
   cat <<-_eof | column -s\& -t
-       --dist & specify the target distribution (default: sid)
+       --dist & specify the target distribution (default: from changes file)
        --arch & specify the target architecture (default: $DEB_BUILD_ARCH)
+       -sa & pass --force-orig-source to sbuild
+       -B & do a binary-only build
        -h|--help & show this output.
        -V|--version & show version information.
        _eof
 }
 
+binonly=0
 sbuild_args=
 schangesfile=
 arch=
-dist=
 for opt in "$@"; do
   case "$opt" in
     -h|--help) usage; exit 0;;
     -V|--version) about; exit 0;;
     --arch=*) arch="${opt#--arch=}";;
-    --dist=*) dist="${opt#--dist=}";;
     -sa) sbuild_args="${sbuild_args:+$sbuild_args }--force-orig-source";;
+    -B) binonly=1;;
     --*) sbuild_args="${sbuild_args:+$sbuild_args }$opt";;
     *_source.changes)
       if [ -z "$schangesfile" ]; then
@@ -87,7 +89,7 @@ for opt in "$@"; do
       fi
       ;;
     *)
-      echo "E: unknown option: $opt" >&1
+      echo "E: unknown option: $opt" >&2
       exit 1
       ;;
   esac
@@ -99,10 +101,13 @@ if [ -z "$schangesfile" ]; then
 fi
 
 [ -z "$arch" ] && arch="$DEB_BUILD_ARCH"
-[ -z "$dist" ] && dist="unstable"
+
+dist="$(sed -ne 's,Distribution: ,,p' "$schangesfile")"
 
 schangesfile_basename="${schangesfile##*/}"
+packagename="${schangesfile_basename%%_*}"
 packagenameversion="${schangesfile_basename%_*}"
+dscfile_basename="$packagenameversion".dsc
 
 case "$schangesfile" in
   */*) cd "${schangesfile%/*}";;
@@ -113,16 +118,33 @@ schangesfile="$schangesfile_basename"
 
 cd "$BUILDDIR"
 
-sbuild $sbuild_args --arch="$arch" --arch-all --dist="$dist" --keyid=$KEYID \
-  "$packagenameversion".dsc
+dcmd "$dscfile_basename" | while read f; do
+  test -f "$f" && continue
+
+  case "$f" in
+    *.tar.gz) 
+      echo "I: fetching missing tarball: $f" >&2
+      apt-get --tar-only --only-source source "$packagename"
+      ;;
+    *)
+      echo "E: I do not know how to obtain the file: $f" >&2
+      exit 1
+      ;;
+  esac
+done
+
+[ "$binonly" = 0 ] && sbuild_args="${sbuild_args:+$sbuild_args }--source --arch-all"
+
+sbuild $sbuild_args --arch="$arch" --dist="$dist" --keyid=$KEYID \
+  "$dscfile_basename"
 
 changesfile="${packagenameversion}_${arch}.changes"
 
-mv "$changesfile" "${changesfile}.binonly"
-mergechanges "$schangesfile" "${changesfile}.binonly" > "$changesfile"
-rm "${changesfile}.binonly" "$schangesfile"
+mergechanges "$schangesfile" "$changesfile" > temp-combined.changes
+mv temp-combined.changes "$changesfile"
+changestool "$changesfile" updatechecksums
 
-#TODO sign here
+#sign_changes_file "$changesfile"
 
 dinstall "$dist" "$changesfile"