From cd3c4292e7ccc8934f229fcf010f8615398b87b5 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 8 Jun 2011 09:34:12 +0100 Subject: bitbake: Cleanup bitbake server init process to be clearer to follow Create a standard format server class instance with method calls for each step in the server setup. There should be enough hooks for each of the different server types. Signed-off-by: Richard Purdie --- bitbake/lib/bb/cooker.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'bitbake/lib/bb/cooker.py') diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 8379d0caf1..94495e1399 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -63,12 +63,11 @@ class BBCooker: Manages one bitbake build run """ - def __init__(self, configuration, server): + def __init__(self, configuration, server_registration_cb): self.status = None self.appendlist = {} - if server: - self.server = server.BitBakeServer(self) + self.server_registration_cb = server_registration_cb self.configuration = configuration @@ -109,7 +108,7 @@ class BBCooker: self.configuration.data = bb.data.init() - if not server: + if not self.server_registration_cb: bb.data.setVar("BB_WORKERCONTEXT", "1", self.configuration.data) bb.data.inheritFromOS(self.configuration.data) @@ -831,7 +830,7 @@ class BBCooker: return True return retval - self.server.register_idle_function(buildFileIdle, rq) + self.server_registration_cb(buildFileIdle, rq) def buildTargets(self, targets, task): """ @@ -890,7 +889,7 @@ class BBCooker: rq = bb.runqueue.RunQueue(self, self.configuration.data, self.status, taskdata, runlist) - self.server.register_idle_function(buildTargetsIdle, rq) + self.server_registration_cb(buildTargetsIdle, rq) def updateCache(self): if self.state == state.running: -- cgit v1.2.3-54-g00ecf