Add support for embedding devicetree into UKI #2440
Conversation
manut
force-pushed
the
task/dtb
branch
4 times, most recently
from
e395ee5
to
931ff21
Compare
Resolves systemd#2439 To easily use the dtbs provided with kernel packages allow specifying a devicetree name in mkosi. It can be passed as parameter to ukify. The dtb is typically installed by the kernel package. Signed-off-by: Manuel Traut <[email protected]>
There was a problem hiding this comment.
Looks mostly reasonable to me. I think this might also be possible by embedding a ukify config file in the package manager tree or the image. I think that was also our idea at some point, to not have to provide all the knobs from ukify's CLI in mkosi, although we've already exposed quite a few of them.
| @@ -1872,6 +1872,11 @@ def build_uki( | |||
| "--ro-bind", stub, stub, | |||
| ] | |||
|
|
|||
| if context.config.devicetree: | |||
| dtb = context.root / f"usr/lib/linux-image-{kver}" / context.config.devicetree | |||
There was a problem hiding this comment.
There should probably be some checking here for the case that the file does not exist in the image.
There was a problem hiding this comment.
The "other" options like e.g. initrds also do not check the existence of the files.
If a non existing dtb will be configured the current output looks like this:
‣ Generating unified kernel image for kernel version 6.6.15-arm64
bwrap: Can't find source path /home/manut/.cache/mkosi/mkosi-workspaceuw1qmalv/root/usr/lib/linux-image-6.6.15-arm64/idonot/exist.dtb: No such file or directory
bwrap: Can't find source path /home/manut/.cache/mkosi/mkosi-workspaceuw1qmalv/root/usr/lib/linux-image-6.6.15-arm64/idonot/exist.dtb: No such file or directory
‣ "/usr/bin/ukify --cmdline @/home/manut/.cache/mkosi/mkosi-workspaceuw1qmalv/cmdline --os-release @/home/manut/.cache/mkosi/mkosi-workspaceuw1qmalv/root/usr/lib/os-release --stub /home/manut/.cache/mkosi/mkosi-workspaceuw1qmalv/root/usr/lib/systemd/boot/efi/linuxaa64.efi.stub --output /home/manut/.cache/mkosi/mkosi-workspaceuw1qmalv/root/boot/EFI/Linux/debian-6.6.15-arm64.efi --efi-arch aa64 --uname 6.6.15-arm64 --devicetree /home/manut/.cache/mkosi/mkosi-workspaceuw1qmalv/root/usr/lib/linux-image-6.6.15-arm64/idonot/exist.dtb --sign-kernel --signtool sbsign --secureboot-private-key /home/manut/qemu/mkosi.key --secureboot-certificate /home/manut/qemu/mkosi.crt --pcr-private-key /home/manut/qemu/mkosi.key --pcr-banks sha1,sha256 build --linux /home/manut/.cache/mkosi/mkosi-workspaceuw1qmalv/root/usr/lib/modules/6.6.15-arm64/vmlinuz --initrd /home/manut/.cache/mkosi/mkosi-workspaceuw1qmalv/initrd/image.raw-initrd" returned non-zero exit code 1.
Shall we fail with a nicer looking message?
| @@ -1872,6 +1872,11 @@ def build_uki( | |||
| "--ro-bind", stub, stub, | |||
| ] | |||
|
|
|||
| if context.config.devicetree: | |||
| dtb = context.root / f"usr/lib/linux-image-{kver}" / context.config.devicetree | |||
There was a problem hiding this comment.
This seems like a completely arbitrary location to me for putting device trees. Is there any kind of spec mandating that this is where device trees should be installed? If not, we need such a spec first. See for example uapi-group/specifications#91 where a standard location for UKI addons is proposed. We'd need such a proposal for device trees as well.
Until then, I'd prefer if you used a ukify config file in a package manager tree to accomplish this.
|
Closing due to lack of response |
Resolves #2439
To easily use the dtbs provided with kernel packages allow specifying a devicetree name in mkosi.
It can be passed as parameter to ukify.
The dtb is typically installed by the kernel package.