diff options
| author |   Chen Qi <Qi.Chen@windriver.com> | 2014-09-19 16:11:49 +0800 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2014-09-26 05:41:54 +0200 |
| commit | 2b32463cfc617a5497544e67afab50b1f3d0fc3c (patch) | |
| tree | 878bc856b3fe8f36275d80dd391fde7ccd19088a | |
| parent | e335110e1e051411207a3f4ce55a1a9388e35daa (diff) | |
| download | meta-openembedded-contrib-2b32463cfc617a5497544e67afab50b1f3d0fc3c.tar.gz | |
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@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb | 9 |
1 files changed, 8 insertions, 1 deletions
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 6ee571e890..143e1c64a3 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))) } |