X-Git-Url: https://git.madduck.net/code/mbuild.git/blobdiff_plain/86244fc270ae41396fc57e3fd2b782a1cd47f900..2d9afe6d90dae9865f2bcb2a514d316cb98b28f3:/sbuild-wrapper.sh diff --git a/sbuild-wrapper.sh b/sbuild-wrapper.sh index 6b90845..9ea51b7 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" @@ -24,6 +28,9 @@ dinstall() { print_bundle_location() { echo "Bundle available at $@ ." } +postbuild() { + : +} KEYID= @@ -72,6 +79,7 @@ for opt in "$@"; do -h|--help) usage; exit 0;; -V|--version) about; exit 0;; --arch=*) arch="${opt#--arch=}";; + -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";; @@ -107,6 +115,8 @@ 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 @@ -116,13 +126,26 @@ esac dcmd cp "${schangesfile##*/}" "$BUILDDIR" schangesfile="$schangesfile_basename" +OLDPWD="$PWD" cd "$BUILDDIR" dcmd "$dscfile_basename" | while read f; do test -f "$f" && continue case "$f" in - *.tar.gz) apt-get --tar-only --only-source source "$packagename";; + *.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 @@ -137,11 +160,7 @@ sbuild $sbuild_args --arch="$arch" --dist="$dist" --keyid=$KEYID \ changesfile="${packagenameversion}_${arch}.changes" -mergechanges "$schangesfile" "$changesfile" > temp-combined.changes -mv temp-combined.changes "$changesfile" -changestool "$changesfile" updatechecksums - -#sign_changes_file "$changesfile" +postbuild "$changesfile" dinstall "$dist" "$changesfile" @@ -155,8 +174,7 @@ bundle="${BUNDLE_DIR}/${BUILD_PREFIX}".bundle.tar tar -chf "$bundle" * chmod 644 "$bundle" -rm -r "$BUILDDIR" -trap - 0 +cleanup print_bundle_location "$bundle"