diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-11-25 15:28:52 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-12-02 09:16:17 +0100 |
commit | efd3696e70a6603f1a45faa4a172433514f0a487 (patch) | |
tree | b72751ba93b050391db05a8e1be7506836b6d515 /meta-oe/recipes-extended | |
parent | 761639b9d7681c81dd69eaf3a37c32791d6e97fd (diff) | |
download | meta-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-extended')
-rw-r--r-- | meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb index 724232339..4e2c12279 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb | |||
@@ -158,15 +158,15 @@ RRECOMMENDS_${PN}-ptest += "${TCLIBC}-dbg ${VALGRIND}" | |||
158 | # no syslog-init for systemd | 158 | # no syslog-init for systemd |
159 | python () { | 159 | python () { |
160 | if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): | 160 | if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): |
161 | pn = d.getVar('PN', True) | 161 | pn = d.getVar('PN') |
162 | sysconfdir = d.getVar('sysconfdir', True) | 162 | sysconfdir = d.getVar('sysconfdir') |
163 | d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-init') | 163 | d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-init') |
164 | d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-init', '%s/init.d/syslog' % (sysconfdir)) | 164 | d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-init', '%s/init.d/syslog' % (sysconfdir)) |
165 | d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-init', '%s/init.d/syslog.%s' % (d.getVar('sysconfdir', True), d.getVar('BPN', True))) | 165 | d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-init', '%s/init.d/syslog.%s' % (d.getVar('sysconfdir'), d.getVar('BPN'))) |
166 | 166 | ||
167 | if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d): | 167 | if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d): |
168 | pn = d.getVar('PN', True) | 168 | pn = d.getVar('PN') |
169 | d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-service') | 169 | d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-service') |
170 | d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-service', '%s/systemd/system/syslog.service' % (d.getVar('sysconfdir', True))) | 170 | d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-service', '%s/systemd/system/syslog.service' % (d.getVar('sysconfdir'))) |
171 | d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-service', '%s/system/rsyslog.service' % (d.getVar('systemd_unitdir', True))) | 171 | d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-service', '%s/system/rsyslog.service' % (d.getVar('systemd_unitdir'))) |
172 | } | 172 | } |