From: Wang Mingyu <wangmy@fujitsu.com>
Date: Fri, 20 Dec 2024 07:49:27 +0000 (+0800)
Subject: debugedit: Fix install conflict when enable multilib.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bc0fcacf0d33eea59a33d28f7263c90c2bf0823;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

debugedit: Fix install conflict when enable multilib.

Error: Transaction test error:
  file /usr/bin/find-debuginfo conflicts between attempted installs of debugedit-5.1-r0.core2_64 and lib32-debugedit-5.1-r0.core2_32

The differences of find-debuginfo are as follows:

@@ -360,7 +360,7 @@ add_minidebug()
   # symbol and NOBITS sections so cannot use --keep-only because that is
   # too aggressive. Field $2 is the section name, $3 is the section type
   # and $8 are the section flags.
-  local remove_sections=`x86_64-poky-linux-readelf -W -S "$debuginfo" \
+  local remove_sections=`i686-pokymllib32-linux-readelf -W -S "$debuginfo" \
        | awk '{ if (index($2,".debug_") != 1 \
                     && ($3 == "PROGBITS" || $3 == "NOTE" || $3 == "NOBITS") \
                     && index($8,"A") == 0) \

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-devtools/debugedit/debugedit_5.1.bb b/meta/recipes-devtools/debugedit/debugedit_5.1.bb
index 5dc103f6438..00c40473c44 100644
--- a/meta/recipes-devtools/debugedit/debugedit_5.1.bb
+++ b/meta/recipes-devtools/debugedit/debugedit_5.1.bb
@@ -21,8 +21,11 @@ SRC_URI[sha256sum] = "ee9b688b2ed8fa62551c54cb5dc31aaa05853e7dedbd9e1237c77894ea
 DEPENDS = "elfutils xxhash"
 DEPENDS:append:libc-musl = " musl-legacy-error"
 
-inherit pkgconfig autotools
+inherit pkgconfig autotools multilib_script
 
 RDEPENDS:${PN} += "bash elfutils-binutils"
 
 BBCLASSEXTEND = "native nativesdk"
+
+MULTILIB_SCRIPTS = "${PN}:${bindir}/find-debuginfo"
+