X-Git-Url: https://git.madduck.net/code/mbuild.git/blobdiff_plain/838d4e8c2f212da3954005330e76588bd3032a21..6f9b0176686f6d54ce1c5993114648b78c7b10d9:/sbuild-wrapper.sh?ds=inline diff --git a/sbuild-wrapper.sh b/sbuild-wrapper.sh index 3cb9013..4f6224d 100755 --- a/sbuild-wrapper.sh +++ b/sbuild-wrapper.sh @@ -2,7 +2,7 @@ # # - automate builds with sbuild and dinstall the result # -# Copyright (c) 2008 martin f. krafft +# Copyright (c) 2008–2010 martin f. krafft # 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)" -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" @@ -54,24 +58,27 @@ 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=}";; + -D) sbuild_args="${sbuild_args:+$sbuild_args }$opt";; -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 +94,7 @@ for opt in "$@"; do fi ;; *) - echo "E: unknown option: $opt" >&1 + echo "E: unknown option: $opt" >&2 exit 1 ;; esac @@ -99,10 +106,15 @@ 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%_*}" +debversion="${packagenameversion#*_}" +upstream_version="${debversion%-*}" +dscfile_basename="$packagenameversion".dsc case "$schangesfile" in */*) cd "${schangesfile%/*}";; @@ -111,18 +123,45 @@ esac dcmd cp "${schangesfile##*/}" "$BUILDDIR" schangesfile="$schangesfile_basename" +OLDPWD="$PWD" 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|*.tar.bz2|*.tar.lzma|*.tar.xz) + 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 + 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" @@ -136,8 +175,7 @@ bundle="${BUNDLE_DIR}/${BUILD_PREFIX}".bundle.tar tar -chf "$bundle" * chmod 644 "$bundle" -rm -r "$BUILDDIR" -trap - 0 +cleanup print_bundle_location "$bundle"