diff options
author | Wang Mingyu <wangmy@fujitsu.com> | 2024-12-20 15:49:27 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-01-08 12:37:20 +0000 |
commit | ca3213f2254064dd7e3f4f53df56e7100683128e (patch) | |
tree | 8ad5d19cc239c8a1a25b86b76cb78496dadd3b9e | |
parent | e77f8ca209d81d64b5d33af64481eccc241ad13d (diff) | |
download | poky-ca3213f2254064dd7e3f4f53df56e7100683128e.tar.gz |
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) \
(From OE-Core rev: 2bc0fcacf0d33eea59a33d28f7263c90c2bf0823)
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>
-rw-r--r-- | meta/recipes-devtools/debugedit/debugedit_5.1.bb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-devtools/debugedit/debugedit_5.1.bb b/meta/recipes-devtools/debugedit/debugedit_5.1.bb index 5dc103f643..00c40473c4 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 | |||
21 | DEPENDS = "elfutils xxhash" | 21 | DEPENDS = "elfutils xxhash" |
22 | DEPENDS:append:libc-musl = " musl-legacy-error" | 22 | DEPENDS:append:libc-musl = " musl-legacy-error" |
23 | 23 | ||
24 | inherit pkgconfig autotools | 24 | inherit pkgconfig autotools multilib_script |
25 | 25 | ||
26 | RDEPENDS:${PN} += "bash elfutils-binutils" | 26 | RDEPENDS:${PN} += "bash elfutils-binutils" |
27 | 27 | ||
28 | BBCLASSEXTEND = "native nativesdk" | 28 | BBCLASSEXTEND = "native nativesdk" |
29 | |||
30 | MULTILIB_SCRIPTS = "${PN}:${bindir}/find-debuginfo" | ||
31 | |||