fix: armhf flavour for 6.5+ kernel is now generic (LP: #2033677)

With the introduction of the 6.5 kernel for mantic on 13th September ago we are seeing image build failures
on the armhf builds. The build failure was `No kernel output for generic-lpae!`.

Introduced in the 6.4 kernel and therefore now also in 6.5 there is no generic-lpae flavor anymore. it's just generic now.

As such this commit updates the expected flavour for armhf to generic.
ubuntu/mantic
Philip Roche 1 year ago
parent e601fd6fc6
commit 8333dbac7a

6
debian/changelog vendored

@ -1,3 +1,9 @@
livecd-rootfs (23.10.37) mantic; urgency=medium
* fix: armhf flavour for 6.5+ kernel is now generic (LP: #2036192)
-- Philip Roche <phil.roche@ubuntu.com> Fri, 15 Sep 2023 11:31:23 +0100
livecd-rootfs (23.10.36) mantic; urgency=medium livecd-rootfs (23.10.36) mantic; urgency=medium
* Since we restored the minimal layer, we also need to adjust all hook * Since we restored the minimal layer, we also need to adjust all hook

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

@ -3,8 +3,6 @@ base/disk-image.binary
base/disk-image-ppc64el.binary base/disk-image-ppc64el.binary
provides livecd.ubuntu-cpc.ext4 provides livecd.ubuntu-cpc.ext4
provides livecd.ubuntu-cpc.initrd-generic 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
provides livecd.ubuntu-cpc.kernel-generic-lpae
provides livecd.ubuntu-cpc.manifest provides livecd.ubuntu-cpc.manifest
provides livecd.ubuntu-cpc.filelist provides livecd.ubuntu-cpc.filelist

@ -1,8 +1,6 @@
base/disk-image-uefi.binary base/disk-image-uefi.binary
provides livecd.ubuntu-cpc.ext4 provides livecd.ubuntu-cpc.ext4
provides livecd.ubuntu-cpc.initrd-generic 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
provides livecd.ubuntu-cpc.kernel-generic-lpae
provides livecd.ubuntu-cpc.manifest provides livecd.ubuntu-cpc.manifest
provides livecd.ubuntu-cpc.filelist provides livecd.ubuntu-cpc.filelist

Loading…
Cancel
Save