From 161eaa28ed16f93d57f3d1c4be84f894e99ab72e Mon Sep 17 00:00:00 2001 From: Awais Belal Date: Sun, 30 Sep 2018 00:31:09 -0700 Subject: bitbake: toaster: Fix bitbake flexible path error from Bugzilla #12891 Commit 15340edce23e63b060c75114d508e1f76757239c introduced a way which allowed bitbake to be found from the PATH variable when directory structures different from poky are used. This just drops a leftover bitbake definition which made the earlier implementation meaningless by reassigning the path relative to oe-core/meta. [YOCTO #12942] (Bitbake rev: 99321236c516277c9d423b1b355bbce1245d9923) Signed-off-by: Awais Belal Signed-off-by: David Reyna Signed-off-by: Richard Purdie --- bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bitbake/lib') diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py index 38503342cb..63b4187bad 100644 --- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py +++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py @@ -360,12 +360,12 @@ class LocalhostBEController(BuildEnvironmentController): for path in os.environ["PATH"].split(os.pathsep): if os.path.exists(os.path.join(path, 'bitbake')): bitbake = os.path.join(path, 'bitbake') + logger.info("Found Bitbake at: %s" % path) break else: logger.error("Looks like Bitbake is not available, please fix your environment") # run bitbake server from the clone - bitbake = os.path.join(self.pokydirname, 'bitbake', 'bin', 'bitbake') 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, -- cgit v1.2.3-54-g00ecf