Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-23 11:21:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Backport fix for cloud RISC-V images from kinetic.

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2022-08-04 17:24:12 +02:00
parent ce9549372a
commit 80cb6a4a1e
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -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@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).

13
live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
View File

@ -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