From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail1.windriver.com ([147.11.146.13]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1UBTmn-0004Bo-40 for openembedded-core@lists.openembedded.org; Fri, 01 Mar 2013 18:30:27 +0100 Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail1.windriver.com (8.14.5/8.14.3) with ESMTP id r21HDvjL004261 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL) for ; Fri, 1 Mar 2013 09:13:57 -0800 (PST) Received: from msp-dhcp50.wrs.com (172.25.34.50) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server id 14.2.328.9; Fri, 1 Mar 2013 09:13:55 -0800 Message-ID: <5130E1D3.4060008@windriver.com> Date: Fri, 1 Mar 2013 11:13:55 -0600 From: Mark Hatle Organization: Wind River Systems User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:17.0) Gecko/20130216 Thunderbird/17.0.3 MIME-Version: 1.0 To: References: <3796.1362104349@schlepp.honig.net> <20130301071228.GA2908@sakrah.homelinux.org> In-Reply-To: <20130301071228.GA2908@sakrah.homelinux.org> Subject: Re: [oe] [PATCH]: Resolve sysvinit and util-linux conflicting man pages. X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Mar 2013 17:30:28 -0000 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit On 3/1/13 1:12 AM, Khem Raj wrote: > On (28/02/13 21:19), Jeffrey Honig wrote: >> From: Jeffrey C Honig >> >> [ 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 >> --- >> 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 >