summaryrefslogtreecommitdiffstats
path: root/poky
diff options
context:
space:
mode:
authorAwais Belal <awais_belal@mentor.com>2018-09-30 00:31:09 -0700
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-10-04 11:19:54 -0400
commit34261d61da43014259ea8e0a251bd250cf1fe5ee (patch)
treebb1867c1638b0cf220e4250e772600919a3ec136 /poky
parentf9bacb13d958fbaa3c45ac19a2a4e381b30e031f (diff)
downloadtalos-openbmc-34261d61da43014259ea8e0a251bd250cf1fe5ee.tar.gz
talos-openbmc-34261d61da43014259ea8e0a251bd250cf1fe5ee.zip
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) (From poky rev: 161eaa28ed16f93d57f3d1c4be84f894e99ab72e) Change-Id: Ida33083b2054d5b402a1d04cfcd021e8f9802707 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> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky')
-rw-r--r--poky/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/poky/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/poky/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
index 38503342c..63b4187ba 100644
--- a/poky/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
+++ b/poky/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,
OpenPOWER on IntegriCloud