[oe-commits] org.oe.dev merge of '109805d1a31b4db5eb14cf0d0c8ab0a2eeedaec6'

[cbrake commit]

merge of '109805d1a31b4db5eb14cf0d0c8ab0a2eeedaec6'
     and '5c8f022efd9bbafe6c82e1c11084eb5ea67334d9'

Author: cbrake at openembedded.org
Branch: org.openembedded.dev
Revision: 30b04663effd5965dffe88e822cae2d0e02ef38a
ViewMTN: http://monotone.openembedded.org/revision/info/30b04663effd5965dffe88e822cae2d0e02ef38a
Files:
1
conf/distro/chinook-compat.conf
packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb
packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
packages/gcc/gcc_csl-arm-2005q3.bb
classes/packaged-staging.bbclass
contrib/angstrom/build-release.sh
Diffs:

#
# mt diff -r109805d1a31b4db5eb14cf0d0c8ab0a2eeedaec6 -r30b04663effd5965dffe88e822cae2d0e02ef38a
#
# 
# 
# patch "conf/distro/chinook-compat.conf"
#  from [ef075089c0bffc9cb8f4e103e1aaccbb75ac73de]
#    to [bc6984bba9a01e6ec920c499c8fbacfe7533e83e]
# 
# patch "packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb"
#  from [4edb5622c405b0073d8f2e86b31a7298338368ea]
#    to [166d7dbda2daacca7a4ec94be94148d230c858e6]
# 
# patch "packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb"
#  from [97a66b98a8afbc6569fe7455fd79084999b95d19]
#    to [040070fa991e9d105a652af1b531fdb6a81da714]
# 
# patch "packages/gcc/gcc_csl-arm-2005q3.bb"
#  from [ad2f03778a959baa857452a7fd577ac3b58442f1]
#    to [c65d119f1d0d3ac8a01e9dc19206d898356e3c50]
# 
============================================================
--- conf/distro/chinook-compat.conf	ef075089c0bffc9cb8f4e103e1aaccbb75ac73de
+++ conf/distro/chinook-compat.conf	bc6984bba9a01e6ec920c499c8fbacfe7533e83e
@@ -59,9 +59,9 @@ PREFERRED_VERSION_binutils-cross    = "2
 PREFERRED_VERSION_binutils = "2.17.50.0.12"
 PREFERRED_VERSION_binutils-cross    = "2.18"
 
-PREFERRED_VERSION_gcc = "3.4.4+csl-arm-2005q3"
-PREFERRED_VERSION_gcc-cross = "3.4.4+csl-arm-2005q3"
-PREFERRED_VERSION_gcc-cross-initial = "3.4.4+csl-arm-2005q3"
+PREFERRED_VERSION_gcc = "3.4.4cs2005q3.2"
+PREFERRED_VERSION_gcc-cross = "3.4.4cs2005q3.2"
+PREFERRED_VERSION_gcc-cross-initial = "3.4.4cs2005q3.2"
 
 # Use recent enough version of the headers to let HAL build successfully.
 PREFERRED_VERSION_linux-libc-headers = "2.6.20"
@@ -146,7 +146,7 @@ PREFERRED_VERSION_libgpg-error = "1.4"
 PREFERRED_VERSION_libglade = "2.4.2"
 PREFERRED_VERSION_gnutls = "1.4.5"
 PREFERRED_VERSION_libgpg-error = "1.4"
-PREFERRED_VERSION_libgcrypt = "1.2.3"
+PREFERRED_VERSION_libgcrypt = "1.4.0"
 
 PREFERRED_VERSION_gpe-scap = "1.3"
 
============================================================
--- packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb	4edb5622c405b0073d8f2e86b31a7298338368ea
+++ packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb	166d7dbda2daacca7a4ec94be94148d230c858e6
@@ -1,2 +1,2 @@
-require gcc-cross_${PV}.bb
+require gcc-cross_csl-arm-2005q3.bb
 require gcc-cross-initial.inc
============================================================
--- packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb	97a66b98a8afbc6569fe7455fd79084999b95d19
+++ packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb	040070fa991e9d105a652af1b531fdb6a81da714
@@ -7,7 +7,7 @@ SECTION = "devel"
 # cut-down gcc for kernel builds
 # only installs ${TARGET_PREFIX}gcc-${PV}, not ${TARGET_PREFIX}gcc.
 
-require gcc-cross-initial_${PV}.bb
+require gcc-cross-initial_csl-arm-2005q3.bb
 
 PROVIDES = "virtual/${TARGET_PREFIX}gcc-${PV}"
 
============================================================
--- packages/gcc/gcc_csl-arm-2005q3.bb	ad2f03778a959baa857452a7fd577ac3b58442f1
+++ packages/gcc/gcc_csl-arm-2005q3.bb	c65d119f1d0d3ac8a01e9dc19206d898356e3c50
@@ -1,9 +1,10 @@ PV = "3.4.4+csl-arm-2005q3"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
 BINV = "3.4.4"
 PV = "3.4.4+csl-arm-2005q3"
+PV_chinook-compat = "3.4.4cs2005q3.2"
 PR = "r3"
 
 FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"


#
# mt diff -r5c8f022efd9bbafe6c82e1c11084eb5ea67334d9 -r30b04663effd5965dffe88e822cae2d0e02ef38a
#
# 
# 
# patch "classes/packaged-staging.bbclass"
#  from [ec2561490be2fcdce7651e0ee01cb5bc8dbecf19]
#    to [38546daf325eaf4ea35dd00e659681b3fb89a516]
# 
# patch "contrib/angstrom/build-release.sh"
#  from [ba8f992bfe8e6c725b91b12fbe667c9f9423659b]
#    to [4ec4d3a4bd4b7faed699da25e5b2cb2e07247b01]
# 
============================================================
--- classes/packaged-staging.bbclass	ec2561490be2fcdce7651e0ee01cb5bc8dbecf19
+++ classes/packaged-staging.bbclass	38546daf325eaf4ea35dd00e659681b3fb89a516
@@ -20,6 +20,9 @@ python () {
         bb.data.setVar("PSTAGING_DISABLED", "1", d)
 }
 
+# multimachine.bbclass will override this
+MULTIMACH_ARCH ?= "${PACKAGE_ARCH}"
+
 export PSTAGING_DISABLED = "0"
 
 DEPLOY_DIR_PSTAGE 	= "${DEPLOY_DIR}/pstage" 
============================================================
--- contrib/angstrom/build-release.sh	ba8f992bfe8e6c725b91b12fbe667c9f9423659b
+++ contrib/angstrom/build-release.sh	4ec4d3a4bd4b7faed699da25e5b2cb2e07247b01
@@ -22,6 +22,9 @@ do_build() {
         fi
 
 	BUILD_MODE="glibc"
+        echo "MACHINE = \"$BUILD_MACHINE\"" > conf/auto.conf
+        echo 'ANGSTROM_MODE = "glibc"' >> conf/auto.conf
+
 	if [ "$BUILD_CLEAN" != "" ]
 	then
 		bitbake -c clean $BUILD_CLEAN