summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/toaster/bldcontrol/localhostbecontroller.py13
1 files changed, 12 insertions, 1 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
index 5df22909d0..aba09e0d27 100644
--- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
+++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
@@ -444,8 +444,19 @@ class LocalhostBEController(BuildEnvironmentController):
444 # clean the Toaster to build environment 444 # clean the Toaster to build environment
445 env_clean = 'unset BBPATH;' # clean BBPATH for <= YP-2.4.0 445 env_clean = 'unset BBPATH;' # clean BBPATH for <= YP-2.4.0
446 446
447 # run bitbake server from the clone 447 # run bitbake server from the clone if available
448 # otherwise pick it from the PATH
448 bitbake = os.path.join(self.pokydirname, 'bitbake', 'bin', 'bitbake') 449 bitbake = os.path.join(self.pokydirname, 'bitbake', 'bin', 'bitbake')
450 if not os.path.exists(bitbake):
451 logger.info("Bitbake not available under %s, will try to use it from PATH" %
452 self.pokydirname)
453 for path in os.environ["PATH"].split(os.pathsep):
454 if os.path.exists(os.path.join(path, 'bitbake')):
455 bitbake = os.path.join(path, 'bitbake')
456 break
457 else:
458 logger.error("Looks like Bitbake is not available, please fix your environment")
459
449 toasterlayers = os.path.join(builddir,"conf/toaster-bblayers.conf") 460 toasterlayers = os.path.join(builddir,"conf/toaster-bblayers.conf")
450 if not is_merged_attr: 461 if not is_merged_attr:
451 self._shellcmd('%s bash -c \"source %s %s; BITBAKE_UI="knotty" %s --read %s --read %s ' 462 self._shellcmd('%s bash -c \"source %s %s; BITBAKE_UI="knotty" %s --read %s --read %s '