From 5b9e91a3b1d4f56c8646d7d7937ab453cc9c40a0 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Tue, 15 Mar 2016 17:48:53 +0100 Subject: oe-buildenv-internal: Add paths to $PATH individually Instead of assuming that the path to the scripts directory always is in $PATH directly before the bitbake directory, treat them as separate paths and add them individually to $PATH. Signed-off-by: Peter Kjellerstedt Signed-off-by: Ross Burton --- scripts/oe-buildenv-internal | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'scripts/oe-buildenv-internal') diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal index 457763b794..85f82f1b31 100755 --- a/scripts/oe-buildenv-internal +++ b/scripts/oe-buildenv-internal @@ -95,9 +95,14 @@ if ! (test -d "$BITBAKEDIR"); then fi # 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 +for newpath in "$BITBAKEDIR/bin" "$OEROOT/scripts"; do + # Remove any existences of $newpath from $PATH + PATH=$(echo $PATH | sed -re "s#(^|:)$newpath(:|$)#\1#g;s#^:##") + + # Add $newpath to $PATH + PATH="$newpath:$PATH" +done +unset BITBAKEDIR newpath # Used by the runqemu script export BUILDDIR -- cgit 1.2.3-korg