[sumo,2/8] toaster: use a more flexible way to find bitbake
Submitted by Belal, Awais on July 6, 2018, 10:43 a.m.
|
Patch ID: 152380
Details
Commit Message
@@ -351,8 +351,19 @@ class LocalhostBEController(BuildEnvironmentController):
# clean the Toaster to build environment
env_clean = 'unset BBPATH;' # clean BBPATH for <= YP-2.4.0
- # run bitbake server from the clone
+ # run bitbake server from the clone if available
+ # otherwise pick it from the PATH
bitbake = os.path.join(self.pokydirname, 'bitbake', 'bin', 'bitbake')
+ if not os.path.exists(bitbake):
+ logger.info("Bitbake not available under %s, will try to use it from PATH" %
+ self.pokydirname)
+ for path in os.environ["PATH"].split(os.pathsep):
+ if os.path.exists(os.path.join(path, 'bitbake')):
+ bitbake = os.path.join(path, 'bitbake')
+ break
+ else:
+ logger.error("Looks like Bitbake is not available, please fix your environment")
+
toasterlayers = os.path.join(builddir,"conf/toaster-bblayers.conf")
self._shellcmd('%s bash -c \"source %s %s; BITBAKE_UI="knotty" %s --read %s --read %s '
'--server-only -B 0.0.0.0:0\"' % (env_clean, oe_init,
The current mechanism for finding the bitbake binary assumes a directory structure which is identical to poky where oe-core's meta and bitbake directories are at the same level. There can be a case where bitbake is used from elsewhere and in such cases the above mentioned assumption fails to hold whereas this is totally allowed by the oe-init-build-env script which can take bitbakedir as an argument. So a better approach would be to use bitbake from PATH while keeping the older mechanism in place so it can be removed after tests are done in various environments. This makes more sense as toaster has also been launched from the same bitbake instance that is the one in PATH. Signed-off-by: Awais Belal <awais_belal@mentor.com> --- bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)