summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-04-06 17:46:46 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-06 23:10:30 +0100
commit52c8740e1be75f8817f47d0769728920c80e52b4 (patch)
tree293d4c63a7c42a545e41ad51d5dc22930a2db5fa /bitbake/lib
parentf5d3ef6c8976b1bd6e0b4b49cf13a53bd833d176 (diff)
downloadpoky-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.py8
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):
320 320
321 # run build with local bitbake. stop the server after the build. 321 # run build with local bitbake. stop the server after the build.
322 log = os.path.join(builddir, 'toaster_ui.log') 322 log = os.path.join(builddir, 'toaster_ui.log')
323 local_bitbake = os.path.join(os.path.dirname(os.getenv('BBBASEDIR')),
324 'bitbake')
323 self._shellcmd(['bash -c \"(TOASTER_BRBE="%s" BBSERVER="0.0.0.0:-1" ' 325 self._shellcmd(['bash -c \"(TOASTER_BRBE="%s" BBSERVER="0.0.0.0:-1" '
324 '../bitbake/bin/bitbake %s -u toasterui --token="" >>%s 2>&1;' 326 '%s %s -u toasterui --token="" >>%s 2>&1;'
325 'BITBAKE_UI="" BBSERVER=0.0.0.0:-1 %s -m)&\"' \ 327 'BITBAKE_UI="" BBSERVER=0.0.0.0:-1 %s -m)&\"' \
326 % (brbe, bbtargets, log, bitbake)], builddir, 328 % (brbe, local_bitbake, bbtargets, log, bitbake)],
327 nowait=True) 329 builddir, nowait=True)
328 330
329 logger.debug('localhostbecontroller: Build launched, exiting. ' 331 logger.debug('localhostbecontroller: Build launched, exiting. '
330 'Follow build logs at %s' % log) 332 'Follow build logs at %s' % log)