summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2019-03-12 13:40:24 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-03-18 11:12:26 +0000
commitbc853f87567bf977ab56e95aaa922fe194fdf990 (patch)
tree2c3c6366fbf0ce3283d967a4bc775804d81e0b27
parent2bfdddfabfc9d5e80ba628283d2d344c49bceaff (diff)
downloadpoky-bc853f87567bf977ab56e95aaa922fe194fdf990.tar.gz
glibc: fix do_populate_sdk fail when multilib used
fix below error: file /usr/include/bits/procfs-id.h conflicts between attempted installs of lib32-libc6-dev-2.29-r0.armv7vet2hf_vfp and libc6-dev-2.29-r0.aarch64 file /usr/include/bits/procfs.h conflicts between attempted installs of lib32-libc6-dev-2.29-r0.armv7vet2hf_vfp and libc6-dev-2.29-r0.aarch64 file /usr/include/bits/shmlba.h conflicts between attempted installs of lib32-libc6-dev-2.29-r0.armv7vet2hf_vfp and libc6-dev-2.29-r0.aarch64 (From OE-Core rev: 1e9120096da81171e9213b0b78df0aff7002de15) Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/glibc/glibc-package.inc1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index b9259612d4..b7c64a0b2e 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -148,6 +148,7 @@ do_install_armmultilib () {
148 oe_multilib_header bits/endian.h bits/fcntl.h bits/fenv.h bits/fp-fast.h bits/hwcap.h bits/ipc.h bits/link.h bits/wordsize.h 148 oe_multilib_header bits/endian.h bits/fcntl.h bits/fenv.h bits/fp-fast.h bits/hwcap.h bits/ipc.h bits/link.h bits/wordsize.h
149 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 149 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
150 oe_multilib_header bits/shm.h bits/sigstack.h bits/stat.h bits/statfs.h bits/typesizes.h 150 oe_multilib_header bits/shm.h bits/sigstack.h bits/stat.h bits/statfs.h bits/typesizes.h
151 oe_multilib_header bits/procfs-id.h bits/procfs.h bits/shmlba.h
151 152
152 oe_multilib_header fpu_control.h gnu/lib-names.h gnu/stubs.h ieee754.h 153 oe_multilib_header fpu_control.h gnu/lib-names.h gnu/stubs.h ieee754.h
153 154