diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-08-24 17:05:13 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-08-25 18:14:53 +0100 |
commit | b9bbb5c7b7ea010a098e19c8da34fd5ea667a39f (patch) | |
tree | db4630996fbebd794815d0cb9e0144ba4297ff7f /bitbake/lib/bb/tinfoil.py | |
parent | a1c956ab4cae61ab3640d0455887645940e85ab6 (diff) | |
download | poky-b9bbb5c7b7ea010a098e19c8da34fd5ea667a39f.tar.gz |
bitbake: main/server/process: Drop configuration object passing
The first thing the UIs do is update the server config from the UI. We
can just rely upon that and start the server with a standard config,
removing the need to pass the confusing configuration object around
as well as configParams, which contains a similar copy of some of the
data.
This makes memory resident bitbake work the same way as the normal
mode, removing the opportunity for some class of bugs.
The xmlrpcinterface and server_timeout values are passed in at server
startup time now and there no longer a second option in the
configuration which is effective ignored once the server starts.
(Bitbake rev: 783a03330802e83c525c55522e3ee2a933bded3a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/tinfoil.py')
-rw-r--r-- | bitbake/lib/bb/tinfoil.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/bitbake/lib/bb/tinfoil.py b/bitbake/lib/bb/tinfoil.py index dccbe0ebb5..e19d9cff04 100644 --- a/bitbake/lib/bb/tinfoil.py +++ b/bitbake/lib/bb/tinfoil.py | |||
@@ -22,7 +22,6 @@ import bb.taskdata | |||
22 | import bb.utils | 22 | import bb.utils |
23 | import bb.command | 23 | import bb.command |
24 | import bb.remotedata | 24 | import bb.remotedata |
25 | from bb.cookerdata import CookerConfiguration | ||
26 | from bb.main import setup_bitbake, BitBakeConfigParameters | 25 | from bb.main import setup_bitbake, BitBakeConfigParameters |
27 | import bb.fetch2 | 26 | import bb.fetch2 |
28 | 27 | ||
@@ -381,18 +380,13 @@ class Tinfoil: | |||
381 | if not config_params: | 380 | if not config_params: |
382 | config_params = TinfoilConfigParameters(config_only=config_only, quiet=quiet) | 381 | config_params = TinfoilConfigParameters(config_only=config_only, quiet=quiet) |
383 | 382 | ||
384 | cookerconfig = CookerConfiguration() | ||
385 | cookerconfig.setConfigParameters(config_params) | ||
386 | |||
387 | if not config_only: | 383 | if not config_only: |
388 | # Disable local loggers because the UI module is going to set up its own | 384 | # Disable local loggers because the UI module is going to set up its own |
389 | for handler in self.localhandlers: | 385 | for handler in self.localhandlers: |
390 | self.logger.handlers.remove(handler) | 386 | self.logger.handlers.remove(handler) |
391 | self.localhandlers = [] | 387 | self.localhandlers = [] |
392 | 388 | ||
393 | self.server_connection, ui_module = setup_bitbake(config_params, | 389 | self.server_connection, ui_module = setup_bitbake(config_params, extrafeatures) |
394 | cookerconfig, | ||
395 | extrafeatures) | ||
396 | 390 | ||
397 | self.ui_module = ui_module | 391 | self.ui_module = ui_module |
398 | 392 | ||