diff options
author | Changqing Li <changqing.li@windriver.com> | 2019-05-28 10:51:59 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-05-29 02:06:24 -0700 |
commit | a5007f6fd662b428422461078e80e9b8967085ba (patch) | |
tree | ccddb864f973dc3070a430434385b734c512aba7 /meta-oe | |
parent | dd5622ef2b4065dc80ee549c57a2ec5010d0b4d1 (diff) | |
download | meta-openembedded-a5007f6fd662b428422461078e80e9b8967085ba.tar.gz |
syslog-ng: add rconflict for package syslog-ng-libs
syslog-ng-libs also have conflicts
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc index b52deff5e..c183f05e0 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc | |||
@@ -127,6 +127,7 @@ CONFFILES_${PN} = "${sysconfdir}/${BPN}.conf ${sysconfdir}/scl.conf" | |||
127 | RDEPENDS_${PN} += " ${@oe.utils.conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}" | 127 | RDEPENDS_${PN} += " ${@oe.utils.conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}" |
128 | 128 | ||
129 | RCONFLICTS_${PN} = "busybox-syslog sysklogd rsyslog" | 129 | RCONFLICTS_${PN} = "busybox-syslog sysklogd rsyslog" |
130 | RCONFLICTS_${PN}-libs = "busybox-syslog sysklogd rsyslog" | ||
130 | 131 | ||
131 | RPROVIDES_${PN} += "${PN}-systemd" | 132 | RPROVIDES_${PN} += "${PN}-systemd" |
132 | RREPLACES_${PN} += "${PN}-systemd" | 133 | RREPLACES_${PN} += "${PN}-systemd" |