glibc: fix multilib headers conflict for arm

Fixes:
Error: Transaction test error:
  file /usr/include/bits/dl_find_object.h conflicts between attempted installs of lib32-libc6-dev-2.35-r0.armv7vet2hf_vfp and libc6-dev-2.35-r0.cortexa57
  file /usr/include/bits/rseq.h conflicts between attempted installs of lib32-libc6-dev-2.35-r0.armv7vet2hf_vfp and libc6-dev-2.35-r0.cortexa57
  file /usr/include/bits/timesize.h conflicts between attempted installs of lib32-libc6-dev-2.35-r0.armv7vet2hf_vfp and libc6-dev-2.35-r0.cortexa57

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index c1c0114a074e5c20e2a221fbb9150856f239edff..7f9e7503a1c796a3cb19ac3bf06368f173be0103 100644 (file)
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -162,6 +162,7 @@ do_install_armmultilib () {
        oe_multilib_header bits/shm.h bits/sigstack.h bits/stat.h bits/statfs.h bits/typesizes.h
        oe_multilib_header bits/procfs-id.h bits/procfs.h bits/shmlba.h
        oe_multilib_header bits/struct_stat.h bits/pthread_stack_min.h
+       oe_multilib_header bits/dl_find_object.h bits/rseq.h bits/timesize.h
 
        oe_multilib_header fpu_control.h gnu/lib-names.h gnu/stubs.h ieee754.h