summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2018-05-23 10:39:07 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-15 17:56:24 +0100
commitae49d379b74bc2dd63ba3b946b3fb85726458575 (patch)
tree0a24f4c923bde926180dfc379e042702ebe20591
parentb4a4cf6122645e27e52e9cd0b2006528010b04e7 (diff)
downloadpoky-ae49d379b74bc2dd63ba3b946b3fb85726458575.tar.gz
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@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/sysklogd/sysklogd.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc
index 1a537fabf4..fc4e67c18e 100644
--- a/meta/recipes-extended/sysklogd/sysklogd.inc
+++ b/meta/recipes-extended/sysklogd/sysklogd.inc
@@ -33,7 +33,7 @@ SYSTEMD_AUTO_ENABLE = "enable"
33 33
34INITSCRIPT_NAME = "syslog" 34INITSCRIPT_NAME = "syslog"
35CONFFILES_${PN} = "${sysconfdir}/syslog.conf" 35CONFFILES_${PN} = "${sysconfdir}/syslog.conf"
36RCONFLICTS_${PN}-syslog = "rsyslog busybox-syslog syslog-ng" 36RCONFLICTS_${PN} = "rsyslog busybox-syslog syslog-ng"
37 37
38CFLAGS += "-DSYSV -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" 38CFLAGS += "-DSYSV -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
39 39