diff options
| author |   Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-04-06 17:46:14 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-06 23:00:10 +0100 |
| commit | a0c8e2b309055e5927a8ff729d292ccaa69d0575 (patch) | |
| tree | f3e788ca0ae50ea3da13daab91ff7bcc160f5c52 | |
| parent | 9ad6393d30cb6196cf7c9a5adcf33febd724d294 (diff) | |
| download | openembedded-core-contrib-a0c8e2b309055e5927a8ff729d292ccaa69d0575.tar.gz | |
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.
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>
| -rw-r--r-- | lib/bb/ui/buildinfohelper.py | 4 | ||||
| -rw-r--r-- | lib/bb/ui/toasterui.py | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/bb/ui/buildinfohelper.py b/lib/bb/ui/buildinfohelper.py index ed43f4c10d..448f263f5a 100644 --- a/lib/bb/ui/buildinfohelper.py +++ b/lib/bb/ui/buildinfohelper.py @@ -849,7 +849,7 @@ class BuildInfoHelper(object): # pylint: disable=bad-continuation # we do not follow the python conventions for continuation indentation due to long lines here - def __init__(self, server, has_build_history = False): + def __init__(self, server, has_build_history = False, brbe = None): self.internal_state = {} self.internal_state['taskdata'] = {} self.internal_state['targets'] = [] @@ -865,7 +865,7 @@ class BuildInfoHelper(object): # this is set for Toaster-triggered builds by localhostbecontroller # via toasterui - self.brbe = None + self.brbe = brbe self.project = None diff --git a/lib/bb/ui/toasterui.py b/lib/bb/ui/toasterui.py index 538a40964c..06a5f17f4e 100644 --- a/lib/bb/ui/toasterui.py +++ b/lib/bb/ui/toasterui.py @@ -195,7 +195,8 @@ def main(server, eventHandler, params): taskfailures = [] first = True - buildinfohelper = BuildInfoHelper(server, build_history_enabled) + buildinfohelper = BuildInfoHelper(server, build_history_enabled, + os.getenv('TOASTER_BRBE')) # write our own log files into bitbake's log directory; # we're only interested in the path to the parent directory of |