Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Mark Hatle <mark.hatle@windriver.com>
To: <openembedded-core@lists.openembedded.org>
Subject: Re: [oe] [PATCH]: Resolve sysvinit and util-linux conflicting man pages.
Date: Fri, 1 Mar 2013 11:13:55 -0600	[thread overview]
Message-ID: <5130E1D3.4060008@windriver.com> (raw)
In-Reply-To: <20130301071228.GA2908@sakrah.homelinux.org>

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
>




  reply	other threads:[~2013-03-01 17:30 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-01  2:19 [oe] [PATCH]: Resolve sysvinit and util-linux conflicting man pages Jeffrey Honig
2013-03-01  7:12 ` Khem Raj
2013-03-01 17:13   ` Mark Hatle [this message]
2013-03-01  9:20 ` Martin Jansa
2013-03-01 17:13   ` Jeffrey Honig
2013-03-01 17:20     ` Mark Hatle

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5130E1D3.4060008@windriver.com \
    --to=mark.hatle@windriver.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox