Fix regression causing a build directory left behind on rpmbuild -bs #3487
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
There are a bunch of flaws here, kinda separate items but as they were
all introduced in a single commit it probably makes sense to address
the mess as one too:
There was a missing 'break' causing %mkbuilddir to use the templates of
%prep, which masks the fact that the %__spec_builddir_* stuff all set
to %{nil} doesn't work, which causes us to try to 'cd' to the build
directory that we're about to create in that %mkbuilddir. It only
happens to work because I forgot to update the rpmMkdirs() call in
rpmbuild to create %_top_builddir instead of %_builddir. Oof.
The only obvious evidence of all that fubar was that rpmbuild -bs
started leaving an empty build directory behind.
Reported-by: Fabio Valentini <[email protected]>
Fixes: rpm-software-management#3382
|
Thank you! Would it be possible to backport this to (or include the patch in) RPM 4.20 in Fedora 41+? |
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.
There are a bunch of flaws here, kinda separate items but as they were all introduced in a single commit it probably makes sense to address the mess as one too:
There was a missing 'break' causing %mkbuilddir to use the templates of %prep, which masks the fact that the %_spec_builddir* stuff all set to %{nil} doesn't work, which causes us to try to 'cd' to the build directory that we're about to create in that %mkbuilddir. It only happens to work because I forgot to update the rpmMkdirs() call in rpmbuild to create %_top_builddir instead of %_builddir. Oof.
The only obvious evidence of all that fubar was that rpmbuild -bs started leaving an empty build directory behind.
Reported-by: Fabio Valentini [email protected]
Fixes: #3382