[oe-commits] [openembedded-core] 51/68: sysklogd: fix typo in RCONFLICTS

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch sumo
in repository openembedded-core.

commit 356c5c2ea005b5ee1723a1b3e2826fdd3007db5a
Author: Chen Qi <Qi.Chen at windriver.com>
AuthorDate: Wed May 23 10:39:07 2018 +0800

    sysklogd: fix typo in RCONFLICTS
    
    It should be RCONFLICTS_${PN} instead of RCONFLICTS_${PN}-syslog.
    There's no ${PN}-syslog package.
    
    (From OE-Core rev: 840d04182bc71ae3f6f562f668b9900c5625e1aa)
    
    Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    (cherry picked from commit ae49d379b74bc2dd63ba3b946b3fb85726458575)
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta/recipes-extended/sysklogd/sysklogd.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc
index 1a537fa..fc4e67c 100644
--- a/meta/recipes-extended/sysklogd/sysklogd.inc
+++ b/meta/recipes-extended/sysklogd/sysklogd.inc
@@ -33,7 +33,7 @@ SYSTEMD_AUTO_ENABLE = "enable"
 
 INITSCRIPT_NAME = "syslog"
 CONFFILES_${PN} = "${sysconfdir}/syslog.conf"
-RCONFLICTS_${PN}-syslog = "rsyslog busybox-syslog syslog-ng"
+RCONFLICTS_${PN} = "rsyslog busybox-syslog syslog-ng"
 
 CFLAGS += "-DSYSV -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.