[OE-core] [PATCH] glibc-package.inc: fix multilib headers conflict

[Kang Kai]

On 2020/2/11 下午11:07, kai.kang at windriver.com wrote:
> From: Kai Kang <kai.kang at windriver.com>
>
> 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

Ping.

Could reproduce with config

require conf/multilib.conf
MACHINE = "qemuarm64"
MULTILIBS = "multilib:lib32"
DEFAULTTUNE_virtclass-multilib-lib32 = "armv7vethf"

Regards,
Kai


>
> Signed-off-by: Kai Kang <kai.kang at windriver.com>
> ---
>   meta/recipes-core/glibc/glibc-package.inc | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
> index 3aed7be4f8..285a9aa2f5 100644
> --- a/meta/recipes-core/glibc/glibc-package.inc
> +++ b/meta/recipes-core/glibc/glibc-package.inc
> @@ -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


-- 
Kai Kang