[neon/neon/livecd-rootfs/Neon/release] live-build/ubuntu-cpc/hooks.d/base: Cherry-pick 4428dbbf8f998c138093e3208bc7a0e7034714be

[Łukasz 'sil2100' Zemczak]

Git commit acb4de3be0476ca5a990ead6e4bdd4bf9083a8e0 by Łukasz 'sil2100' Zemczak, on behalf of Dimitri John Ledkov.
Committed on 15/06/2021 at 11:30.
Pushed by jriddell into branch 'Neon/release'.

Cherry-pick 4428dbbf8f998c138093e3208bc7a0e7034714be

riscv64: generalise slightly how preinstalled server images are built, to allow using subarch to pick u-boot binaries to install.

M  +6    -2    live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
M  +1    -1    live-build/ubuntu-cpc/hooks.d/base/qcow2-image.binary

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

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 5295d45f..b3f4613a 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
@@ -136,13 +136,17 @@ install_grub() {
             chroot mountpoint u-boot-update
 
             if [ -n "${SUBARCH:-}" ]; then
+                u_boot_arch="${SUBARCH}"
+                if [ "${u_boot_arch}" = "hifive" ]; then
+                    u_boot_arch=sifive_fu540
+                fi
                 chroot mountpoint apt-get install -qqy u-boot-sifive
                 # FSBL, which gets U-Boot SPL
                 loader1="/dev/mapper${loop_device///dev/}p13"
                 # The real U-Boot
                 loader2="/dev/mapper${loop_device///dev/}p14"
-                dd if=mountpoint/usr/lib/u-boot/sifive_fu540/u-boot-spl.bin of=$loader1
-                dd if=mountpoint/usr/lib/u-boot/sifive_fu540/u-boot.itb of=$loader2
+                dd if=mountpoint/usr/lib/u-boot/${u_boot_arch}/u-boot-spl.bin of=$loader1
+                dd if=mountpoint/usr/lib/u-boot/${u_boot_arch}/u-boot.itb of=$loader2
                 # Provide end-user modifyable CIDATA
                 cidata_dev="/dev/mapper${loop_device///dev/}p12"
                 setup_cidata "${cidata_dev}"
diff --git a/live-build/ubuntu-cpc/hooks.d/base/qcow2-image.binary b/live-build/ubuntu-cpc/hooks.d/base/qcow2-image.binary
index a4851e26..5b38fe69 100755
--- a/live-build/ubuntu-cpc/hooks.d/base/qcow2-image.binary
+++ b/live-build/ubuntu-cpc/hooks.d/base/qcow2-image.binary
@@ -7,7 +7,7 @@ case $ARCH:$SUBARCH in
 		xz -T4 -c binary/boot/disk.ext4 > livecd.ubuntu-cpc.disk1.img.xz
 	        exit 0
 		;;
-	riscv64:hifive)
+	riscv64:hifive|riscv64:sifive_*)
 		xz -T4 -c binary/boot/disk-uefi.ext4 > livecd.ubuntu-cpc.disk1.img.xz
 	        exit 0
 		;;