From 1f3e4a5ad75cc639a320ead8ef2771ed2a4172ed Mon Sep 17 00:00:00 2001
From: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
Date: Wed, 27 Apr 2022 14:17:10 +0100
Subject: [PATCH] mk-sbuild: build Ubuntu chroots for unknown new releases

Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
---
 mk-sbuild | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

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"