X-Git-Url: https://git.madduck.net/code/mbuild.git/blobdiff_plain/5b3058d05388b5c448897a7209f415d4860cabf7..043daa5db9c741c54c242d1c2fa2cfff820ff4a4:/sbuild-wrapper.sh?ds=sidebyside diff --git a/sbuild-wrapper.sh b/sbuild-wrapper.sh index 3f5a2ee..c410dcb 100755 --- a/sbuild-wrapper.sh +++ b/sbuild-wrapper.sh @@ -72,6 +72,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";; @@ -105,7 +106,11 @@ fi 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%/*}";; @@ -116,16 +121,32 @@ schangesfile="$schangesfile_basename" cd "$BUILDDIR" +dcmd "$dscfile_basename" | while read f; do + test -f "$f" && continue + + 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}" + ;; + *) + 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 \ - "$packagenameversion".dsc + "$dscfile_basename" changesfile="${packagenameversion}_${arch}.changes" -mergechanges "$schangesfile" "$changesfile" > temp-combined.changes -mv temp-combined.changes "$changesfile" -changestool "$changesfile" updatechecksums +#mergechanges "$schangesfile" "$changesfile" > temp-combined.changes +#mv temp-combined.changes "$changesfile" +#changestool "$changesfile" updatechecksums #sign_changes_file "$changesfile"