← Back to issue list

packaging: use our patchelf branch

View original Github issue

Metadata

Project
snapcraft
Number
#2528
Type
pull request
State
merged
Author
cmatsuoka
Labels
—
Created
Updated
Closed

Current evaluation

Merged (commit bd26cafd6, squashed merge of #2528): snapcraft.yaml now points patchelf sources at Snapcore's own patchelf branch with the failing s390x test disabled, unblocking s390x package builds; later reverted by #2531.

Resolution: closed resolved

Reason: PR #2528 was approved and merged to master as commit bd26cafd6 ("snap: use snapcraft's 0.10 patchelf branch"), a one-line change to the patchelf source reference. It was later reverted in #2531 (commit 44be372e3), which went back to patchelf 0.9 with local patches.

Evaluated by: mr-cal-bot

No scores available.

Issue body

Upstream patchelf issue NixOS/patchelf#167 prevents package building on s390x. The test failure is apparently not significant for our use cases, so switch patchelf sources to a branch with the offending test disabled. Signed-off-by: Claudio Matsuoka <claudio.matsuoka@canonical.com> Note: this PR requires patchelf PR snapcore/patchelf#1 to be merged before running tests on s390x. - [x] Have you followed the [guidelines for contributing](https://github.com/snapcore/snapcraft/blob/master/CONTRIBUTING.md)? - [x] Have you signed the [CLA](http://www.ubuntu.com/legal/contributors/)? - [ ] Have you successfully run `./runtests.sh static`? - [ ] Have you successfully run `./runtests.sh tests/unit`? -----

Evaluation history

Date Model Scores Action Summary
stealth/space-bunny-alpha — closed resolved Merged (commit bd26cafd6, squashed merge of #2528): snapcraft.yaml now points patchelf sources at Snapcore's own patchelf branch with the failing s390x test disabled, unblocking s390x package builds; later reverted by #2531.
stealth/space-bunny-alpha — closed resolved PR #2528 merged into master (e39d240), switching patchelf sources to Snapcore's test-disabled branch to unblock s390x package builds.
qwen/qwen3.6-35b-a3b — — Merged into master to fix s390x build failures by switching patchelf to a custom branch with a failing test disabled. The one-line change was approved, passed CI, and integrated.
qwen3.6-35b-a3b-mtp-q6 — — Merged into master. Replaced upstream patchelf with a custom branch to bypass a test failure blocking s390x builds. Requires a dependent patchelf PR. Codecov reported a negligible coverage decrease.

Update history

No update history recorded yet.

Related work

  • Related To: snapcraft#2531 (confidence 90%)

    Follow-up commit 44be372e3 'snap: revert to patchelf 0.9 with local patches' undid this change shortly after merge.

  • Related To: snapcraft#2519 (confidence 70%)

    Commit e39d2404c (#2519) introduced the patchelf 0.10 sources that #2528 then redirected to the Snapcore branch.

  • Related To: patchelf#1 (confidence 55%)

    Companion upstream PR referenced in the description, required before running tests on s390x.

Related issues

Issue Project State Summary Similarity
#1873 elf: cleaner patchelf experience snapcraft merged Merged as df6992224: Snapcraft now prefers system Patchelf outside snaps and copies target files to avoid hard-link patching conflicts.
76%
#2006 many: use packaging logic to get patchelf snapcraft merged Merged PR #2006 in commit aa2a40322, replacing separate patchelf retrieval with shared packaging logic so snap and deb builds use the same version.
76%
#3589 snap: correct patch apply for patchelf snapcraft merged Merged PR #3589 fixed PatchELF patch application in the snap build via commit d9484faf9 (merge a636d26b5).
75%
#1935 elf: contemplate more patching scenarios snapcraft merged Merged PR #1935 as 048adc4a3, adding ELF patching for classic snaps built on bionic targeting core16 and for hooks built with Snapcraft.
75%
#1669 patchelf with ld-linux from the future snapcraft closed Resolved by commit bdaf0b7f1, which added Snapcraft handling for PatchELF and ELF files when the built glibc/linker does not match the base.
74%
#2081 elf: patch everything instead of a subset of elf files snapcraft merged Merged PR #2081 restored Snapcraft 2.39 behavior by patching every ELF file; commit 77770452b partially reverted 64f78f762a05.
74%
#1888 elf: make patchelf a dependency snapcraft merged Merged PR #1888 via commit 7c947f5ec, moving Patchelf out of project_loader build tools and into the deb and snap delivery mechanisms.
74%
#1742707 patchelf is missing from snapcraft Depends: snapcraft (launchpad) closed Reported missing patchelf apt dependency since snapcraft 2.38. Fixed by PR #1888 (commit 7c947f5ec, "elf: make patchelf a dependency"), released in snapcraft 2.40; issue closed by sergiusens.
73%
#3841 elf: add elf file patcher snapcraft merged Merged PR #3841 in commit e03a971b3, adding a patchelf-based ELF file patcher ported from Snapcraft 6.x for CRAFT-1191.
72%
#3277 pluginhandler: support using patchelf on strict snaps snapcraft merged Merged PR #3277 as fd8e95c3d, adding per-part enable-patchelf support to patch ELF rpaths and interpreters in strictly confined snaps.
72%