From 946c5cf90ccd38561317c8562bf5ffd46e3cdd25 Mon Sep 17 00:00:00 2001 From: Gauthier Jolly Date: Fri, 23 Jun 2023 13:24:57 +0200 Subject: [PATCH 1/2] ubuntu-cpc: install grub-efi on riscv images grub-efi-riscv64 is in the archive and edk2 support for riscv is being merged upstream. --- live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary index bcc88f2f..792b2e1a 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary @@ -268,7 +268,6 @@ install_grub() { fi ;; riscv64) - # TODO grub-efi-riscv64 exists, but is not used by all the images yet if [ -n "${SUBARCH:-}" ]; then # Per-device images local my_d=$(dirname $(readlink -f ${0})) @@ -451,7 +450,7 @@ EOF esac else # Other images e.g. cloud images - chroot mountpoint apt-get install -qqy u-boot-menu #grub-efi-riscv64 + chroot mountpoint apt-get install -qqy u-boot-menu grub-efi-riscv64 efi_target=riscv64-efi chroot mountpoint u-boot-update From 7d7afb8abfe75e5e0f08a468a75b99b15ee9d8b7 Mon Sep 17 00:00:00 2001 From: Gauthier Jolly Date: Fri, 23 Jun 2023 13:26:44 +0200 Subject: [PATCH 2/2] update d/c --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9e35a687..f27387d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.891ubuntu1) UNRELEASED; urgency=medium + + * ubuntu-cpc: install grub-efi on riscv images + + -- Gauthier Jolly Fri, 23 Jun 2023 13:26:12 +0200 + livecd-rootfs (2.891) mantic; urgency=medium * Follow up fix to the CHANNEL handling for subiquity images: make sure that