From aca40d6ebfe51f31b27d745d4b21b8b724c7582b Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 9 May 2016 16:32:58 -0700 Subject: [PATCH] Import patches-unapplied version 2.410 to ubuntu/yakkety-proposed Imported using git-ubuntu import. Changelog parent: ad693abb51773b9636b970f09ed5537b2fd45579 New changelog entries: * 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. --- debian/changelog | 8 +++ live-build/auto/config | 128 +++++++++++++++++++---------------------- 2 files changed, 68 insertions(+), 68 deletions(-) diff --git a/debian/changelog b/debian/changelog index d4cd0304..d103fbdd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.410) yakkety; urgency=medium + + * 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 Mon, 09 May 2016 16:32:58 -0700 + livecd-rootfs (2.409) yakkety; urgency=medium [ Michael Vogt ] diff --git a/live-build/auto/config b/live-build/auto/config index c1e9d016..0621058b 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 @@ -350,66 +350,64 @@ case $PROJECT in ;; 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" - - # some workarounds because the seeds are not quite - # corrent at the moment - add_package install dbus - add_package install isc-dhcp-client - add_package install libpam-systemd - add_package install ppp - add_package install watchdog - # no Task: header yet - add_package install snapd - add_package install ubuntu-core-snapd-units - - # no minimal as we want to be really minimal - #add_task install minimal - add_task install ubuntu-core - - # more packages are pulled in via the seed. - # (important to remember when comparing to the - # livecd-rootfs from ppa:snappy-dev/image) + OPTS="${OPTS:+$OPTS }--apt-recommends false" - case $ARCH in - i386) - # efi support can go once the task - # header is available for grub-efi-ia32-bin - add_package install grub-efi-ia32-bin - ;; - esac + # some workarounds because the seeds are not quite + # corrent at the moment + add_package install dbus + add_package install isc-dhcp-client + add_package install libpam-systemd + add_package install ppp + add_package install watchdog + # no Task: header yet + add_package install snapd + add_package install ubuntu-core-snapd-units + + # no minimal as we want to be really minimal + #add_task install minimal + add_task install ubuntu-core + + # more packages are pulled in via the seed. + # (important to remember when comparing to the + # livecd-rootfs from ppa:snappy-dev/image) - # generic kernel etc - KERNEL_FLAVOURS=none - case $ARCH in - i386) - add_package install grub-pc - ;; - amd64) - add_package install grub-pc-bin - add_package install grub-efi-amd64-signed - add_package install shim-signed - ;; - armhf) - add_package install flash-kernel u-boot-tools - ;; - arm64) - add_package install u-boot-tools - ;; - esac - OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none --initramfs-compression=none" + case $ARCH in + i386) + # efi support can go once the task + # header is available for grub-efi-ia32-bin + add_package install grub-efi-ia32-bin + ;; + esac + + # generic kernel etc + KERNEL_FLAVOURS=none + case $ARCH in + i386) + add_package install grub-pc + ;; + amd64) + add_package install grub-pc-bin + add_package install grub-efi-amd64-signed + add_package install shim-signed + ;; + armhf) + add_package install flash-kernel u-boot-tools + ;; + arm64) + add_package install u-boot-tools + ;; + esac + OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none --initramfs-compression=none" - # contains the framework definition - add_package install ubuntu-core-libs + # contains the framework definition + add_package install ubuntu-core-libs - # universe needed for 'system-image-cli' and multiverse for firmware - COMPONENTS='main restricted universe multiverse' - fi + # universe needed for 'system-image-cli' and multiverse for firmware + COMPONENTS='main restricted universe multiverse' + OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal" + ;; + + ubuntu-base) OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal" ;; @@ -557,17 +555,11 @@ case $ARCH in esac case $PROJECT in - ubuntu-server|ubuntu-core|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" - KERNEL_FLAVOURS=none - BINARY_REMOVE_LINUX=false - ;; - esac + ubuntu-server|ubuntu-base|ubuntu-touch|ubuntu-pd) + OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none" + KERNEL_FLAVOURS=none + BINARY_REMOVE_LINUX=false + ;; esac add_chroot_hook update-apt-file-cache