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

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.

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2022-07-29 17:44:33 +02:00
parent 4d0d9aa7af
commit e760da3284
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,8 +219,9 @@ install_grub() {
fi fi
;; ;;
riscv64) 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 if [ -n "${SUBARCH:-}" ]; then
# Per-device images
case "${SUBARCH}" in case "${SUBARCH}" in
"nezha") "nezha")
echo "Installing U-Boot for Nezha board" &1>2 echo "Installing U-Boot for Nezha board" &1>2
@ -327,10 +328,16 @@ EOF
setup_cinocloud mountpoint setup_cinocloud mountpoint
;; ;;
esac 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 fi
if [ "${SUBARCH}" != "visionfive" ] && [ "${SUBARCH}" != "nezha" ]; then if [ "${SUBARCH:-}" != "visionfive" ] && [ "${SUBARCH:-}" != "nezha" ]; then
## TODO remove below once we have grub-efi-riscv64 ## TODO remove below once we have grub-efi-riscv64 for the platforms
rm mountpoint/tmp/device.map rm mountpoint/tmp/device.map
umount mountpoint/boot/efi umount mountpoint/boot/efi
mount mount