diff --git a/debian/changelog b/debian/changelog index 3db9fab..d918502 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,11 @@ ubuntu-dev-tools (0.190) UNRELEASED; urgency=medium * WIP. + [ Dimitri John Ledkov ] + * mk-sbuild: + + For ubuntu, fix the debootstrap script to "gutsy", so to allow using + mk-sbuild for newer releases without requiring a newer debootstrap. + -- Mattia Rizzolo Mon, 04 Apr 2022 15:05:39 +0200 ubuntu-dev-tools (0.189) unstable; urgency=medium diff --git a/mk-sbuild b/mk-sbuild index 13ad77e..be8118c 100755 --- a/mk-sbuild +++ b/mk-sbuild @@ -394,6 +394,9 @@ elif [ -z "$DISTRO" ]; then exit 1 fi +# By default SCRIPT must match RELEASE +SCRIPT="$RELEASE" + if [ "$DISTRO" = "ubuntu" ]; then ubuntu_dist_ge() { local releases="$(ubuntu-distro-info --all)" @@ -417,6 +420,8 @@ if [ "$DISTRO" = "ubuntu" ]; then done [ $left -ge $right ] && return 0 || return 1 } + # On Ubuntu, set SCRIPT to gutsy to allow building new RELEASES without new debootstrap + SCRIPT=gutsy fi # By default, name the schroot the same as the release @@ -578,8 +583,8 @@ esac # Is the specified release known to debootstrap? variant_opt="--variant=buildd" -if [ ! -r "/usr/share/debootstrap/scripts/$RELEASE" ]; then - echo "Specified release ($RELEASE) not known to debootstrap" >&2 +if [ ! -r "/usr/share/debootstrap/scripts/$SCRIPT" ]; then + echo "Specified release ($SCRIPT) not known to debootstrap" >&2 exit 1 fi @@ -801,7 +806,7 @@ esac sudo mkdir -p -m 0700 "$MNT"/root/.gnupg # debootstrap the chroot -sudo ${proxy:+"http_proxy=${proxy}"} "$DEBOOTSTRAP_COMMAND" --arch="$CHROOT_ARCH" $variant_opt $debootstrap_opts "$RELEASE" "$MNT" "${DEBOOTSTRAP_MIRROR:-http://archive.ubuntu.com/ubuntu}" +sudo ${proxy:+"http_proxy=${proxy}"} "$DEBOOTSTRAP_COMMAND" --arch="$CHROOT_ARCH" $variant_opt $debootstrap_opts "$RELEASE" "$MNT" "${DEBOOTSTRAP_MIRROR:-http://archive.ubuntu.com/ubuntu}" "$SCRIPT" if [ $EATMYDATA -eq 1 ]; then sudo mkdir -p "${MNT}/usr/local/libexec/mk-sbuild"