doPatch: send patch name to %__patch #1350
Closed
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
when people override %__patch, they are able to process the patch name now with this change Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
|
Thinking about your use case, you can achieve the same (i.e. get the filename of the patch being passed) just by running |
dmnks
reviewed
Aug 27, 2020
| } else { | ||
| patchcmd = rpmExpand("%{__patch} ", args, " < ", fn, NULL); | ||
| patchcmd = rpmExpand("RPM_PATCH_NAME=", sp->path, " %{__patch} ", args, " < ", fn, NULL); |
There was a problem hiding this comment.
fn is a pointer to the same string pointed to by sp->path, and is also what's passed to stdin of the %__patch binary in the end, which means you can easily get that value by running readlink -f /dev/stdin in your binary. Handy, isn't it? :)
TomasTomecek
added a commit
to TomasTomecek/dist-git-to-source-git
that referenced
this pull request
Aug 28, 2020
We need to explicitly support the %setup + %patch combo because these two macros can't be replaced via the traditional macro system in /usr/lib/rpm/ since rpm parses them via C code in: rpm-software-management/rpm#1350 This patch tries to detect the usage of %setup - if any of the %auto{setup,patch} are used, we're good since those use the %__scm_{setup/apply} which we override to make sure git repos are created. Otherwise d2s replaces %setup with '%autosetup -N' (-N to let %patch do the job). With that change we'll be sure that git repo is created during %prep. We then replace %__patch with packitpatch to apply the patches. The last missing piece was patch metadata - rpm does not pass the patch name to %__patch. Luckily, Michal Domonkos is so fabulous - we can `readlink -f /dev/stdin` which points to the actual patch (rpm does `cat $patch | %__patch`). 🍻 🥂 🎉 🥳 Fixes packit#37 Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
|
Works awesome, thank you Michal, you rock!! |
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.
when people override %__patch, they are able to process the patch name
now with this change
we need this change for creating repositories with expanded sources for CentOS Stream.