-
Notifications
You must be signed in to change notification settings - Fork 379
Add devicetree-auto support for UKI #3832
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
base: main
Are you sure you want to change the base?
Conversation
789b8f1
to
82efab3
Compare
This makes sense, but why not just make these packages install stuff to some canonical location where mkosi can look this stuff up inside the image after package installation? I'm not convinced we need a separate setting for adding an extra lookup directory for this stuff. |
Sounds good but I'm not sure how we'd want that implemented here though. kernel-install specifies So, maybe if |
Or what if we make that setting take a glob and if it's a glob, we include all those device trees? |
Ya I think either works, though if it's a glob maybe people would try to use globbing to select more specific things and would be more difficult to implement (so implementing "all" would be easier?)
Which do you prefer?
…On August 21, 2025 7:35:59 AM PDT, Daan De Meyer ***@***.***> wrote:
DaanDeMeyer left a comment (systemd/mkosi#3832)
`Devicetree=all` sounds like it could do the trick.
Or what if we make that setting take a glob and if it's a glob, we include all those device trees?
|
@craftyguy I think we can go with a glob for the existing And we should probably fail hard if it is a glob and type 1 entries are configured to be used since we need to be using UKIs for the devicetree-auto stuff I think. |
82efab3
to
1eeec6f
Compare
@DaanDeMeyer ok I think I got this implemented, and tested with some globs locally (expected dtbs were embedded in dtbauto sections) |
Please pull in #3881 or rebase on top of it when merged. |
Picked to this branch |
870d035
to
744d355
Compare
@DaanDeMeyer I tried to make this behave like the kernel modules regex/glob stuff, and in the latest patch I replaced Anyways, it seems to work when I set
|
70d9021
to
2058ecf
Compare
e349590
to
79c81e8
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, just a few nits
156eba9
to
176e458
Compare
This renames Devicetree --> Devicetrees, and adds support for listing regex, globs, files as currently supported for KernelModule* options. When multiple devicetrees are found, they are added to dtbauto sections when building a UKI. Multiple dtbs are not supported for type 1 booting. Fixes systemd#3827
176e458
to
e40fc86
Compare
This renames Devicetree --> Devicetrees, and adds support for listing
regex, globs, files as currently supported for KernelModule* options.
When multiple devicetrees are found, they are added to dtbauto sections
when building a UKI.
Multiple dtbs are not supported for type 1 booting.
Fixes #3827