summaryrefslogtreecommitdiffstats
path: root/scripts/oe-buildenv-internal
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2013-04-09 12:24:13 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-09 13:16:53 +0100
commit977ea67ea58cbab244668c93c8df5ea73b1361e5 (patch)
treebee42d49fd1fe271097714fc930921428c08032c /scripts/oe-buildenv-internal
parent42a72b1089b9eb8000941769d3d79c8b142b1ad7 (diff)
downloadast2050-yocto-poky-977ea67ea58cbab244668c93c8df5ea73b1361e5.zip
ast2050-yocto-poky-977ea67ea58cbab244668c93c8df5ea73b1361e5.tar.gz
oe-buildenv-internal: Only add to $PATH if needed
First strip $PATH of any existence of the paths needed by Open Embedded and BitBake. Then add the needed paths at the beginning. This makes sure the needed paths are searched first, without growing $PATH unnecessarily if oe-init-build-env is rerun for a directory for which it has previously been run. (From OE-Core rev: 7429db6f38e405774ba66b3fa1bc3ac4b74ae6b9) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/oe-buildenv-internal')
-rwxr-xr-xscripts/oe-buildenv-internal5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal
index df95389..644df8f 100755
--- a/scripts/oe-buildenv-internal
+++ b/scripts/oe-buildenv-internal
@@ -74,8 +74,9 @@ if ! (test -d "$BITBAKEDIR"); then
return 1
fi
-NEWPATHS="${OEROOT}/scripts:$BITBAKEDIR/bin/:"
-[ "${PATH#$NEWPATHS}" != "$PATH" ] || PATH="$NEWPATHS$PATH"
+# Make sure our paths are at the beginning of $PATH
+NEWPATHS="${OEROOT}/scripts:$BITBAKEDIR/bin:"
+PATH=$NEWPATHS$(echo $PATH | sed -e "s|:$NEWPATHS|:|g" -e "s|^$NEWPATHS||")
unset BITBAKEDIR NEWPATHS
# Used by the runqemu script
OpenPOWER on IntegriCloud