From: Ed Bartosh <ed.bartosh@linux.intel.com>
Date: Wed, 6 Apr 2016 16:46:46 +0000 (+0100)
Subject: toaster: get bitbake location from BBBASEDIR
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c9e3375d278bee712c41f07428bc82108b9aaae;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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>
---

diff --git a/lib/toaster/bldcontrol/localhostbecontroller.py b/lib/toaster/bldcontrol/localhostbecontroller.py
index ab9cf2574cd..7def1f3a172 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)