Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-06 00:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop special-casing of ubuntu-core:system-image in places, now that

Browse Source 
ubuntu-core unambiguously refers to the snappy Ubuntu Core image.
This commit is contained in:
Steve Langasek 2016-05-09 16:31:57 -07:00
parent 8b79962b99
commit baf4f47379
2 changed files with 54 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -1,6 +1,8 @@
livecd-rootfs (2.410) UNRELEASED; urgency=medium livecd-rootfs (2.410) UNRELEASED; urgency=medium
* Rename old ubuntu-core tarballs to ubuntu-base to avoid confusion. * Rename old ubuntu-core tarballs to ubuntu-base to avoid confusion.
* Drop special-casing of ubuntu-core:system-image in places, now that
ubuntu-core unambiguously refers to the snappy Ubuntu Core image.
-- Steve Langasek <steve.langasek@ubuntu.com> Mon, 09 May 2016 15:02:22 -0700 -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 09 May 2016 15:02:22 -0700

14
live-build/auto/config
View File

@ -350,11 +350,6 @@ case $PROJECT in
;; ;;
ubuntu-core) ubuntu-core)
# mvo: This is for cron.daily-preinstalled
# CDIMAGE_PREINSTALLED is not passed from build.py
# and PREINSTALLED means something different. So
# we use SUBPROJECT to pass on the information
if [ "$SUBPROJECT" = "system-image" ]; then
OPTS="${OPTS:+$OPTS }--apt-recommends false" OPTS="${OPTS:+$OPTS }--apt-recommends false"
# some workarounds because the seeds are not quite # some workarounds because the seeds are not quite
@ -409,7 +404,6 @@ case $PROJECT in
# universe needed for 'system-image-cli' and multiverse for firmware # universe needed for 'system-image-cli' and multiverse for firmware
COMPONENTS='main restricted universe multiverse' COMPONENTS='main restricted universe multiverse'
fi
OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal" OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
;; ;;
@ -561,18 +555,12 @@ case $ARCH in
esac esac
case $PROJECT in case $PROJECT in
ubuntu-server|ubuntu-core|ubuntu-base|ubuntu-touch|ubuntu-pd) ubuntu-server|ubuntu-base|ubuntu-touch|ubuntu-pd)
case $SUBPROJECT in
system-image)
# keep the kernel for the system-image build
;;
*)
OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none" OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
KERNEL_FLAVOURS=none KERNEL_FLAVOURS=none
BINARY_REMOVE_LINUX=false BINARY_REMOVE_LINUX=false
;; ;;
esac esac
esac
add_chroot_hook update-apt-file-cache add_chroot_hook update-apt-file-cache
add_chroot_hook update-apt-xapian-index add_chroot_hook update-apt-xapian-index