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

Some minor tweaks to the changes done by xypron.

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2023-06-28 10:42:27 +02:00
parent e14379f405
commit 95d6a004a6
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -264,7 +264,6 @@ install_grub() {
fi fi
;; ;;
riscv64) 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 # Per-device images
local my_d=$(dirname $(readlink -f ${0})) local my_d=$(dirname $(readlink -f ${0}))
@ -367,7 +366,6 @@ EOF
dd if=mountpoint/usr/lib/u-boot/sifive_unmatched/u-boot-spl.bin of=$loader1 dd if=mountpoint/usr/lib/u-boot/sifive_unmatched/u-boot-spl.bin of=$loader1
dd if=mountpoint/usr/lib/u-boot/sifive_unmatched/u-boot.itb of=$loader2 dd if=mountpoint/usr/lib/u-boot/sifive_unmatched/u-boot.itb of=$loader2
;; ;;
*)
esac esac
chroot mountpoint bash -c 'FK_FORCE=yes apt-get install -qqy grub-efi-riscv64 flash-kernel' chroot mountpoint bash -c 'FK_FORCE=yes apt-get install -qqy grub-efi-riscv64 flash-kernel'
efi_target=riscv64-efi efi_target=riscv64-efi
@ -385,7 +383,7 @@ EOF
chroot mountpoint rm -f /boot/boot.scr chroot mountpoint rm -f /boot/boot.scr
else else
# Other images e.g. cloud images # Other images e.g. cloud images
chroot mountpoint apt-get install -qqy u-boot-menu #grub-efi-riscv64 chroot mountpoint apt-get install -qqy u-boot-menu grub-efi-riscv64
efi_target=riscv64-efi efi_target=riscv64-efi
chroot mountpoint u-boot-update chroot mountpoint u-boot-update