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:54:10 +0100 |
| commit | 5897c5edc4549dddef7a7b2cbb8d60a9d33b4c10 (patch) | |
| tree | c1b46df676ef760b5b88424186952f8673b4a2b6 /scripts | |
| parent | 42734220721e3aaa46642014319d91189e63ce9f (diff) | |
| download | poky-5897c5edc4549dddef7a7b2cbb8d60a9d33b4c10.tar.gz | |
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.
(From OE-Core rev: 33263b69e6b470b4f02172dabe6815df8ab0cd0a)
Signed-off-by: brian avery <brian.avery@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
| -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 @@ | |||
| 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 meta-ide-support | grep ^RECIPE_SYSROOT_NATIVE | cut -d '"' -f2` | 57 | OECORE_NATIVE_SYSROOT=`bitbake -e | grep ^STAGING_DIR_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 meta-ide-support | grep ^RECIPE_SYSROOT_NATIVE | cut -d '"' -f2` | 60 | OECORE_NATIVE_SYSROOT=`bitbake -e | grep ^STAGING_DIR_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 | |||
| 72 | if [ "x$OECORE_NATIVE_SYSROOT" = "x" ]; then | 72 | if [ "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 RECIPE_SYSROOT_NATIVE" | 75 | echo "There was an error running bitbake to determine STAGING_DIR_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 |
