From 2837b110ae8fd5ff0ca3ac5959cadb7d4a5ce6cc Mon Sep 17 00:00:00 2001 From: Alexandru DAMIAN Date: Mon, 13 Oct 2014 17:10:39 +0100 Subject: bitbake: toaster: change startup parameter passing to avoid race We avoid a race between the setting the TOASTER_BRBE variable and reading the variable in toaster ui by supplying the variable at server startup time through the toaster.conf post-read file. Additional small changes are included, including marking the build request with the environment id of where the build took place. (Bitbake rev: 7c333350418c4140e6c988c5272940f8057d327d) Signed-off-by: Alexandru DAMIAN Signed-off-by: Richard Purdie --- bitbake/lib/toaster/bldcontrol/bbcontroller.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bitbake/lib/toaster/bldcontrol/bbcontroller.py') diff --git a/bitbake/lib/toaster/bldcontrol/bbcontroller.py b/bitbake/lib/toaster/bldcontrol/bbcontroller.py index 6812ae3e6e..6bb45d6388 100644 --- a/bitbake/lib/toaster/bldcontrol/bbcontroller.py +++ b/bitbake/lib/toaster/bldcontrol/bbcontroller.py @@ -118,7 +118,7 @@ class BuildEnvironmentController(object): self.connection = None - def startBBServer(self): + def startBBServer(self, brbe): """ Starts a BB server with Toaster toasterui set up to record the builds, an no controlling UI. After this method executes, self.be bbaddress/bbport MUST point to a running and free server, and the bbstate MUST be updated to "started". @@ -142,12 +142,12 @@ class BuildEnvironmentController(object): raise Exception("Must override setLayers") - def getBBController(self): + def getBBController(self, brbe): """ returns a BitbakeController to an already started server; this is the point where the server starts if needed; or reconnects to the server if we can """ if not self.connection: - self.startBBServer() + self.startBBServer(brbe) self.be.lock = BuildEnvironment.LOCK_RUNNING self.be.save() -- cgit v1.2.3-54-g00ecf