X-Git-Url: https://git.madduck.net/code/mbuild.git/blobdiff_plain/4160d5712d45ad3f7b24b9cb56782c2043ab1bef..eae6e9eed0538117e974bfe7578bf428ebab68d0:/sbuild-wrapper.sh diff --git a/sbuild-wrapper.sh b/sbuild-wrapper.sh index c0fc8e6..9a58d88 100755 --- a/sbuild-wrapper.sh +++ b/sbuild-wrapper.sh @@ -54,25 +54,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 @@ -88,7 +90,7 @@ for opt in "$@"; do fi ;; *) - echo "E: unknown option: $opt" >&1 + echo "E: unknown option: $opt" >&2 exit 1 ;; esac @@ -100,10 +102,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%/*}";; @@ -114,16 +121,34 @@ 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) + 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 \ + "$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"