From fcbba5a89b2ebe3a6688b976f6e0600970d9cc4b Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Wed, 2 Dec 2015 10:02:54 -0800 Subject: bitbake: toaster: set varibales on bitbake server Set project variables using connection to bitbake server instead of writing them to toaster configuration files. This is a way to avoid rewriting configuration files before and after every build, triggered by toaster UI. (Bitbake rev: 3f77c69b867735b5d27c6ab7c62e39ac8d5cb2b5) Signed-off-by: Ed Bartosh Signed-off-by: brian avery Signed-off-by: Richard Purdie --- bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'bitbake') 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): def triggerBuild(self, bitbake, layers, variables, targets): # set up the buid environment with the needed layers self.setLayers(bitbake, layers, targets) - self.writeConfFile("conf/toaster-pre.conf", variables) - self.writeConfFile("conf/toaster.conf", raw = "INHERIT+=\"toaster buildhistory\"") # get the bb server running with the build req id and build env id bbctrl = self.getBBController() + # set variables + for var in variables: + bbctrl.setVariable(var.name, var.value) + + # Add 'toaster' and 'buildhistory' to INHERIT variable + inherit = {item.strip() for item in bbctrl.getVariable('INHERIT').split()} + inherit = inherit.union(["toaster", "buildhistory"]) + bbctrl.setVariable('INHERIT', ' '.join(inherit)) + # trigger the build command task = reduce(lambda x, y: x if len(y)== 0 else y, map(lambda y: y.task, targets)) if len(task) == 0: -- cgit v1.2.3-54-g00ecf