summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMing Liu <peter.x.liu@external.atlascopco.com>2017-06-27 12:38:49 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-28 20:55:09 +0100
commit4a040aa83f79fae203c39fe650f8b1ad504f5eae (patch)
treeba3ba17b38f12508c174adc2764e95195b8eb57a
parent8b6fde28e9fe7503f6946500e5b4ee30664501b9 (diff)
downloadpoky-4a040aa83f79fae203c39fe650f8b1ad504f5eae.tar.gz
scripts/oe-find-native-sysroot: fix a incomplete regexp
A "=" is missing in the regexp, which leads it match multiple results if STAGING_DIR_NATIVE has overrides, for instance: ... STAGING_DIR_NATIVE="xxxx" STAGING_DIR_NATIVE_qemux86="yyyy" ... it will match both of them without "=". (From OE-Core rev: fb9cf84b1d537e2b8c26cd78f6ac27c55a7e79fc) Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/oe-find-native-sysroot2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/oe-find-native-sysroot b/scripts/oe-find-native-sysroot
index 235a67c95c..350ea21373 100755
--- a/scripts/oe-find-native-sysroot
+++ b/scripts/oe-find-native-sysroot
@@ -50,7 +50,7 @@ BITBAKE_E=""
50set_oe_native_sysroot(){ 50set_oe_native_sysroot(){
51 echo "Running bitbake -e $1" 51 echo "Running bitbake -e $1"
52 BITBAKE_E="`bitbake -e $1`" 52 BITBAKE_E="`bitbake -e $1`"
53 OECORE_NATIVE_SYSROOT=`echo "$BITBAKE_E" | grep ^STAGING_DIR_NATIVE | cut -d '"' -f2` 53 OECORE_NATIVE_SYSROOT=`echo "$BITBAKE_E" | grep ^STAGING_DIR_NATIVE= | cut -d '"' -f2`
54 54
55 if [ "x$OECORE_NATIVE_SYSROOT" = "x" ]; then 55 if [ "x$OECORE_NATIVE_SYSROOT" = "x" ]; then
56 # This indicates that there was an error running bitbake -e that 56 # This indicates that there was an error running bitbake -e that