diff options
| author |   Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-04-06 17:46:46 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-06 23:00:10 +0100 |
| commit | 6c9e3375d278bee712c41f07428bc82108b9aaae (patch) | |
| tree | 3f2499ea3b9f385d6a64a0027a63324d4a148614 | |
| parent | 429d47325aadb74d476e5b7f4738f2dfe26cde95 (diff) | |
| download | openembedded-core-contrib-6c9e3375d278bee712c41f07428bc82108b9aaae.tar.gz | |
toaster: get bitbake location from BBBASEDIR
It was incorrectly assumed in the current code that bitbake is in
../bitbake/bin/ directory. It's not always the case.
Using bitbake from $BBBASEDIR should be .
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/toaster/bldcontrol/localhostbecontroller.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/toaster/bldcontrol/localhostbecontroller.py b/lib/toaster/bldcontrol/localhostbecontroller.py index ab9cf2574c..7def1f3a17 100644 --- a/lib/toaster/bldcontrol/localhostbecontroller.py +++ b/lib/toaster/bldcontrol/localhostbecontroller.py @@ -320,11 +320,13 @@ class LocalhostBEController(BuildEnvironmentController): # run build with local bitbake. stop the server after the build. log = os.path.join(builddir, 'toaster_ui.log') + local_bitbake = os.path.join(os.path.dirname(os.getenv('BBBASEDIR')), + 'bitbake') self._shellcmd(['bash -c \"(TOASTER_BRBE="%s" BBSERVER="0.0.0.0:-1" ' - '../bitbake/bin/bitbake %s -u toasterui --token="" >>%s 2>&1;' + '%s %s -u toasterui --token="" >>%s 2>&1;' 'BITBAKE_UI="" BBSERVER=0.0.0.0:-1 %s -m)&\"' \ - % (brbe, bbtargets, log, bitbake)], builddir, - nowait=True) + % (brbe, local_bitbake, bbtargets, log, bitbake)], + builddir, nowait=True) logger.debug('localhostbecontroller: Build launched, exiting. ' 'Follow build logs at %s' % log) |