summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-08-17 12:12:20 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-19 18:05:45 +0100
commit7ce27b9fce8dd9c05d98878185f46721cc2e81f3 (patch)
tree9631cfd8818b7621a8c86908c5e5f8e81d19896a /bitbake/lib
parent37a2c062a5919473157e236fbb19a1eafba00f8e (diff)
downloadpoky-7ce27b9fce8dd9c05d98878185f46721cc2e81f3.tar.gz
bitbake: cooker: ensure prefile/postfile can work in memory resident mode
The prefile/postfile options weren't working in memory resident mode because they weren't being passed through to the server, so ensure that they do get passed through and that the server is reset when the values come through. (Bitbake rev: a3f7dc042fc7b1c308bfd248431930eb8ba50326) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/cooker.py4
-rw-r--r--bitbake/lib/bb/cookerdata.py3
2 files changed, 5 insertions, 2 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index fb38289397..a2b0bb5d7d 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -527,9 +527,11 @@ class BBCooker:
527 self.handleCollections( self.data.getVar("BBFILE_COLLECTIONS", True) ) 527 self.handleCollections( self.data.getVar("BBFILE_COLLECTIONS", True) )
528 528
529 def updateConfigOpts(self, options, environment): 529 def updateConfigOpts(self, options, environment):
530 clean = True
530 for o in options: 531 for o in options:
532 if o in ['prefile', 'postfile']:
533 clean = False
531 setattr(self.configuration, o, options[o]) 534 setattr(self.configuration, o, options[o])
532 clean = True
533 for k in bb.utils.approved_variables(): 535 for k in bb.utils.approved_variables():
534 if k in environment and k not in self.configuration.env: 536 if k in environment and k not in self.configuration.env:
535 logger.debug(1, "Updating environment variable %s to %s" % (k, environment[k])) 537 logger.debug(1, "Updating environment variable %s to %s" % (k, environment[k]))
diff --git a/bitbake/lib/bb/cookerdata.py b/bitbake/lib/bb/cookerdata.py
index 57fc6bb50e..b20040c0b3 100644
--- a/bitbake/lib/bb/cookerdata.py
+++ b/bitbake/lib/bb/cookerdata.py
@@ -73,7 +73,8 @@ class ConfigParameters(object):
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 "prefile", "postfile"]:
77 options[o] = getattr(self.options, o) 78 options[o] = getattr(self.options, o)
78 79
79 ret, error = server.runCommand(["updateConfig", options, environment]) 80 ret, error = server.runCommand(["updateConfig", options, environment])