summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster/bldcontrol
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/toaster/bldcontrol')
-rw-r--r--bitbake/lib/toaster/bldcontrol/localhostbecontroller.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
index 19afb1ada5..efba73e769 100644
--- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
+++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
@@ -291,12 +291,19 @@ class LocalhostBEController(BuildEnvironmentController):
291 def triggerBuild(self, bitbake, layers, variables, targets): 291 def triggerBuild(self, bitbake, layers, variables, targets):
292 # set up the buid environment with the needed layers 292 # set up the buid environment with the needed layers
293 self.setLayers(bitbake, layers, targets) 293 self.setLayers(bitbake, layers, targets)
294 self.writeConfFile("conf/toaster-pre.conf", variables)
295 self.writeConfFile("conf/toaster.conf", raw = "INHERIT+=\"toaster buildhistory\"")
296 294
297 # get the bb server running with the build req id and build env id 295 # get the bb server running with the build req id and build env id
298 bbctrl = self.getBBController() 296 bbctrl = self.getBBController()
299 297
298 # set variables
299 for var in variables:
300 bbctrl.setVariable(var.name, var.value)
301
302 # Add 'toaster' and 'buildhistory' to INHERIT variable
303 inherit = {item.strip() for item in bbctrl.getVariable('INHERIT').split()}
304 inherit = inherit.union(["toaster", "buildhistory"])
305 bbctrl.setVariable('INHERIT', ' '.join(inherit))
306
300 # trigger the build command 307 # trigger the build command
301 task = reduce(lambda x, y: x if len(y)== 0 else y, map(lambda y: y.task, targets)) 308 task = reduce(lambda x, y: x if len(y)== 0 else y, map(lambda y: y.task, targets))
302 if len(task) == 0: 309 if len(task) == 0: