summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Herrera <adrian.herrera@arm.com>2021-01-13 13:44:59 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-01-15 13:39:21 +0000
commitf6c90ed0ad24b7d4f892e22e088b1578824eb1d3 (patch)
tree9ea5c0e18b50fa9ba8d92ea689078b6387dd90b8
parentd9d451804c5955091d12ba6b0670fa50363fa8d8 (diff)
downloadopenembedded-core-contrib-f6c90ed0ad24b7d4f892e22e088b1578824eb1d3.tar.gz
openembedded-core-contrib-f6c90ed0ad24b7d4f892e22e088b1578824eb1d3.tar.bz2
openembedded-core-contrib-f6c90ed0ad24b7d4f892e22e088b1578824eb1d3.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>
-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