[neon/neon/livecd-rootfs/Neon/release] live-build/ubuntu-cpc/hooks.d/base: riscv: LicheeRV must use u-boot-nezha package

[Heinrich Schuchardt]

Git commit 8ba2493a80e5c2169de160af098faf384e63d797 by Heinrich Schuchardt, on behalf of Alexandre Ghiti.
Committed on 17/11/2022 at 10:21.
Pushed by jriddell into branch 'Neon/release'.

riscv: LicheeRV must use u-boot-nezha package

Signed-off-by: Alexandre Ghiti <alexandre.ghiti at canonical.com>

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

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

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 6dd27c48..bc6749ff 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
@@ -292,7 +292,8 @@ install_grub() {
                         loader1="/dev/mapper${loop_device///dev/}p13"
                         dd if=mountpoint/usr/lib/u-boot/nezha/boot0_sdcard_sun20iw1p1.bin of=$loader1
                         # The real U-Boot
-                        chroot mountpoint apt-get install -qqy u-boot-${SUBARCH}
+                        # u-boot-nezha actually contains both the LicheeRV and the Nezha boards support
+                        chroot mountpoint apt-get install -qqy u-boot-nezha
                         loader2="/dev/mapper${loop_device///dev/}p14"
                         dd if=mountpoint/usr/lib/u-boot/${SUBARCH}/u-boot.toc1 of=$loader2
                         # Provide end-user modifyable CIDATA