summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2022-02-24 15:41:07 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-02-25 12:41:23 +0000
commit9954ff5056a0f4789f303a8d8cf9834cfd7d688c (patch)
tree836fbc8faa50c3c6823898a6894017c21b548f64 /meta/recipes-core
parentf44c0187ed3133ecd32e96b2eb2df790f001cda7 (diff)
downloadpoky-9954ff5056a0f4789f303a8d8cf9834cfd7d688c.tar.gz
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 (From OE-Core rev: 0982c2bc19f4cacd72fd43f93c6a0a4d45a75c6a) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-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 c1c0114a07..7f9e7503a1 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -162,6 +162,7 @@ do_install_armmultilib () {
162 oe_multilib_header bits/shm.h bits/sigstack.h bits/stat.h bits/statfs.h bits/typesizes.h 162 oe_multilib_header bits/shm.h bits/sigstack.h bits/stat.h bits/statfs.h bits/typesizes.h
163 oe_multilib_header bits/procfs-id.h bits/procfs.h bits/shmlba.h 163 oe_multilib_header bits/procfs-id.h bits/procfs.h bits/shmlba.h
164 oe_multilib_header bits/struct_stat.h bits/pthread_stack_min.h 164 oe_multilib_header bits/struct_stat.h bits/pthread_stack_min.h
165 oe_multilib_header bits/dl_find_object.h bits/rseq.h bits/timesize.h
165 166
166 oe_multilib_header fpu_control.h gnu/lib-names.h gnu/stubs.h ieee754.h 167 oe_multilib_header fpu_control.h gnu/lib-names.h gnu/stubs.h ieee754.h
167 168