Fix conflict error when enable multilib.

file /usr/include/bits/pthread_stack_min.h conflicts between attempted installs of libc6-dev-2.34-r0.aarch64 and lib32-libc6-dev-2.34-r0.armv7ahf_neon

Signed-off-by: Lei Maohui <leimaohui@fujitsu.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 56fbf8b08cedab0560c8f09367f304acdb52dfc3..e25561d9b991d869d6d54843dc35232f02572b15 100644 (file)
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -160,7 +160,7 @@ do_install_armmultilib () {
        oe_multilib_header bits/local_lim.h bits/mman.h bits/msq.h bits/pthreadtypes.h bits/pthreadtypes-arch.h  bits/sem.h  bits/semaphore.h bits/setjmp.h
        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
+       oe_multilib_header bits/struct_stat.h bits/pthread_stack_min.h
 
        oe_multilib_header fpu_control.h gnu/lib-names.h gnu/stubs.h ieee754.h