[gentoo-commits] proj/portage:master commit in: bin/

[Sam James]

commit:     48229ca5dad6404e52a0b24bdf3a913b6820231b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May  6 01:51:11 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun  3 21:02:13 2025 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=48229ca5

estrip: salt build IDs with ${CATEGORY}/${PF}:${SLOT}

Use debugedit to salt build IDs with ${CATEGORY}/${PF}:${SLOT} to avoid
file collisions (same build ID generated as another package) where a bundled
library is installed.

This is initially done only with FEATURES=installsources as that's the
case we require debugedit in.

Bug: https://bugs.gentoo.org/549672
Bug: https://bugs.gentoo.org/953869
Signed-off-by: Sam James <sam <AT> gentoo.org>
Part-of: https://github.com/gentoo/portage/pull/1436
Signed-off-by: Sam James <sam <AT> gentoo.org>

 bin/estrip | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/estrip b/bin/estrip
index 086c717a44..e587c08994 100755
--- a/bin/estrip
+++ b/bin/estrip
@@ -231,6 +231,7 @@ save_elf_sources() {
        # (the -i flag below).  save that output so we don't need to recompute
        # it later on in the save_elf_debug step.
        buildid=$("${path_of[debugedit]}" -i \
+               -s "${CATEGORY}/${PF}:${SLOT}" \
                -b "${WORKDIR}" \
                -d "${prepstrip_sources_dir}" \
                -l "${tmpdir}/sources/${x##*/}.${BASHPID}" \