diff options
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | 2 | ||||
-rw-r--r-- | bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py index 1ccdd24b89..e588924639 100644 --- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py +++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | |||
@@ -256,7 +256,7 @@ class LocalhostBEController(BuildEnvironmentController): | |||
256 | return open(os.path.join(self.be.builddir, "toaster_server.log"), "r").read() | 256 | return open(os.path.join(self.be.builddir, "toaster_server.log"), "r").read() |
257 | 257 | ||
258 | 258 | ||
259 | def triggerBuild(self, bitbake, layers, variables, targets): | 259 | def triggerBuild(self, bitbake, layers, variables, targets, brbe): |
260 | # set up the build environment with the needed layers | 260 | # set up the build environment with the needed layers |
261 | self.setLayers(bitbake, layers, targets) | 261 | self.setLayers(bitbake, layers, targets) |
262 | 262 | ||
diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py b/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py index 0bd5d08226..8ba836ee4b 100644 --- a/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py +++ b/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py | |||
@@ -49,15 +49,13 @@ class Command(NoArgsCommand): | |||
49 | 49 | ||
50 | logger.debug("runbuilds: starting build %s, environment %s" % (str(br).decode('utf-8'), bec.be)) | 50 | logger.debug("runbuilds: starting build %s, environment %s" % (str(br).decode('utf-8'), bec.be)) |
51 | 51 | ||
52 | # write the build identification variable | ||
53 | BRVariable.objects.create(req = br, name="TOASTER_BRBE", value="%d:%d" % (br.pk, bec.be.pk)) | ||
54 | |||
55 | # let the build request know where it is being executed | 52 | # let the build request know where it is being executed |
56 | br.environment = bec.be | 53 | br.environment = bec.be |
57 | br.save() | 54 | br.save() |
58 | 55 | ||
59 | # this triggers an async build | 56 | # this triggers an async build |
60 | bec.triggerBuild(br.brbitbake, br.brlayer_set.all(), br.brvariable_set.all(), br.brtarget_set.all()) | 57 | bec.triggerBuild(br.brbitbake, br.brlayer_set.all(), br.brvariable_set.all(), |
58 | br.brtarget_set.all(), "%d:%d" % (br.pk, bec.be.pk)) | ||
61 | 59 | ||
62 | except Exception as e: | 60 | except Exception as e: |
63 | logger.error("runbuilds: Error launching build %s" % e) | 61 | logger.error("runbuilds: Error launching build %s" % e) |