From caedaee057b7f6de860fffcb26e55eea3db5ce2d Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 9 May 2016 17:07:33 -0700 Subject: [PATCH] Rename old ubuntu-core tarballs to ubuntu-base, for consistency with the changes already made to yakkety and the ubuntu-cdimage project. LP: #1579950. --- debian/changelog | 8 ++++++++ live-build/auto/config | 8 ++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 101e0dd0..9e5886c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.408.1) xenial; urgency=medium + + * Rename old ubuntu-core tarballs to ubuntu-base, for consistency with + the changes already made to yakkety and the ubuntu-cdimage project. + LP: #1579950. + + -- Steve Langasek Mon, 09 May 2016 17:00:19 -0700 + livecd-rootfs (2.408) xenial; urgency=medium * drop linux-firmware-raspi2, it does not actually contain driver diff --git a/live-build/auto/config b/live-build/auto/config index c1e9d016..12a72dc1 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -168,7 +168,7 @@ if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then ubuntu-server) add_package live oem-config-debconf ubiquity-frontend-debconf ;; - ubuntu-core|base|ubuntu-touch|ubuntu-pd|ubuntu-cpc|ubuntu-desktop-next) + ubuntu-core|ubuntu-base|base|ubuntu-touch|ubuntu-pd|ubuntu-cpc|ubuntu-desktop-next) ;; *) add_package live oem-config-gtk ubiquity-frontend-gtk @@ -413,6 +413,10 @@ case $PROJECT in OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal" ;; + ubuntu-base) + OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal" + ;; + ubuntu-touch|ubuntu-pd) if [ "$PROJECT" = "ubuntu-touch" ]; then meta_package=ubuntu-touch @@ -557,7 +561,7 @@ case $ARCH in esac case $PROJECT in - ubuntu-server|ubuntu-core|ubuntu-touch|ubuntu-pd) + ubuntu-server|ubuntu-core|ubuntu-base|ubuntu-touch|ubuntu-pd) case $SUBPROJECT in system-image) # keep the kernel for the system-image build