]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commit
linux-libc-headers: multilib_header asm/kvm_para.h and asm/bpf_perf_event.h
authorChen Qi <Qi.Chen@windriver.com>
Fri, 20 Apr 2018 09:07:35 +0000 (17:07 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 4 May 2018 12:28:05 +0000 (13:28 +0100)
commit2822c25757a2f26f87b3a5626db11a09489fe90b
treeba13f37c62868ce7abd2bcad5515b2700d06b526
parentb69c185a671267368d6849d72575f2b6869f412a
linux-libc-headers: multilib_header asm/kvm_para.h and asm/bpf_perf_event.h

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.

(From OE-Core rev: 89b4e77129990b842e2ca917b98473ec58205e88)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc