Bug#991141: debian-cd: arm64 device trees not included in ESP

[Michael Walle]

Package: debian-cd
Severity: normal

It is useful to have the device trees available on the ESP. If we have these,
(vanilla) u-boot should be able to boot any board which has a dtb in the kernel
out-of-the box using EFI.

The (arm64) mini.iso already includes the DTBs in /dtb (which is the path
u-boot searches for).

Unfortunatly, these files are missing from ESP in the debian netinst.iso.
Please include them there, too.



-- System Information:
Debian Release: 10.10
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.10.0-0.bpo.3-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8), LANGUAGE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages debian-cd depends on:
ii apt 1.8.2.3
ii bc 1.07.1-2+b1
ii bzip2 1.0.6-9.2~deb10u1
ii cpp 4:8.3.0-1
ii curl 7.64.0-4+deb10u2
ii dpkg-dev 1.19.7
ii genisoimage 9:1.1.11-3+b2
pn grep-dctrl <none>
pn libcompress-zlib-perl <none>
pn libdigest-md5-perl <none>
ii libdpkg-perl 1.19.7
pn lynx <none>
ii make 4.2.1-1.2
ii perl [libdigest-sha-perl] 5.28.1-6+deb10u1
pn tofrodos <none>
ii wget 1.20.1-1.1

Versions of packages debian-cd recommends:
ii dosfstools 4.1-2
pn hfsutils <none>
pn isolinux <none>
pn mtools <none>
ii netpbm 2:10.0-15.3+b2
pn syslinux-common <none>
pn syslinux-utils <none>

debian-cd suggests no packages.

[Michael Walle]

It seems that debian-cd (re)builds its own efi.img and doesn't
add the dtbs but only the EFI/ subdirectory from the d-i
efi.img.

This might fix the problem, please take it with a grain of salt
because I was unable to actually test it. I've tried the
commands by hand though.

diff --git a/tools/boot/bullseye/boot-arm64
b/tools/boot/bullseye/boot-arm64
index d954dff3..7c55d408 100755
--- a/tools/boot/bullseye/boot-arm64
+++ b/tools/boot/bullseye/boot-arm64
@@ -84,9 +84,11 @@ cat cdrom/debian-cd_info.tar.gz | (cd boot$N/; tar
zx)
if [ -d boot$N/grub ] ; then
echo " Adding EFI boot code for $ARCH on CD$N"

- # Move GRUB files to the right place.
+ # Move GRUB and DTB files to the right place.
mkdir -p $CDDIR/EFI/boot
mcopy -n -s -i boot$N/grub/efi.img '::efi/*' $CDDIR/EFI
+ mkdir -p $CDDIR/dtb
+ mcopy -n -s -i boot$N/grub/efi.img '::dtb/*' $CDDIR/dtb
mkdir -p $CDDIR/boot/grub
mv boot$N/grub/* $CDDIR/boot/grub/
rmdir boot$N/grub

[Dmitry Baryshkov]

Package: debian-cd
Followup-For: Bug #991141

I'd like to second this request. We are looking at using Debian
Installer images to support Qualcomm hardware (both Robotics boards and
laptops). Having DTB files inside ESP would simplify booting /
installation process.


-- System Information:
Debian Release: trixie/sid
APT prefers testing
APT policy: (500, 'testing')
Architecture: arm64 (aarch64)

Kernel: Linux 6.10.0-test-dp+ (SMP w/8 CPU threads; PREEMPT)
Kernel taint flags: TAINT_WARN
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages debian-cd depends on:
ii apt 2.9.6
ii bc 1.07.1-4
ii bzip2 1.0.8-5.1
ii cpp 4:13.2.0-7
ii curl 8.8.0-4
ii dctrl-tools [grep-dctrl] 2.24-3
ii dpkg-dev 1.22.9
ii genisoimage 9:1.1.11-3.5
pn libcompress-zlib-perl <none>
pn libdigest-md5-perl <none>
ii libdpkg-perl 1.22.9
ii libfile-slurp-perl 9999.32-2
ii libyaml-libyaml-perl 0.89+ds-1+b1
ii lynx 2.9.2-1
ii make 4.3-4.1
ii perl [libdigest-sha-perl] 5.38.2-5
ii pigz 2.8-1
ii tofrodos 1.7.13+ds-6
ii uuid-runtime 2.40.2-1
ii wget 1.24.5-1
ii xorriso 1.5.6-1.2

Versions of packages debian-cd recommends:
ii dosfstools 4.2-1.1
ii hfsutils 3.2.6-16
ii isolinux 3:6.04~git20190206.bf6db5b4+dfsg1-3
ii mtools 4.0.43-1
ii syslinux-common 3:6.04~git20190206.bf6db5b4+dfsg1-3

debian-cd suggests no packages.

-- no debconf information