[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7869/8267] sysklogd: conflict with other syslog daemons

[Emmanuele Bassi <ebassi src gnome org>]

commit 5912b2e5b529e9ce7b60a21e2c3f94295c20a17b
Author: Chen Qi <Qi Chen windriver com>
Date:   Tue Sep 5 17:55:27 2017 +0800

    sysklogd: conflict with other syslog daemons
    
    Set RCONFLICTS to disallow multiple syslog daemon providers to be installed
    on the target, and remove codes that deal with such situation.
    
    Also, set ALTERNATIVE_PRIORITY back to 100. It was set to '10' in case of
    systemd because sysklogd didn't have systemd support. For now, if we disallow
    multiple syslog daemons to be installed, and it stays '10', then if sysklogd
    is installed on target, the /sbin/syslogd would link to /bin/busybox.nosuid,
    causing sysklogd service files using busybox's utility.
    
    (From OE-Core rev: ecc116603079b45b1fa69c3d4537b19b28707859)
    
    Signed-off-by: Chen Qi <Qi Chen windriver com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-extended/sysklogd/sysklogd.inc |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc
index 644728a..e9a4a02 100644
--- a/meta/recipes-extended/sysklogd/sysklogd.inc
+++ b/meta/recipes-extended/sysklogd/sysklogd.inc
@@ -32,7 +32,8 @@ SYSTEMD_SERVICE_${PN} = "syslogd.service klogd.service"
 SYSTEMD_AUTO_ENABLE = "enable"
 
 INITSCRIPT_NAME = "syslog"
-CONFFILES_${PN} = "${sysconfdir}/syslog.conf.${BPN}"
+CONFFILES_${PN} = "${sysconfdir}/syslog.conf"
+RCONFLICTS_${PN}-syslog = "rsyslog busybox-syslog syslog-ng"
 
 CFLAGS += "-DSYSV -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
 
@@ -57,20 +58,15 @@ do_install () {
 
 FILES_${PN} += 
"${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/sysklogd.conf', '', d)}"
 
-# sysklogd package has no internal systemd support, so we weigh busybox's
-# sysklogd utility over it in case of systemd
-ALTERNATIVE_PRIORITY = "${@bb.utils.contains('DISTRO_FEATURES','systemd','10','100',d)}"
+ALTERNATIVE_PRIORITY = "100"
 
-ALTERNATIVE_${PN} = "syslogd klogd syslog-conf \
-    ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','syslog-init','',d)}"
+ALTERNATIVE_${PN} = "syslogd klogd"
 
 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"
-ALTERNATIVE_LINK_NAME[syslog-conf] = "${sysconfdir}/syslog.conf"
 
 pkg_prerm_${PN} () {
        if test "x$D" = "x"; then