[neon/neon/livecd-rootfs/Neon/release] /: Cherry pick fix for unmatched boot image build fix from kinetic.

[Łukasz 'sil2100' Zemczak]

Git commit 84e7e03bf20bb5825857e31c86e03c88c606d0f0 by Łukasz 'sil2100' Zemczak.
Committed on 25/07/2022 at 08:25.
Pushed by jriddell into branch 'Neon/release'.

Cherry pick fix for unmatched boot image build fix from kinetic.

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

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

diff --git a/debian/changelog b/debian/changelog
index 4f7135f5..a75480ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+livecd-rootfs (2.765.6) UNRELEASED; urgency=medium
+
+  [ Alexandre Ghiti ]
+  * Fix SiFive Unmatched build. While merging the VisionFive support, we
+    removed the installation of u-boot-menu for the Unmatched by mistake
+    (LP: #1982735).
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak at ubuntu.com>  Mon, 25 Jul 2022 10:24:08 +0200
+
 livecd-rootfs (2.765.5) jammy; urgency=medium
 
   * Add support for the VisionFive and the Nezha boards (LP: #1980935)
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 f34d827d..5009ffe3 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
@@ -304,6 +304,9 @@ EOF
                         setup_cinocloud mountpoint
                         ;;
                     *)
+                        chroot mountpoint apt-get install -qqy u-boot-menu #grub-efi-riscv64
+                        efi_target=riscv64-efi
+                        chroot mountpoint u-boot-update
                         u_boot_arch="${SUBARCH}"
                         if [ "${u_boot_arch}" = "hifive" ]; then
                             u_boot_arch=sifive_fu540