From 63113028d9ab0dfb1d88279f619ad8b076c2f12e Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 24 Jun 2014 09:34:12 +0100 Subject: [PATCH] Install linux-signed-generic directly in live passes rather than relying on it being in the corresponding tasks. linux-signed-generic shouldn't be in a task because that expands to ABI-versioned packages, and tasks can't be updated post-release. --- debian/changelog | 9 +++++++++ live-build/auto/config | 24 ++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/debian/changelog b/debian/changelog index b3adff76..02e8319a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.208.1) UNRELEASED; urgency=medium + + * Install linux-signed-generic directly in live passes rather than relying + on it being in the corresponding tasks. linux-signed-generic shouldn't + be in a task because that expands to ABI-versioned packages, and tasks + can't be updated post-release. + + -- Colin Watson Tue, 24 Jun 2014 04:28:55 +0100 + livecd-rootfs (2.208) trusty; urgency=medium * Adding support for ubuntu-touch i386 based images diff --git a/live-build/auto/config b/live-build/auto/config index cc825d03..f414cb01 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -190,6 +190,9 @@ case $PROJECT in ;; esac LIVE_TASK='ubuntu-live' + case $ARCH in + amd64) add_package live linux-signed-generic ;; + esac ;; kubuntu|kubuntu-dvd) @@ -209,6 +212,9 @@ case $PROJECT in ;; esac 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 ;; @@ -223,6 +229,9 @@ 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' ;; @@ -230,6 +239,9 @@ 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 ;; @@ -244,12 +256,18 @@ 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 ;; @@ -263,6 +281,9 @@ 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' ;; @@ -278,6 +299,9 @@ case $PROJECT in add_task install minimal standard ubuntu-desktop add_package install ubuntukylin-default-settings LIVE_TASK='ubuntu-live' + case $ARCH in + amd64) add_package live linux-signed-generic ;; + esac COMPONENTS='main restricted universe' ;;