diff options
| author |   Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2013-04-09 12:24:13 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-09 13:11:51 +0100 |
| commit | 7429db6f38e405774ba66b3fa1bc3ac4b74ae6b9 (patch) | |
| tree | 960a09cb7d7e77f64ece96585316672bfeca5489 | |
| parent | 01fa98083df0931e07e8715616dafe600258adba (diff) | |
| download | openembedded-core-contrib-7429db6f38e405774ba66b3fa1bc3ac4b74ae6b9.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.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rwxr-xr-x | scripts/oe-buildenv-internal | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal index df953896f1..644df8f30c 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 |