summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/cookerdata.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-21 10:49:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-21 14:37:39 +0000
commitdb45ddeeaf3c6c598f4a8ca67730e662d4e22232 (patch)
treef1cc523a862d2e4c88cb36a52fc01fd9c105e4c5 /bitbake/lib/bb/cookerdata.py
parent3e4d84aea3623d4eac2e5a094cf103b26859a6b6 (diff)
downloadpoky-db45ddeeaf3c6c598f4a8ca67730e662d4e22232.tar.gz
bitbake: command/cooker/knotty: Fix memres handling of command environment changes
If the environment changes, we need memory resident bitbake to adapt to those changes. This adds in functionality to handle this alongside the configuration option handling code. This means that the common usage: MACHINE=X bitbake Y now works with the memory resident server. (Bitbake rev: 4d1343010da757a0c126bc22475354da44aaf8e3) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/cookerdata.py')
-rw-r--r--bitbake/lib/bb/cookerdata.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/cookerdata.py b/bitbake/lib/bb/cookerdata.py
index 2ceed2d867..7eae761d59 100644
--- a/bitbake/lib/bb/cookerdata.py
+++ b/bitbake/lib/bb/cookerdata.py
@@ -69,14 +69,14 @@ class ConfigParameters(object):
69 if bbpkgs: 69 if bbpkgs:
70 self.options.pkgs_to_build.extend(bbpkgs.split()) 70 self.options.pkgs_to_build.extend(bbpkgs.split())
71 71
72 def updateToServer(self, server): 72 def updateToServer(self, server, environment):
73 options = {} 73 options = {}
74 for o in ["abort", "tryaltconfigs", "force", "invalidate_stamp", 74 for o in ["abort", "tryaltconfigs", "force", "invalidate_stamp",
75 "verbose", "debug", "dry_run", "dump_signatures", 75 "verbose", "debug", "dry_run", "dump_signatures",
76 "debug_domains", "extra_assume_provided", "profile"]: 76 "debug_domains", "extra_assume_provided", "profile"]:
77 options[o] = getattr(self.options, o) 77 options[o] = getattr(self.options, o)
78 78
79 ret, error = server.runCommand(["updateConfig", options]) 79 ret, error = server.runCommand(["updateConfig", options, environment])
80 if error: 80 if error:
81 raise Exception("Unable to update the server configuration with local parameters: %s" % error) 81 raise Exception("Unable to update the server configuration with local parameters: %s" % error)
82 82