Rename old ubuntu-core tarballs to ubuntu-base, for consistency with

the changes already made to yakkety and the ubuntu-cdimage project.
LP: #1579950.
This commit is contained in:
Steve Langasek 2016-05-09 17:04:55 -07:00
parent 6376e6128a
commit 4970f16940
2 changed files with 11 additions and 3 deletions

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.208.12) trusty; 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 <steve.langasek@ubuntu.com> Mon, 09 May 2016 17:03:01 -0700
livecd-rootfs (2.208.11) trusty; urgency=medium
* Only install thermald on amd64|i386 on lubuntu, fixing PPC build.

View File

@ -164,7 +164,7 @@ if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then
ubuntu-server)
add_package live oem-config-debconf ubiquity-frontend-debconf
;;
ubuntu-core|base|ubuntu-touch)
ubuntu-core|ubuntu-base|base|ubuntu-touch)
;;
*)
add_package live oem-config-gtk ubiquity-frontend-gtk
@ -363,7 +363,7 @@ case $PROJECT in
PREINSTALL_POOL_SEEDS='server-ship'
;;
ubuntu-core)
ubuntu-core|ubuntu-base)
add_task install minimal
OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
;;
@ -451,7 +451,7 @@ case $ARCH in
esac
case $PROJECT in
ubuntu-server|ubuntu-core|ubuntu-touch)
ubuntu-server|ubuntu-core|ubuntu-base|ubuntu-touch)
OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
KERNEL_FLAVOURS=none
BINARY_REMOVE_LINUX=false