aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/util-linux
diff options
context:
space:
mode:
authorQing He <qing.he@intel.com>2011-01-19 09:44:51 +0800
committerSaul Wold <sgw@linux.intel.com>2011-01-24 14:09:12 -0800
commit036e4a920fe1dd97c521eb44dcb50bf3df29e43b (patch)
treece7b27b85810292d9e534b321912a621e7868348 /meta/recipes-core/util-linux
parentff02b364282befc1f8606b0bbf7fa659e7765ca5 (diff)
downloadopenembedded-core-contrib-036e4a920fe1dd97c521eb44dcb50bf3df29e43b.tar.gz
openembedded-core-contrib-036e4a920fe1dd97c521eb44dcb50bf3df29e43b.tar.bz2
openembedded-core-contrib-036e4a920fe1dd97c521eb44dcb50bf3df29e43b.zip
util-linux: separately packaging blkid and uuid
To avoid full set of util-linux included by library dependencies. Fixes [BUGID #661]. Signed-off-by: Qing He <qing.he@intel.com>
Diffstat (limited to 'meta/recipes-core/util-linux')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc9
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.17.2.bb2
2 files changed, 9 insertions, 2 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 91b57c6b07..931a627b56 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -27,7 +27,9 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v${MAJOR_VERSION}/u
file://make_include \
"
-PACKAGES_prepend = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-swaponoff util-linux-losetup util-linux-umount util-linux-mount util-linux-readprofile "
+PACKAGES_prepend = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-swaponoff \
+ util-linux-losetup util-linux-umount util-linux-mount util-linux-readprofile \
+ util-linux-libblkid util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev "
PACKAGES_virtclass-native = ""
@@ -48,6 +50,11 @@ FILES_util-linux-mount = "/bin/mount.${PN}"
FILES_util-linux-umount = "/bin/umount.${PN}"
FILES_util-linux-readprofile = "/sbin/readprofile"
+FILES_util-linux-libblkid = "/usr/lib/libblkid.so.*"
+FILES_util-linux-libblkid-dev = "/usr/lib/libblkid.so /usr/lib/libblkid.a /usr/lib/libblkid.la /usr/include/blkid"
+FILES_util-linux-libuuid = "/usr/lib/libuuid.so.*"
+FILES_util-linux-libuuid-dev = "/usr/lib/libuuid.so /usr/lib/libuuid.a /usr/lib/libuuid.la /usr/include/uuid"
+
RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile "
RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup"
diff --git a/meta/recipes-core/util-linux/util-linux_2.17.2.bb b/meta/recipes-core/util-linux/util-linux_2.17.2.bb
index 9b344d4de2..662bde0dfc 100644
--- a/meta/recipes-core/util-linux/util-linux_2.17.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.17.2.bb
@@ -1,6 +1,6 @@
MAJOR_VERSION = "2.17"
require util-linux.inc
-PR="r1"
+PR = "r2"
SRC_URI += "file://uclibc-compile.patch \
file://util-linux-ng-replace-siginterrupt.patch"