[oe-commits] Chen Qi : rsyslog: add UPDATE_ALTERNATIVE for syslog-service
git at git.openembedded.org
git at git.openembedded.org
Mon Sep 29 02:51:29 UTC 2014
Module: meta-openembedded.git
Branch: master
Commit: 2b32463cfc617a5497544e67afab50b1f3d0fc3c
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=2b32463cfc617a5497544e67afab50b1f3d0fc3c
Author: Chen Qi <Qi.Chen at windriver.com>
Date: Fri Sep 19 16:11:49 2014 +0800
rsyslog: add UPDATE_ALTERNATIVE for syslog-service
Use ALTERNATIVE mechanism in OE to manage the syslog service to
avoid conflicts with other syslog implementations like sysklogd
or busybox.
Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb
index 6ee571e..143e1c6 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb
@@ -97,9 +97,16 @@ RDEPENDS_${PN} += "logrotate"
# no syslog-init for systemd
python () {
- if 'sysvinit' in d.getVar("DISTRO_FEATURES", True).split():
+ if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
pn = d.getVar('PN', True)
sysconfdir = d.getVar('sysconfdir', True)
d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-init')
d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-init', '%s/init.d/syslog' % (sysconfdir))
+ d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-init', '%s/init.d/syslog.%s' % (d.getVar('sysconfdir', True), d.getVar('BPN', True)))
+
+ if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d):
+ pn = d.getVar('PN', True)
+ d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-service')
+ d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-service', '%s/systemd/system/syslog.service' % (d.getVar('sysconfdir', True)))
+ d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-service', '%s/system/rsyslog.service' % (d.getVar('systemd_unitdir', True)))
}
More information about the Openembedded-commits
mailing list