Re: [oe-commits] MiLo : util-linux: Add package for libmount

[Martin Jansa <martin.jansa@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 5479 bytes --]

On Wed, Mar 06, 2013 at 09:08:30AM +0100, Mike Looijmans wrote:
> On 03/06/2013 07:23 AM, Martin Jansa wrote:
> > On Thu, Feb 28, 2013 at 11:15:51PM +0000, git@git.openembedded.org wrote:
> >> Module: openembedded-core.git
> >> Branch: master
> >> Commit: 2e79110e31da940728d42411cad3d019d570fc31
> >> URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=2e79110e31da940728d42411cad3d019d570fc31
> >>
> >> Author: MiLo <milo-software@users.sourceforge.net>
> >> Date:   Tue Feb 19 18:23:15 2013 +0100
> >>
> >> 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.
> >
> > Breaks upgrade path:
> >
> >   * check_data_file_clashes: Package libmount1 wants to install file
> >   * /lib/libmount.so.1.1.0
> >          But that file is already provided by package  * util-linux
> >   * check_data_file_clashes: Package libmount1 wants to install file
> >   * /lib/libmount.so.1
> >          But that file is already provided by package  * util-linux
> >
> > RREPLACES is probably needed.
> 
> Indeed, I can reproduce that too. But I'm not sure how to fix this, as I 
> cannot bluntly claim that libmount replaces util-linux, because it 
> really doesn't. So RREPLACES_util-linux-libmount = "util-linux" is 
> probably not the way to go here. Or is it? It does not "feel" right 
> anyway, because the old situation should have never happened.

It should work (it doesn't replace util-linux completely until it also
RPROVIDES it and opkg wont try to remove util-linux until it also
RCONFLICTS with ti). 

But to be sure test it on device as with every other change.

> Prior to the libmount patch, it was not possible to remove util-linux 
> from any system that installed util-linux-mount (or any other that 
> requires libmount), without applying "force". And util-linux itself 
> depends on packages that in turn depend on util-linux. That's the circle 
> I wanted to break out of.
> 
> How does one properly inform opkg that a file has moved from one 
> (installed) package to another?

RREPLACES

> >> Signed-off-by: MiLo <milo-software@users.sourceforge.net>
> >> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> >>
> >> ---
> >>
> >>   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+
> >>
> >>
> >> _______________________________________________
> >> Openembedded-commits mailing list
> >> Openembedded-commits@lists.openembedded.org
> >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits
> >
> 
> 
> -- 
> Mike Looijmans - Topic Automation
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]