summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorAwais Belal <awais_belal@mentor.com>2018-09-30 00:31:09 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-04 14:57:25 +0100
commit161eaa28ed16f93d57f3d1c4be84f894e99ab72e (patch)
tree40a29068710dda130a32bd7200f24032f9f5e773 /bitbake
parent3b8dc3a88e28546100a6b0b2f2cc37f44e619371 (diff)
downloadpoky-161eaa28ed16f93d57f3d1c4be84f894e99ab72e.tar.gz
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 <awais_belal@mentor.com> Signed-off-by: David Reyna <David.Reyna@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/toaster/bldcontrol/localhostbecontroller.py2
1 files changed, 1 insertions, 1 deletions
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):
360 for path in os.environ["PATH"].split(os.pathsep): 360 for path in os.environ["PATH"].split(os.pathsep):
361 if os.path.exists(os.path.join(path, 'bitbake')): 361 if os.path.exists(os.path.join(path, 'bitbake')):
362 bitbake = os.path.join(path, 'bitbake') 362 bitbake = os.path.join(path, 'bitbake')
363 logger.info("Found Bitbake at: %s" % path)
363 break 364 break
364 else: 365 else:
365 logger.error("Looks like Bitbake is not available, please fix your environment") 366 logger.error("Looks like Bitbake is not available, please fix your environment")
366 367
367 # run bitbake server from the clone 368 # run bitbake server from the clone
368 bitbake = os.path.join(self.pokydirname, 'bitbake', 'bin', 'bitbake')
369 toasterlayers = os.path.join(builddir,"conf/toaster-bblayers.conf") 369 toasterlayers = os.path.join(builddir,"conf/toaster-bblayers.conf")
370 self._shellcmd('%s bash -c \"source %s %s; BITBAKE_UI="knotty" %s --read %s --read %s ' 370 self._shellcmd('%s bash -c \"source %s %s; BITBAKE_UI="knotty" %s --read %s --read %s '
371 '--server-only -B 0.0.0.0:0\"' % (env_clean, oe_init, 371 '--server-only -B 0.0.0.0:0\"' % (env_clean, oe_init,