mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
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>
This commit is contained in:
parent
ae1580992c
commit
9becb31475
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user