summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-04-06 17:46:14 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-06 23:10:27 +0100
commit0b0d754950da5606b4ba7c7a8d3a43706ba8fddf (patch)
treea09c35196bd4a66357c8707a0219b1b36cbd6756 /bitbake/lib/bb
parent94ac3f0ed048d3bf031d942f2fcd5745aaed2cc5 (diff)
downloadpoky-0b0d754950da5606b4ba7c7a8d3a43706ba8fddf.tar.gz
bitbake: toasterui: add brbe parameter to buildinfohelper
In current toaster code BRBE(build request:build environment) value is passed from toaster to buildinfohelper through the 'SetBRBE' event. Passing it through environment variable is easier as it doesn't involve rpc communication between toaster and bitbake server. It also eliminates the need in running bitbake observer process. Added parameter 'brbe' to BuildInfoHelper.__init__ Used environment variable TOASTER_BRBE to set brbe for buildinfohelper object. (Bitbake rev: a0c8e2b309055e5927a8ff729d292ccaa69d0575) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/ui/buildinfohelper.py4
-rw-r--r--bitbake/lib/bb/ui/toasterui.py3
2 files changed, 4 insertions, 3 deletions
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py
index ed43f4c10d..448f263f5a 100644
--- a/bitbake/lib/bb/ui/buildinfohelper.py
+++ b/bitbake/lib/bb/ui/buildinfohelper.py
@@ -849,7 +849,7 @@ class BuildInfoHelper(object):
849 # pylint: disable=bad-continuation 849 # pylint: disable=bad-continuation
850 # we do not follow the python conventions for continuation indentation due to long lines here 850 # we do not follow the python conventions for continuation indentation due to long lines here
851 851
852 def __init__(self, server, has_build_history = False): 852 def __init__(self, server, has_build_history = False, brbe = None):
853 self.internal_state = {} 853 self.internal_state = {}
854 self.internal_state['taskdata'] = {} 854 self.internal_state['taskdata'] = {}
855 self.internal_state['targets'] = [] 855 self.internal_state['targets'] = []
@@ -865,7 +865,7 @@ class BuildInfoHelper(object):
865 865
866 # this is set for Toaster-triggered builds by localhostbecontroller 866 # this is set for Toaster-triggered builds by localhostbecontroller
867 # via toasterui 867 # via toasterui
868 self.brbe = None 868 self.brbe = brbe
869 869
870 self.project = None 870 self.project = None
871 871
diff --git a/bitbake/lib/bb/ui/toasterui.py b/bitbake/lib/bb/ui/toasterui.py
index 538a40964c..06a5f17f4e 100644
--- a/bitbake/lib/bb/ui/toasterui.py
+++ b/bitbake/lib/bb/ui/toasterui.py
@@ -195,7 +195,8 @@ def main(server, eventHandler, params):
195 taskfailures = [] 195 taskfailures = []
196 first = True 196 first = True
197 197
198 buildinfohelper = BuildInfoHelper(server, build_history_enabled) 198 buildinfohelper = BuildInfoHelper(server, build_history_enabled,
199 os.getenv('TOASTER_BRBE'))
199 200
200 # write our own log files into bitbake's log directory; 201 # write our own log files into bitbake's log directory;
201 # we're only interested in the path to the parent directory of 202 # we're only interested in the path to the parent directory of