From 9becb314754a4741249deaad64e378b01508a124 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Fri, 7 Apr 2023 18:23:02 +0800 Subject: 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 Signed-off-by: Khem Raj --- meta-oe/recipes-support/syslog-ng/syslog-ng_4.0.1.bb | 4 ++++ 1 file changed, 4 insertions(+) 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 4521593ed7..650c7bd5f3 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() { # Remove /var/run as it is created on startup rm -rf ${D}${localstatedir}/run + # it causes install conflict when multilib enabled + # since python support is disabled, not deliver it + rm -f ${D}${bindir}/syslog-ng-update-virtualenv + # support for systemd if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -m 644 ${WORKDIR}/syslog-ng.conf.systemd ${D}${sysconfdir}/${BPN}/${BPN}.conf -- cgit v1.2.3-54-g00ecf