Skip to contentSkip to conversation

util-linux: Add package for libmount

PATCH In review MiLo 3 participants 3 messages Feb 19, 2013 – Feb 27, 2013

lore
Share & tools
lore

MiLo

author
#0 lore raw

PATCH v2 1/1 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.

---
 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 deletions(-)
meta/recipes-core/util-linux/util-linux.inc +3 -0
index 10439c0..bd7b089 100644
@@ -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"
meta/recipes-core/util-linux/util-linux_2.22.2.bb +1 -1
index dd95573..f91784b 100644
@@ -1,5 +1,5 @@
 MAJOR_VERSION = "2.22"
-PR = "r0"
+PR = "r1"
 require util-linux.inc
 
 # note that `lscpu' is under GPLv3+
Signature · 1 line
1.7.5.4
#1 lore raw

Is there any feedback on this patch yet?

Mike.

Quoted 47 lines · MiLo

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.

---
  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 deletions(-)
meta/recipes-core/util-linux/util-linux.inc +3 -0
index 10439c0..bd7b089 100644
@@ -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"
meta/recipes-core/util-linux/util-linux_2.22.2.bb +1 -1
index dd95573..f91784b 100644
@@ -1,5 +1,5 @@
  MAJOR_VERSION = "2.22"
-PR = "r0"
+PR = "r1"
  require util-linux.inc
 
  # note that `lscpu' is under GPLv3+