summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/command.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-24 09:27:25 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-24 10:34:53 +0100
commitfa4b1fa2577fb1a8128154c2f1417df575dbb022 (patch)
treec41f59641a8e3f2239f5f449a8fd8696da1b7578 /bitbake/lib/bb/command.py
parent7cf87fc083386dc162f3573c782d77447e608a16 (diff)
downloadpoky-fa4b1fa2577fb1a8128154c2f1417df575dbb022.tar.gz
bitbake: cooker/cookerdata: Improve configuration object handling
Originally it seemed like a good idea to keep the parameters around. Having seen this in real life use, its incorrect, we should pull all the data we need into the cooker's configuguration and then use this to build the datastore. Being able to just build the datastore from the parameters seemed like a good idea but having a dummy cooker configuration object is now looking like the better option. This also fixes failures in hob since the parseFiles command can call into cooker directly now and reset the configuration prefiles and postfiles at will, rather than the indirect calls before which were breaking the datastore (e.g. BBPATH wasn't set). The cleanup this allows in tinfoil illustrates how this change makes more sense. (Bitbake rev: f50df5b891bf318f12fc61c74adfcc626cc6f836) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/command.py')
-rw-r--r--bitbake/lib/bb/command.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/bitbake/lib/bb/command.py b/bitbake/lib/bb/command.py
index 916eedac19..cc6a981921 100644
--- a/bitbake/lib/bb/command.py
+++ b/bitbake/lib/bb/command.py
@@ -387,7 +387,9 @@ class CommandsAsync:
387 """ 387 """
388 prefiles = params[0] 388 prefiles = params[0]
389 postfiles = params[1] 389 postfiles = params[1]
390 command.cooker.databuilder.parseConfigurationFiles(prefiles, postfiles) 390 command.cooker.configuration.prefile = prefiles
391 command.cooker.configuration.postfile = postfiles
392 command.cooker.loadConfigurationData()
391 command.finishAsyncCommand() 393 command.finishAsyncCommand()
392 parseConfigurationFiles.needcache = False 394 parseConfigurationFiles.needcache = False
393 395