aboutsummaryrefslogtreecommitdiffstats
path: root/lib/bb/main.py
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-10-16 19:23:58 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-27 07:23:21 +0000
commit02c64f7487ca8ec5d32c440f5002c4b8f64b76a6 (patch)
treedd5a0cced2fd9d540b20edd62b765906625e0edc /lib/bb/main.py
parent7b3ed62800cb7352154897c1c5ad2440a54df198 (diff)
downloadbitbake-02c64f7487ca8ec5d32c440f5002c4b8f64b76a6.tar.gz
cooker: preserve pre and 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 <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/main.py')
-rwxr-xr-xlib/bb/main.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/bb/main.py b/lib/bb/main.py
index 8762f7220..c8530fc3d 100755
--- a/lib/bb/main.py
+++ b/lib/bb/main.py
@@ -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)