diff options
-rw-r--r-- | bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py index f960a389c4..38503342cb 100644 --- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py +++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | |||
@@ -351,6 +351,19 @@ class LocalhostBEController(BuildEnvironmentController): | |||
351 | # clean the Toaster to build environment | 351 | # clean the Toaster to build environment |
352 | env_clean = 'unset BBPATH;' # clean BBPATH for <= YP-2.4.0 | 352 | env_clean = 'unset BBPATH;' # clean BBPATH for <= YP-2.4.0 |
353 | 353 | ||
354 | # run bitbake server from the clone if available | ||
355 | # otherwise pick it from the PATH | ||
356 | bitbake = os.path.join(self.pokydirname, 'bitbake', 'bin', 'bitbake') | ||
357 | if not os.path.exists(bitbake): | ||
358 | logger.info("Bitbake not available under %s, will try to use it from PATH" % | ||
359 | self.pokydirname) | ||
360 | for path in os.environ["PATH"].split(os.pathsep): | ||
361 | if os.path.exists(os.path.join(path, 'bitbake')): | ||
362 | bitbake = os.path.join(path, 'bitbake') | ||
363 | break | ||
364 | else: | ||
365 | logger.error("Looks like Bitbake is not available, please fix your environment") | ||
366 | |||
354 | # run bitbake server from the clone | 367 | # run bitbake server from the clone |
355 | bitbake = os.path.join(self.pokydirname, 'bitbake', 'bin', 'bitbake') | 368 | bitbake = os.path.join(self.pokydirname, 'bitbake', 'bin', 'bitbake') |
356 | toasterlayers = os.path.join(builddir,"conf/toaster-bblayers.conf") | 369 | toasterlayers = os.path.join(builddir,"conf/toaster-bblayers.conf") |