summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/syslog-ng
diff options
context:
space:
mode:
authorJoshua Lock <joshua.g.lock@intel.com>2016-11-25 15:28:52 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2016-12-02 09:16:17 +0100
commitefd3696e70a6603f1a45faa4a172433514f0a487 (patch)
treeb72751ba93b050391db05a8e1be7506836b6d515 /meta-oe/recipes-support/syslog-ng
parent761639b9d7681c81dd69eaf3a37c32791d6e97fd (diff)
downloadmeta-openembedded-efd3696e70a6603f1a45faa4a172433514f0a487.tar.gz
remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True option from getVar() calls with a regex search and replace. Search made with the following regex: getVar ?\(( ?[^,()]*), True\) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Diffstat (limited to 'meta-oe/recipes-support/syslog-ng')
-rw-r--r--meta-oe/recipes-support/syslog-ng/syslog-ng.inc10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
index 898e9c2a3..7b56dd4c1 100644
--- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
+++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
@@ -104,17 +104,17 @@ SYSTEMD_SERVICE_${PN} = "${BPN}.service"
104# no syslog-init for systemd 104# no syslog-init for systemd
105python () { 105python () {
106 if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): 106 if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
107 pn = d.getVar('PN', True) 107 pn = d.getVar('PN')
108 sysconfdir = d.getVar('sysconfdir', True) 108 sysconfdir = d.getVar('sysconfdir')
109 d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-init') 109 d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-init')
110 d.setVarFlag('ALTERNATIVE_PRIORITY', 'syslog-init', '200') 110 d.setVarFlag('ALTERNATIVE_PRIORITY', 'syslog-init', '200')
111 d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-init', '%s/init.d/syslog' % (sysconfdir)) 111 d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-init', '%s/init.d/syslog' % (sysconfdir))
112 112
113 if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d): 113 if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d):
114 pn = d.getVar('PN', True) 114 pn = d.getVar('PN')
115 d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-service') 115 d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-service')
116 d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-service', '%s/systemd/system/syslog.service' % (d.getVar('sysconfdir', True))) 116 d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-service', '%s/systemd/system/syslog.service' % (d.getVar('sysconfdir')))
117 d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-service', '%s/system/${BPN}.service' % (d.getVar('systemd_unitdir', True))) 117 d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-service', '%s/system/${BPN}.service' % (d.getVar('systemd_unitdir')))
118} 118}
119 119
120INITSCRIPT_NAME = "syslog" 120INITSCRIPT_NAME = "syslog"