github: Fix kernel-apply-patch.sh again for other branches #3622
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
The previous fix worked on main, but not on the other branches where hv-daemons-9999.ebuild still exists. The glob was matching more than one ebuild, causing the rename to fail. This change ensures that the glob doesn't match 9999. It will fail if there is still more than one match, but that was the case originally. Bash isn't smart enough to determine the latest version accurately. Finally, it won't run sed if the ebuild is a symlink because doing so would turn it into a regular file. We shouldn't put COREOS_SOURCE_REVISION in symlinked ebuilds. Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
Contributor
|
Oh ok, so 9999 is the faulty version: so what about backporting this to maintenance branch: #3565 ? |
Contributor
Author
|
I didn't want to backport the whole thing, but just backporting 3d1a2a4 wouldn't hurt. Happy to do that instead. |
Contributor
Your call on this, but if we dropped the live ebuild on |
Contributor
Author
|
Okay, done that. 🤞 |
Contributor
Alright, it worked. :) |
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.
Fix kernel-apply-patch.sh again for other branches
#3592 worked on main, but not on the other branches where hv-daemons-9999.ebuild still exists. The glob was matching more than one ebuild, causing the rename to fail.
This change ensures that the glob doesn't match 9999. It will fail if there is still more than one match, but that was the case originally. Bash isn't smart enough to determine the latest version accurately.
Finally, it won't run sed if the ebuild is a symlink because doing so would turn it into a regular file. We shouldn't put
COREOS_SOURCE_REVISIONin symlinked ebuilds.How to use
You can probably run kernel-apply-patch.sh manually.
Testing done
I tested the changed snippet manually against main and an older branch. I also added other ebuild versions to verify the behaviour.
changelog/directory (user-facing change, bug fix, security fix, update) -- N/A/bootand/usrsize, packages, list files for any missing binaries, kernel modules, config files, kernel modules, etc. -- N/A