cooker: preserve pre-post configs

PATCH New Ed Bartosh 1 participant 1 message Oct 16, 2015

Share & tools

Ed Bartosh

author

2015-10-16 16:37 UTC #0 lore raw

PATCH 1/1 cooker: preserve pre-post configs

Additional config files passed to bitbake server with --read and --postread options are rewritten by client bitbake even if it doesn't use those options.

This is a show stopper for toaster as toaster command line builds are based on the assumption that server is aware of toster configs, provided by --postread option.

This behaviour is fixed by preserving values of --read and --postread options when bitbake server starts and restoring them if client bitbake doesn't explicitly specify them.

Signed-off-by Ed Bartosh <[email protected]>

---
 bitbake/lib/bb/cooker.py     | 5 +++++
 bitbake/lib/bb/cookerdata.py | 2 ++
 bitbake/lib/bb/main.py       | 7 +++++++
 3 files changed, 14 insertions(+)

bitbake/lib/bb/cooker.py +5 -0

index a416d2e..276e42e 100644
@@ -531,6 +531,11 @@ class BBCooker:
         for o in options:
             if o in ['prefile', 'postfile']:
                 clean = False
+                server_val = getattr(self.configuration, "%s_server" % o)
+                if not options[o] and server_val:
+                    # restore value provided on server start
+                    setattr(self.configuration, o, server_val)
+                    continue
             setattr(self.configuration, o, options[o])
         for k in bb.utils.approved_variables():
             if k in environment and k not in self.configuration.env:

bitbake/lib/bb/cookerdata.py +2 -0

index a3fa552..671c0cb 100644
@@ -129,6 +129,8 @@ class CookerConfiguration(object):
         self.extra_assume_provided = []
         self.prefile = []
         self.postfile = []
+        self.prefile_server = []
+        self.postfile_server = []
         self.debug = 0
         self.cmd = None
         self.abort = True

bitbake/lib/bb/main.py +7 -0

index 8762f72..c8530fc 100755
@@ -383,6 +383,13 @@ def bitbake_main(configParams, configuration):
         # Collect the feature set for the UI
         featureset = getattr(ui_module, "featureSet", [])
 
+    if configParams.server_only:
+        for param in ('prefile', 'postfile'):
+            value = getattr(configParams, param)
+            if value:
+                setattr(configuration, "%s_server" % param, value)
+                param = "%s_server" % param
+
     if not configParams.remote_server:
         # we start a server with a given configuration
         server = start_server(servermodule, configParams, configuration, featureset)

Signature · 1 line

2.1.4