aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQi.Chen@windriver.com <Qi.Chen@windriver.com>2017-12-26 13:50:46 +0800
committerArmin Kuster <akuster808@gmail.com>2018-02-01 07:32:04 -0800
commited6ed8d6ffff188d1a42072f8248bf377b1b651b (patch)
tree0c88a68bc2a1e072f6a8c9189e0aadd809759bdc
parent4bdaf0c9e1f09747362d600b63373f36e2c1fd0c (diff)
downloadmeta-openembedded-contrib-ed6ed8d6ffff188d1a42072f8248bf377b1b651b.tar.gz
meta-openembedded-contrib-ed6ed8d6ffff188d1a42072f8248bf377b1b651b.tar.bz2
meta-openembedded-contrib-ed6ed8d6ffff188d1a42072f8248bf377b1b651b.zip
hwloc: fix multilib problem
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@windriver.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> (cherry picked from commit 303fd6d589250c4a2ef23342d639348464e1a593) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-extended/hwloc/hwloc_1.11.5.bb9
1 files 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 d7fdd823c0..5a335b9249 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})"