Patchwork [oe] : Resolve sysvinit and util-linux conflicting man pages.

login
register
mail settings
Submitter Jeffrey Honig
Date March 1, 2013, 2:19 a.m.
Message ID <3796.1362104349@schlepp.honig.net>
Download mbox | patch
Permalink /patch/45325/
State New
Headers show

Comments

Jeffrey Honig - March 1, 2013, 2:19 a.m.
From: Jeffrey C Honig <jeffrey.honig@windriver.com>

[ CQID: WIND00404316 ]

Use alternatives mechanism to prevent sysvlinux and util-linux
man pages from causing conflicts.

Signed-off-by: Jeffrey C Honig <jeffrey.honig@windriver.com>
---
 meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb    |   11 ++++++++++-
 meta/recipes-core/util-linux/util-linux.inc       |    9 +++++++++
 meta/recipes-core/util-linux/util-linux_2.22.2.bb |    2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)
Khem Raj - March 1, 2013, 7:12 a.m.
On (28/02/13 21:19), Jeffrey Honig wrote:
> From: Jeffrey C Honig <jeffrey.honig@windriver.com>
> 
> [ CQID: WIND00404316 ]

except above. Patch looks ok. 

> 
> Use alternatives mechanism to prevent sysvlinux and util-linux
> man pages from causing conflicts.
> 
> Signed-off-by: Jeffrey C Honig <jeffrey.honig@windriver.com>
> ---
>  meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb    |   11 ++++++++++-
>  meta/recipes-core/util-linux/util-linux.inc       |    9 +++++++++
>  meta/recipes-core/util-linux/util-linux_2.22.2.bb |    2 +-
>  3 files changed, 20 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
> index 0a11139..e64b67a 100644
> --- a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
> +++ b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
> @@ -5,7 +5,7 @@ SECTION = "base"
>  LICENSE = "GPLv2+"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
>                      file://COPYRIGHT;endline=15;md5=349c872e0066155e1818b786938876a4"
> -PR = "r10"
> +PR = "r11"
>  
>  RDEPENDS_${PN} = "${PN}-inittab"
>  
> @@ -45,6 +45,15 @@ ALTERNATIVE_LINK_NAME[poweroff] = "${base_sbindir}/poweroff"
>  ALTERNATIVE_${PN}-pidof = "pidof"
>  ALTERNATIVE_LINK_NAME[pidof] = "${base_bindir}/pidof"
>  
> +ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1"
> +
> +ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1"
> +ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1"
> +ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1"
> +ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8"
> +ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1"
> +ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1"
> +
>  PACKAGES =+ "sysvinit-pidof sysvinit-sulogin"
>  FILES_${PN} += "${base_sbindir}/* ${base_bindir}/*"
>  FILES_sysvinit-pidof = "${base_bindir}/pidof.sysvinit ${base_sbindir}/killall5"
> diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
> index 10439c0..c91f4a3 100644
> --- a/meta/recipes-core/util-linux/util-linux.inc
> +++ b/meta/recipes-core/util-linux/util-linux.inc
> @@ -154,6 +154,15 @@ ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
>  ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix"
>  ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
>  
> +ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1"
> +
> +ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1"
> +ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1"
> +ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1"
> +ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8"
> +ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1"
> +ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1"
> +
>  # There seems to be problem, atleast on nslu2, with these, untill they are
>  # fixed the busybox ones have higher priority
>  ALTERNATIVE_PRIORITY[hwclock] = "10"
> 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+
> -- 
> 1.7.9.5
> 
> 
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Martin Jansa - March 1, 2013, 9:20 a.m.
On Thu, Feb 28, 2013 at 09:19:09PM -0500, Jeffrey Honig wrote:
> From: Jeffrey C Honig <jeffrey.honig@windriver.com>
> 
> [ CQID: WIND00404316 ]
> 
> Use alternatives mechanism to prevent sysvlinux and util-linux
> man pages from causing conflicts.

It would be better to set higher then default priority in one of them,
otherwise last installed/upgraded wins (at least with opkg u-a 
implementation).

> Signed-off-by: Jeffrey C Honig <jeffrey.honig@windriver.com>
> ---
>  meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb    |   11 ++++++++++-
>  meta/recipes-core/util-linux/util-linux.inc       |    9 +++++++++
>  meta/recipes-core/util-linux/util-linux_2.22.2.bb |    2 +-
>  3 files changed, 20 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
> index 0a11139..e64b67a 100644
> --- a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
> +++ b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
> @@ -5,7 +5,7 @@ SECTION = "base"
>  LICENSE = "GPLv2+"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
>                      file://COPYRIGHT;endline=15;md5=349c872e0066155e1818b786938876a4"
> -PR = "r10"
> +PR = "r11"
>  
>  RDEPENDS_${PN} = "${PN}-inittab"
>  
> @@ -45,6 +45,15 @@ ALTERNATIVE_LINK_NAME[poweroff] = "${base_sbindir}/poweroff"
>  ALTERNATIVE_${PN}-pidof = "pidof"
>  ALTERNATIVE_LINK_NAME[pidof] = "${base_bindir}/pidof"
>  
> +ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1"
> +
> +ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1"
> +ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1"
> +ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1"
> +ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8"
> +ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1"
> +ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1"
> +
>  PACKAGES =+ "sysvinit-pidof sysvinit-sulogin"
>  FILES_${PN} += "${base_sbindir}/* ${base_bindir}/*"
>  FILES_sysvinit-pidof = "${base_bindir}/pidof.sysvinit ${base_sbindir}/killall5"
> diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
> index 10439c0..c91f4a3 100644
> --- a/meta/recipes-core/util-linux/util-linux.inc
> +++ b/meta/recipes-core/util-linux/util-linux.inc
> @@ -154,6 +154,15 @@ ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
>  ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix"
>  ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
>  
> +ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1"
> +
> +ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1"
> +ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1"
> +ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1"
> +ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8"
> +ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1"
> +ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1"
> +
>  # There seems to be problem, atleast on nslu2, with these, untill they are
>  # fixed the busybox ones have higher priority
>  ALTERNATIVE_PRIORITY[hwclock] = "10"
> 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+
> -- 
> 1.7.9.5
> 
> 
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Jeffrey Honig - March 1, 2013, 5:13 p.m.
Martin Jansa <martin.jansa@gmail.com> wrote:

> On Thu, Feb 28, 2013 at 09:19:09PM -0500, Jeffrey Honig wrote:
> > From: Jeffrey C Honig <jeffrey.honig@windriver.com>
> > 
> > [ CQID: WIND00404316 ]
> > 
> > Use alternatives mechanism to prevent sysvlinux and util-linux
> > man pages from causing conflicts.
> 
> It would be better to set higher then default priority in one of them,
> otherwise last installed/upgraded wins (at least with opkg u-a 
> implementation).

As I understand it, this is already present:

sysvinit_2.88dsf.bb:

ALTERNATIVE_PRIORITY = "200"

util-linux.inc:

ALTERNATIVE_PRIORITY = "100"

Thanks!

Jeff

> > Signed-off-by: Jeffrey C Honig <jeffrey.honig@windriver.com>
> > ---
> >  meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb    |   11 ++++++++++-
> >  meta/recipes-core/util-linux/util-linux.inc       |    9 +++++++++
> >  meta/recipes-core/util-linux/util-linux_2.22.2.bb |    2 +-
> >  3 files changed, 20 insertions(+), 2 deletions(-)
> > 
> > diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
> > index 0a11139..e64b67a 100644
> > --- a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
> > +++ b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
> > @@ -5,7 +5,7 @@ SECTION = "base"
> >  LICENSE = "GPLv2+"
> >  LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
> >                      file://COPYRIGHT;endline=15;md5=349c872e0066155e1818b786938876a4"
> > -PR = "r10"
> > +PR = "r11"
> >  
> >  RDEPENDS_${PN} = "${PN}-inittab"
> >  
> > @@ -45,6 +45,15 @@ ALTERNATIVE_LINK_NAME[poweroff] = "${base_sbindir}/poweroff"
> >  ALTERNATIVE_${PN}-pidof = "pidof"
> >  ALTERNATIVE_LINK_NAME[pidof] = "${base_bindir}/pidof"
> >  
> > +ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1"
> > +
> > +ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1"
> > +ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1"
> > +ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1"
> > +ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8"
> > +ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1"
> > +ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1"
> > +
> >  PACKAGES =+ "sysvinit-pidof sysvinit-sulogin"
> >  FILES_${PN} += "${base_sbindir}/* ${base_bindir}/*"
> >  FILES_sysvinit-pidof = "${base_bindir}/pidof.sysvinit ${base_sbindir}/killall5"
> > diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
> > index 10439c0..c91f4a3 100644
> > --- a/meta/recipes-core/util-linux/util-linux.inc
> > +++ b/meta/recipes-core/util-linux/util-linux.inc
> > @@ -154,6 +154,15 @@ ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
> >  ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix"
> >  ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
> >  
> > +ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1"
> > +
> > +ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1"
> > +ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1"
> > +ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1"
> > +ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8"
> > +ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1"
> > +ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1"
> > +
> >  # There seems to be problem, atleast on nslu2, with these, untill they are
> >  # fixed the busybox ones have higher priority
> >  ALTERNATIVE_PRIORITY[hwclock] = "10"
> > 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+
> > -- 
> > 1.7.9.5
> > 
> > 
> > 
> > 
> > _______________________________________________
> > 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
Mark Hatle - March 1, 2013, 5:13 p.m.
On 3/1/13 1:12 AM, Khem Raj wrote:
> On (28/02/13 21:19), Jeffrey Honig wrote:
>> From: Jeffrey C Honig <jeffrey.honig@windriver.com>
>>
>> [ CQID: WIND00404316 ]
>
> except above. Patch looks ok.

We've submitted patches before with those identifiers and nobody has complained. 
  It's within the patch submission guidelines (and well makes our tracking 
easier from open source back into our internal systems.)

With that said, if the OE community does not want those types of identifiers 
I'll make sure my people know to exclude them in the future.  (I was the one who 
originally said submit them, unless the community says otherwise.)

--Mark

>>
>> Use alternatives mechanism to prevent sysvlinux and util-linux
>> man pages from causing conflicts.
>>
>> Signed-off-by: Jeffrey C Honig <jeffrey.honig@windriver.com>
>> ---
>>   meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb    |   11 ++++++++++-
>>   meta/recipes-core/util-linux/util-linux.inc       |    9 +++++++++
>>   meta/recipes-core/util-linux/util-linux_2.22.2.bb |    2 +-
>>   3 files changed, 20 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
>> index 0a11139..e64b67a 100644
>> --- a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
>> +++ b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
>> @@ -5,7 +5,7 @@ SECTION = "base"
>>   LICENSE = "GPLv2+"
>>   LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
>>                       file://COPYRIGHT;endline=15;md5=349c872e0066155e1818b786938876a4"
>> -PR = "r10"
>> +PR = "r11"
>>
>>   RDEPENDS_${PN} = "${PN}-inittab"
>>
>> @@ -45,6 +45,15 @@ ALTERNATIVE_LINK_NAME[poweroff] = "${base_sbindir}/poweroff"
>>   ALTERNATIVE_${PN}-pidof = "pidof"
>>   ALTERNATIVE_LINK_NAME[pidof] = "${base_bindir}/pidof"
>>
>> +ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1"
>> +
>> +ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1"
>> +ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1"
>> +ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1"
>> +ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8"
>> +ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1"
>> +ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1"
>> +
>>   PACKAGES =+ "sysvinit-pidof sysvinit-sulogin"
>>   FILES_${PN} += "${base_sbindir}/* ${base_bindir}/*"
>>   FILES_sysvinit-pidof = "${base_bindir}/pidof.sysvinit ${base_sbindir}/killall5"
>> diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
>> index 10439c0..c91f4a3 100644
>> --- a/meta/recipes-core/util-linux/util-linux.inc
>> +++ b/meta/recipes-core/util-linux/util-linux.inc
>> @@ -154,6 +154,15 @@ ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
>>   ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix"
>>   ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
>>
>> +ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1"
>> +
>> +ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1"
>> +ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1"
>> +ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1"
>> +ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8"
>> +ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1"
>> +ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1"
>> +
>>   # There seems to be problem, atleast on nslu2, with these, untill they are
>>   # fixed the busybox ones have higher priority
>>   ALTERNATIVE_PRIORITY[hwclock] = "10"
>> 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+
>> --
>> 1.7.9.5
>>
>>
>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Mark Hatle - March 1, 2013, 5:20 p.m.
On 3/1/13 11:13 AM, Jeffrey Honig wrote:
> Martin Jansa <martin.jansa@gmail.com> wrote:
>
>> On Thu, Feb 28, 2013 at 09:19:09PM -0500, Jeffrey Honig wrote:
>>> From: Jeffrey C Honig <jeffrey.honig@windriver.com>
>>>
>>> [ CQID: WIND00404316 ]
>>>
>>> Use alternatives mechanism to prevent sysvlinux and util-linux
>>> man pages from causing conflicts.
>>
>> It would be better to set higher then default priority in one of them,
>> otherwise last installed/upgraded wins (at least with opkg u-a
>> implementation).
>
> As I understand it, this is already present:
>
> sysvinit_2.88dsf.bb:
>
> ALTERNATIVE_PRIORITY = "200"
>
> util-linux.inc:
>
> ALTERNATIVE_PRIORITY = "100"

And to clarify, this ensures the manpage for these alternatives match the 
priority of the base package as well.  So if both sysvinit and util-linux are 
installed (as well as their doc files), both man pages and executables will match.

--Mark

> Thanks!
>
> Jeff
>
>>> Signed-off-by: Jeffrey C Honig <jeffrey.honig@windriver.com>
>>> ---
>>>   meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb    |   11 ++++++++++-
>>>   meta/recipes-core/util-linux/util-linux.inc       |    9 +++++++++
>>>   meta/recipes-core/util-linux/util-linux_2.22.2.bb |    2 +-
>>>   3 files changed, 20 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
>>> index 0a11139..e64b67a 100644
>>> --- a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
>>> +++ b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
>>> @@ -5,7 +5,7 @@ SECTION = "base"
>>>   LICENSE = "GPLv2+"
>>>   LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
>>>                       file://COPYRIGHT;endline=15;md5=349c872e0066155e1818b786938876a4"
>>> -PR = "r10"
>>> +PR = "r11"
>>>
>>>   RDEPENDS_${PN} = "${PN}-inittab"
>>>
>>> @@ -45,6 +45,15 @@ ALTERNATIVE_LINK_NAME[poweroff] = "${base_sbindir}/poweroff"
>>>   ALTERNATIVE_${PN}-pidof = "pidof"
>>>   ALTERNATIVE_LINK_NAME[pidof] = "${base_bindir}/pidof"
>>>
>>> +ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1"
>>> +
>>> +ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1"
>>> +ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1"
>>> +ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1"
>>> +ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8"
>>> +ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1"
>>> +ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1"
>>> +
>>>   PACKAGES =+ "sysvinit-pidof sysvinit-sulogin"
>>>   FILES_${PN} += "${base_sbindir}/* ${base_bindir}/*"
>>>   FILES_sysvinit-pidof = "${base_bindir}/pidof.sysvinit ${base_sbindir}/killall5"
>>> diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
>>> index 10439c0..c91f4a3 100644
>>> --- a/meta/recipes-core/util-linux/util-linux.inc
>>> +++ b/meta/recipes-core/util-linux/util-linux.inc
>>> @@ -154,6 +154,15 @@ ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
>>>   ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix"
>>>   ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
>>>
>>> +ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1"
>>> +
>>> +ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1"
>>> +ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1"
>>> +ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1"
>>> +ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8"
>>> +ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1"
>>> +ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1"
>>> +
>>>   # There seems to be problem, atleast on nslu2, with these, untill they are
>>>   # fixed the busybox ones have higher priority
>>>   ALTERNATIVE_PRIORITY[hwclock] = "10"
>>> 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+
>>> --
>>> 1.7.9.5
>>>
>>>
>>>
>>>
>>> _______________________________________________
>>> 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
>

Patch

diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
index 0a11139..e64b67a 100644
--- a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
+++ b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
@@ -5,7 +5,7 @@  SECTION = "base"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
                     file://COPYRIGHT;endline=15;md5=349c872e0066155e1818b786938876a4"
-PR = "r10"
+PR = "r11"
 
 RDEPENDS_${PN} = "${PN}-inittab"
 
@@ -45,6 +45,15 @@  ALTERNATIVE_LINK_NAME[poweroff] = "${base_sbindir}/poweroff"
 ALTERNATIVE_${PN}-pidof = "pidof"
 ALTERNATIVE_LINK_NAME[pidof] = "${base_bindir}/pidof"
 
+ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1"
+
+ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1"
+ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1"
+ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1"
+ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8"
+ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1"
+ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1"
+
 PACKAGES =+ "sysvinit-pidof sysvinit-sulogin"
 FILES_${PN} += "${base_sbindir}/* ${base_bindir}/*"
 FILES_sysvinit-pidof = "${base_bindir}/pidof.sysvinit ${base_sbindir}/killall5"
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 10439c0..c91f4a3 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -154,6 +154,15 @@  ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
 ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix"
 ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
 
+ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1"
+
+ALTERNATIVE_LINK_NAME[last.1] = "${mandir}/man1/last.1"
+ALTERNATIVE_LINK_NAME[mesg.1] = "${mandir}/man1/mesg.1"
+ALTERNATIVE_LINK_NAME[mountpoint.1] = "${mandir}/man1/mountpoint.1"
+ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8"
+ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1"
+ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1"
+
 # There seems to be problem, atleast on nslu2, with these, untill they are
 # fixed the busybox ones have higher priority
 ALTERNATIVE_PRIORITY[hwclock] = "10"
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+