[neon/neon/livecd-rootfs/Neon/release] /: Backport fix for cloud RISC-V images from kinetic.

[Łukasz 'sil2100' Zemczak]

Git commit 80cb6a4a1e8ef25ae70b79cfae378bf8eb776f21 by Łukasz 'sil2100' Zemczak.
Committed on 04/08/2022 at 15:24.
Pushed by jriddell into branch 'Neon/release'.

Backport fix for cloud RISC-V images from kinetic.

M  +8    -0    debian/changelog
M  +10   -3    live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary

https://invent.kde.org/neon/neon/livecd-rootfs/commit/80cb6a4a1e8ef25ae70b79cfae378bf8eb776f21

diff --git a/debian/changelog b/debian/changelog
index 996a5d97..388c16c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.765.9) UNRELEASED; urgency=medium
+
+  * When adding the new RISC-V platforms, some of the generic non-SUBARCH code
+    went missing and some invalid assumptions have been made, causing cloud
+    images to fail building. This upload fixes these (LP: #1983599).
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak at ubuntu.com>  Thu, 04 Aug 2022 17:15:03 +0200
+
 livecd-rootfs (2.765.8) jammy; urgency=medium
 
   * Manually blacklist DKMS modules for Ubuntu Studio builds (LP: #1983521).
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 5009ffe3..f516e7a6 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
@@ -219,8 +219,9 @@ install_grub() {
             fi
             ;;
         riscv64)
-            # TODO grub-efi-riscv64 does not exist yet on riscv64
+            # TODO grub-efi-riscv64 exists, but is not used by all the images yet
             if [ -n "${SUBARCH:-}" ]; then
+                # Per-device images
                 case "${SUBARCH}" in
                     "nezha")
                         echo "Installing U-Boot for Nezha board" &1>2
@@ -327,10 +328,16 @@ EOF
                         setup_cinocloud mountpoint
                         ;;
                 esac
+            else
+                # Other images e.g. cloud images
+                chroot mountpoint apt-get install -qqy u-boot-menu #grub-efi-riscv64
+                efi_target=riscv64-efi
+
+                chroot mountpoint u-boot-update
             fi
 
-            if [ "${SUBARCH}" != "visionfive" ] && [ "${SUBARCH}" != "nezha" ]; then
-                ## TODO remove below once we have grub-efi-riscv64
+            if [ "${SUBARCH:-}" != "visionfive" ] && [ "${SUBARCH:-}" != "nezha" ]; then
+                ## TODO remove below once we have grub-efi-riscv64 for the platforms
                 rm mountpoint/tmp/device.map
                 umount mountpoint/boot/efi
                 mount