build: work around issues between pkg_rpm and rpmbuild after 4.20 #4652
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
Since rpmbuild 4.20 the _builddir variable is forcefully set to <chosen_builddir>/<pkg_name> (which is created if it doesn't exist. Any files that are not built/copied by the %prep% phase must be already present in <chosen_builddir>/<pkg_name>/[%buildsubdir]. pkg_rpm doesn't expect that and places the files to be packaged in <chosen_builddir>. Since %buildsubdir is not used (=="."), we compensate by setting it to "..". As a result <chosen_builddir>/<pkg_name>/[%buildsubdir] evaluates to <chosen_buildir> thereby restoring pre-4.20 behaviour. Since 4.20 build-info rpms are buld by default. We don't support or want that, so set "don't-do-it" explicitly.
|
This change is |
oncilla
approved these changes
Nov 20, 2024
There was a problem hiding this comment.
Reviewed 1 of 1 files at r1, all commit messages.
Reviewable status:complete! all files reviewed, all discussions resolved (waiting on @jiceatscion)
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.
Since rpmbuild v4.20, the _builddir variable is forcefully set to <chosen_builddir>/<pkg_name> (which is created if it doesn't exist). Any files that are not built/copied by the %prep% phase must be already present in <chosen_builddir>/<pkg_name>/[%buildsubdir].
pkg_rpm doesn't expect that and places the files to be packaged in <chosen_builddir>. Since %buildsubdir is not used (=="."), we compensate by setting it to "..". As a result <chosen_builddir>/<pkg_name>/[%buildsubdir] evaluates to <chosen_buildir> thereby restoring pre-4.20 behavior.
Since 4.20, debug-info rpms are built by default. We don't support or want that, so we now set "don't-do-it" explicitly.
Fixes #4653