Skip to contentSkip to conversation

Set version related variables in environment files.

PATCH Applied Lianhao Lu 2 participants 3 messages Aug 2, 2011 – Aug 4, 2011

lore
Share & tools
lore

Lianhao Lu

author
#0 lore raw

cover Set version related variables in environment files.

Fixed bug #1306. Have all the environment files created by meta-toolchain, meta-ide-support and meta-envrionment-xxx contain the same version related variables.

The following changes since commit 2a41a311ddda11713296391050f3c2c1b2c1d3d3:
Koen Kooi (1):

        arch-armv7a.inc: fix armv7a-vfp-neon -> armv7a compat case

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib llu/bug1306
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=llu/bug1306

Lianhao Lu (1):
environment files: Added and unified version related variables.

 meta/classes/toolchain-scripts.bbclass     |    3 +++
 meta/recipes-core/meta/meta-environment.bb |    2 +-
 meta/recipes-core/meta/meta-ide-support.bb |    2 +-
 meta/recipes-core/meta/meta-toolchain.bb   |    2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)
author
#1 lore raw

PATCH 1/1 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.

---
 meta/classes/toolchain-scripts.bbclass     |    3 +++
 meta/recipes-core/meta/meta-environment.bb |    2 +-
 meta/recipes-core/meta/meta-ide-support.bb |    2 +-
 meta/recipes-core/meta/meta-toolchain.bb   |    2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)
meta/classes/toolchain-scripts.bbclass +3 -0
index 832cce4..fe11e72 100644
@@ -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
meta/recipes-core/meta/meta-environment.bb +1 -1
index 6d547bb..114727c 100644
@@ -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"
 
meta/recipes-core/meta/meta-ide-support.bb +1 -1
index 7a3c053..326b25a 100644
@@ -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
 
meta/recipes-core/meta/meta-toolchain.bb +1 -1
index ab98bf9..164d717 100644
@@ -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"
Signature · 1 line
1.7.0.4
Applied
#2 lore raw
In reply to Lianhao Lu
Quoted 23 lines · Lianhao Lu

Fixed bug #1306. Have all the environment files created by meta-toolchain, meta-ide-support and meta-envrionment-xxx contain the same version related variables.

The following changes since commit 2a41a311ddda11713296391050f3c2c1b2c1d3d3:

   Koen Kooi (1):
         arch-armv7a.inc: fix armv7a-vfp-neon ->  armv7a compat case

are available in the git repository at:

   git://git.yoctoproject.org/poky-contrib llu/bug1306
   http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=llu/bug1306

Lianhao Lu (1):
environment files: Added and unified version related variables.

  meta/classes/toolchain-scripts.bbclass     |    3 +++
  meta/recipes-core/meta/meta-environment.bb |    2 +-
  meta/recipes-core/meta/meta-ide-support.bb |    2 +-
  meta/recipes-core/meta/meta-toolchain.bb   |    2 +-
  4 files changed, 6 insertions(+), 3 deletions(-)
Quoted 5 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Merged into OE-Core

Thanks
Sau!