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

Backport patches for sbin merge and glibc move to /usr/ #1438

Merged
merged 2 commits into from
Nov 22, 2024

Conversation

bcl
Copy link
Contributor

@bcl bcl commented Nov 22, 2024

No description provided.

keszybz and others added 2 commits November 22, 2024 08:39
When packages are rebuilt in an environment with merged sbin, files move
from /usr/sbin to /usr/bin. 'runtime-cleanup' was wreaking havoc on such
installations, removing 'losetup', 'mkswap', and other crucial utilities.
(https://bodhi.fedoraproject.org/updates/FEDORA-2024-3aafcac6a8#comment-3609189)

The rules for the change:
- for single names, /sbin/ is replaced by /*bin/. E.g.
  /usr/sbin/chpasswd → /usr/*bin/chpasswd. This is easy, because we want
  to match 'chpasswd' no matter where it is installed.
- in some cases, there was a glob, but the rpm only has files
  in /usr/sbin, so we can apply the same substition and match those files
  no matter where they are installed.
- in some other cases, there was a glob, but it only matched a single
  file in /usr/sbin, and the package has other files in /usr/bin. In
  those cases, we need to adjust the glob to be more specific, e.g.
  /usr/sbin/* → /usr/*bin/iconvconfig for glibc.

This should be safe with unmerged packages, and should unbreak builds on
with merged packages.
Add wildcards to the paths so that runtime-cleanup works with either
location.
@bcl bcl merged commit 32eb5e7 into weldr:f40-branch Nov 22, 2024
2 checks passed
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.

2 participants