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

Merge branch 'cpc/riscv/install_grub' of git+ssh://git.launchpad.net/~gjolly/livecd-rootfs into ubuntu/master

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2023-06-28 10:45:13 +02:00
commit 99189cc727
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -2,6 +2,7 @@ livecd-rootfs (2.892) UNRELEASED; urgency=medium
[ Gauthier Jolly ] [ Gauthier Jolly ]
* ubuntu-cpc: fix images for hardware devices * ubuntu-cpc: fix images for hardware devices
* ubuntu-cpc: install grub-efi on riscv images
[ Heinrich Schuchardt ] [ Heinrich Schuchardt ]
* RISC-V: use GRUB on Unmatched board. Simplify the code. * RISC-V: use GRUB on Unmatched board. Simplify the code.

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

@ -268,7 +268,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}))
@ -451,7 +450,7 @@ EOF
esac esac
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