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

base-filesystem: Support Arch-style multilib #26645

Merged
merged 1 commit into from Mar 6, 2023

Conversation

AdrianVovk
Copy link
Contributor

On distros like Arch and on carbonOS, libraries end up in /usr/lib. Thus, /lib64 should point to /usr/lib. This commit adds this functionality as a final fallback (if neither Debian-style nor Fedora-style multilib can be detected)

As discussed on the mailing list

On distros like Arch and on carbonOS, libraries end up in /usr/lib.
Thus, /lib64 should point to /usr/lib. This commit adds this
functionality as a final fallback (if neither Debian-style nor
Fedora-style multilib can be detected)
@AdrianVovk
Copy link
Contributor Author

I haven't tested this yet.

Would you want me to add a test case for it?

@github-actions github-actions bot added util-lib please-review PR is ready for (re-)review by a maintainer labels Mar 2, 2023
@poettering
Copy link
Member

lgtm, but please update the comment

@poettering poettering added good-to-merge/with-minor-suggestions and removed please-review PR is ready for (re-)review by a maintainer labels Mar 3, 2023
@poettering
Copy link
Member

So, I was informed that arch-style multilib does exist, and it uses /usr/lib32/ as kind of an inverse of fedora-style /usr/lib64.

Here's my question though: what about /lib32/? if that exists we'd have to create that symlink here. But I take it that is not a thing, only /usr/lib32/ exists?

under the assumption that's the case, then I guess this still looks OK.

@poettering poettering added good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed and removed good-to-merge/with-minor-suggestions labels Mar 3, 2023
@AdrianVovk
Copy link
Contributor Author

I can't tell if the CI failure has much to do with this MR... can someone take a look and/or rerun the test? How does this work?

@bluca bluca merged commit 27e6958 into systemd:main Mar 6, 2023
@github-actions github-actions bot removed the good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed label Mar 6, 2023
@AdrianVovk
Copy link
Contributor Author

Thanks!

@AdrianVovk AdrianVovk deleted the base-fs-lib64-to-lib branch April 11, 2023 17:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

None yet

4 participants