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

sys-fs/dd-rescue: Fix building for musl. #26455

Closed
wants to merge 1 commit into from

Conversation

listout
Copy link
Contributor

@listout listout commented Jul 17, 2022

The original patch was written by gentoo developer Thomas Deutschmann
whissi@gentoo.org, but the patch needed to be rebased. I've added in
my secmem patch inside it (another musl fix for dd-rescue).

Closes: https://bugs.gentoo.org/829285

Signed-off-by: brahmajit das listout@protonmail.com

@gentoo-bot
Copy link

Pull Request assignment

Submitter: @listout
Areas affected: ebuilds
Packages affected: sys-fs/dd-rescue

sys-fs/dd-rescue: @gentoo/base-system

Linked bugs

Bugs linked: 829285


In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of ConductCopyright policy (expl.) ● DevmanualGitHub PRsProxy-maint guide

@gentoo-bot gentoo-bot added assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. labels Jul 17, 2022
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2022-07-17 20:29 UTC
Newest commit scanned: 58388b5
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/cf24fca4fd/output.html

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2022-07-18 04:59 UTC
Newest commit scanned: b54d5d5
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/62f0ee0349/output.html

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2022-09-13 19:43 UTC
Newest commit scanned: 65e57c6
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/6eb34d8c07/output.html

@thesamesam
Copy link
Member

Doesn't apply.

>>> Source unpacked in /var/tmp/portage/sys-fs/dd-rescue-1.99.12/work
>>> Preparing source in /var/tmp/portage/sys-fs/dd-rescue-1.99.12/work/dd_rescue-1.99.12 ...
 * Applying dd-rescue-1.99.11-musl-r2.patch ...
patching file configure.ac
Hunk #1 FAILED at 11.
1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej
patching file ddr_ctrl.h
patching file ffs.h
patching file fiemap.h
patching file fmt_no.h
patching file fstrim.h
patching file libddr_hash.c
patching file libddr_lzo.c
Hunk #1 succeeded at 26 with fuzz 2.
patching file libddr_null.c
patching file sha512.h
patching file secmem.c                                                                                                                                                                                   [ !! ]
 * ERROR: sys-fs/dd-rescue-1.99.12::gentoo failed (prepare phase):
 *   patch -p1  failed with /var/tmp/portage/sys-fs/dd-rescue-1.99.12/files/dd-rescue-1.99.11-musl-r2.patch
 *
 * Call stack:
 *               ebuild.sh, line  122:  Called src_prepare
 *             environment, line 2413:  Called default
 *      phase-functions.sh, line  872:  Called default_src_prepare
 *      phase-functions.sh, line  937:  Called __eapi6_src_prepare
 *             environment, line  263:  Called eapply '/var/tmp/portage/sys-fs/dd-rescue-1.99.12/files/dd-rescue-1.99.11-musl-r2.patch'
 *             environment, line 1154:  Called _eapply_patch '/var/tmp/portage/sys-fs/dd-rescue-1.99.12/files/dd-rescue-1.99.11-musl-r2.patch'
 *             environment, line 1092:  Called __helpers_die 'patch -p1  failed with /var/tmp/portage/sys-fs/dd-rescue-1.99.12/files/dd-rescue-1.99.11-musl-r2.patch'
 *   isolated-functions.sh, line  112:  Called die
 * The specific snippet of code:
 *              die "$@"
 *

@listout listout force-pushed the dd-rescue-fix-patch branch 2 times, most recently from 93889e3 to 830488c Compare September 15, 2022 07:02
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2022-09-15 07:03 UTC
Newest commit scanned: 93889e3
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/63a8ec71bc/output.html

@listout
Copy link
Contributor Author

listout commented Sep 15, 2022

@thesamesam Thanks for that, I've fixed it. But the patch for x.11 and x.12 is not the same and I cannot rename the patch file without losing history. Any advice?

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2022-09-15 07:23 UTC
Newest commit scanned: 830488c
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/c75d46af27/output.html

@thesamesam
Copy link
Member

@thesamesam Thanks for that, I've fixed it. But the patch for x.11 and x.12 is not the same and I cannot rename the patch file without losing history. Any advice?

Just fix x.12 (copy to a new file and note in the commit message you based it on foo.patch).

The original patch was written by gentoo developer Thomas Deutschmann
<whissi@gentoo.org>, but the patch needed to be rebased. I've added in
my secmem patch inside it (another musl fix for dd-rescue).

Closes: https://bugs.gentoo.org/829285
Signed-off-by: brahmajit das <listout@protonmail.com>
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2023-06-29 18:55 UTC
Newest commit scanned: 475fdcc
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/1b474436a6/output.html

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR.
Projects
None yet
4 participants