From 02c64f7487ca8ec5d32c440f5002c4b8f64b76a6 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Fri, 16 Oct 2015 19:23:58 +0300 Subject: 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 Signed-off-by: Richard Purdie --- lib/bb/main.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'lib/bb/main.py') 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) -- cgit 1.2.3-korg