]> code.ossystems Code Review - openembedded-core.git/commitdiff
pciutils: Fix multilib header conflict - pci/config.h
authorMing Liu <ming.liu@windriver.com>
Thu, 30 Oct 2014 02:59:18 +0000 (10:59 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 4 Nov 2014 10:20:33 +0000 (10:20 +0000)
pci/config.h conflicts between 32-bit and 64-bit versions.

Signed-off-by: Ming Liu <ming.liu@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/recipes-bsp/pciutils/pciutils_3.2.1.bb

index 852a93e1b163bbf30c9d88d0a1bcedc5e7f90abd..6e299532107ff107d19c0f9292f561a56a189b85 100644 (file)
@@ -17,6 +17,8 @@ SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.bz2 \
 SRC_URI[md5sum] = "425b1acad6854cc2bbb06ac8e48e76fc"
 SRC_URI[sha256sum] = "12d52b19042e2fd058af12e7d877bbbce72213cb3a0b5ec7ff0703ac09e3dcde"
 
+inherit multilib_header
+
 PARALLEL_MAKE = ""
 
 PCI_CONF_FLAG = "ZLIB=yes DNS=yes SHARED=yes"
@@ -49,6 +51,8 @@ do_install () {
 
        install -d ${D}${bindir}
        ln -s ../sbin/lspci ${D}${bindir}/lspci
+
+       oe_multilib_header pci/config.h
 }
 
 PACKAGES =+ "${PN}-ids libpci libpci-dev libpci-dbg"