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

Consistently use install_tree, allow overriding /lib/modules #389

Merged
merged 4 commits into from
Feb 1, 2024

Conversation

evelikov
Copy link
Collaborator

With many distributions moving from /lib/modules to /usr/lib/modules,
allow for the builder to select their option. For backwards
compatibility the default is still /lib/modules.

As result distros for example Arch don't need to patch the project.
Plus this nicely aligns with kmod, which recently allowed for similar
change.

To override set the MODDIR variable during make.

@scaronni @anbe42 @seblu happy to hear if you have any concerns about this.

Fwiw kmod has landed /usr/lib/modules support with this series, although the last release v31 was just prior to that work.

@scaronni
Copy link
Collaborator

I think it's a very good idea! Shall we merge and create a new release with all the recent changes?

@evelikov
Copy link
Collaborator Author

Yup, my plan was to make a release soonish - the next week or so. Was just checking when the kmod team will do a release on their end (with similar feature).

We should be aiming at the former, since it's the toggle the user can
override. Seemingly none of our tests do, so this went under the radar.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
We're going to add more patterns to replace soon, across multiple files.
So avoid adding even more duplication.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Swap for the more common s,@foobar@,$(BAZ),g sed pattern.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
With many distributions moving from /lib/modules to /usr/lib/modules,
allow for the builder to select their option. For backwards
compatibility the default is still /lib/modules.

As result distros for example Arch don't need to patch the project.
Plus this nicely aligns with kmod, which recently allowed for similar
change.

Note: the tests still use the original path. If needed that can be
changed as follow-up.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
@evelikov
Copy link
Collaborator Author

Rebasing this was a bit more fiddly than I expected. So I will be merging this as the CI completes.

With kmod release expected in a week or two, I am aiming to do dkms shortly afterwards - especially since without #390 modules can fail to load.

If anyone has comments or concerns - please raise them at any point.

@evelikov evelikov merged commit 6b76c7f into dell:master Feb 1, 2024
24 checks passed
@evelikov evelikov deleted the usr-lib-modules branch February 1, 2024 17:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants