diff options
author | Steffen Sledz <sledz@dresearch-fe.de> | 2015-11-11 15:34:43 +0100 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2015-12-20 14:12:16 -0800 |
commit | 5826ba6968ef5cfb3b31b80009f3341a18d34331 (patch) | |
tree | 591a9f857888ad81ff35e9aa5e3e1161c3538578 /meta-oe | |
parent | 6c1b51eff1539d794abbd53c3ba023ba1296f189 (diff) | |
download | meta-openembedded-5826ba6968ef5cfb3b31b80009f3341a18d34331.tar.gz |
syslog-ng: add UPDATE_ALTERNATIVE for syslog-service
Use ALTERNATIVE mechanism in OE to manage the syslog service to
avoid conflicts with other syslog implementations like rsyslog
or busybox.
Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc index a990bf8e1..54f6920f5 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc | |||
@@ -96,12 +96,18 @@ SYSTEMD_SERVICE_${PN} = "${BPN}.service" | |||
96 | 96 | ||
97 | # no syslog-init for systemd | 97 | # no syslog-init for systemd |
98 | python () { | 98 | python () { |
99 | if 'sysvinit' in d.getVar("DISTRO_FEATURES", True).split(): | 99 | if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): |
100 | pn = d.getVar('PN', True) | 100 | pn = d.getVar('PN', True) |
101 | sysconfdir = d.getVar('sysconfdir', True) | 101 | sysconfdir = d.getVar('sysconfdir', True) |
102 | d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-init') | 102 | d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-init') |
103 | d.setVarFlag('ALTERNATIVE_PRIORITY', 'syslog-init', '200') | 103 | d.setVarFlag('ALTERNATIVE_PRIORITY', 'syslog-init', '200') |
104 | d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-init', '%s/init.d/syslog' % (sysconfdir)) | 104 | d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-init', '%s/init.d/syslog' % (sysconfdir)) |
105 | |||
106 | if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d): | ||
107 | pn = d.getVar('PN', True) | ||
108 | d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-service') | ||
109 | d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-service', '%s/systemd/system/syslog.service' % (d.getVar('sysconfdir', True))) | ||
110 | d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-service', '%s/system/${BPN}.service' % (d.getVar('systemd_unitdir', True))) | ||
105 | } | 111 | } |
106 | 112 | ||
107 | INITSCRIPT_NAME = "syslog" | 113 | INITSCRIPT_NAME = "syslog" |