summaryrefslogtreecommitdiffstats
path: root/bitbake/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:24:30 +0000
commit4ab7202c31482dcb42a4406ec5f35e06963a6eaf (patch)
treea645e12652e36365bfb52c21a3898ce4e10489c1 /bitbake/lib/bb/main.py
parentfdfdfc8ccb96ce8f2d4b9644d182b1e1a5a6af28 (diff)
downloadpoky-4ab7202c31482dcb42a4406ec5f35e06963a6eaf.tar.gz
bitbake: 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. (Bitbake rev: 02c64f7487ca8ec5d32c440f5002c4b8f64b76a6) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/main.py')
-rwxr-xr-xbitbake/lib/bb/main.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/bitbake/lib/bb/main.py b/bitbake/lib/bb/main.py
index 8762f7220a..c8530fc3d8 100755
--- a/bitbake/lib/bb/main.py
+++ b/bitbake/lib/bb/main.py
@@ -383,6 +383,13 @@ def bitbake_main(configParams, configuration):
383 # Collect the feature set for the UI 383 # Collect the feature set for the UI
384 featureset = getattr(ui_module, "featureSet", []) 384 featureset = getattr(ui_module, "featureSet", [])
385 385
386 if configParams.server_only:
387 for param in ('prefile', 'postfile'):
388 value = getattr(configParams, param)
389 if value:
390 setattr(configuration, "%s_server" % param, value)
391 param = "%s_server" % param
392
386 if not configParams.remote_server: 393 if not configParams.remote_server:
387 # we start a server with a given configuration 394 # we start a server with a given configuration
388 server = start_server(servermodule, configParams, configuration, featureset) 395 server = start_server(servermodule, configParams, configuration, featureset)