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

Install linux-signed-generic directly in live passes rather than relying

Browse Source 
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.
This commit is contained in:
Colin Watson 2014-06-24 02:18:31 +01:00
parent def653746f
commit 8fa8c644c2
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
livecd-rootfs (2.218) 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 <cjwatson@ubuntu.com> Tue, 24 Jun 2014 02:16:51 +0100
livecd-rootfs (2.217) utopic; urgency=medium livecd-rootfs (2.217) utopic; urgency=medium
* drop swapfile creation for preinstalled images * drop swapfile creation for preinstalled images

27
live-build/auto/config
View File

@ -188,12 +188,18 @@ case $PROJECT in
;; ;;
esac esac
LIVE_TASK='ubuntu-live' LIVE_TASK='ubuntu-live'
case $ARCH in
amd64) add_package live linux-signed-generic ;;
esac
;; ;;
ubuntu-desktop-next) ubuntu-desktop-next)
add_task install minimal standard ubuntu-desktop-next ubuntu-sdk-libs add_task install minimal standard ubuntu-desktop-next ubuntu-sdk-libs
COMPONENTS='main restricted universe' COMPONENTS='main restricted universe'
LIVE_TASK='ubuntu-touch-live' LIVE_TASK='ubuntu-touch-live'
case $ARCH in
amd64) add_package live linux-signed-generic ;;
esac
;; ;;
kubuntu|kubuntu-dvd) kubuntu|kubuntu-dvd)
@ -213,6 +219,9 @@ case $PROJECT in
;; ;;
esac esac
LIVE_TASK='kubuntu-live' LIVE_TASK='kubuntu-live'
case $ARCH in
amd64) add_package live linux-signed-generic ;;
esac
COMPONENTS='main restricted universe' COMPONENTS='main restricted universe'
add_chroot_hook remove-gnome-icon-cache add_chroot_hook remove-gnome-icon-cache
;; ;;
@ -227,6 +236,9 @@ case $PROJECT in
edubuntu|edubuntu-dvd) edubuntu|edubuntu-dvd)
add_task install minimal standard ubuntu-desktop edubuntu-desktop-gnome add_task install minimal standard ubuntu-desktop edubuntu-desktop-gnome
LIVE_TASK='edubuntu-live' LIVE_TASK='edubuntu-live'
case $ARCH in
amd64) add_package live linux-signed-generic ;;
esac
COMPONENTS='main restricted universe' COMPONENTS='main restricted universe'
;; ;;
@ -234,6 +246,9 @@ case $PROJECT in
add_task install minimal standard xubuntu-desktop add_task install minimal standard xubuntu-desktop
add_package install xterm add_package install xterm
LIVE_TASK='xubuntu-live' LIVE_TASK='xubuntu-live'
case $ARCH in
amd64) add_package live linux-signed-generic ;;
esac
COMPONENTS='main restricted universe multiverse' COMPONENTS='main restricted universe multiverse'
case $ARCH in case $ARCH in
amd64|i386) KERNEL_FLAVOURS=generic ;; amd64|i386) KERNEL_FLAVOURS=generic ;;
@ -248,12 +263,18 @@ case $PROJECT in
mythbuntu) mythbuntu)
add_task install minimal standard mythbuntu-desktop add_task install minimal standard mythbuntu-desktop
LIVE_TASK='mythbuntu-live' LIVE_TASK='mythbuntu-live'
case $ARCH in
amd64) add_package live linux-signed-generic ;;
esac
COMPONENTS='main restricted universe multiverse' COMPONENTS='main restricted universe multiverse'
;; ;;
lubuntu) lubuntu)
add_task install minimal standard lubuntu-desktop add_task install minimal standard lubuntu-desktop
LIVE_TASK='lubuntu-live' LIVE_TASK='lubuntu-live'
case $ARCH in
amd64) add_package live linux-signed-generic ;;
esac
COMPONENTS='main restricted universe multiverse' COMPONENTS='main restricted universe multiverse'
case $ARCH in case $ARCH in
amd64|i386) KERNEL_FLAVOURS=generic ;; amd64|i386) KERNEL_FLAVOURS=generic ;;
@ -267,6 +288,9 @@ case $PROJECT in
ubuntu-gnome) ubuntu-gnome)
add_task install minimal standard ubuntu-gnome-desktop add_task install minimal standard ubuntu-gnome-desktop
LIVE_TASK='ubuntu-gnome-live' LIVE_TASK='ubuntu-gnome-live'
case $ARCH in
amd64) add_package live linux-signed-generic ;;
esac
COMPONENTS='main restricted universe' COMPONENTS='main restricted universe'
;; ;;
@ -282,6 +306,9 @@ case $PROJECT in
add_task install minimal standard ubuntu-desktop add_task install minimal standard ubuntu-desktop
add_package install ubuntukylin-default-settings add_package install ubuntukylin-default-settings
LIVE_TASK='ubuntu-live' LIVE_TASK='ubuntu-live'
case $ARCH in
amd64) add_package live linux-signed-generic ;;
esac
COMPONENTS='main restricted universe' COMPONENTS='main restricted universe'
;; ;;