Merge remote-tracking branch 'philroche/bugfix/ubuntu-cpc-LP-2037074-flashkernel-removal' into ubuntu/master

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (23.10.49) UNRELEASED; urgency=medium
+
+  * fix: arm64 flash-kernel removal from ubuntu-cpc project cloud images
+    (LP: #2037074)
+
+ -- Phil Roche <phil.roche@canonical.com>  Wed, 27 Sep 2023 11:34:05 +0100
+
 livecd-rootfs (23.10.48) mantic; urgency=medium
 
   [ Dimitri John Ledkov ]

live-build/auto/config

@@ -1057,11 +1057,7 @@ case $PROJECT in
 			*+raspi)
 				add_task install ubuntu-server-raspi
 				;;
-			armhf*)
-				add_package install flash-kernel
-				;;
 			arm64*)
-				add_package install flash-kernel
 				if [ "${SUBARCH:-}" = "generic" ]; then
 					KERNEL_FLAVOURS=generic
 				fi