summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Herrera <adrian.herrera@arm.com>2021-01-13 13:44:59 +0000
committerSteve Sakoman <steve@sakoman.com>2021-01-18 04:46:16 -1000
commitd5cb96e3b5501b7349d075c47636902c9ce1c49c (patch)
tree691ca96dc3dfa8e3e31d52bddc34b3bc336bdfe9
parent62c5cac25fef9c1ad98b7300f8c52ae21344870e (diff)
downloadopenembedded-core-d5cb96e3b5501b7349d075c47636902c9ce1c49c.tar.gz
openembedded-core-d5cb96e3b5501b7349d075c47636902c9ce1c49c.tar.bz2
openembedded-core-d5cb96e3b5501b7349d075c47636902c9ce1c49c.zip
scripts: oe-run-native, fix *-native directories
This fixes a crash with "find" when running a native tool and *-native directories do not exist under the binary directory in the sysroot. This happened because the directory wildcard was passed as part of the root directory. The directory wildcard is now passed by "-name", which returns an empty result if no matching directory. Signed-off-by: Adrian Herrera <adrian.herrera@arm.com> Change-Id: Iba7acd8bbd7e0beb4d25c984f6af7a4fd21486e6 Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit f6c90ed0ad24b7d4f892e22e088b1578824eb1d3) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rwxr-xr-xscripts/oe-run-native2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/oe-run-native b/scripts/oe-run-native
index 4e63e69cc4..22958d97e7 100755
--- a/scripts/oe-run-native
+++ b/scripts/oe-run-native
@@ -43,7 +43,7 @@ fi
OLD_PATH=$PATH
# look for a tool only in native sysroot
-PATH=$OECORE_NATIVE_SYSROOT/usr/bin:$OECORE_NATIVE_SYSROOT/bin:$OECORE_NATIVE_SYSROOT/usr/sbin:$OECORE_NATIVE_SYSROOT/sbin$(find $OECORE_NATIVE_SYSROOT/usr/bin/*-native -maxdepth 1 -type d -printf ":%p")
+PATH=$OECORE_NATIVE_SYSROOT/usr/bin:$OECORE_NATIVE_SYSROOT/bin:$OECORE_NATIVE_SYSROOT/usr/sbin:$OECORE_NATIVE_SYSROOT/sbin$(find $OECORE_NATIVE_SYSROOT/usr/bin -maxdepth 1 -name "*-native" -type d -printf ":%p")
tool_find=`/usr/bin/which $tool 2>/dev/null`
if [ -n "$tool_find" ] ; then