glibc-package.inc: fix multilib headers conflict
PATCH 1/1 glibc-package.inc: fix multilib headers conflict
From: Kai Kang <[email protected]>
Pass bits/endianness.h and bits/struct_rwlock.h to oe_multilib_header in glibc-package.inc to fix files conflict:
| Error: Transaction check error: | file /usr/include/bits/endianness.h conflicts between attempted installs of lib32-libc6-dev-2.31-r0.armv7vet2hf_vfp and libc6-dev-2.31-r0.aarch64 | file /usr/include/bits/struct_rwlock.h conflicts between attempted installs of lib32-libc6-dev-2.31-r0.armv7vet2hf_vfp and libc6-dev-2.31-r0.aarch64
--- meta/recipes-core/glibc/glibc-package.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/glibc/glibc-package.inc +1 -1
@@ -87,7 +87,7 @@ do_install() { rmdir --ignore-fail-on-non-empty ${D}${libexecdir} fi - oe_multilib_header bits/syscall.h bits/long-double.h bits/floatn.h + oe_multilib_header bits/syscall.h bits/long-double.h bits/floatn.h bits/endianness.h bits/struct_rwlock.h if [ -f ${D}${bindir}/mtrace ]; then sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' -e '2s,exec.*perl,exec ${USRBINPATH}/env perl,' ${D}${bindir}/mtrace
Signature · 1 line
2.17.1
Quoted 8 lines · On 2020/2/11 下午11:07, [email protected] wrote:
From: Kai Kang <[email protected]>
Pass
bits/endianness.handbits/struct_rwlock.htooe_multilib_headerin glibc-package.inc to fix files conflict:| Error: Transaction check error: | file /usr/include/bits/endianness.h conflicts between attempted installs of lib32-libc6-dev-2.31-r0.armv7vet2hf_vfp and libc6-dev-2.31-r0.aarch64 | file /usr/include/bits/struct_rwlock.h conflicts between attempted installs of lib32-libc6-dev-2.31-r0.armv7vet2hf_vfp and libc6-dev-2.31-r0.aarch64
Ping.
Could reproduce with config
require conf/multilib.conf
MACHINE = "qemuarm64"
MULTILIBS = "multilib:lib32" DEFAULTTUNE_virtclass-multilib-lib32 = "armv7vethf"
Regards,
Kai
Quoted 19 lines
Signed-off-by Kai Kang <[email protected]>--- meta/recipes-core/glibc/glibc-package.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)meta/recipes-core/glibc/glibc-package.inc +1
-1@@ -87,7 +87,7 @@ do_install() { rmdir --ignore-fail-on-non-empty ${D}${libexecdir} fi - oe_multilib_header bits/syscall.h bits/long-double.h bits/floatn.h + oe_multilib_header bits/syscall.h bits/long-double.h bits/floatn.h bits/endianness.h bits/struct_rwlock.h if [ -f ${D}${bindir}/mtrace ]; then sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' -e '2s,exec.*perl,exec ${USRBINPATH}/env perl,' ${D}${bindir}/mtrace
Signature · 1 line
Kai Kang
Quoted 10 lines · Kang Kai
Quoted 8 lines · On 2020/2/11 下午11:07, [email protected] wrote:
From: Kai Kang <[email protected]>
Pass
bits/endianness.handbits/struct_rwlock.htooe_multilib_headerin glibc-package.inc to fix files conflict:| Error: Transaction check error: | file /usr/include/bits/endianness.h conflicts between attempted installs of lib32-libc6-dev-2.31-r0.armv7vet2hf_vfp and libc6-dev-2.31-r0.aarch64 | file /usr/include/bits/struct_rwlock.h conflicts between attempted installs of lib32-libc6-dev-2.31-r0.armv7vet2hf_vfp and libc6-dev-2.31-r0.aarch64
Quoted 8 lines
Ping.
Could reproduce with config
require
conf/multilib.conf
MACHINE = "qemuarm64"
MULTILIBS = "multilib:lib32" DEFAULTTUNE_virtclass-multilib-lib32 = "armv7vethf"
And
IMAGE_INSTALL_append = " lib32-libc6-dev libc6-dev"
of course.
Quoted 25 lines
Regards,
KaiQuoted 18 lines
Signed-off-by Kai Kang <[email protected]>---
meta/recipes-core/glibc/glibc-package.inc | 2 +-1 file changed, 1 insertion(+), 1 deletion(-)meta/recipes-core/glibc/glibc-package.inc +0
-0@@ -87,7 +87,7 @@ do_install() { rmdir --ignore-fail-on-non-empty ${D}${libexecdir}fi
-oe_multilib_headerbits/syscall.hbits/long-double.hbits/floatn.h
+oe_multilib_headerbits/syscall.hbits/long-double.hbits/floatn.hbits/endianness.hbits/struct_rwlock.h
if [ -f ${D}${bindir}/mtrace ]; then
sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' -e '2s,exec.*perl,exec ${USRBINPATH}/env perl,' ${D}${bindir}/mtrace
Signature · 1 line
Kai Kang