Switch Ubuntu desktop to only hwe-20.04 kernel flavour.

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 <xnox@ubuntu.com>  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

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-*)

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
 		;;