From d56653396d437fd4c370f5123c33173cdf1bbc75 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Thu, 30 May 2019 12:20:12 +0100 Subject: [PATCH] Drop ubuntu-rtm configs --- debian/changelog | 1 + debian/tests/default-bootstraps | 2 -- live-build/auto/config | 16 ---------------- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index e9a5463a..4998a3bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ livecd-rootfs (2.588) UNRELEASED; urgency=medium * Drop ubuntu-desktop-next hooks * Drop ubuntu-touch configs * Drop ubuntu-touch hooks + * Drop ubuntu-rtm configs -- Dimitri John Ledkov Thu, 30 May 2019 12:00:40 +0100 diff --git a/debian/tests/default-bootstraps b/debian/tests/default-bootstraps index e6ffd9f9..2e2072f2 100755 --- a/debian/tests/default-bootstraps +++ b/debian/tests/default-bootstraps @@ -41,8 +41,6 @@ ALL_TRIPLETS=" ubuntu-mate-live:: ubuntu-netbook:: ubuntu-server:: - ubuntu-server:ubuntu-rtm: - ubuntu-server:ubuntu-rtm/foo: ubuntu-server:wubi: xubuntu::" diff --git a/live-build/auto/config b/live-build/auto/config index 27d67f94..a486093d 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -1236,22 +1236,6 @@ EOF fi fi -case ${SUBPROJECT:-} in - ubuntu-rtm|ubuntu-rtm/*) - # debootstrap doesn't know about ubuntu-rtm series directly. Rather - # than having to teach it, we employ a few hacks to make it use the - # Ubuntu script instead. - mkdir -p config/fake_debootstrap_dir/scripts - ln -s /usr/share/debootstrap/devices.tar.gz \ - config/fake_debootstrap_dir/ - ln -s /usr/share/debootstrap/functions config/fake_debootstrap_dir/ - ln -s /usr/share/debootstrap/scripts/gutsy \ - "config/fake_debootstrap_dir/scripts/$SUITE" - echo 'export DEBOOTSTRAP_DIR="$PWD/config/fake_debootstrap_dir"' \ - >> config/bootstrap - ;; -esac - if [ "$PREINSTALLED" = "true" ]; then if [ -n "$PREINSTALL_POOL_SEEDS" ]; then UNWANTED_SEEDS="${LIVE_TASK:+$LIVE_TASK }boot installer required"