From 977ea67ea58cbab244668c93c8df5ea73b1361e5 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Tue, 9 Apr 2013 12:24:13 +0200 Subject: 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 Signed-off-by: Richard Purdie --- scripts/oe-buildenv-internal | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'scripts/oe-buildenv-internal') 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 -- cgit v1.2.3-54-g00ecf