diff options
Diffstat (limited to 'bitbake/lib/toaster/bldcontrol/localhostbecontroller.py')
-rw-r--r-- | bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py index a7db1efc65..efd82c325b 100644 --- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py +++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | |||
@@ -308,12 +308,17 @@ class LocalhostBEController(BuildEnvironmentController): | |||
308 | # get the bb server running with the build req id and build env id | 308 | # get the bb server running with the build req id and build env id |
309 | bbctrl = self.getBBController() | 309 | bbctrl = self.getBBController() |
310 | 310 | ||
311 | # set variables | 311 | # set variables; TOASTER_BRBE is not set on the server, as this |
312 | # causes events from command-line builds to be attached to the last | ||
313 | # Toaster-triggered build; instead, TOASTER_BRBE is fired as an event so | ||
314 | # that toasterui can set it on the buildinfohelper; | ||
315 | # see https://bugzilla.yoctoproject.org/show_bug.cgi?id=9021 | ||
312 | for var in variables: | 316 | for var in variables: |
313 | bbctrl.setVariable(var.name, var.value) | ||
314 | if var.name == 'TOASTER_BRBE': | 317 | if var.name == 'TOASTER_BRBE': |
315 | bbctrl.triggerEvent('bb.event.MetadataEvent("SetBRBE", "%s")' \ | 318 | bbctrl.triggerEvent('bb.event.MetadataEvent("SetBRBE", "%s")' \ |
316 | % var.value) | 319 | % var.value) |
320 | else: | ||
321 | bbctrl.setVariable(var.name, var.value) | ||
317 | 322 | ||
318 | # Add 'toaster' and 'buildhistory' to INHERIT variable | 323 | # Add 'toaster' and 'buildhistory' to INHERIT variable |
319 | inherit = {item.strip() for item in bbctrl.getVariable('INHERIT').split()} | 324 | inherit = {item.strip() for item in bbctrl.getVariable('INHERIT').split()} |