Imported 2.796

No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2023-01-11 04:48:18 +00:00
parent daa725fa52
commit c6d4c73dfe
2 changed files with 14 additions and 9 deletions

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
livecd-rootfs (2.796) lunar; urgency=medium
[ Heinrich Schuchardt ]
* riscv64: adjust U-Boot installation for Nezha D1 and LicheeRV. Since
version 2022.10 U-Boot SPL and U-Boot are installed onto the same
partition. Package nezha-boot0 is not needed anymore.
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Mon, 09 Jan 2023 14:10:22 +0100
livecd-rootfs (2.795) lunar; urgency=medium
* Don't depend on python3-launchpadlib on i386. This breaks ppa-enabled

View File

@ -298,16 +298,12 @@ install_grub() {
chroot mountpoint bash -c 'FK_FORCE=yes apt-get install -qqy grub-efi-riscv64 flash-kernel'
efi_target=riscv64-efi
# nezha-boot0 is actually compatible with the LicheeRV boards (and probably other D1-based boards)
chroot mountpoint apt-get install -qqy nezha-boot0
# FSBL, which gets U-Boot SPL
loader1="/dev/mapper${loop_device///dev/}p13"
dd if=mountpoint/usr/lib/u-boot/nezha/boot0_sdcard_sun20iw1p1.bin of=$loader1
# The real U-Boot
# u-boot-nezha actually contains both the LicheeRV and the Nezha boards support
# u-boot-nezha supports both the LicheeRV and the Nezha D1.
chroot mountpoint apt-get install -qqy u-boot-nezha
loader2="/dev/mapper${loop_device///dev/}p14"
dd if=mountpoint/usr/lib/u-boot/${SUBARCH}/u-boot.toc1 of=$loader2
# Since version 2022.10 U-Boot SPL and U-Boot are installed onto the same partition.
# Package nezha-boot0 is not needed anymore.
loader1="/dev/mapper${loop_device///dev/}p13"
dd if=mountpoint/usr/lib/u-boot/${SUBARCH}/u-boot-sunxi-with-spl.bin of=$loader1
# Provide end-user modifyable CIDATA
cidata_dev="/dev/mapper${loop_device///dev/}p12"
setup_cidata "${cidata_dev}"