diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-03-16 10:20:56 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-17 16:53:04 +0000 |
commit | a861ee210c37c9853d5266e42716edfa88ec7847 (patch) | |
tree | 05498a4f03666f981dd5d04cee947006ecaabc62 /meta/recipes-extended/sysklogd | |
parent | 33162228c65e09ebc6cbc617cdafe7c3344d19dc (diff) | |
download | poky-a861ee210c37c9853d5266e42716edfa88ec7847.tar.gz |
sysklogd: use update-alternatives for more manpages
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
(From OE-Core rev: d08cfe3d3de01c529dda1a60f42870dd3132c256)
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/sysklogd')
-rw-r--r-- | meta/recipes-extended/sysklogd/sysklogd.inc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc index f9af0a4833..78b8d7a985 100644 --- a/meta/recipes-extended/sysklogd/sysklogd.inc +++ b/meta/recipes-extended/sysklogd/sysklogd.inc | |||
@@ -64,6 +64,9 @@ ALTERNATIVE_PRIORITY = "${@bb.utils.contains('DISTRO_FEATURES','systemd','10','1 | |||
64 | ALTERNATIVE_${PN} = "syslogd klogd syslog-conf \ | 64 | ALTERNATIVE_${PN} = "syslogd klogd syslog-conf \ |
65 | ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','syslog-init','',d)}" | 65 | ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','syslog-init','',d)}" |
66 | 66 | ||
67 | ALTERNATIVE_${PN}-doc = "syslogd.8" | ||
68 | ALTERNATIVE_LINK_NAME[syslogd.8] = "${mandir}/man8/syslogd.8" | ||
69 | |||
67 | ALTERNATIVE_LINK_NAME[syslogd] = "${base_sbindir}/syslogd" | 70 | ALTERNATIVE_LINK_NAME[syslogd] = "${base_sbindir}/syslogd" |
68 | ALTERNATIVE_LINK_NAME[klogd] = "${base_sbindir}/klogd" | 71 | ALTERNATIVE_LINK_NAME[klogd] = "${base_sbindir}/klogd" |
69 | ALTERNATIVE_LINK_NAME[syslog-init] = "${sysconfdir}/init.d/syslog" | 72 | ALTERNATIVE_LINK_NAME[syslog-init] = "${sysconfdir}/init.d/syslog" |