From 2870738f00a40da0ddd542df3954506b04aa3921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Fri, 24 Jan 2020 18:47:22 +0100 Subject: [PATCH] Merge the manually-pushed 2.636 from Laney. --- debian/changelog | 16 +++++++++++++++- live-build/auto/build | 2 +- live-build/auto/config | 29 +---------------------------- 3 files changed, 17 insertions(+), 30 deletions(-) diff --git a/debian/changelog b/debian/changelog index f423fdae..2ce81a10 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.636) UNRELEASED; urgency=medium +livecd-rootfs (2.637) UNRELEASED; urgency=medium * Ensure seed partition is mounted on no-cloud images which use system-boot as their seed (LP: #1860046) @@ -7,6 +7,20 @@ livecd-rootfs (2.636) UNRELEASED; urgency=medium -- Dave Jones Fri, 24 Jan 2020 15:17:56 +0000 +livecd-rootfs (2.636) focal; urgency=medium + + * Stop trying to install linux-oem. It's dropped, but us trying to install + it is causing Ubuntu images to fail to build. It is due to be replaced by + linux-oem-20.04 (currently built from linux-...-5.4). But that is stuck in + focal-proposed at the minute, so there is nothing to transition to until + it migrates. + * Drop linux-signed-generic for flavours too - follow up from 2.630 which + handled this for Ubuntu. (LP: #1859146) + * Ditto for ubuntu-core:system-image - move from linux-signed-image-generic + to linux-image-generic. + + -- Iain Lane Fri, 10 Jan 2020 12:11:02 +0000 + livecd-rootfs (2.635) focal; urgency=medium * Preserve apt preferences created by any package we install (i.e. diff --git a/live-build/auto/build b/live-build/auto/build index c12ba331..26e73b96 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -606,7 +606,7 @@ case $PROJECT:${SUBPROJECT:-} in linux_package="linux-image-$devarch" case $ARCH in amd64) - linux_package="linux-signed-image-generic" + linux_package="linux-image-generic" ;; arm64) if [ "$devarch" = "dragonboard" ]; then diff --git a/live-build/auto/config b/live-build/auto/config index 0b50f0ff..123466f2 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -552,7 +552,7 @@ case $PROJECT in LIVE_TASK='ubuntu-live' add_task install minimal standard ubuntu-desktop add_task live ubuntu-desktop-minimal-default-languages ubuntu-desktop-default-languages - KERNEL_FLAVOURS='generic oem' + KERNEL_FLAVOURS='generic' ;; esac ;; @@ -561,9 +561,6 @@ case $PROJECT in add_task install minimal standard add_task install kubuntu-desktop LIVE_TASK='kubuntu-live' - case $ARCH in - amd64) add_package live linux-signed-generic ;; - esac COMPONENTS='main restricted universe' add_chroot_hook remove-gnome-icon-cache ;; @@ -590,9 +587,6 @@ case $PROJECT in edubuntu|edubuntu-dvd) add_task install minimal standard ubuntu-desktop edubuntu-desktop-gnome LIVE_TASK='edubuntu-live' - case $ARCH in - amd64) add_package live linux-signed-generic ;; - esac COMPONENTS='main restricted universe' ;; @@ -600,9 +594,6 @@ case $PROJECT in add_task install minimal standard xubuntu-desktop add_package install xterm LIVE_TASK='xubuntu-live' - case $ARCH in - amd64) add_package live linux-signed-generic ;; - esac COMPONENTS='main restricted universe multiverse' case $ARCH in amd64|i386) KERNEL_FLAVOURS=generic ;; @@ -617,18 +608,12 @@ case $PROJECT in mythbuntu) add_task install minimal standard mythbuntu-desktop LIVE_TASK='mythbuntu-live' - case $ARCH in - amd64) add_package live linux-signed-generic ;; - esac COMPONENTS='main restricted universe multiverse' ;; lubuntu) add_task install minimal standard lubuntu-desktop LIVE_TASK='lubuntu-live' - case $ARCH in - amd64) add_package live linux-signed-generic ;; - esac COMPONENTS='main restricted universe multiverse' case $ARCH in amd64|i386) KERNEL_FLAVOURS=generic ;; @@ -638,27 +623,18 @@ case $PROJECT in ubuntu-gnome) add_task install minimal standard ubuntu-gnome-desktop LIVE_TASK='ubuntu-gnome-live' - case $ARCH in - amd64) add_package live linux-signed-generic ;; - esac COMPONENTS='main restricted universe' ;; ubuntu-budgie) add_task install minimal standard ubuntu-budgie-desktop LIVE_TASK='ubuntu-budgie-live' - case $ARCH in - amd64) add_package live linux-signed-generic ;; - esac COMPONENTS='main restricted universe' ;; ubuntu-mate) add_task install minimal standard ubuntu-mate-core ubuntu-mate-desktop LIVE_TASK='ubuntu-mate-live' - case $ARCH in - amd64) add_package live linux-signed-generic ;; - esac COMPONENTS='main restricted universe multiverse' ;; @@ -674,9 +650,6 @@ case $PROJECT in add_task install minimal standard ubuntukylin-desktop add_package install ubuntukylin-default-settings LIVE_TASK='ubuntukylin-live' - case $ARCH in - amd64) add_package live linux-signed-generic ;; - esac COMPONENTS='main restricted universe' ;;