summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/toolchain-scripts.bbclass12
-rwxr-xr-xscripts/oe-find-native-sysroot2
-rwxr-xr-xscripts/runqemu-export-rootfs2
3 files changed, 8 insertions, 8 deletions
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index f7b52be752..b7e4e04eaf 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -29,8 +29,8 @@ toolchain_create_sdk_env_script () {
29 echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script 29 echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
30 echo 'export OECORE_TARGET_SYSROOT="${SDKTARGETSYSROOT}"' >> $script 30 echo 'export OECORE_TARGET_SYSROOT="${SDKTARGETSYSROOT}"' >> $script
31 echo 'export OECORE_ACLOCAL_OPTS="-I ${SDKPATHNATIVE}/usr/share/aclocal"' >> $script 31 echo 'export OECORE_ACLOCAL_OPTS="-I ${SDKPATHNATIVE}/usr/share/aclocal"' >> $script
32 echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script 32 echo 'export OECORE_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
33 echo 'export POKY_SDK_VERSION="${SDK_VERSION}"' >> $script 33 echo 'export OECORE_SDK_VERSION="${SDK_VERSION}"' >> $script
34} 34}
35 35
36# This function creates an environment-setup-script in the TMPDIR which enables 36# This function creates an environment-setup-script in the TMPDIR which enables
@@ -63,8 +63,8 @@ toolchain_create_tree_env_script () {
63 echo 'export OECORE_NATIVE_SYSROOT="${STAGING_DIR_NATIVE}"' >> $script 63 echo 'export OECORE_NATIVE_SYSROOT="${STAGING_DIR_NATIVE}"' >> $script
64 echo 'export OECORE_TARGET_SYSROOT="${STAGING_DIR_TARGET}"' >> $script 64 echo 'export OECORE_TARGET_SYSROOT="${STAGING_DIR_TARGET}"' >> $script
65 echo 'export OECORE_ACLOCAL_OPTS="-I ${STAGING_DIR_NATIVE}/usr/share/aclocal"' >> $script 65 echo 'export OECORE_ACLOCAL_OPTS="-I ${STAGING_DIR_NATIVE}/usr/share/aclocal"' >> $script
66 echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script 66 echo 'export OECORE_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
67 echo 'export POKY_SDK_VERSION="${SDK_VERSION}"' >> $script 67 echo 'export OECORE_SDK_VERSION="${SDK_VERSION}"' >> $script
68} 68}
69 69
70# This function creates an environment-setup-script for use by the ADT installer 70# This function creates an environment-setup-script for use by the ADT installer
@@ -97,8 +97,8 @@ toolchain_create_sdk_env_script_for_installer () {
97 echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script 97 echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
98 echo 'export OECORE_TARGET_SYSROOT="##SDKTARGETSYSROOT##"' >> $script 98 echo 'export OECORE_TARGET_SYSROOT="##SDKTARGETSYSROOT##"' >> $script
99 echo 'export OECORE_ACLOCAL_OPTS="-I ${SDKPATHNATIVE}/usr/share/acloal"' >> $script 99 echo 'export OECORE_ACLOCAL_OPTS="-I ${SDKPATHNATIVE}/usr/share/acloal"' >> $script
100 echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script 100 echo 'export OECORE_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
101 echo 'export POKY_SDK_VERSION="${SDK_VERSION}"' >> $script 101 echo 'export OECORE_SDK_VERSION="${SDK_VERSION}"' >> $script
102} 102}
103 103
104#This function create a site config file 104#This function create a site config file
diff --git a/scripts/oe-find-native-sysroot b/scripts/oe-find-native-sysroot
index 26fc730c60..b99014b52e 100755
--- a/scripts/oe-find-native-sysroot
+++ b/scripts/oe-find-native-sysroot
@@ -59,7 +59,7 @@ fi
59if [ ! -e "$OECORE_NATIVE_SYSROOT/usr/bin/pseudo" ]; then 59if [ ! -e "$OECORE_NATIVE_SYSROOT/usr/bin/pseudo" ]; then
60 echo "Error: Unable to find pseudo binary in $OECORE_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$OECORE_DISTRO_VERSION" = "x" ]; then
63 echo "Have you run 'bitbake meta-ide-support'?" 63 echo "Have you run 'bitbake meta-ide-support'?"
64 else 64 else
65 echo "This shouldn't happen - something is wrong with your toolchain installation" 65 echo "This shouldn't happen - something is wrong with your toolchain installation"
diff --git a/scripts/runqemu-export-rootfs b/scripts/runqemu-export-rootfs
index 6b4aee8116..6f4604d9a6 100755
--- a/scripts/runqemu-export-rootfs
+++ b/scripts/runqemu-export-rootfs
@@ -49,7 +49,7 @@ fi
49if [ ! -e "$OECORE_NATIVE_SYSROOT/usr/sbin/rpc.mountd" ]; then 49if [ ! -e "$OECORE_NATIVE_SYSROOT/usr/sbin/rpc.mountd" ]; then
50 echo "Error: Unable to find rpc.mountd binary in $OECORE_NATIVE_SYSROOT/usr/sbin/" 50 echo "Error: Unable to find rpc.mountd binary in $OECORE_NATIVE_SYSROOT/usr/sbin/"
51 51
52 if [ "x$POKY_DISTRO_VERSION" = "x" ]; then 52 if [ "x$OECORE_DISTRO_VERSION" = "x" ]; then
53 echo "Have you run 'bitbake meta-ide-support'?" 53 echo "Have you run 'bitbake meta-ide-support'?"
54 else 54 else
55 echo "This shouldn't happen - something is missing from your toolchain installation" 55 echo "This shouldn't happen - something is missing from your toolchain installation"