diff options
author | Ming Liu <ming.liu@windriver.com> | 2014-10-30 10:59:18 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-11-04 10:27:12 +0000 |
commit | 69dd116eb957c964a539e71513f7f18f8ed5cff0 (patch) | |
tree | a6154ede701bf404e36583e3151d3e0a103367a2 /meta | |
parent | 72964fca1d044fbb49ae64c4bab3145e32240c9f (diff) | |
download | poky-69dd116eb957c964a539e71513f7f18f8ed5cff0.tar.gz |
pciutils: Fix multilib header conflict - pci/config.h
pci/config.h conflicts between 32-bit and 64-bit versions.
(From OE-Core rev: 21fb6bc1b030cab14e2c9b14607b34a62262ac06)
Signed-off-by: Ming Liu <ming.liu@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-bsp/pciutils/pciutils_3.2.1.bb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/recipes-bsp/pciutils/pciutils_3.2.1.bb b/meta/recipes-bsp/pciutils/pciutils_3.2.1.bb index 852a93e1b1..6e29953210 100644 --- a/meta/recipes-bsp/pciutils/pciutils_3.2.1.bb +++ b/meta/recipes-bsp/pciutils/pciutils_3.2.1.bb | |||
@@ -17,6 +17,8 @@ SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.bz2 \ | |||
17 | SRC_URI[md5sum] = "425b1acad6854cc2bbb06ac8e48e76fc" | 17 | SRC_URI[md5sum] = "425b1acad6854cc2bbb06ac8e48e76fc" |
18 | SRC_URI[sha256sum] = "12d52b19042e2fd058af12e7d877bbbce72213cb3a0b5ec7ff0703ac09e3dcde" | 18 | SRC_URI[sha256sum] = "12d52b19042e2fd058af12e7d877bbbce72213cb3a0b5ec7ff0703ac09e3dcde" |
19 | 19 | ||
20 | inherit multilib_header | ||
21 | |||
20 | PARALLEL_MAKE = "" | 22 | PARALLEL_MAKE = "" |
21 | 23 | ||
22 | PCI_CONF_FLAG = "ZLIB=yes DNS=yes SHARED=yes" | 24 | PCI_CONF_FLAG = "ZLIB=yes DNS=yes SHARED=yes" |
@@ -49,6 +51,8 @@ do_install () { | |||
49 | 51 | ||
50 | install -d ${D}${bindir} | 52 | install -d ${D}${bindir} |
51 | ln -s ../sbin/lspci ${D}${bindir}/lspci | 53 | ln -s ../sbin/lspci ${D}${bindir}/lspci |
54 | |||
55 | oe_multilib_header pci/config.h | ||
52 | } | 56 | } |
53 | 57 | ||
54 | PACKAGES =+ "${PN}-ids libpci libpci-dev libpci-dbg" | 58 | PACKAGES =+ "${PN}-ids libpci libpci-dev libpci-dbg" |