diff options
| author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-04-12 14:29:11 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-04-13 10:52:54 +0100 |
| commit | 33263b69e6b470b4f02172dabe6815df8ab0cd0a (patch) | |
| tree | cd4499e31ba99ca9fad14840592ed6dbabb4bc6b | |
| parent | b8f26c011d5ed888d85fef040bd821400d54c8fe (diff) | |
| download | openembedded-core-33263b69e6b470b4f02172dabe6815df8ab0cd0a.tar.gz openembedded-core-33263b69e6b470b4f02172dabe6815df8ab0cd0a.tar.bz2 openembedded-core-33263b69e6b470b4f02172dabe6815df8ab0cd0a.zip | |
Revert "scripts: change way we find native tools (pseudo)"
This reverts commit f200f37699031cd98f4594b2992e6b0d8f753440.
This reverts the patch that fixed runqemu-extract-sdk. It failed
to fix other issues in the script/tools that were introduced by RSS. The
following patch from Robert Yang fixes both. Therefore, reverting this
patch in favor of his.
Signed-off-by: brian avery <brian.avery@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rwxr-xr-x | scripts/oe-find-native-sysroot | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/oe-find-native-sysroot b/scripts/oe-find-native-sysroot index 3f4c29da8a..13a5c46039 100755 --- a/scripts/oe-find-native-sysroot +++ b/scripts/oe-find-native-sysroot @@ -2,7 +2,7 @@ # # Find a native sysroot to use - either from an in-tree OE build or # from a toolchain installation. It then ensures the variable -# $OECORE_NATIVE_SYSROOT is set to the sysroot's base directory, and sets +# $OECORE_NATIVE_SYSROOT is set to the sysroot's base directory, and sets # $PSEUDO to the path of the pseudo binary. # # This script is intended to be run within other scripts by source'ing @@ -54,10 +54,10 @@ if [ "x$OECORE_NATIVE_SYSROOT" = "x" ]; then exit 1 fi touch conf/sanity.conf - OECORE_NATIVE_SYSROOT=`bitbake -e meta-ide-support | grep ^RECIPE_SYSROOT_NATIVE | cut -d '"' -f2` + OECORE_NATIVE_SYSROOT=`bitbake -e | grep ^STAGING_DIR_NATIVE | cut -d '"' -f2` rm -f conf/sanity.conf else - OECORE_NATIVE_SYSROOT=`bitbake -e meta-ide-support | grep ^RECIPE_SYSROOT_NATIVE | cut -d '"' -f2` + OECORE_NATIVE_SYSROOT=`bitbake -e | grep ^STAGING_DIR_NATIVE | cut -d '"' -f2` fi else echo "Error: Unable to locate bitbake command." @@ -72,7 +72,7 @@ fi if [ "x$OECORE_NATIVE_SYSROOT" = "x" ]; then # This indicates that there was an error running bitbake -e that # the user needs to be informed of - echo "There was an error running bitbake to determine RECIPE_SYSROOT_NATIVE" + echo "There was an error running bitbake to determine STAGING_DIR_NATIVE" echo "Here is the output from bitbake -e" bitbake -e exit 1 |