Skip to contentSkip to conversation

scripts/oe-oe-buildenv-internal: add SCRIPTSDIR

PATCH In review Joshua Downer 2 participants 2 messages Sep 6, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scripts/oe-oe-buildenv-internal: add SCRIPTSDIR

The addition of the SCRIPTSDIR variable allows the user to customize the location of the scripts/ directory. The default remains $OEROOT/scripts.

---
 scripts/oe-buildenv-internal | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
scripts/oe-buildenv-internal +6 -1
index 485d4c52e1..564b7c8b55 100755
@@ -77,6 +77,11 @@ if [ -z "$BITBAKEDIR" ]; then
     test -d "$BITBAKEDIR" || BITBAKEDIR="$OEROOT/../bitbake$BBEXTRA"
 fi
 
+if [ -z "$SCRIPTSDIR" ]; then
+    SCRIPTSDIR="$OEROOT/scripts"
+fi
+
+SCRIPTSDIR=$(readlink -f "$SCRIPTSDIR")
 BITBAKEDIR=$(readlink -f "$BITBAKEDIR")
 BUILDDIR=$(readlink -f "$BUILDDIR")
 BBPATH=$BUILDDIR
@@ -93,7 +98,7 @@ PYTHONPATH=$BITBAKEDIR/lib:$PYTHONPATH
 export PYTHONPATH
 
 # Make sure our paths are at the beginning of $PATH
-for newpath in "$BITBAKEDIR/bin" "$OEROOT/scripts"; do
+for newpath in "$BITBAKEDIR/bin" "$SCRIPTSDIR"; do
     # Remove any existences of $newpath from $PATH
     PATH=$(echo $PATH | sed -re "s#(^|:)$newpath(:|$)#\2#g;s#^:##")
 
Signature · 1 line
2.25.1
#1 lore raw

Can you explain the use case please? I'm not sure this should be added to core if there are no uses or examples or tests for it.

Alex

Quoted 46 lines · Joshua Downer

The addition of the SCRIPTSDIR variable allows the user to customize the location of the scripts/ directory. The default remains $OEROOT/scripts.

---
 scripts/oe-buildenv-internal | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
scripts/oe-buildenv-internal +6 -2
index 485d4c52e1..564b7c8b55 100755
@@ -77,6 +77,11 @@ if [ -z "$BITBAKEDIR" ]; then
     test -d "$BITBAKEDIR" || BITBAKEDIR="$OEROOT/../bitbake$BBEXTRA"
 fi
 
+if [ -z "$SCRIPTSDIR" ]; then
+    SCRIPTSDIR="$OEROOT/scripts"
+fi
+
+SCRIPTSDIR=$(readlink -f "$SCRIPTSDIR")
 BITBAKEDIR=$(readlink -f "$BITBAKEDIR")
 BUILDDIR=$(readlink -f "$BUILDDIR")
 BBPATH=$BUILDDIR
@@ -93,7 +98,7 @@ PYTHONPATH=$BITBAKEDIR/lib:$PYTHONPATH
 export PYTHONPATH
 
 # Make sure our paths are at the beginning of $PATH
-for newpath in "$BITBAKEDIR/bin" "$OEROOT/scripts"; do
+for newpath in "$BITBAKEDIR/bin" "$SCRIPTSDIR"; do
     # Remove any existences of $newpath from $PATH
     PATH=$(echo $PATH | sed -re "s#(^|:)$newpath(:|$)#\2#g;s#^:##")
 
--

2.25.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#170342): https://lists.openembedded.org/g/openembedded-core/message/170342
Mute This Topic: https://lists.openembedded.org/mt/93497736/1686489
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-