Skip to content

kernels: find and sort upstream patches based on spec definitions #40

Merged
ginglis13 merged 3 commits intobottlerocket-os:developfrom
ginglis13:sort-upstream-patches
Feb 6, 2025
Merged

kernels: find and sort upstream patches based on spec definitions #40
ginglis13 merged 3 commits intobottlerocket-os:developfrom
ginglis13:sort-upstream-patches

Conversation

@ginglis13
Copy link
Copy Markdown
Contributor

Issue number:

Closes #39

Description of changes:

Instead of relying on patch files vended by the upstream to be numerically ordered, find patch files from the upstream spec file for a respective package and sort based on patch number to apply patches in order.

Testing done:

make for both architectures

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.

Find patches in upstream SRPM's kernel.spec, sorted by their patch
number.

Signed-off-by: Gavin Inglis <giinglis@amazon.com>
Find patches in upstream SRPM's kernel.spec, sorted by their patch
number.

Signed-off-by: Gavin Inglis <giinglis@amazon.com>
Make finding upstream patches via upstream SRPM's spec more robust by
sorting based on the patch number N in "PatchN" lines.

Signed-off-by: Gavin Inglis <giinglis@amazon.com>
@ginglis13 ginglis13 merged commit 9d46110 into bottlerocket-os:develop Feb 6, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Apply upstream kernel patches based on ordering in the upstream spec

3 participants