diff options
author | Jeffrey C Honig <jeffrey.honig@windriver.com> | 2013-02-28 21:19:09 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-07 11:13:25 +0000 |
commit | af97a79d017722d0571d552e390f2881efe228e2 (patch) | |
tree | 6cd0e316c44886745dab463e9b7a6d27fab62b15 /meta/recipes-core/util-linux | |
parent | 5ff26f61b6860e56c255b2b6a2b0215be75b1db9 (diff) | |
download | openembedded-core-contrib-af97a79d017722d0571d552e390f2881efe228e2.tar.gz |
Resolve sysvinit and util-linux conflicting man pages.
[ CQID: WIND00404316 ]
Use alternatives mechanism to prevent sysvlinux and util-linux
man pages from causing conflicts.
Signed-off-by: Jeffrey C Honig <jeffrey.honig@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/util-linux')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 9 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux_2.22.2.bb | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index bd7b089d8e..1cb4f5fb2c 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -157,6 +157,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 f91784b56d..2f48e0b860 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 = "r1" +PR = "r2" require util-linux.inc # note that `lscpu' is under GPLv3+ |