From cf15cc4810034ea77f3cf49f7bc745fe4ba1768f Mon Sep 17 00:00:00 2001 From: Philip Roche Date: Wed, 27 Sep 2023 11:33:54 +0100 Subject: [PATCH] fix: arm flash-kernel removal from ubuntu-cpc project cloud images (LP: #2037074) With the migration from linux-kvm to linux-virtual/generic for the mantic minimal images we can now start building arm64 minimal cloud images. When building initial test images we noticed that the flash-kernel package was being installed. This is not required for EFI images. This commit removes the flash-kernel package from the cloud images arm installs The only images built using the livecd-rootfs ubuntu-cpc project for arm64 and armhf which are not cloud images (which therefore do not require flash-kernel) are the raspi images. raspi does require flash-kernel. But the raspi images use the `ubuntu-server-raspi` task to install the flash-kernel. As such this non raspi flash-kernel package install can be completely removed. It also means that initramfs-tools and dracut-install are installed as these are dependencies of flash-kernel package. --- debian/changelog | 7 +++++++ live-build/auto/config | 4 ---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 605e729f..72986ab1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (23.10.48) UNRELEASED; urgency=medium + + * fix: arm64 flash-kernel removal from ubuntu-cpc project cloud images + (LP: #2037074) + + -- Phil Roche Wed, 27 Sep 2023 11:34:05 +0100 + livecd-rootfs (23.10.47) mantic; urgency=medium [ Phil Roche ] diff --git a/live-build/auto/config b/live-build/auto/config index 7896b6fd..946b9ac3 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -1048,11 +1048,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