summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross@burtonini.com>2021-05-04 13:57:40 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-05-11 12:02:29 +0100
commite18e4cb59f0b663d5fa77eb9b0c1aca1067d3f68 (patch)
tree5289751cf41486762337bd25be9e18a867c2f26f
parent7843c046ad249bea1cccb333a1a16e05d627bbe4 (diff)
downloadpoky-e18e4cb59f0b663d5fa77eb9b0c1aca1067d3f68.tar.gz
oe-buildenv-internal: add BitBake's library to PYTHONPATH
There are many Python scripts in oe-core that want to use Tinfoil, and right now they have to know where they are to work out where BitBake is likely to be. This is suboptimal as BitBake could be somewhere else, so this approach doesn't scale to other layers at all. Solve this by adding BITBAKEDIR/lib to PYTHONPATH in oe-buildenv-internal, so that Python has BitBake on its search path once the build system is configured. (From OE-Core rev: c65fe0a000c1170d346ffcddf7c65fad53a55b36) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit a48178f6d00e7f97a09f42d5a164204e9dcffa9f) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/oe-buildenv-internal4
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal
index ba0a9b44d6..e0d920f2fc 100755
--- a/scripts/oe-buildenv-internal
+++ b/scripts/oe-buildenv-internal
@@ -88,6 +88,10 @@ if [ ! -d "$BITBAKEDIR" ]; then
88 return 1 88 return 1
89fi 89fi
90 90
91# Add BitBake's library to PYTHONPATH
92PYTHONPATH=$BITBAKEDIR/lib:$PYTHONPATH
93export PYTHONPATH
94
91# Make sure our paths are at the beginning of $PATH 95# Make sure our paths are at the beginning of $PATH
92for newpath in "$BITBAKEDIR/bin" "$OEROOT/scripts"; do 96for newpath in "$BITBAKEDIR/bin" "$OEROOT/scripts"; do
93 # Remove any existences of $newpath from $PATH 97 # Remove any existences of $newpath from $PATH