summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/syslog-ng
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2023-04-07 18:23:02 +0800
committerKhem Raj <raj.khem@gmail.com>2023-04-07 16:58:15 -0700
commit9becb314754a4741249deaad64e378b01508a124 (patch)
tree74df81c8b4d68351bc91c5ce3faef94172e1be7d /meta-oe/recipes-support/syslog-ng
parentae1580992c282841ff6b899c06e9af98195aa34e (diff)
downloadmeta-openembedded-9becb314754a4741249deaad64e378b01508a124.tar.gz
syslog-ng: not deliver syslog-ng-update-virtualenv
syslog-ng-update-virtualenv causes install conflict when multilib enabled: Error: Transaction test error: file /usr/bin/syslog-ng-update-virtualenv conflicts between attempted installs of lib32-syslog-ng-4.0.1-r0.core2_32 and syslog-ng-4.0.1-r0.core2_64 Since python support is disabled, not deliver it. Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/syslog-ng')
-rw-r--r--meta-oe/recipes-support/syslog-ng/syslog-ng_4.0.1.bb4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng_4.0.1.bb b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.0.1.bb
index 4521593ed..650c7bd5f 100644
--- a/meta-oe/recipes-support/syslog-ng/syslog-ng_4.0.1.bb
+++ b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.0.1.bb
@@ -85,6 +85,10 @@ do_install:append() {
85 # Remove /var/run as it is created on startup 85 # Remove /var/run as it is created on startup
86 rm -rf ${D}${localstatedir}/run 86 rm -rf ${D}${localstatedir}/run
87 87
88 # it causes install conflict when multilib enabled
89 # since python support is disabled, not deliver it
90 rm -f ${D}${bindir}/syslog-ng-update-virtualenv
91
88 # support for systemd 92 # support for systemd
89 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then 93 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
90 install -m 644 ${WORKDIR}/syslog-ng.conf.systemd ${D}${sysconfdir}/${BPN}/${BPN}.conf 94 install -m 644 ${WORKDIR}/syslog-ng.conf.systemd ${D}${sysconfdir}/${BPN}/${BPN}.conf