All of lore.kernel.org
 help / color / mirror / Atom feed
From: Martin Jansa <martin.jansa@gmail.com>
To: Jeffrey Honig <jeffrey.honig@windriver.com>
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [oe] [PATCH]: Resolve sysvinit and util-linux conflicting man pages.
Date: Fri, 1 Mar 2013 10:20:51 +0100	[thread overview]
Message-ID: <20130301092051.GG3279@jama> (raw)
In-Reply-To: <3796.1362104349@schlepp.honig.net>

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

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

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

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

  parent reply	other threads:[~2013-03-01  9:37 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
2013-03-01  9:20 ` Martin Jansa [this message]
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=20130301092051.GG3279@jama \
    --to=martin.jansa@gmail.com \
    --cc=jeffrey.honig@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.