summaryrefslogtreecommitdiffstats
path: root/bitbake/bin
diff options
context:
space:
mode:
authorJoshua Lock <joshua.g.lock@intel.com>2016-11-25 15:28:08 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-30 15:48:09 +0000
commit1fce7ecbbb004a5ad82da3eef79cfd52b276708d (patch)
treedc19c8ecb8e0b04ba5eafd27a7679bb55585a868 /bitbake/bin
parent1d0c124cdf0282b8d139063409e40982f0ec9888 (diff)
downloadpoky-1fce7ecbbb004a5ad82da3eef79cfd52b276708d.tar.gz
bitbake: bitbake: 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\) (Bitbake rev: 3b45c479de8640f92dd1d9f147b02e1eecfaadc8) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/bin')
-rwxr-xr-xbitbake/bin/bitbake-layers2
-rwxr-xr-xbitbake/bin/bitbake-worker4
2 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/bin/bitbake-layers b/bitbake/bin/bitbake-layers
index 946def220c..1e2cfbcac1 100755
--- a/bitbake/bin/bitbake-layers
+++ b/bitbake/bin/bitbake-layers
@@ -89,7 +89,7 @@ def main():
89 tinfoil = tinfoil_init(False) 89 tinfoil = tinfoil_init(False)
90 try: 90 try:
91 for path in ([topdir] + 91 for path in ([topdir] +
92 tinfoil.config_data.getVar('BBPATH', True).split(':')): 92 tinfoil.config_data.getVar('BBPATH').split(':')):
93 pluginpath = os.path.join(path, 'lib', 'bblayers') 93 pluginpath = os.path.join(path, 'lib', 'bblayers')
94 bb.utils.load_plugins(logger, plugins, pluginpath) 94 bb.utils.load_plugins(logger, plugins, pluginpath)
95 95
diff --git a/bitbake/bin/bitbake-worker b/bitbake/bin/bitbake-worker
index db3c4b184f..8d043946cb 100755
--- a/bitbake/bin/bitbake-worker
+++ b/bitbake/bin/bitbake-worker
@@ -228,7 +228,7 @@ def fork_off_task(cfg, data, databuilder, workerdata, fn, task, taskname, append
228 the_data = bb_cache.loadDataFull(fn, appends) 228 the_data = bb_cache.loadDataFull(fn, appends)
229 the_data.setVar('BB_TASKHASH', workerdata["runq_hash"][task]) 229 the_data.setVar('BB_TASKHASH', workerdata["runq_hash"][task])
230 230
231 bb.utils.set_process_name("%s:%s" % (the_data.getVar("PN", True), taskname.replace("do_", ""))) 231 bb.utils.set_process_name("%s:%s" % (the_data.getVar("PN"), taskname.replace("do_", "")))
232 232
233 # exported_vars() returns a generator which *cannot* be passed to os.environ.update() 233 # exported_vars() returns a generator which *cannot* be passed to os.environ.update()
234 # successfully. We also need to unset anything from the environment which shouldn't be there 234 # successfully. We also need to unset anything from the environment which shouldn't be there
@@ -247,7 +247,7 @@ def fork_off_task(cfg, data, databuilder, workerdata, fn, task, taskname, append
247 if task_exports: 247 if task_exports:
248 for e in task_exports.split(): 248 for e in task_exports.split():
249 the_data.setVarFlag(e, 'export', '1') 249 the_data.setVarFlag(e, 'export', '1')
250 v = the_data.getVar(e, True) 250 v = the_data.getVar(e)
251 if v is not None: 251 if v is not None:
252 os.environ[e] = v 252 os.environ[e] = v
253 253