From 2e79110e31da940728d42411cad3d019d570fc31 Mon Sep 17 00:00:00 2001 From: MiLo Date: Tue, 19 Feb 2013 18:23:15 +0100 Subject: util-linux: Add package for libmount The libmount shared library was part of util-linux. This caused util-linux-mount to RDEPEND on util-linux, so including that would also drag in all of util-linux and all its recommendations. To break this circular dependency, add a libmount package that holds the libmount.so.* files, just like the other libraries built by util- linux. Signed-off-by: MiLo Signed-off-by: Saul Wold --- meta/recipes-core/util-linux/util-linux.inc | 3 +++ meta/recipes-core/util-linux/util-linux_2.22.2.bb | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'meta/recipes-core/util-linux') diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 10439c0797..bd7b089d8e 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -31,6 +31,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin PACKAGES =+ "util-linux-agetty 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-libmount util-linux-libmount-dev \ util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \ util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \ util-linux-mkfs util-linux-mcookie util-linux-reset" @@ -64,6 +65,8 @@ FILES_util-linux-reset = "${base_bindir}/reset" 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-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-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-lscpu = "${bindir}/lscpu" diff --git a/meta/recipes-core/util-linux/util-linux_2.22.2.bb b/meta/recipes-core/util-linux/util-linux_2.22.2.bb index dd9557320c..f91784b56d 100644 --- a/meta/recipes-core/util-linux/util-linux_2.22.2.bb +++ b/meta/recipes-core/util-linux/util-linux_2.22.2.bb @@ -1,5 +1,5 @@ MAJOR_VERSION = "2.22" -PR = "r0" +PR = "r1" require util-linux.inc # note that `lscpu' is under GPLv3+ -- cgit 1.2.3-korg