[oe-commits] [bitbake] branch 1.38 updated: toaster: Fix bitbake flexible path error from Bugzilla #12891

git at git.openembedded.org git at git.openembedded.org
Thu Oct 4 13:57:52 UTC 2018


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch 1.38
in repository bitbake.

The following commit(s) were added to refs/heads/1.38 by this push:
     new 9932123  toaster: Fix bitbake flexible path error from Bugzilla #12891
9932123 is described below

commit 99321236c516277c9d423b1b355bbce1245d9923
Author: Awais Belal <awais_belal at mentor.com>
AuthorDate: Sun Sep 30 00:31:09 2018 -0700

    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]
    
    Signed-off-by: Awais Belal <awais_belal at mentor.com>
    Signed-off-by: David Reyna <David.Reyna at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/toaster/bldcontrol/localhostbecontroller.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/toaster/bldcontrol/localhostbecontroller.py b/lib/toaster/bldcontrol/localhostbecontroller.py
index 3850334..63b4187 100644
--- a/lib/toaster/bldcontrol/localhostbecontroller.py
+++ b/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,

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list