diff options
Diffstat (limited to 'bin/bitbake')
| -rwxr-xr-x | bin/bitbake | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/bin/bitbake b/bin/bitbake index 60c4b96c7..b4506efb5 100755 --- a/bin/bitbake +++ b/bin/bitbake @@ -75,18 +75,6 @@ def get_ui(config): sys.exit("FATAL: Invalid user interface '%s' specified.\n" "Valid interfaces: depexp, goggle, ncurses, hob, knotty [default]." % interface) -def gather_extra_cache_data(): - extra = [] - interfaces = ['depexp', 'goggle', 'ncurses', 'hob', 'knotty'] - for i in interfaces: - try: - ui = __import__("bb.ui." + i, fromlist = [i]) - if hasattr(ui, "extraCaches"): - extra = extra + ui.extraCaches - del ui - except: - pass - return extra # Display bitbake/OE warnings via the BitBake.Warnings logger, ignoring others""" warnlog = logging.getLogger("BitBake.Warnings") @@ -302,25 +290,22 @@ def main(): # Clear away any spurious environment variables while we stoke up the cooker cleanedvars = bb.utils.clean_environment() - # Collect all the caches we need - if configParams.server_only: - configuration.extra_caches = gather_extra_cache_data() - else: - configuration.extra_caches = getattr(ui_module, "extraCaches", []) - if not configParams.remote_server: # we start a server with a given configuration server = start_server(servermodule, configParams, configuration) else: - # we start a stub server that is actually a XMLRPClient to + # we start a stub server that is actually a XMLRPClient that connects to a real server server = servermodule.BitBakeXMLRPCClient(configParams.observe_only) server.saveConnectionDetails(configParams.remote_server) logger.removeHandler(handler) if not configParams.server_only: + # Collect the feature set for the UI + featureset = getattr(ui_module, "featureSet", []) + # Setup a connection to the server (cooker) - server_connection = server.establishConnection() + server_connection = server.establishConnection(featureset) # Restore the environment in case the UI needs it for k in cleanedvars: |