Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-03-12 23:51:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'unknown-ubuntu-script' of git+ssh://git.launchpad.net/~xnox/ubuntu-dev-tools

Browse Source 
MR: https://code.launchpad.net/~xnox/ubuntu-dev-tools/+git/ubuntu-dev-tools/+merge/420623
Signed-off-by: Mattia Rizzolo <mattia@debian.org>
This commit is contained in:
Mattia Rizzolo 2022-05-01 14:40:23 +02:00
commit b9c9a21696
No known key found for this signature in database
GPG Key ID: 0816B9E18C762BAD
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debian/changelog vendored
View File

@ -2,6 +2,11 @@ ubuntu-dev-tools (0.190) UNRELEASED; urgency=medium
* WIP. * 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 <mattia@debian.org> Mon, 04 Apr 2022 15:05:39 +0200 -- Mattia Rizzolo <mattia@debian.org> Mon, 04 Apr 2022 15:05:39 +0200
ubuntu-dev-tools (0.189) unstable; urgency=medium ubuntu-dev-tools (0.189) unstable; urgency=medium

11
mk-sbuild
View File

@ -394,6 +394,9 @@ elif [ -z "$DISTRO" ]; then
exit 1 exit 1
fi fi
# By default SCRIPT must match RELEASE
SCRIPT="$RELEASE"
if [ "$DISTRO" = "ubuntu" ]; then if [ "$DISTRO" = "ubuntu" ]; then
ubuntu_dist_ge() { ubuntu_dist_ge() {
local releases="$(ubuntu-distro-info --all)" local releases="$(ubuntu-distro-info --all)"
@ -417,6 +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
SCRIPT=gutsy
fi fi
# By default, name the schroot the same as the release # By default, name the schroot the same as the release
@ -578,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/$RELEASE" ]; then if [ ! -r "/usr/share/debootstrap/scripts/$SCRIPT" ]; then
echo "Specified release ($RELEASE) not known to debootstrap" >&2 echo "Specified release ($SCRIPT) not known to debootstrap" >&2
exit 1 exit 1
fi fi
@ -801,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}" 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 if [ $EATMYDATA -eq 1 ]; then
sudo mkdir -p "${MNT}/usr/local/libexec/mk-sbuild" sudo mkdir -p "${MNT}/usr/local/libexec/mk-sbuild"