tinfoil: ensure PATH includes bitbake's bin directory
cover tinfoil: ensure PATH includes bitbake's bin directory
The following changes since commit 95deecabfffdb6a7009ecc385c8b12290fbfcb73:
bitbake: Update version to 1.33.1 (2017-02-07 14:35:48 +0000)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib paule/tinfoil-path
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=paule/tinfoil-path
Paul Eggleton (1):
tinfoil: ensure PATH includes bitbake's bin directory
lib/bb/tinfoil.py | 13 +++++++++++++ 1 file changed, 13 insertions(+)
Signature · 1 line
2.9.3
PATCH 1/1 tinfoil: ensure PATH includes bitbake's bin directory
The runqueue expects to be able to run 'bitbake-worker' from PATH, but for example in the OE extensible SDK, tinfoil is used within devtool where this isn't the case (we're not exposing bitbake to the user, thus bitbake's bin directory isn't in PATH).
This fixes devtool modify usage within the extensible SDK which has apparently been broken since the tinfoil2 changes went in.
Fixes [YOCTO #11034].
--- lib/bb/tinfoil.py | 13 +++++++++++++ 1 file changed, 13 insertions(+)
lib/bb/tinfoil.py +13 -0
@@ -211,6 +211,19 @@ class Tinfoil: self.ui_module = ui_module + # Ensure the path to bitbake's bin directory is in PATH so that things like + # bitbake-worker can be run (usually this is the case, but it doesn't have to be) + path = os.getenv('PATH').split(':') + bitbakebinpath = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..', 'bin')) + for entry in path: + if entry.endswith(os.sep): + entry = entry[:-1] + if os.path.abspath(entry) == bitbakebinpath: + break + else: + path.insert(0, bitbakebinpath) + os.environ['PATH'] = ':'.join(path) + if self.server_connection: _server_connections.append(self.server_connection) if config_only:
Signature · 1 line
2.9.3