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:10:30 +0100 |
commit | 52c8740e1be75f8817f47d0769728920c80e52b4 (patch) | |
tree | 293d4c63a7c42a545e41ad51d5dc22930a2db5fa /bitbake/lib | |
parent | f5d3ef6c8976b1bd6e0b4b49cf13a53bd833d176 (diff) | |
download | openembedded-core-contrib-52c8740e1be75f8817f47d0769728920c80e52b4.tar.gz |
bitbake: 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 .
(Bitbake rev: 6c9e3375d278bee712c41f07428bc82108b9aaae)
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')
-rw-r--r-- | bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py index ab9cf2574c..7def1f3a17 100644 --- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py +++ b/bitbake/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) |