]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commit
debugedit: Fix install conflict when enable multilib.
authorWang Mingyu <wangmy@fujitsu.com>
Fri, 20 Dec 2024 07:49:27 +0000 (15:49 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 8 Jan 2025 12:36:45 +0000 (12:36 +0000)
commit2bc0fcacf0d33eea59a33d28f7263c90c2bf0823
treee65b98b46a727e30bda73b6aa58669b0a7e06846
parent3ac21b32b5f5616cc7c0641fb3132eec9b27e5b7
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>
meta/recipes-devtools/debugedit/debugedit_5.1.bb