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: copy device trees to the ESP

Browse Source 
Commit f9c5020200ce ("riscv: directly copy device trees to /boot/dtbs")
incorrectly copied devicetrees into /boot/dtbs/$kvers instead of /boot/efi/dtbs,
inside the ESP and where U-boot expects them. This commit fixes this path.

Fixes: f9c5020200ce ("riscv: directly copy device trees to /boot/dtbs")
Signed-off-by: Adriano Cordova <adriano.cordova@canonical.com>
This commit is contained in:
Adriano Cordova 2025-01-21 10:41:31 -03:00 committed by Michael Hudson-Doyle
parent 2adb738584
commit 365435ad2d
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.10) plucky; urgency=medium
* riscv: copy device trees to the ESP. Fixes (LP: #2095415)
-- Adriano Cordova <adriano.cordova@canonical.com> Tue, 21 Jan 2025 10:38:54 -0300
livecd-rootfs (25.04.9) plucky; urgency=medium
* Move reference wsl-setup script to /usr/lib/wsl/

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/lib/firmware/$kver/device-tree"
)
dtb_tgt_dir="mountpoint/boot/dtbs/$kver/"
dtb_tgt_dir="mountpoint/boot/efi/dtbs/"
mkdir -p "$dtb_tgt_dir"
for src_dir in "${dtb_src_dirs[@]}"; do
[ -d "$src_dir" ] && cp -r -v "$src_dir"/* "$dtb_tgt_dir" || echo "Skipping missing: $src_dir"