Merge remote-tracking branch 'philroche/bugfix/ubuntu-cpc-LP-2036192-armhf' into ubuntu/master

debian/changelog

@@ -1,6 +1,7 @@
 livecd-rootfs (23.10.37) mantic; urgency=medium
 
   * fix: ensure minimize-manual script uses passed in argument for all commands (LP: #2036198)
+  * fix: armhf flavour for 6.5+ kernel is now generic (LP: #2036192)
 
  -- Philip Roche <phil.roche@ubuntu.com>  Fri, 15 Sep 2023 11:58:23 +0100
 

live-build/auto/build

@@ -618,11 +618,7 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
 	fi
 	case $FLAVOUR in
 		allwinner|virtual|generic-hwe-*)
-			if [ "$ARCH" = "armhf" ]; then
+			FLAVOUR="generic"
-				FLAVOUR="generic-lpae"
-			else
-				FLAVOUR="generic"
-			fi
 			;;
 		oem-*)
 			FLAVOUR="oem"

live-build/ubuntu-cpc/hooks.d/base/series/disk-image

@@ -3,8 +3,6 @@ base/disk-image.binary
 base/disk-image-ppc64el.binary
 provides livecd.ubuntu-cpc.ext4
 provides livecd.ubuntu-cpc.initrd-generic
-provides livecd.ubuntu-cpc.initrd-generic-lpae
 provides livecd.ubuntu-cpc.kernel-generic
-provides livecd.ubuntu-cpc.kernel-generic-lpae
 provides livecd.ubuntu-cpc.manifest
 provides livecd.ubuntu-cpc.filelist

live-build/ubuntu-cpc/hooks.d/base/series/disk-image-uefi

@@ -1,8 +1,6 @@
 base/disk-image-uefi.binary
 provides livecd.ubuntu-cpc.ext4
 provides livecd.ubuntu-cpc.initrd-generic
-provides livecd.ubuntu-cpc.initrd-generic-lpae
 provides livecd.ubuntu-cpc.kernel-generic
-provides livecd.ubuntu-cpc.kernel-generic-lpae
 provides livecd.ubuntu-cpc.manifest
 provides livecd.ubuntu-cpc.filelist