X-Git-Url: https://git.madduck.net/code/mbuild.git/blobdiff_plain/86244fc270ae41396fc57e3fd2b782a1cd47f900..01d6356b34d4735dffc414feadf516160c029193:/sbuild-wrapper.sh diff --git a/sbuild-wrapper.sh b/sbuild-wrapper.sh index 6b90845..12e178c 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";; @@ -107,6 +108,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 @@ -122,7 +125,11 @@ 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) + last_version="$(apt-cache madison mdadm | 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 @@ -137,9 +144,9 @@ 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 +#mergechanges "$schangesfile" "$changesfile" > temp-combined.changes +#mv temp-combined.changes "$changesfile" +#changestool "$changesfile" updatechecksums #sign_changes_file "$changesfile"