diff options
Diffstat (limited to 'bitbake/lib/toaster/bldcontrol')
-rw-r--r-- | bitbake/lib/toaster/bldcontrol/bbcontroller.py | 5 | ||||
-rw-r--r-- | bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/bbcontroller.py b/bitbake/lib/toaster/bldcontrol/bbcontroller.py index 7c27fe110e..102606e929 100644 --- a/bitbake/lib/toaster/bldcontrol/bbcontroller.py +++ b/bitbake/lib/toaster/bldcontrol/bbcontroller.py | |||
@@ -135,6 +135,11 @@ class BuildEnvironmentController(object): | |||
135 | bblayerconffile.write("# line added by toaster build control\nBBLAYERS = \"" + " ".join(layerlist) + "\"") | 135 | bblayerconffile.write("# line added by toaster build control\nBBLAYERS = \"" + " ".join(layerlist) + "\"") |
136 | bblayerconffile.close() | 136 | bblayerconffile.close() |
137 | 137 | ||
138 | def writePreConfFile(self, variable_list): | ||
139 | prefilepath = os.path.join(self.be.builddir, "conf/toaster-pre.conf") | ||
140 | with open(prefilepath, "w") as prefile: | ||
141 | for i in variable_list: | ||
142 | prefile.write("%s=\"%s\"\n" % (i.name, i.value)) | ||
138 | 143 | ||
139 | 144 | ||
140 | def startBBServer(self, brbe): | 145 | def startBBServer(self, brbe): |
diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py b/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py index 56c989c9c9..bdce6ee902 100644 --- a/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py +++ b/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py | |||
@@ -53,14 +53,11 @@ class Command(NoArgsCommand): | |||
53 | 53 | ||
54 | # set up the buid environment with the needed layers | 54 | # set up the buid environment with the needed layers |
55 | bec.setLayers(br.brbitbake_set.all(), br.brlayer_set.all()) | 55 | bec.setLayers(br.brbitbake_set.all(), br.brlayer_set.all()) |
56 | bec.writePreConfFile(br.brvariable_set.all()) | ||
56 | 57 | ||
57 | # get the bb server running with the build req id and build env id | 58 | # get the bb server running with the build req id and build env id |
58 | bbctrl = bec.getBBController("%d:%d" % (br.pk, bec.be.pk)) | 59 | bbctrl = bec.getBBController("%d:%d" % (br.pk, bec.be.pk)) |
59 | 60 | ||
60 | # set the build configuration | ||
61 | for variable in br.brvariable_set.all(): | ||
62 | bbctrl.setVariable(variable.name, variable.value) | ||
63 | |||
64 | # trigger the build command | 61 | # trigger the build command |
65 | task = reduce(lambda x, y: x if len(y)== 0 else y, map(lambda y: y.task, br.brtarget_set.all())) | 62 | task = reduce(lambda x, y: x if len(y)== 0 else y, map(lambda y: y.task, br.brtarget_set.all())) |
66 | if len(task) == 0: | 63 | if len(task) == 0: |