remove variant sensitivity from 5.15 kernel #3905
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
The 5.15 kernel is nearing its end-of-life in upstream Amazon Linux. Move vmware and metal variants that are still on 5.15 over to 6.1, to ensure that they run a supported kernel until they reach end-of-life. Signed-off-by: Ben Cressey <bcressey@amazon.com>
Now that the only in-tree users of the 5.15 kernel are aws variants, merge the aws-specific config into the main config and remove the variant sensitive marker from the package. Signed-off-by: Ben Cressey <bcressey@amazon.com>
yeazelm
approved these changes
Apr 22, 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.
Issue number:
Related: #3883
Description of changes:
Move non-aws variants from the 5.15 to the 6.1 kernel. After the only in-tree users of the 5.15 kernel are aws variants, merge the aws-specific config into the main config and remove the variant sensitive marker from the package.
Although changing the kernel for a variant mid-stream is unusual, the update policy permits it for cases where the kernel will reach end-of-life before the variant.
Removing conditional compilation from the 6.1 kernel will be quite a bit more complicated. Landing this change first will limit that complexity to just the 6.1 kernel, rather than requiring a separate set of complicated changes for the 5.15 kernel shortly before it reaches end-of-life.
(A future change will move all the
aws-k8s-*variants from the 5.15 to the 6.1 kernel. Currently that's blocked by #3459 and full confirmation that Lustre works as expected.)Testing done:
Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.