[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5152/8267] sysklogd: use update-alternatives for more manpages



commit a861ee210c37c9853d5266e42716edfa88ec7847
Author: Paul Gortmaker <paul gortmaker windriver com>
Date:   Thu Mar 16 10:20:56 2017 -0400

    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>

 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 f9af0a4..78b8d7a 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
 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"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]