Fix the retrieval of kernel version, release and dist #735
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
During the build of the out-of-tree drivers, the base image will always have the `kernel-core` package installed. And the `Makefile` doesn't pass the `KERNEL_VERSION` argument to the build command. So, it's simpler to rely on the `kernel-core` package info. The commands to get the `KREL` and `KDIST` were not working with RHEL 9.4 kernel. The new set of commands has been tested with `ubi9/ubi:9.4` and `centos/centos:stream9` based driver toolkit image and they return the correct value. For example, the values returned for the following kernels are: * `5.14.0-427.28.1.el9_4` (`ubi9:ubi:9.4`): * `KVER`: `5.14.0` * `KREL`: `427.28.1` * `KDIST`: `.el9_4` * `5.14.0-427.el9` (`centos/centos:stream9`): * `KVER`: `5.14.0` * `KREL`: `427` * `KDIST`: `.el9` The `OS_VERSION_MAJOR` argument is also not passed by the `Makefile`, but we can get it from the `/etc/os-release` file. I'm switching to grep+sed, because I don't want to load all the other variables. Signed-off-by: Fabien Dupont <[email protected]>
fabiendupont
requested review from
MichaelClifford,
rhatdan,
sallyom,
lmilbaum,
cgwalters and
Gregory-Pereira
as code owners
|
LGTM |
rhatdan
approved these changes
Aug 7, 2024
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.
During the build of the out-of-tree drivers, the base image will always have the
kernel-corepackage installed. And theMakefiledoesn't pass theKERNEL_VERSIONargument to the build command. So, it's simpler to rely on thekernel-corepackage info.The commands to get the
KRELandKDISTwere not working with RHEL 9.4 kernel. The new set of commands has been tested withubi9/ubi:9.4andcentos/centos:stream9based driver toolkit image and they return the correct value. For example, the values returned for the following kernels are:5.14.0-427.28.1.el9_4(ubi9:ubi:9.4):KVER:5.14.0KREL:427.28.1KDIST:.el9_45.14.0-427.el9(centos/centos:stream9):KVER:5.14.0KREL:427KDIST:.el9The
OS_VERSION_MAJORargument is also not passed by theMakefile, but we can get it from the/etc/os-releasefile. I'm switching to grep+sed, because I don't want to load all the other variables.