Skip to contentSkip to conversation

: Resolve sysvinit and util-linux conflicting man pages.

PATCH In review Jeffrey Honig 4 participants 6 messages Mar 1, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 : Resolve sysvinit and util-linux conflicting man pages.

From: Jeffrey C Honig <[email protected]>

[ 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(-)
meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb +10 -1
index 0a11139..e64b67a 100644
@@ -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"
meta/recipes-core/util-linux/util-linux.inc +9 -0
index 10439c0..c91f4a3 100644
@@ -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"
meta/recipes-core/util-linux/util-linux_2.22.2.bb +1 -1
index dd95573..f91784b 100644
@@ -1,5 +1,5 @@
 MAJOR_VERSION = "2.22"
-PR = "r0"
+PR = "r1"
 require util-linux.inc
 
 # note that `lscpu' is under GPLv3+
Signature · 1 line
1.7.9.5
#1 lore raw
Quoted 3 lines · Jeffrey Honig

From: Jeffrey C Honig <[email protected]>

[ CQID: WIND00404316 ]

except above. Patch looks ok.

Quoted 81 lines

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(-)
meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb +10 -1
index 0a11139..e64b67a 100644
@@ -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"
meta/recipes-core/util-linux/util-linux.inc +9 -0
index 10439c0..c91f4a3 100644
@@ -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"
meta/recipes-core/util-linux/util-linux_2.22.2.bb +1 -1
index dd95573..f91784b 100644
@@ -1,5 +1,5 @@
 MAJOR_VERSION = "2.22"
-PR = "r0"
+PR = "r1"
 require util-linux.inc
 
 # note that `lscpu' is under GPLv3+
Signature · 9 lines
1.7.9.5




_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Signature · 1 line
-Khem
#3 lore raw
In reply to Jeffrey Honig
Quoted 6 lines · Jeffrey Honig

From: Jeffrey C Honig <[email protected]>

[ 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).

Quoted 77 lines
---
 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(-)
meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb +10 -1
index 0a11139..e64b67a 100644
@@ -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"
meta/recipes-core/util-linux/util-linux.inc +9 -0
index 10439c0..c91f4a3 100644
@@ -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"
meta/recipes-core/util-linux/util-linux_2.22.2.bb +1 -1
index dd95573..f91784b 100644
@@ -1,5 +1,5 @@
 MAJOR_VERSION = "2.22"
-PR = "r0"
+PR = "r1"
 require util-linux.inc
 
 # note that `lscpu' is under GPLv3+
Signature · 9 lines
1.7.9.5




_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#2 lore raw
In reply to Khem Raj
Quoted 6 lines · Khem Raj
Quoted 3 lines · Jeffrey Honig

From: Jeffrey C Honig <[email protected]>

[ 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

Quoted 82 lines
Quoted 81 lines

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(-)
meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb +10 -1
index 0a11139..e64b67a 100644
@@ -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"
meta/recipes-core/util-linux/util-linux.inc +9 -0
index 10439c0..c91f4a3 100644
@@ -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"
meta/recipes-core/util-linux/util-linux_2.22.2.bb +1 -2
index dd95573..f91784b 100644
@@ -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
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

#4 lore raw
In reply to Martin Jansa
Quoted 11 lines · Martin Jansa
Quoted 6 lines · Jeffrey Honig

From: Jeffrey C Honig <[email protected]>

[ 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

Quoted 80 lines
Quoted 77 lines
---
 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(-)
meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb +10 -1
index 0a11139..e64b67a 100644
@@ -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"
meta/recipes-core/util-linux/util-linux.inc +9 -0
index 10439c0..c91f4a3 100644
@@ -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"
meta/recipes-core/util-linux/util-linux_2.22.2.bb +1 -1
index dd95573..f91784b 100644
@@ -1,5 +1,5 @@
 MAJOR_VERSION = "2.22"
-PR = "r0"
+PR = "r1"
 require util-linux.inc
 
 # note that `lscpu' is under GPLv3+
Signature · 9 lines
1.7.9.5




_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
Signature · 5 lines
Jeffrey C. Honig
Manager of Linux Products Division / SDT
Wind River (风河)
+1.607.216.8613
http://www.windriver.com
#5 lore raw
Quoted 16 lines · Jeffrey Honig
Quoted 11 lines · Martin Jansa
Quoted 6 lines · Jeffrey Honig

From: Jeffrey C Honig <[email protected]>

[ 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:

Quoted 7 lines

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

Quoted 85 lines

Thanks!

Jeff

Quoted 80 lines
Quoted 73 lines
---
  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(-)
meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb +10 -1
index 0a11139..e64b67a 100644
@@ -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"
meta/recipes-core/util-linux/util-linux.inc +9 -0
index 10439c0..c91f4a3 100644
@@ -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"
meta/recipes-core/util-linux/util-linux_2.22.2.bb +1 -2
index dd95573..f91784b 100644
@@ -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

Quoted 4 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

--
Martin 'JaMa' Jansa jabber: [email protected]