]> code.ossystems Code Review - openembedded-core.git/commitdiff
sysklogd: use update-alternatives for more manpages
authorPaul Gortmaker <paul.gortmaker@windriver.com>
Thu, 16 Mar 2017 14:20:56 +0000 (10:20 -0400)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 17 Mar 2017 11:55:25 +0000 (11:55 +0000)
To fix:

   file /usr/share/man/man8/syslogd.8 conflicts between attempted installs
   of inetutils-doc-1.9.4-r0.core2_64 and sysklogd-doc-1.5.1-r0.core2_64

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-extended/sysklogd/sysklogd.inc

index f9af0a4833dea6cbc0891d91166c8302f4a081bb..78b8d7a985297492b8bf3dbd9b09bcf238d1b9f6 100644 (file)
@@ -64,6 +64,9 @@ ALTERNATIVE_PRIORITY = "${@bb.utils.contains('DISTRO_FEATURES','systemd','10','1
 ALTERNATIVE_${PN} = "syslogd klogd syslog-conf \
     ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','syslog-init','',d)}"
 
+ALTERNATIVE_${PN}-doc = "syslogd.8"
+ALTERNATIVE_LINK_NAME[syslogd.8] = "${mandir}/man8/syslogd.8"
+
 ALTERNATIVE_LINK_NAME[syslogd] = "${base_sbindir}/syslogd"
 ALTERNATIVE_LINK_NAME[klogd] = "${base_sbindir}/klogd"
 ALTERNATIVE_LINK_NAME[syslog-init] = "${sysconfdir}/init.d/syslog"