-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
Linux 6.10 compat: fix rpm-kmod and builtin #16450
Conversation
I started building this PR into the 6.10.5 kernel with copy-builtin, and hit an unrelated bug (#16433). The build did get far enough to build icp and zstd though (this PR changed their build scripts), so I'm going to call that good enough. |
Removing WIP tag since I was able to build icp & zstd with builtin using the 6.10.5 kernel. |
a81e726
to
ff36ee4
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.
This works for me as a workaround. We may just want to consider switching to always making a copy and not doing a VPATH build.
The 6.10 kernel broke our rpm-kmod builds. The 6.10 kernel really wants the source files in the same directory as the object files. This workaround makes rpm-kmod work again. It also updates the builtin kernel codepath to work correctly with 6.10. See kernel commits: b1992c3772e6 kbuild: use $(src) instead of $(srctree)/$(src) for source directory 9a0ebe5011f4 kbuild: use $(obj)/ instead of $(src)/ for common pattern rules Fixes: openzfs#16439 Signed-off-by: Tony Hutter <hutter2@llnl.gov>
ff36ee4
to
661a0d5
Compare
It turns out my workaround is less a hack than I thought, as kmodtool just copies over the source code into each kernel-build directory
https://rpmfusion.org/Packaging/KernelModules/Kmods2 I've updated my comment in the code to reflect this. |
The 6.10 kernel broke our rpm-kmod builds. The 6.10 kernel really wants the source files in the same directory as the object files. This workaround makes rpm-kmod work again. It also updates the builtin kernel codepath to work correctly with 6.10. See kernel commits: b1992c3772e6 kbuild: use $(src) instead of $(srctree)/$(src) for source directory 9a0ebe5011f4 kbuild: use $(obj)/ instead of $(src)/ for common pattern rules Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Tony Hutter <hutter2@llnl.gov> Closes openzfs#16439 Closes openzfs#16450
Motivation and Context
Fixes: #16439. This will allow Fedora 39-40 buildbot to work again.
Description
The 6.10 kernel broke our rpm-kmod builds. The 6.10 kernel really wants the source files in the same directory as the object files. This workaround makes rpm-kmod work again. It also updates the builtin kernel codepath to work correctly with 6.10.
See kernel commits:
Marking as draft until I can test builtin.
How Has This Been Tested?
Types of changes
Checklist:
Signed-off-by
.