diff options
Diffstat (limited to 'bitbake/lib/toaster')
3 files changed, 21 insertions, 9 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/bbcontroller.py b/bitbake/lib/toaster/bldcontrol/bbcontroller.py index dbfb2f3..cf3f1fd 100644 --- a/bitbake/lib/toaster/bldcontrol/bbcontroller.py +++ b/bitbake/lib/toaster/bldcontrol/bbcontroller.py @@ -140,25 +140,25 @@ class BuildEnvironmentController(object): bblayerconffile.write("# line added by toaster build control\nBBLAYERS = \"" + " ".join(layerlist) + "\"") bblayerconffile.close() - def writePreConfFile(self, variable_list): - prefilepath = os.path.join(self.be.builddir, "conf/toaster-pre.conf") - with open(prefilepath, "w") as prefile: - for i in variable_list: - prefile.write("%s=\"%s\"\n" % (i.name, i.value)) + def writeConfFile(self, variable_list = None, raw = None): + """ Writes a configuration file in the build directory. Override with buildenv-specific implementation. """ + raise Exception("FIXME: Must override to actually write a configuration file") - def startBBServer(self, brbe): + + def startBBServer(self): """ 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". """ - raise Exception("Must override in order to actually start the BB server") + raise Exception("FIXME: Must override in order to actually start the BB server") def stopBBServer(self): """ Stops the currently running BB server. The bbstate MUST be updated to "stopped". self.connection must be none. """ + raise Exception("FIXME: Must override stoBBServer") def setLayers(self, bbs, ls): """ Checks-out bitbake executor and layers from git repositories. @@ -168,7 +168,7 @@ class BuildEnvironmentController(object): a word of attention: by convention, the first layer for any build will be poky! """ - raise Exception("Must override setLayers") + raise Exception("FIXME: Must override setLayers") def getBBController(self): diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py index 980751f..47708d1 100644 --- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py +++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py @@ -82,6 +82,17 @@ class LocalhostBEController(BuildEnvironmentController): self._createdirpath(self.be.builddir) self._shellcmd("bash -c \"source %s/oe-init-build-env %s\"" % (self.pokydirname, self.be.builddir)) + + def writeConfFile(self, file_name, variable_list = None, raw = None): + filepath = os.path.join(self.be.builddir, file_name) + with open(filepath, "w") as conffile: + if variable_list is not None: + for i in variable_list: + conffile.write("%s=\"%s\"\n" % (i.name, i.value)) + if raw is not None: + conffile.write(raw) + + def startBBServer(self): assert self.pokydirname and os.path.exists(self.pokydirname) assert self.islayerset diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py b/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py index 23ee855..3b539b5 100644 --- a/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py +++ b/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py @@ -56,7 +56,8 @@ class Command(NoArgsCommand): # set up the buid environment with the needed layers bec.setLayers(br.brbitbake_set.all(), br.brlayer_set.all()) - bec.writePreConfFile(br.brvariable_set.all()) + bec.writeConfFile("conf/toaster-pre.conf", br.brvariable_set.all()) + bec.writeConfFile("conf/toaster.conf", raw = "INHERIT+=\"toaster buildhistory\"") # get the bb server running with the build req id and build env id bbctrl = bec.getBBController() |
