summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2015-01-08 13:15:11 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-08 22:34:36 +0000
commit3c3766927212853dfd195185caaa0fc951f049c8 (patch)
tree67ad0fcb09294cda67f039999716df91cc9e697e /bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py
parented9fa17467ad8f41c654187eb840d4b4e15d262d (diff)
downloadpoky-3c3766927212853dfd195185caaa0fc951f049c8.tar.gz
bitbake: toaster: write pre-read conf file for build variables
We change the setting of variables from directly injection into the set-up cooker to writing a conf file that is pre-read on bitbake server startup. This is needed because the injection can only happen after the variable set is parsed, and the variables already inferred, so setting up variables happens too late. [YOCTO #7045] (Bitbake rev: 854f680b5b9d2d0fa796af84cb1218545fbfc55a) Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py')
-rw-r--r--bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py5
1 files changed, 1 insertions, 4 deletions
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: