Skip to contentSkip to conversation

oe-buildenv-internal: remove path from previous project

PATCH Superseded [email protected] 1 participant 1 message May 12, 2023

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 oe-buildenv-internal: remove path from previous project

From: Chen Qi <[email protected]>

For now, only that paths added from current project are removed to avoid PATH growing unnecessarily. This is to handle the case of sourcing the init script into different build directories.

However, if we source the init script from different projects into different build directories, the paths added by previous projects are not cleaned up.

To avoid this, we record the paths added into OE_ADDED_PATH, and remove it in the next sourcing.

Note that the paths, "$OEROOT/scripts:$BITBAKEDIR/bin:", are added
as a whole. A previous commit, "oe-buildenv-internal: Add paths to $PATH individually", made the change to treat these two paths separately, the reason was
not "assuming the path to the scripts directory always is in $PATH directly before the bitbake directory". But this is exactly the effect
of the codes. I see no reason why we should complicate things.

---
 scripts/oe-buildenv-internal | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
scripts/oe-buildenv-internal +6 -8
index 485d4c52e1..fdc29bd353 100755
@@ -92,15 +92,13 @@ fi
 PYTHONPATH=$BITBAKEDIR/lib:$PYTHONPATH
 export PYTHONPATH
 
+# Remove old added path
+[ -n "$OE_ADDED_PATH" ] && PATH=$(echo $PATH | sed -e "s#$OE_ADDED_PATH##")
+OE_ADDED_PATH="$OEROOT/scripts:$BITBAKEDIR/bin:"
 # Make sure our paths are at the beginning of $PATH
-for newpath in "$BITBAKEDIR/bin" "$OEROOT/scripts"; do
-    # Remove any existences of $newpath from $PATH
-    PATH=$(echo $PATH | sed -re "s#(^|:)$newpath(:|$)#\2#g;s#^:##")
-
-    # Add $newpath to $PATH
-    PATH="$newpath:$PATH"
-done
-unset BITBAKEDIR newpath
+PATH="$OE_ADDED_PATH$PATH"
+export OE_ADDED_PATH
+unset BITBAKEDIR
 
 # Used by the runqemu script
 export BUILDDIR
Signature · 1 line
2.34.1