Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-26 18:21:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use generic-hwe-20.04 as the default (rolling) kernel flavour.

Browse Source
This commit is contained in:
Dimitri John Ledkov 2020-04-01 11:31:10 +01:00
parent 30430fc7d8
commit dd83c55b61
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -1,6 +1,7 @@
livecd-rootfs (2.657) UNRELEASED; urgency=medium livecd-rootfs (2.657) UNRELEASED; urgency=medium
* Determine kernel image/initrd version exactly, using apt data. * Determine kernel image/initrd version exactly, using apt data.
* Use generic-hwe-20.04 as the default (rolling) kernel flavour.
-- Dimitri John Ledkov <xnox@ubuntu.com> Wed, 01 Apr 2020 11:13:42 +0100 -- Dimitri John Ledkov <xnox@ubuntu.com> Wed, 01 Apr 2020 11:13:42 +0100

14
live-build/auto/config
View File

@ -560,6 +560,9 @@ if ! [ -e config/germinate-output/structure ]; then
${COMPONENTS:+-c "$COMPONENTS"} -a $ARCH) ${COMPONENTS:+-c "$COMPONENTS"} -a $ARCH)
fi fi
# Default kernel
KERNEL_FLAVOURS='generic-hwe-20.04'
case $PROJECT in case $PROJECT in
ubuntu|ubuntu-dvd) ubuntu|ubuntu-dvd)
@ -581,10 +584,9 @@ 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
KERNEL_FLAVOURS='generic'
case $ARCH in case $ARCH in
amd64) amd64)
KERNEL_FLAVOURS='generic oem-20.04' KERNEL_FLAVOURS="$KERNEL_FLAVOURS oem-20.04"
;; ;;
esac esac
;; ;;
@ -629,9 +631,6 @@ case $PROJECT in
add_package install xterm add_package install xterm
LIVE_TASK='xubuntu-live' LIVE_TASK='xubuntu-live'
COMPONENTS='main restricted universe multiverse' COMPONENTS='main restricted universe multiverse'
case $ARCH in
amd64|i386) KERNEL_FLAVOURS=generic ;;
esac
;; ;;
ubuntu-netbook) ubuntu-netbook)
@ -649,9 +648,6 @@ case $PROJECT in
add_task install minimal standard lubuntu-desktop add_task install minimal standard lubuntu-desktop
LIVE_TASK='lubuntu-live' LIVE_TASK='lubuntu-live'
COMPONENTS='main restricted universe multiverse' COMPONENTS='main restricted universe multiverse'
case $ARCH in
amd64|i386) KERNEL_FLAVOURS=generic ;;
esac
;; ;;
ubuntu-gnome) ubuntu-gnome)
@ -676,7 +672,7 @@ case $PROJECT in
add_task install minimal standard ubuntustudio-desktop ubuntustudio-audio ubuntustudio-fonts ubuntustudio-graphics ubuntustudio-video ubuntustudio-publishing ubuntustudio-photography add_task install minimal standard ubuntustudio-desktop ubuntustudio-audio ubuntustudio-fonts ubuntustudio-graphics ubuntustudio-video ubuntustudio-publishing ubuntustudio-photography
COMPONENTS='main restricted universe multiverse' COMPONENTS='main restricted universe multiverse'
case $ARCH in case $ARCH in
amd64|i386) KERNEL_FLAVOURS=lowlatency ;; amd64|i386) KERNEL_FLAVOURS=lowlatency-hwe-20.04 ;;
esac esac
;; ;;