diff options
| author | Lianhao Lu <lianhao.lu@intel.com> | 2011-08-01 15:50:02 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-04 15:04:32 +0100 |
| commit | 9a78cb7980861291df8e8f8c6782735c9b4440ec (patch) | |
| tree | a011b1c8fcad440dd44ec6cb0b1cdf383d286a3f | |
| parent | e57a0bdfd47d14b03cd6d0337c4216b423fe965d (diff) | |
| download | ast2050-yocto-poky-9a78cb7980861291df8e8f8c6782735c9b4440ec.zip ast2050-yocto-poky-9a78cb7980861291df8e8f8c6782735c9b4440ec.tar.gz | |
environment files: Added and unified version related variables.
[YOCTO #1306] Fixing.
Added and unified version related variables in all environment files
generated by package meta-toolchain, meta-ide-support,
meta-environment-xxx.
(From OE-Core rev: 5fbea0f2614d5bc9aec0819a337cdec9b5331f71)
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/toolchain-scripts.bbclass | 3 | ||||
| -rw-r--r-- | meta/recipes-core/meta/meta-environment.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-core/meta/meta-ide-support.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-core/meta/meta-toolchain.bb | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass index 832cce4..fe11e72 100644 --- a/meta/classes/toolchain-scripts.bbclass +++ b/meta/classes/toolchain-scripts.bbclass @@ -30,6 +30,7 @@ toolchain_create_sdk_env_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 } # This function creates an environment-setup-script in the TMPDIR which enables @@ -61,6 +62,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 } # This function creates an environment-setup-script for use by the ADT installer diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb index 6d547bb..114727c 100644 --- a/meta/recipes-core/meta/meta-environment.bb +++ b/meta/recipes-core/meta/meta-environment.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Package of environment files for SDK" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" LICENSE = "MIT" -PR = "r5" +PR = "r6" EXCLUDE_FROM_WORLD = "1" diff --git a/meta/recipes-core/meta/meta-ide-support.bb b/meta/recipes-core/meta/meta-ide-support.bb index 7a3c053..326b25a 100644 --- a/meta/recipes-core/meta/meta-ide-support.bb +++ b/meta/recipes-core/meta/meta-ide-support.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" DEPENDS = "virtual/libc gdb-cross qemu-helper-native unfs-server-native" -PR = "r1" +PR = "r2" inherit meta toolchain-scripts diff --git a/meta/recipes-core/meta/meta-toolchain.bb b/meta/recipes-core/meta/meta-toolchain.bb index ab98bf9..164d717 100644 --- a/meta/recipes-core/meta/meta-toolchain.bb +++ b/meta/recipes-core/meta/meta-toolchain.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Meta package for building a installable toolchain" LICENSE = "MIT" -PR = "r4" +PR = "r5" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
