Fix kmodtool for packaging mainline Linux #14617
Merged
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
behlendorf
added
Component: Packaging
behlendorf
reviewed
Mar 16, 2023
scripts/kmodtool
Outdated
| @@ -333,7 +333,7 @@ print_customrpmtemplate () | |||
| { | |||
| for kernel in ${1} | |||
| do | |||
| if [[ -e "${buildroot}/usr/src/kernels/${kernel}" ]] ; then | |||
| if [[ -e "${buildroot}/usr/src/kernels/${kernel}" ]] && [[ "${kernel}" =~ el|fc ]]; then | |||
There was a problem hiding this comment.
Unfortunately this is going to break some RedHat derivatives. Could we instead invert the conditional and check for a user-build-kernel and then a Fedora/RH kernel.
There was a problem hiding this comment.
Inverting the conditional seems like it could work. I'll test it out and update this PR when I get the chance. Thanks!
kmodtool currently incorrectly identifies offical RHEL kernels, as opposed to custom kernels. This can cause the openZFS kmod RPM build to break. The issue can be reproduced by building a set of mainline Linux RPMs, installing them, and then attempting to build the openZFS kmod package against them. Signed-off-by: Timothy Day <timday@amazon.com>
tim-day-387
changed the title
|
This got closed/re-opened when I refreshed my Github fork. I need to find a better workflow for updating Github PRs. But I tested flipping the conditional on a few setups (based on CentOS specifically) and everything seemed to work well. |
behlendorf
approved these changes
Mar 22, 2023
andrewc12
pushed a commit
to andrewc12/openzfs
that referenced
this pull request
Mar 23, 2023
kmodtool currently incorrectly identifies official RHEL kernels, as opposed to custom kernels. This can cause the openZFS kmod RPM build to break. The issue can be reproduced by building a set of mainline Linux RPMs, installing them, and then attempting to build the openZFS kmod package against them. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Timothy Day <timday@amazon.com> Closes openzfs#14617
pcd1193182
pushed a commit
to pcd1193182/zfs
that referenced
this pull request
Sep 26, 2023
kmodtool currently incorrectly identifies official RHEL kernels, as opposed to custom kernels. This can cause the openZFS kmod RPM build to break. The issue can be reproduced by building a set of mainline Linux RPMs, installing them, and then attempting to build the openZFS kmod package against them. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Timothy Day <timday@amazon.com> Closes openzfs#14617
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.
Motivation and Context
I built a kernel.org 5.15.94 using Clang for some work on a Lustre patch (https://review.whamcloud.com/c/fs/lustre-release/+/50063). I needed to build the openZFS kernel modules as well. The build failed because kmodtool was incorrectly identifying my kernel as a RHEL/CentOS one.
Description
Changing the order of the checks in kmodtool allows the kernel to be identified correctly. The custom kernel has the Makefile under
/lib/modules/${kernel}/build, whereas the RHEL distributed kernel does not.How Has This Been Tested?
The kmod package builds on both my default system and the system with the custom kernel. I ran this though shellcheck and it didn't return any errors. The change isn't POSIX, but kmodtool is using bash in the shebang anyway.
Types of changes
Checklist:
Signed-off-by.