stable-2.3 | packaging: Use patch for applying patches
#3725
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
`tools/packaging/scripts/apply_patches.sh` uses `git apply $patch`, but this will not apply to subdirectories. If one wanted to apply with `git apply`, they'd have to run it with `--directory=...` _relative to the Git tree's root_ (absolute will not work!). I suggest we just use `patch`, which will do what we expected `git apply` would do. `patch` is also added to build containers that require it. Fixes: kata-containers#3690 Signed-off-by: Jakob Naucke <jakob.naucke@ibm.com>
Jakob-Naucke
added
no-forward-port-needed
backport
jodh-intel
approved these changes
Feb 18, 2022
Jakob-Naucke
changed the title
patch for applying patchespatch for applying patches
|
/test |
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.
tools/packaging/scripts/apply_patches.shusesgit apply $patch, butthis will not apply to subdirectories. If one wanted to apply with
git apply, they'd have to run it with--directory=...relative to the Git tree's root (absolute will not work!). I suggest
we just use
patch, which will do what we expectedgit applywoulddo.
patchis also added to build containers that require it.Fixes: #3690
Signed-off-by: Jakob Naucke jakob.naucke@ibm.com
Backport of #3691