| Submitter | MiLo |
|---|---|
| Date | Feb. 19, 2013, 5:23 p.m. |
| Message ID | <1361294595-2454-1-git-send-email-milo-software@users.sourceforge.net> |
| Download | mbox | patch |
| Permalink | /patch/44865/ |
| State | New |
| Headers | show |
Comments
Is there any feedback on this patch yet? Mike. On 02/19/2013 06:23 PM, MiLo wrote: > 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 <milo-software@users.sourceforge.net> > --- > 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(-) > > diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc > index 10439c0..bd7b089 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 dd95573..f91784b 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+ >
On 27 February 2013 11:37, Mike Looijmans <mike.looijmans@topic.nl> wrote: > Is there any feedback on this patch yet? Acked-By: Ross Burton <ross.burton@intel.com> I've been using it to reduce dependencies pulled in by systemd. Ross
Patch
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 10439c0..bd7b089 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 dd95573..f91784b 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+
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 <milo-software@users.sourceforge.net> --- 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(-)