summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQiang Chen <qiang.chen@windriver.com>2013-11-18 10:18:32 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-20 14:03:05 +0000
commit4571c9e963c667bce8b61e88816b34ba74b2aab7 (patch)
tree24d221b450249e2ed3506f5025576f250065c5ea
parent4df9daee5c732c0a20dabe8515577238a1508512 (diff)
downloadopenembedded-core-contrib-4571c9e963c667bce8b61e88816b34ba74b2aab7.tar.gz
openembedded-core-contrib-4571c9e963c667bce8b61e88816b34ba74b2aab7.tar.bz2
openembedded-core-contrib-4571c9e963c667bce8b61e88816b34ba74b2aab7.zip
util-linux: collect libs for related libxx-dev package
Commit 91c0f9e3 moves library files to base_libdir for safe while symbol link libblkid.so, libmount.so and libuuid.so are placed in libdir, not base_libdir. Meanwhile, libblkid.la, libmount.la and libuuid.la are placed in libdir too. Thus they are missed by related develop package and collected by util-linux's develop package at last. Fix it. Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com> Signed-off-by: Qiang Chen <qiang.chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 94c0ba0940..5d1dcd1616 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -77,11 +77,11 @@ FILES_util-linux-reset = "${base_bindir}/reset"
FILES_util-linux-partx = "${sbindir}/partx"
FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*"
-FILES_util-linux-libblkid-dev = "${base_libdir}/libblkid.so ${base_libdir}/libblkid.la ${includedir}/blkid ${libdir}/pkgconfig/blkid.pc"
+FILES_util-linux-libblkid-dev = "${libdir}/libblkid.so ${libdir}/libblkid.la ${includedir}/blkid ${libdir}/pkgconfig/blkid.pc"
FILES_util-linux-libmount = "${base_libdir}/libmount.so.*"
-FILES_util-linux-libmount-dev = "${base_libdir}/libmount.so ${base_libdir}/libmount.la ${includedir}/libmount ${libdir}/pkgconfig/mount.pc"
+FILES_util-linux-libmount-dev = "${libdir}/libmount.so ${libdir}/libmount.la ${includedir}/libmount ${libdir}/pkgconfig/mount.pc"
FILES_util-linux-libuuid = "${base_libdir}/libuuid.so.*"
-FILES_util-linux-libuuid-dev = "${base_libdir}/libuuid.so ${base_libdir}/libuuid.la ${includedir}/uuid ${libdir}/pkgconfig/uuid.pc"
+FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so ${libdir}/libuuid.la ${includedir}/uuid ${libdir}/pkgconfig/uuid.pc"
FILES_util-linux-lscpu = "${bindir}/lscpu"
FILES_util-linux-fsck = "${base_sbindir}/fsck*"