* [PATCH] Resolve sysvinit and util-linux conflicting man pages.
@ 2013-02-21 18:14 jeffrey.honig
2013-02-25 19:33 ` Martin Jansa
0 siblings, 1 reply; 2+ messages in thread
From: jeffrey.honig @ 2013-02-21 18:14 UTC (permalink / raw)
To: openembedded-devel
From: Jeffrey C Honig <jch@honig.net>
[ CQID: WIND00404316 ]
Use alternatives mechanism to prevent sysvlinux and util-linux
man pages from causing conflicts.
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Resolve sysvinit and util-linux conflicting man pages.
2013-02-21 18:14 [PATCH] Resolve sysvinit and util-linux conflicting man pages jeffrey.honig
@ 2013-02-25 19:33 ` Martin Jansa
0 siblings, 0 replies; 2+ messages in thread
From: Martin Jansa @ 2013-02-25 19:33 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 3799 bytes --]
On Thu, Feb 21, 2013 at 01:14:43PM -0500, jeffrey.honig@windriver.com wrote:
> From: Jeffrey C Honig <jch@honig.net>
>
> [ CQID: WIND00404316 ]
This belongs to oe-core ML.
>
> Use alternatives mechanism to prevent sysvlinux and util-linux
> man pages from causing conflicts.
> ---
> 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-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-02-25 19:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-21 18:14 [PATCH] Resolve sysvinit and util-linux conflicting man pages jeffrey.honig
2013-02-25 19:33 ` Martin Jansa
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.