[oe] [PATCH 26/36] hwloc: fix multilib problem

[Armin Kuster]

From: "Qi.Chen at windriver.com" <Qi.Chen at windriver.com>

Use libhwloc instead of lib${PN} to fix problem in case of multilib.
Otherwise, when installing lib32-hwloc into image, we would have the
following error at do_rootfs.

  - nothing provides lib32-liblib32-hwloc = 1.11.5-r0 needed by lib32-hwloc-1.11.5-r0.corei7_32

Also, fix FILES variable for libhwloc to not contain .so link file.
This would fix the QA issue, and the INSANE_SKIP line is no longer needed.

Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
Signed-off-by: Armin Kuster <akuster808 at gmail.com>
(cherry picked from commit 303fd6d589250c4a2ef23342d639348464e1a593)
Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta-oe/recipes-extended/hwloc/hwloc_1.11.5.bb | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/meta-oe/recipes-extended/hwloc/hwloc_1.11.5.bb b/meta-oe/recipes-extended/hwloc/hwloc_1.11.5.bb
index d7fdd82..5a335b9 100644
--- a/meta-oe/recipes-extended/hwloc/hwloc_1.11.5.bb
+++ b/meta-oe/recipes-extended/hwloc/hwloc_1.11.5.bb
@@ -24,9 +24,6 @@ PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 cairo,cairo"
 PACKAGECONFIG[pci] = "--enable-pci,--disable-pci,libpciaccess,libpciaccess"
 
 # Split hwloc library into separate subpackage
-PACKAGES_prepend = " lib${PN} "
-FILES_lib${PN} += "${libdir}/lib${PN}.so*"
-RDEPENDS_${PN} += "lib${PN} (= ${EXTENDPKGV})"
-
-# XXX dev-so QA check doesn't like soname symlinks in non-dev packages
-INSANE_SKIP_lib${PN} += "dev-so"
+PACKAGES_prepend = " libhwloc "
+FILES_libhwloc += "${libdir}/libhwloc.so.*"
+RDEPENDS_${PN} += "libhwloc (= ${EXTENDPKGV})"
-- 
2.7.4