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

Imported 2.630

Browse Source 
No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2019-12-09 22:18:28 +00:00
parent acc8c17f34
commit d3f8eccbde
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.630) focal; urgency=medium
* Drop installing dummy transitional linux-signed-generic, these days
linux-generic is always signed, on arches that need/support it.
* Ship two kernel flavours on desktop image.
-- Dimitri John Ledkov <xnox@ubuntu.com> Mon, 09 Dec 2019 14:47:27 +0000
livecd-rootfs (2.629) focal; urgency=medium livecd-rootfs (2.629) focal; urgency=medium
* Also make qemu-utils a non-i386 dependency, since it is only used for * Also make qemu-utils a non-i386 dependency, since it is only used for

10
live-build/auto/config
View File

@ -479,8 +479,6 @@ case $BINARYFORMAT in
;; ;;
esac esac
SIGNED_KERNEL_PACKAGE="linux-signed-generic"
if [ "${SUBPROJECT:-}" = minimized ]; then if [ "${SUBPROJECT:-}" = minimized ]; then
OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal --linux-packages=linux-image" OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal --linux-packages=linux-image"
fi fi
@ -534,10 +532,6 @@ case $PROJECT in
add_task minimal.standard.live ubuntu-live add_task minimal.standard.live ubuntu-live
add_package minimal.standard.live lupin-casper add_package minimal.standard.live lupin-casper
case $ARCH in
amd64) add_package minimal.standard.live $SIGNED_KERNEL_PACKAGE ;;
esac
# LANG PASS for minimal and standard # LANG PASS for minimal and standard
remove_packages_from_seed_regexp minimal desktop-minimal-default-languages '^desktop-minimal-(?!default-languages)[^.]+$' remove_packages_from_seed_regexp minimal desktop-minimal-default-languages '^desktop-minimal-(?!default-languages)[^.]+$'
remove_packages_from_seed_regexp minimal desktop-minimal-default-languages '' # none (if no default langpack is selected) remove_packages_from_seed_regexp minimal desktop-minimal-default-languages '' # none (if no default langpack is selected)
@ -548,9 +542,7 @@ case $PROJECT in
LIVE_TASK='ubuntu-live' LIVE_TASK='ubuntu-live'
add_task install minimal standard ubuntu-desktop add_task install minimal standard ubuntu-desktop
add_task live ubuntu-desktop-minimal-default-languages ubuntu-desktop-default-languages add_task live ubuntu-desktop-minimal-default-languages ubuntu-desktop-default-languages
case $ARCH in KERNEL_FLAVOURS='generic oem'
amd64) add_package live $SIGNED_KERNEL_PACKAGE ;;
esac
;; ;;
esac esac
;; ;;