From 3723595eb9038a171c5a144505aab0e9f68f9d3e Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Thu, 28 Jul 2022 03:38:21 +0000 Subject: [PATCH] Imported 2.770 No reason for CPC update specified. --- debian/changelog | 9 +++++++++ .../ubuntu-cpc/hooks.d/base/disk-image-uefi.binary | 3 +++ 2 files changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index c1f2c580..5caed142 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.770) kinetic; 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 Mon, 25 Jul 2022 10:18:50 +0200 + livecd-rootfs (2.769) kinetic; urgency=medium [ Alexandre Ghiti ] 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