[neon/neon/livecd-rootfs/Neon/release-lts] /: Enable the HWE kernel for all flavours.

[Łukasz 'sil2100' Zemczak]

Git commit e22a16b0681dcdd41c55a7ec2e835145ce11e47c by Łukasz 'sil2100' Zemczak.
Committed on 01/02/2021 at 21:25.
Pushed by jriddell into branch 'Neon/release-lts'.

Enable the HWE kernel for all flavours.

M  +7    -0    debian/changelog
M  +7    -9    live-build/auto/config

https://invent.kde.org/neon/neon/livecd-rootfs/commit/e22a16b0681dcdd41c55a7ec2e835145ce11e47c

diff --git a/debian/changelog b/debian/changelog
index 54d4f2f2..78ee37b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.664.14) UNRELEASED; urgency=medium
+
+  * Actually also enable the hwe kernel for all flavours for 20.04.2
+    (LP: #1914119)
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak at ubuntu.com>  Mon, 01 Feb 2021 22:17:01 +0100
+
 livecd-rootfs (2.664.13) focal; urgency=medium
 
   * Enable the hwe variant for ubuntu-server-live (LP: #1913314)
diff --git a/live-build/auto/config b/live-build/auto/config
index 1a867311..ef60309f 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -605,6 +605,7 @@ case $PROJECT in
 		LIVE_TASK='kubuntu-live'
 		COMPONENTS='main restricted universe'
 		add_chroot_hook remove-gnome-icon-cache
+		KERNEL_FLAVOURS='generic-hwe-20.04'
 		;;
 
 	kubuntu-active)
@@ -637,9 +638,7 @@ case $PROJECT in
 		add_package install xterm
 		LIVE_TASK='xubuntu-live'
 		COMPONENTS='main restricted universe multiverse'
-		case $ARCH in
-			amd64|i386)	KERNEL_FLAVOURS=generic ;;
-		esac
+		KERNEL_FLAVOURS='generic-hwe-20.04'
 		;;
 
 	ubuntu-netbook)
@@ -657,9 +656,7 @@ case $PROJECT in
 		add_task install minimal standard lubuntu-desktop
 		LIVE_TASK='lubuntu-live'
 		COMPONENTS='main restricted universe multiverse'
-		case $ARCH in
-			amd64|i386)	KERNEL_FLAVOURS=generic ;;
-		esac
+		KERNEL_FLAVOURS='generic-hwe-20.04'
 		;;
 
 	ubuntu-gnome)
@@ -672,12 +669,14 @@ case $PROJECT in
 		add_task install minimal standard ubuntu-budgie-desktop
 		LIVE_TASK='ubuntu-budgie-live'
 		COMPONENTS='main restricted universe'
+		KERNEL_FLAVOURS='generic-hwe-20.04'
 		;;
 
 	ubuntu-mate)
 		add_task install minimal standard ubuntu-mate-core ubuntu-mate-desktop
 		LIVE_TASK='ubuntu-mate-live'
 		COMPONENTS='main restricted universe multiverse'
+		KERNEL_FLAVOURS='generic-hwe-20.04'
 		;;
 
 	ubuntustudio-dvd)
@@ -700,9 +699,7 @@ case $PROJECT in
 				;;
 		esac
 		COMPONENTS='main restricted universe multiverse'
-		case $ARCH in
-			amd64|i386)	KERNEL_FLAVOURS=lowlatency ;;
-		esac
+		KERNEL_FLAVOURS='lowlatency-hwe-20.04'
 		;;
 
 	ubuntukylin)
@@ -710,6 +707,7 @@ case $PROJECT in
 		add_package install ubuntukylin-default-settings
 		LIVE_TASK='ubuntukylin-live'
 		COMPONENTS='main restricted universe'
+		KERNEL_FLAVOURS='generic-hwe-20.04'
 		;;
 
 	base)