Skip to content

Comments

[Backport staging-24.05] setup-hooks/strip: uniqify files by inode number before stripping#314541

Merged
winterqt merged 1 commit intostaging-24.05from
backport-314175-to-staging-24.05
May 26, 2024
Merged

[Backport staging-24.05] setup-hooks/strip: uniqify files by inode number before stripping#314541
winterqt merged 1 commit intostaging-24.05from
backport-314175-to-staging-24.05

Conversation

@github-actions
Copy link
Contributor

Bot-based backport to staging-24.05, triggered by a label in #314175.

  • Before merging, ensure that this backport is acceptable for the release.
    • Even as a non-commiter, if you find that it is not acceptable, leave a comment.

#246164 but for hardlinks.

Mesa, among other packages, has binaries that are linked together and
can end up corrupted when the same binary is stripped through two
different names.

To resolve this, print out the device and inode number before each file
name, sort/uniq based on that, then cut it back out before stripping.

The symlink resolution logic is removed as the same file accessed
through two different links in `$paths` will necessarily have the same
numbers. File/directory within the paths listed in `$paths` are
correctly not (and were never) processed due to the `-type f` predicate
and (implied) `-P` option to `find`.

(cherry picked from commit 4d6d293)
@github-actions github-actions bot requested a review from Ericson2314 as a code owner May 25, 2024 09:37
@flokli flokli requested review from Mic92, lheckemann and yu-re-ka May 25, 2024 09:37
@ofborg ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels May 25, 2024
Copy link
Contributor

@tpwrules tpwrules left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Built all the way up to Mesa on x86_64-linux and it succeeded. Diff looks good too.

@winterqt winterqt merged commit d53b5e8 into staging-24.05 May 26, 2024
@winterqt winterqt deleted the backport-314175-to-staging-24.05 branch May 26, 2024 05:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants