summaryrefslogtreecommitdiffstats
path: root/scripts/poky-find-native-sysroot
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/poky-find-native-sysroot')
-rwxr-xr-xscripts/poky-find-native-sysroot14
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/poky-find-native-sysroot b/scripts/poky-find-native-sysroot
index 226229421c..d44fd9536e 100755
--- a/scripts/poky-find-native-sysroot
+++ b/scripts/poky-find-native-sysroot
@@ -2,7 +2,7 @@
2# 2#
3# Find a native sysroot to use - either from an in-tree Poky build or 3# Find a native sysroot to use - either from an in-tree Poky build or
4# from a toolchain installation. It then ensures the variable 4# from a toolchain installation. It then ensures the variable
5# $POKY_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
@@ -30,7 +30,7 @@
30# with this program; if not, write to the Free Software Foundation, Inc., 30# with this program; if not, write to the Free Software Foundation, Inc.,
31# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 31# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
32 32
33if [ -z "$POKY_NATIVE_SYSROOT" ]; then 33if [ -z "$OECORE_NATIVE_SYSROOT" ]; then
34 BITBAKE=`which bitbake` 34 BITBAKE=`which bitbake`
35 if [ "x$BITBAKE" != "x" ]; then 35 if [ "x$BITBAKE" != "x" ]; then
36 if [ "$UID" = "0" ]; then 36 if [ "$UID" = "0" ]; then
@@ -40,10 +40,10 @@ if [ -z "$POKY_NATIVE_SYSROOT" ]; then
40 exit 1 40 exit 1
41 fi 41 fi
42 touch conf/sanity.conf 42 touch conf/sanity.conf
43 POKY_NATIVE_SYSROOT=`bitbake -e | grep ^STAGING_DIR_NATIVE | cut -d '=' -f2 | cut -d '"' -f2` 43 OECORE_NATIVE_SYSROOT=`bitbake -e | grep ^STAGING_DIR_NATIVE | cut -d '=' -f2 | cut -d '"' -f2`
44 rm -f conf/sanity.conf 44 rm -f conf/sanity.conf
45 else 45 else
46 POKY_NATIVE_SYSROOT=`bitbake -e | grep ^STAGING_DIR_NATIVE | cut -d '=' -f2 | cut -d '"' -f2` 46 OECORE_NATIVE_SYSROOT=`bitbake -e | grep ^STAGING_DIR_NATIVE | cut -d '=' -f2 | cut -d '"' -f2`
47 fi 47 fi
48 else 48 else
49 echo "Error: Unable to locate your native sysroot." 49 echo "Error: Unable to locate your native sysroot."
@@ -56,8 +56,8 @@ if [ -z "$POKY_NATIVE_SYSROOT" ]; then
56fi 56fi
57 57
58# Set up pseudo command 58# Set up pseudo command
59if [ ! -e "$POKY_NATIVE_SYSROOT/usr/bin/pseudo" ]; then 59if [ ! -e "$OECORE_NATIVE_SYSROOT/usr/bin/pseudo" ]; then
60 echo "Error: Unable to find pseudo binary in $POKY_NATIVE_SYSROOT/usr/bin/" 60 echo "Error: Unable to find pseudo binary in $OECORE_NATIVE_SYSROOT/usr/bin/"
61 61
62 if [ "x$POKY_DISTRO_VERSION" = "x" ]; then 62 if [ "x$POKY_DISTRO_VERSION" = "x" ]; then
63 echo "Have you run 'bitbake meta-ide-support'?" 63 echo "Have you run 'bitbake meta-ide-support'?"
@@ -69,4 +69,4 @@ if [ ! -e "$POKY_NATIVE_SYSROOT/usr/bin/pseudo" ]; then
69 exit 1 69 exit 1
70 fi 70 fi
71fi 71fi
72PSEUDO="$POKY_NATIVE_SYSROOT/usr/bin/pseudo" 72PSEUDO="$OECORE_NATIVE_SYSROOT/usr/bin/pseudo"