[OE-core] [PATCH] sysklogd.inc: add syslogd.8 to ALTERNATIVE_${PN}-doc

mingli.yu at windriver.com mingli.yu at windriver.com
Thu Sep 27 05:22:50 UTC 2018


From: Mark Hatle <mark.hatle at windriver.com>

Other recipes, such as meta-networking inetutils
may also provide a man page for syslogd.8.
Use the alternatives mechanism to select the man
page to display.

This is a partial revert of commit:
988aad01b20c18a8850db0ad6dc547525d94116c

Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
Signed-off-by: Mingli Yu <Mingli.Yu at windriver.com>
---
 meta/recipes-extended/sysklogd/sysklogd.inc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc
index fc4e67c..c932b20 100644
--- a/meta/recipes-extended/sysklogd/sysklogd.inc
+++ b/meta/recipes-extended/sysklogd/sysklogd.inc
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
                     file://klogd.c;beginline=2;endline=19;md5=7e87ed0ae6142de079bce738c10c899d \
                    "
 
-inherit update-rc.d systemd
+inherit update-rc.d update-alternatives systemd
 
 SRC_URI = "http://www.infodrom.org/projects/sysklogd/download/sysklogd-${PV}.tar.gz \
            file://no-strip-install.patch \
@@ -58,6 +58,10 @@ do_install () {
 
 FILES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/sysklogd.conf', '', d)}"
 
+ALTERNATIVE_PRIORITY = "100"
+ALTERNATIVE_${PN}-doc = "syslogd.8"
+ALTERNATIVE_LINK_NAME[syslogd.8] = "${mandir}/man8/syslogd.8"
+
 pkg_prerm_${PN} () {
 	if test "x$D" = "x"; then
 	if test "$1" = "upgrade" -o "$1" = "remove"; then
-- 
2.7.4




More information about the Openembedded-core mailing list