Use OECORE_DISTRO_VERSION instead of POKY_DISTRO_VERSION

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index f7b52be75226a6be471bb548714d1096b2eaa2b9..b7e4e04eafa66c0ba4a18edd1601d00b64c4e7d7 100644 (file)
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -29,8 +29,8 @@ toolchain_create_sdk_env_script () {
        echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
        echo 'export OECORE_TARGET_SYSROOT="${SDKTARGETSYSROOT}"' >> $script
        echo 'export OECORE_ACLOCAL_OPTS="-I ${SDKPATHNATIVE}/usr/share/aclocal"' >> $script
-       echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
-       echo 'export POKY_SDK_VERSION="${SDK_VERSION}"' >> $script
+       echo 'export OECORE_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
+       echo 'export OECORE_SDK_VERSION="${SDK_VERSION}"' >> $script
 }
 
 # This function creates an environment-setup-script in the TMPDIR which enables
@@ -63,8 +63,8 @@ toolchain_create_tree_env_script () {
        echo 'export OECORE_NATIVE_SYSROOT="${STAGING_DIR_NATIVE}"' >> $script
        echo 'export OECORE_TARGET_SYSROOT="${STAGING_DIR_TARGET}"' >> $script
        echo 'export OECORE_ACLOCAL_OPTS="-I ${STAGING_DIR_NATIVE}/usr/share/aclocal"' >> $script
-       echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
-       echo 'export POKY_SDK_VERSION="${SDK_VERSION}"' >> $script
+       echo 'export OECORE_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
+       echo 'export OECORE_SDK_VERSION="${SDK_VERSION}"' >> $script
 }
 
 # This function creates an environment-setup-script for use by the ADT installer
@@ -97,8 +97,8 @@ toolchain_create_sdk_env_script_for_installer () {
        echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
        echo 'export OECORE_TARGET_SYSROOT="##SDKTARGETSYSROOT##"' >> $script
         echo 'export OECORE_ACLOCAL_OPTS="-I ${SDKPATHNATIVE}/usr/share/acloal"' >> $script
-       echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
-       echo 'export POKY_SDK_VERSION="${SDK_VERSION}"' >> $script
+       echo 'export OECORE_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
+       echo 'export OECORE_SDK_VERSION="${SDK_VERSION}"' >> $script
 }
 
 #This function create a site config file

diff --git a/scripts/oe-find-native-sysroot b/scripts/oe-find-native-sysroot
index 26fc730c6092facfd6de46a9cdf846d17aad5717..b99014b52eccd46c3f1472b2abbb317c53aa3661 100755 (executable)
--- a/scripts/oe-find-native-sysroot
+++ b/scripts/oe-find-native-sysroot
@@ -59,7 +59,7 @@ fi
 if [ ! -e "$OECORE_NATIVE_SYSROOT/usr/bin/pseudo" ]; then
     echo "Error: Unable to find pseudo binary in $OECORE_NATIVE_SYSROOT/usr/bin/"
 
-    if [ "x$POKY_DISTRO_VERSION" = "x" ]; then
+    if [ "x$OECORE_DISTRO_VERSION" = "x" ]; then
         echo "Have you run 'bitbake meta-ide-support'?"
     else
         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 6b4aee8116e0043cfcfc7d715738c626a39eb24b..6f4604d9a6534cf6ee0cbbb459d43fbc9c649bce 100755 (executable)
--- a/scripts/runqemu-export-rootfs
+++ b/scripts/runqemu-export-rootfs
@@ -49,7 +49,7 @@ fi
 if [ ! -e "$OECORE_NATIVE_SYSROOT/usr/sbin/rpc.mountd" ]; then
        echo "Error: Unable to find rpc.mountd binary in $OECORE_NATIVE_SYSROOT/usr/sbin/"
 
-       if [ "x$POKY_DISTRO_VERSION" = "x" ]; then
+       if [ "x$OECORE_DISTRO_VERSION" = "x" ]; then
            echo "Have you run 'bitbake meta-ide-support'?"
        else
            echo "This shouldn't happen - something is missing from your toolchain installation"