diff options
Diffstat (limited to 'lib/bb')
| -rw-r--r-- | lib/bb/cooker.py | 4 | ||||
| -rw-r--r-- | lib/bb/cookerdata.py | 9 | ||||
| -rwxr-xr-x | lib/bb/main.py | 10 | ||||
| -rw-r--r-- | lib/bb/server/process.py | 9 | ||||
| -rw-r--r-- | lib/bb/tinfoil.py | 8 |
5 files changed, 12 insertions, 28 deletions
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index 3f9cb7543..99605e584 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -148,7 +148,7 @@ class BBCooker: Manages one bitbake build run """ - def __init__(self, configuration, featureSet=None, idleCallBackRegister=None): + def __init__(self, featureSet=None, idleCallBackRegister=None): self.recipecaches = None self.eventlog = None self.skiplist = {} @@ -157,7 +157,7 @@ class BBCooker: for f in featureSet: self.featureset.setFeature(f) - self.configuration = configuration + self.configuration = bb.cookerdata.CookerConfiguration() self.idleCallBackRegister = idleCallBackRegister diff --git a/lib/bb/cookerdata.py b/lib/bb/cookerdata.py index 3baa9ade1..190ff3ab8 100644 --- a/lib/bb/cookerdata.py +++ b/lib/bb/cookerdata.py @@ -136,22 +136,13 @@ class CookerConfiguration(object): self.build_verbose_stdout = False self.dry_run = False self.tracking = False - self.xmlrpcinterface = [] - self.server_timeout = None self.writeeventlog = False - self.server_only = False self.limited_deps = False self.runall = [] self.runonly = [] self.env = {} - def setConfigParameters(self, parameters): - for key in self.__dict__.keys(): - if key in parameters.options.__dict__: - setattr(self, key, parameters.options.__dict__[key]) - self.env = parameters.environment.copy() - def __getstate__(self): state = {} for key in self.__dict__.keys(): diff --git a/lib/bb/main.py b/lib/bb/main.py index e483cce1a..7990195ea 100755 --- a/lib/bb/main.py +++ b/lib/bb/main.py @@ -344,8 +344,6 @@ def bitbake_main(configParams, configuration): except: pass - configuration.setConfigParameters(configParams) - if configParams.server_only and configParams.remote_server: raise BBMainException("FATAL: The '--server-only' option conflicts with %s.\n" % ("the BBSERVER environment variable" if "BBSERVER" in os.environ \ @@ -363,7 +361,7 @@ def bitbake_main(configParams, configuration): bb.msg.init_msgconfig(configParams.verbose, configParams.debug, configParams.debug_domains) - server_connection, ui_module = setup_bitbake(configParams, configuration) + server_connection, ui_module = setup_bitbake(configParams) # No server connection if server_connection is None: if configParams.status_only: @@ -390,7 +388,7 @@ def bitbake_main(configParams, configuration): return 1 -def setup_bitbake(configParams, configuration, extrafeatures=None): +def setup_bitbake(configParams, extrafeatures=None): # Ensure logging messages get sent to the UI as events handler = bb.event.LogHandler() if not configParams.status_only: @@ -431,11 +429,11 @@ def setup_bitbake(configParams, configuration, extrafeatures=None): logger.info("bitbake server is not running.") lock.close() return None, None - # we start a server with a given configuration + # we start a server with a given featureset logger.info("Starting bitbake server...") # Clear the event queue since we already displayed messages bb.event.ui_queue = [] - server = bb.server.process.BitBakeServer(lock, sockname, configuration, featureset) + server = bb.server.process.BitBakeServer(lock, sockname, featureset, configParams.server_timeout, configParams.xmlrpcinterface) else: logger.info("Reconnecting to bitbake server...") diff --git a/lib/bb/server/process.py b/lib/bb/server/process.py index 8f5abb32b..03cdde04e 100644 --- a/lib/bb/server/process.py +++ b/lib/bb/server/process.py @@ -394,9 +394,10 @@ class BitBakeServer(object): start_log_format = '--- Starting bitbake server pid %s at %s ---' start_log_datetime_format = '%Y-%m-%d %H:%M:%S.%f' - def __init__(self, lock, sockname, configuration, featureset): + def __init__(self, lock, sockname, featureset, server_timeout, xmlrpcinterface): - self.configuration = configuration + self.server_timeout = server_timeout + self.xmlrpcinterface = xmlrpcinterface self.featureset = featureset self.sockname = sockname self.bitbake_lock = lock @@ -476,11 +477,11 @@ class BitBakeServer(object): os.chdir(cwd) sock.listen(1) - server = ProcessServer(self.bitbake_lock, sock, self.sockname, self.configuration.server_timeout, self.configuration.xmlrpcinterface) + server = ProcessServer(self.bitbake_lock, sock, self.sockname, self.server_timeout, self.xmlrpcinterface) os.close(self.readypipe) writer = ConnectionWriter(self.readypipein) try: - self.cooker = bb.cooker.BBCooker(self.configuration, self.featureset, server.register_idle_function) + self.cooker = bb.cooker.BBCooker(self.featureset, server.register_idle_function) except bb.BBHandledException: return None writer.send("r") diff --git a/lib/bb/tinfoil.py b/lib/bb/tinfoil.py index dccbe0ebb..e19d9cff0 100644 --- a/lib/bb/tinfoil.py +++ b/lib/bb/tinfoil.py @@ -22,7 +22,6 @@ import bb.taskdata import bb.utils import bb.command import bb.remotedata -from bb.cookerdata import CookerConfiguration from bb.main import setup_bitbake, BitBakeConfigParameters import bb.fetch2 @@ -381,18 +380,13 @@ class Tinfoil: if not config_params: config_params = TinfoilConfigParameters(config_only=config_only, quiet=quiet) - cookerconfig = CookerConfiguration() - cookerconfig.setConfigParameters(config_params) - if not config_only: # Disable local loggers because the UI module is going to set up its own for handler in self.localhandlers: self.logger.handlers.remove(handler) self.localhandlers = [] - self.server_connection, ui_module = setup_bitbake(config_params, - cookerconfig, - extrafeatures) + self.server_connection, ui_module = setup_bitbake(config_params, extrafeatures) self.ui_module = ui_module |