commit:     e12ac86cb72002b216be0ae316ae7062a91268fa
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  7 05:31:24 2026 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan  7 05:31:24 2026 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=e12ac86c

Revert "estrip: adjust build ID adjustment for splitdebug w/ 
FEATURES=-installsources"

This reverts commit 86eded1c04bd633e46d65449a4dc063579caadd6.

As Andre Ryan reports on the bug, this can't work because debugedit -i
isn't starting from the same inputs for its hash.

Bug: https://bugs.gentoo.org/968220
Signed-off-by: Sam James <sam <AT> gentoo.org>

 bin/estrip | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/bin/estrip b/bin/estrip
index bc6071f8fb..590e40f76e 100755
--- a/bin/estrip
+++ b/bin/estrip
@@ -168,12 +168,6 @@ save_elf_debug() {
                                        buildid=$("${name_of[debugedit]}" -i \
                                                -s "${CATEGORY}/${PF}:${SLOT}" \
                                                "${src}")
-
-                                       # We need to process the splitdebug 
file too
-                                       # if we're doing it at this late 
juncture (bug #968220)
-                                       "${name_of[debugedit]}" -i \
-                                               -s "${CATEGORY}/${PF}:${SLOT}" \
-                                               "${dst}"
                                elif ! contains_word buildid 
"${warned_for[debugedit]}"; then
                                        warned_for[debugedit]+=" buildid"
                                        stash_warning <<-'EOF'

Reply via email to