summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrian avery <brian.avery@intel.com>2017-04-04 15:22:10 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-05 23:22:12 +0100
commitf200f37699031cd98f4594b2992e6b0d8f753440 (patch)
tree70960ac42b0df7bbd7558dbb4880789e27e99d54
parentbb81269c3db0dae68829c8fd6b40a36d7395b641 (diff)
downloadpoky-f200f37699031cd98f4594b2992e6b0d8f753440.tar.gz
scripts: change way we find native tools (pseudo)
oe-find-native-sysroot: Recipe Specific Sysroots have eliminated the large STAGING_DIR_NATIVE. Now, we will rely on the meta-ide-support sysroot that is what was populating the large STAGING_DIR_NATIVE in previous versions anyway. We now look for RECIPE_SYSROOT_NATIVE. [YOCTO #11119] (From OE-Core rev: d8b4c58676705e9749347be0e8f191ccccc37f05) Signed-off-by: brian avery <brian.avery@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/oe-find-native-sysroot8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/oe-find-native-sysroot b/scripts/oe-find-native-sysroot
index 13a5c46039..3f4c29da8a 100755
--- a/scripts/oe-find-native-sysroot
+++ b/scripts/oe-find-native-sysroot
@@ -2,7 +2,7 @@
2# 2#
3# Find a native sysroot to use - either from an in-tree OE build or 3# Find a native sysroot to use - either from an in-tree OE build or
4# from a toolchain installation. It then ensures the variable 4# from a toolchain installation. It then ensures the variable
5# $OECORE_NATIVE_SYSROOT is set to the sysroot's base directory, and sets 5# $OECORE_NATIVE_SYSROOT is set to the sysroot's base directory, and sets
6# $PSEUDO to the path of the pseudo binary. 6# $PSEUDO to the path of the pseudo binary.
7# 7#
8# This script is intended to be run within other scripts by source'ing 8# This script is intended to be run within other scripts by source'ing
@@ -54,10 +54,10 @@ if [ "x$OECORE_NATIVE_SYSROOT" = "x" ]; then
54 exit 1 54 exit 1
55 fi 55 fi
56 touch conf/sanity.conf 56 touch conf/sanity.conf
57 OECORE_NATIVE_SYSROOT=`bitbake -e | grep ^STAGING_DIR_NATIVE | cut -d '"' -f2` 57 OECORE_NATIVE_SYSROOT=`bitbake -e meta-ide-support | grep ^RECIPE_SYSROOT_NATIVE | cut -d '"' -f2`
58 rm -f conf/sanity.conf 58 rm -f conf/sanity.conf
59 else 59 else
60 OECORE_NATIVE_SYSROOT=`bitbake -e | grep ^STAGING_DIR_NATIVE | cut -d '"' -f2` 60 OECORE_NATIVE_SYSROOT=`bitbake -e meta-ide-support | grep ^RECIPE_SYSROOT_NATIVE | cut -d '"' -f2`
61 fi 61 fi
62 else 62 else
63 echo "Error: Unable to locate bitbake command." 63 echo "Error: Unable to locate bitbake command."
@@ -72,7 +72,7 @@ fi
72if [ "x$OECORE_NATIVE_SYSROOT" = "x" ]; then 72if [ "x$OECORE_NATIVE_SYSROOT" = "x" ]; then
73 # This indicates that there was an error running bitbake -e that 73 # This indicates that there was an error running bitbake -e that
74 # the user needs to be informed of 74 # the user needs to be informed of
75 echo "There was an error running bitbake to determine STAGING_DIR_NATIVE" 75 echo "There was an error running bitbake to determine RECIPE_SYSROOT_NATIVE"
76 echo "Here is the output from bitbake -e" 76 echo "Here is the output from bitbake -e"
77 bitbake -e 77 bitbake -e
78 exit 1 78 exit 1