Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert recent %_root_prefix macro addition (RhBug:2233454) #2625

Merged
merged 2 commits into from
Aug 22, 2023

Conversation

pmatilai
Copy link
Member

Commit cececfb introduced %_root_prefix macro but this unnecessarily breaks widespread use in scl-utils: https://bugzilla.redhat.com/show_bug.cgi?id=2233454

Just query the value from pkg-config if available and otherwise use hardcoded value pointing to /usr instead. We don't need an intermediate global macro for this.

Commit cececfb introduced %_root_prefix
macro but this clashes with pre-existing use in scl-utils:
https://bugzilla.redhat.com/show_bug.cgi?id=223345:

Just query the value from pkg-config if available and otherwise use
hardcoded value pointing to /usr instead. We don't need an intermediate
global macro for this.
Commit c7fd9fe introduced %_sysusersdir
into the group of global configure-related macros but that's not what
it's related to at all, it's only related to our sysusers integration
feature. Move it where it really belongs.
@pmatilai
Copy link
Member Author

Note that even if scl-utils was changed to test for something else, this clash has a potential of breaking rpm instead. scl-utils was there first by a long shot, we better let them have the macro.

@pmatilai pmatilai merged commit 0e336e2 into rpm-software-management:master Aug 22, 2023
1 check passed
@pmatilai pmatilai deleted the sysuserdir branch August 22, 2023 11:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant