From: Steffen Sledz <sledz@dresearch-fe.de>
To: openembedded-devel <openembedded-devel@lists.openembedded.org>
Cc: Koen Kooi <koen@dominion.thruhere.net>
Subject: [meta-oe][PATCH] syslog-ng: add UPDATE_ALTERNATIVE for syslog-service
Date: Wed, 11 Nov 2015 15:34:43 +0100 [thread overview]
Message-ID: <56435203.1060004@dresearch-fe.de> (raw)
In-Reply-To: <1447161133-3700-2-git-send-email-sledz@dresearch-fe.de>
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>
---
meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
index a990bf8..54f6920 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"
# 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_PRIORITY', 'syslog-init', '200')
d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-init', '%s/init.d/syslog' % (sysconfdir))
+
+ 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/${BPN}.service' % (d.getVar('systemd_unitdir', True)))
}
INITSCRIPT_NAME = "syslog"
--
2.6.3
next parent reply other threads:[~2015-11-11 14:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1447161133-3700-2-git-send-email-sledz@dresearch-fe.de>
2015-11-11 14:34 ` Steffen Sledz [this message]
2015-11-12 14:02 ` [meta-oe][PATCH] syslog-ng: add UPDATE_ALTERNATIVE for syslog-service Steffen Sledz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56435203.1060004@dresearch-fe.de \
--to=sledz@dresearch-fe.de \
--cc=koen@dominion.thruhere.net \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox