Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduce support for overriding system's DeviceTree #3346

Merged
merged 1 commit into from
Jan 15, 2025

Conversation

andersson
Copy link

While experimenting with OS images on development boards where either the bootloader doesn't load a Flattened DeviceTree Blob, or if one wants to replace the one provided by the bootloader with a specific/new one for development/experimentation/testing purposes, it's convenient to use the OS-loaders ability to load a specific DeviceTree blob.

Add a new option to mkosi, to cause a specified DeviceTree blob to be baked into the UKI, or copied into /boot and added to the systemd loader entry.

As different distributions store the dtb files in different locations the requested file is searched for in the locations spotted in Debian, Fedora, Arch Linux packages (both from distro and kernel build system - as these differs as well).

Resolves #2439
Based on initial effort by Manuel Traut.

@andersson andersson force-pushed the for-mkosi/devicetree branch 2 times, most recently from 86b7fd9 to 17c3f63 Compare January 12, 2025 05:22
mkosi/config.py Outdated Show resolved Hide resolved
mkosi/__init__.py Outdated Show resolved Hide resolved
@andersson andersson force-pushed the for-mkosi/devicetree branch 2 times, most recently from 6909357 to 41f063a Compare January 12, 2025 17:19
mkosi/__init__.py Outdated Show resolved Hide resolved
mkosi/__init__.py Outdated Show resolved Hide resolved
mkosi/__init__.py Outdated Show resolved Hide resolved
mkosi/__init__.py Outdated Show resolved Hide resolved
@DaanDeMeyer
Copy link
Contributor

@andersson You resolved some conversations but didn't push, maybe you forgot?

@andersson andersson force-pushed the for-mkosi/devicetree branch from 41f063a to cc0f184 Compare January 14, 2025 21:54
@andersson
Copy link
Author

@DaanDeMeyer no I didn't push, I was waiting for your confirmation on the install_type1() rework. I marked them as resolved as they where trivial and I wanted to de-clutter the PR view. Perhaps I'm using Github wrong?

I've updated and pushed a new version now. Thank you.

@andersson andersson force-pushed the for-mkosi/devicetree branch from cc0f184 to 04e0307 Compare January 14, 2025 22:17
Copy link
Contributor

@DaanDeMeyer DaanDeMeyer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing documentation in man page

@andersson andersson force-pushed the for-mkosi/devicetree branch 2 times, most recently from c75e898 to 36bc2fd Compare January 15, 2025 16:00
While experimenting with OS images on development boards where either
the bootloader doesn't load a Flattened DeviceTree Blob, or if one wants
to replace the one provided by the bootloader with a specific/new one
for development/experimentation/testing purposes, it's convenient to use
the OS-loaders ability to load a specific DeviceTree blob.

Add a new option to mkosi, to cause a specified DeviceTree blob to be
baked into the UKI, or copied into /boot and added to the systemd loader
entry.

As different distributions store the dtb files in different locations
the requested file is searched for in the locations spotted in Debian,
Fedora, Arch Linux packages (both from distro and kernel build system -
as these differs as well).

Resolves systemd#2439
Based on initial effort by Manuel Traut.

Signed-off-by: Bjorn Andersson <[email protected]>
@andersson andersson force-pushed the for-mkosi/devicetree branch from 36bc2fd to caa0ecc Compare January 15, 2025 16:01
mkosi/__init__.py Show resolved Hide resolved
@DaanDeMeyer DaanDeMeyer merged commit 5618eaf into systemd:main Jan 15, 2025
30 of 31 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

Allow specifying a devicetree binary that is passed to ukify
4 participants