When building SDK via populate_sdk for qemuarm64 with multilib
enabled, we would have conflict about bits/floatn.h at populate_sdk
time.
file /usr/include/asm/bpf_perf_event.h conflicts between attempted installs
of lib32-linux-libc-headers-dev-4.15.7-r0.armv7vehf_vfp and
linux-libc-headers-dev-4.15.7-r0.aarch64
file /usr/include/asm/kvm_para.h conflicts between attempted installs of
lib32-linux-libc-headers-dev-4.15.7-r0.armv7vehf_vfp and
linux-libc-headers-dev-4.15.7-r0.aarch64
Apply oe_multilib_header on these header files to fix the problem.
Signed-off-by: Chen Qi <qi.c...@windriver.com>
---
meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
index 1657df6..9903c06 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
@@ -78,7 +78,7 @@ do_install_append_arm () {
}
do_install_armmultilib () {
- oe_multilib_header asm/auxvec.h asm/bitsperlong.h asm/byteorder.h
asm/fcntl.h asm/hwcap.h asm/ioctls.h asm/kvm.h asm/mman.h asm/param.h
asm/perf_regs.h
+ oe_multilib_header asm/auxvec.h asm/bitsperlong.h asm/byteorder.h
asm/fcntl.h asm/hwcap.h asm/ioctls.h asm/kvm.h asm/kvm_para.h asm/mman.h
asm/param.h asm/perf_regs.h asm/bpf_perf_event.h
oe_multilib_header asm/posix_types.h asm/ptrace.h asm/setup.h
asm/sigcontext.h asm/siginfo.h asm/signal.h asm/stat.h asm/statfs.h asm/swab.h
asm/types.h asm/unistd.h
}
--
1.9.1
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
