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

riscv: correct installation path of dtbs

Browse Source 
U-Boot with distroboot has:

efi_dtb_prefixes=/ /dtb/ /dtb/current/

So we should install the device-trees into dtb/ and not dtbs/ on the EFI
system partition.

Fixes: 365435ad2dbe ("riscv: copy device trees to the ESP")
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
This commit is contained in:
Heinrich Schuchardt 2025-01-27 13:39:20 +01:00
parent 365435ad2d
commit 0c5b7dfd0c
2 changed files with 7 additions and 1 deletions
debian
changelog
live-build/ubuntu-cpc/hooks.d/base
disk-image-uefi-non-cloud.binary

6
debian/changelog vendored

@ -1,3 +1,9 @@
livecd-rootfs (25.04.11) UNRELEASED; urgency=medium
* riscv: copy device trees dtb/ in ESP
-- Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Mon, 27 Jan 2025 13:42:35 +0100
livecd-rootfs (25.04.10) plucky; urgency=medium livecd-rootfs (25.04.10) plucky; urgency=medium
* riscv: copy device trees to the ESP. Fixes (LP: #2095415) * riscv: copy device trees to the ESP. Fixes (LP: #2095415)

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

@ -365,7 +365,7 @@ EOF
"mountpoint/usr/lib/linux-image-$kver" "mountpoint/usr/lib/linux-image-$kver"
"mountpoint/lib/firmware/$kver/device-tree" "mountpoint/lib/firmware/$kver/device-tree"
) )
dtb_tgt_dir="mountpoint/boot/efi/dtbs/" dtb_tgt_dir="mountpoint/boot/efi/dtb/"
mkdir -p "$dtb_tgt_dir" mkdir -p "$dtb_tgt_dir"
for src_dir in "${dtb_src_dirs[@]}"; do for src_dir in "${dtb_src_dirs[@]}"; do
[ -d "$src_dir" ] && cp -r -v "$src_dir"/* "$dtb_tgt_dir" || echo "Skipping missing: $src_dir" [ -d "$src_dir" ] && cp -r -v "$src_dir"/* "$dtb_tgt_dir" || echo "Skipping missing: $src_dir"