mirror of
https://git.yoctoproject.org/poky
synced 2026-04-23 09:32:17 +02:00
Use OECORE_DISTRO_VERSION instead of POKY_DISTRO_VERSION
(From OE-Core rev: 6890c02ec4538b82b694deaba39e9921af4e3f47) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
b6bd7133c2
commit
505be75bbf
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user