From: martin f. krafft Date: Fri, 29 Jan 2010 03:08:26 +0000 (+0100) Subject: enable multiple-arch building X-Git-Url: https://git.madduck.net/code/mbuild.git/commitdiff_plain/d3c87d0175c44902f7be928745a3dadc80c07632?ds=inline enable multiple-arch building Signed-off-by: martin f. krafft --- diff --git a/sbuild-wrapper.sh b/sbuild-wrapper.sh index 10aa292..be75ff3 100755 --- a/sbuild-wrapper.sh +++ b/sbuild-wrapper.sh @@ -72,6 +72,7 @@ usage() binonly=0 sbuild_args= +sbuild_args_sourceful= schangesfile= arch= for opt in "$@"; do @@ -153,16 +154,56 @@ dcmd "$dscfile_basename" | while read f; do esac done -[ "$binonly" = 0 ] && sbuild_args="${sbuild_args:+$sbuild_args }--source --arch-all" +rm $schangesfile +unset schangesfile -sbuild $sbuild_args --arch="$arch" --dist="$dist" --keyid=$KEYID \ - "$dscfile_basename" +if [ "$binonly" = 0 ]; then + sbuild_args_sourceful="--source --arch-all" +fi + +if [ "$arch" = all ]; then + arch="$(schroot -l | sed -rne 's,^sid-([^-]+).*,\1,p' | uniq | tr '\n' ' ')" +fi + +for a in $arch; do + echo "I: building $packagenameversion for $a/$dist…" >&2 + + sbuild $sbuild_args $sbuild_args_sourceful \ + --arch="$a" --dist="$dist" --keyid=$KEYID \ + "$dscfile_basename" + + changesfile="${packagenameversion}_${a}.changes" + + if [ -n "$sbuild_args_sourceful" ]; then + schangesfile="${packagenameversion}_source+${changesfile#${packagenameversion}_}" + mv "$changesfile" "$schangesfile" + changesfile="$schangesfile" + fi -changesfile="${packagenameversion}_${arch}.changes" + # subsequent iterations should be binonly + sbuild_args_sourceful= -postbuild "$changesfile" + echo "I: running post-build hook ($packagenameversion/$a/$dist)…" >&2 + postbuild "$dist" "$a" "$changesfile" + echo "I: running dinstall ($packagenameversion/$a/$dist)…" >&2 + dinstall "$dist" "$changesfile" -dinstall "$dist" "$changesfile" + echo "I: done building $packagenameversion for $a/$dist" >&2 +done + +if [ -n "${schangesfile:-}" ]; then + sarch="${schangesfile##*_}"; sarch=${sarch%.changes} + combined_arch="$(echo -n "${sarch}+"; + for i in *.changes; do + [ "$i" = "$schangesfile" ] && continue + t="${i##*_}"; echo "${t%.changes}" + done)" + + if [ -n "$combined_arch" ]; then + mergechanges *.changes > ${packagenameversion}_${combined_arch}.changes + arch="$combined_arch" + fi +fi DATESTR="$(date +%Y.%m.%d.%H%M%S)" BUILD_PREFIX="${packagenameversion}_${arch}.${DATESTR}" @@ -170,9 +211,9 @@ BUILD_PREFIX="${packagenameversion}_${arch}.${DATESTR}" bundle="${BUNDLE_DIR}/${BUILD_PREFIX}".bundle.tar tar -chf "$bundle" * chmod 644 "$bundle" +print_bundle_location "$bundle" -cleanup -print_bundle_location "$bundle" +cleanup exit 0