From 56ac1865f744758d5e4fcb3af71e5e03c69356d2 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Thu, 16 Apr 2020 01:30:31 +0100 Subject: [PATCH] Switch Ubuntu desktop to only hwe-20.04 kernel flavour. --- debian/changelog | 6 ++++++ live-build/auto/build | 2 +- live-build/auto/config | 7 +------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 388c792e..1b3925c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.662) UNRELEASED; urgency=medium + + * Switch Ubuntu desktop to only hwe-20.04 kernel flavour. + + -- Dimitri John Ledkov Wed, 15 Apr 2020 13:11:35 +0100 + livecd-rootfs (2.660) focal; urgency=medium * Remove dependencies on qemu-utils and snapd on riscv64, we don't have diff --git a/live-build/auto/build b/live-build/auto/build index 2ec77b86..3c8f76fe 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -820,7 +820,7 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do continue fi case $FLAVOUR in - virtual) + virtual|generic-hwe-*) FLAVOUR="generic" ;; oem-*) diff --git a/live-build/auto/config b/live-build/auto/config index 8f619055..04b8013d 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -581,12 +581,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' - case $ARCH in - amd64) - KERNEL_FLAVOURS='generic oem-20.04' - ;; - esac + KERNEL_FLAVOURS='generic-hwe-20.04' ;; esac ;;