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/sysvinit | |
| parent | 5ff26f61b6860e56c255b2b6a2b0215be75b1db9 (diff) | |
| download | openembedded-core-af97a79d017722d0571d552e390f2881efe228e2.tar.gz openembedded-core-af97a79d017722d0571d552e390f2881efe228e2.tar.bz2 openembedded-core-af97a79d017722d0571d552e390f2881efe228e2.zip | |
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/sysvinit')
| -rw-r--r-- | meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb index 0a11139ec4..e64b67a683 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" |