Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-05-11 17:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

mk-sbuild: Rename SCRIPT to DEBOOTSTRAP_SCRIPT

Browse Source 
Signed-off-by: Benjamin Drung <bdrung@ubuntu.com>
This commit is contained in:
Benjamin Drung 2022-06-16 10:20:22 +02:00
parent 214da052b2
commit bf5796c69e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mk-sbuild
View File

@ -394,8 +394,8 @@ elif [ -z "$DISTRO" ]; then
exit 1 exit 1
fi fi
# By default SCRIPT must match RELEASE # By default DEBOOTSTRAP_SCRIPT must match RELEASE
SCRIPT="$RELEASE" DEBOOTSTRAP_SCRIPT="$RELEASE"
if [ "$DISTRO" = "ubuntu" ]; then if [ "$DISTRO" = "ubuntu" ]; then
ubuntu_dist_ge() { ubuntu_dist_ge() {
@ -420,8 +420,8 @@ if [ "$DISTRO" = "ubuntu" ]; then
done done
[ $left -ge $right ] && return 0 || return 1 [ $left -ge $right ] && return 0 || return 1
} }
# On Ubuntu, set SCRIPT to gutsy to allow building new RELEASES without new debootstrap # On Ubuntu, set DEBOOTSTRAP_SCRIPT to gutsy to allow building new RELEASES without new debootstrap
SCRIPT=gutsy DEBOOTSTRAP_SCRIPT=gutsy
fi fi
# By default, name the schroot the same as the release # By default, name the schroot the same as the release
@ -583,8 +583,8 @@ esac
# Is the specified release known to debootstrap? # Is the specified release known to debootstrap?
variant_opt="--variant=buildd" variant_opt="--variant=buildd"
if [ ! -r "/usr/share/debootstrap/scripts/$SCRIPT" ]; then if [ ! -r "/usr/share/debootstrap/scripts/$DEBOOTSTRAP_SCRIPT" ]; then
echo "Specified release ($SCRIPT) not known to debootstrap" >&2 echo "Specified release ($DEBOOTSTRAP_SCRIPT) not known to debootstrap" >&2
exit 1 exit 1
fi fi
@ -806,7 +806,7 @@ esac
sudo mkdir -p -m 0700 "$MNT"/root/.gnupg sudo mkdir -p -m 0700 "$MNT"/root/.gnupg
# debootstrap the chroot # 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}" "$SCRIPT" sudo ${proxy:+"http_proxy=${proxy}"} "$DEBOOTSTRAP_COMMAND" --arch="$CHROOT_ARCH" $variant_opt $debootstrap_opts "$RELEASE" "$MNT" "${DEBOOTSTRAP_MIRROR:-http://archive.ubuntu.com/ubuntu}" "$DEBOOTSTRAP_SCRIPT"
if [ $EATMYDATA -eq 1 ]; then if [ $EATMYDATA -eq 1 ]; then
sudo mkdir -p "${MNT}/usr/local/libexec/mk-sbuild" sudo mkdir -p "${MNT}/usr/local/libexec/mk-sbuild"