Add integration tests for RHEL-9.6 release #1453
Merged
Conversation
This file contains hidden or 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
Contributor
joe-lawrence
commented
Apr 25, 2025
joe-lawrence
commented
- Fix an s390x system call macro compilation error
- Rebase RHEL-9.5 integration tests, no modifications needed
In RHEL-9.6, both KPATCH_SYSCALL_WRAPPERS_V1 and KPATCH_SYSCALL_WRAPPERS_V2 are defined due to the order of the preprocessor defines: (Consider a RHEL-9.6 kernel version of 5.14.0-570.12.1) # if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0) # define KPATCH_SYSCALL_WRAPPERS_V2 # else # define KPATCH_SYSCALL_WRAPPERS_V1 << here # endif # if defined(RHEL_RELEASE_CODE) # if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(9, 6) # define KPATCH_SYSCALL_WRAPPERS_V2 << and here # else # define KPATCH_SYSCALL_WRAPPERS_V1 # endif Re-arrange the conditionals such that only downstream and upstream are considered exclusive of one another. Fixes: e42c799 ("kpatch-syscall: update for s390x RHEL-9.6 backports") Signed-off-by: Joe Lawrence <[email protected]>
Signed-off-by: Joe Lawrence <[email protected]>
|
Passes internal beaker runs on ppc64le, s390x, and x86_64: https://beaker.engineering.redhat.com/jobs/10990806 |
joe-lawrence
commented
Apr 25, 2025
| # define KPATCH_SYSCALL_WRAPPERS_V2 | ||
| # else | ||
| # define KPATCH_SYSCALL_WRAPPERS_V1 | ||
| # endif | ||
| # endif | ||
|
|
There was a problem hiding this comment.
@jpoimboe : how did we miss this in the review 😆 ? I think I was so annoyed about not being able to combine defined(X) ... X on a single line that I botched the rest.
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.