Modules and firmware includes #3312
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
behrmann
reviewed
Jan 2, 2025
hundeboll
force-pushed
the
modules-and-firmware-includes
branch
2 times, most recently
from
5e6af61 to
0177fd9
Compare
DaanDeMeyer
requested changes
Jan 3, 2025
The kernel module include/exclude logic matches against paths below any folder in /usr/lib/modules/$(uname -r)/*/, and not just the `kernel` folder. Mention other common folder such as `extra` and `updates` in the documentation too, to avoid confused users.
hundeboll
force-pushed
the
modules-and-firmware-includes
branch
from
0177fd9 to
aadac1d
Compare
Okay, spent some time to get to know |
|
Also removed the unconditional include of modules / firmwares below an |
DaanDeMeyer
requested changes
Jan 3, 2025
hundeboll
force-pushed
the
modules-and-firmware-includes
branch
from
aadac1d to
623881c
Compare
DaanDeMeyer
approved these changes
Jan 3, 2025
hundeboll
force-pushed
the
modules-and-firmware-includes
branch
from
623881c to
6cc4454
Compare
DaanDeMeyer
requested changes
Jan 3, 2025
Some modules reference a firmware file that is just a link to a "real" file. Make sure those files are also included when needed by resolving those referenced symlinks and including their target files in the set of required firmware files.
hundeboll
force-pushed
the
modules-and-firmware-includes
branch
from
6cc4454 to
21b9a1a
Compare
DaanDeMeyer
approved these changes
Jan 3, 2025
behrmann
approved these changes
Jan 3, 2025
Comment on lines
+1019
to
+1020
| relative to the `/usr/lib/modules/<kver>/kernel` directory (note that they match against modules in the | ||
| `updates` and `extra` sibling directories too). mkosi checks for a match anywhere in the module path (e.g. |
There was a problem hiding this comment.
I think this would be clearer:
Suggested change
| relative to the `/usr/lib/modules/<kver>/kernel` directory (note that they match against modules in the | |
| `updates` and `extra` sibling directories too). mkosi checks for a match anywhere in the module path (e.g. | |
| relative to the `/usr/lib/modules/<kver>` directory. mkosi checks for a match anywhere in the module path (e.g. |
mentioning the updates and extra directories explicitly only obscures that, we look relative to that.
behrmann
reviewed
Jan 3, 2025
| # results in dangling symlinks in the final image. | ||
| for fw in firmware.copy(): | ||
| if (root / fw).is_symlink(): | ||
| target = Path(chase(root, fw)) |
There was a problem hiding this comment.
Suggested change
| target = Path(chase(root, fw)) | |
| target = Path(chase(os.fspath(root), os.fspath(fw))) |
is needed here to appease mypy.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In order to include out-of-tree modules (and their required firmware) installed in an
updatessubfolder, a special case is added when a file is found below that folder.Furthermore, a firmware file required by a module might be a symbolic link to the real firmware file. Add handling of this case too.