[oe-commits] org.oe.dev merge of '266509b97479fd932511cb63332861a369849008'

[rpurdie commit]

merge of '266509b97479fd932511cb63332861a369849008'
     and '794e1f022e3fc8866fcadb5c7158d8521fc62a1c'

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 109805d1a31b4db5eb14cf0d0c8ab0a2eeedaec6
ViewMTN: http://monotone.openembedded.org/revision/info/109805d1a31b4db5eb14cf0d0c8ab0a2eeedaec6
Files:
1
conf/distro/sharprom-compatible.conf
contrib/angstrom/build-release.sh
packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
classes/packaged-staging.bbclass
Diffs:

#
# mt diff -r266509b97479fd932511cb63332861a369849008 -r109805d1a31b4db5eb14cf0d0c8ab0a2eeedaec6
#
# 
# 
# patch "conf/distro/sharprom-compatible.conf"
#  from [4a8c4da47b66154274df571dcbb7461c90098bfd]
#    to [866d17894061cd031cda619513332fa012433fa3]
# 
# patch "contrib/angstrom/build-release.sh"
#  from [ba8f992bfe8e6c725b91b12fbe667c9f9423659b]
#    to [4ec4d3a4bd4b7faed699da25e5b2cb2e07247b01]
# 
# patch "packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb"
#  from [bf7366a30c3b81bb4c152fef10a1d3f481091656]
#    to [395167a26cd17318d047dfec7f4761b1c8546cec]
# 
============================================================
--- conf/distro/sharprom-compatible.conf	4a8c4da47b66154274df571dcbb7461c90098bfd
+++ conf/distro/sharprom-compatible.conf	866d17894061cd031cda619513332fa012433fa3
@@ -36,6 +36,8 @@ PREFERRED_PROVIDER_virtual/libc = "sharp
 PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "sharprom-toolchain-native" 
 PREFERRED_PROVIDER_virtual/arm-linux-binutils = "sharprom-toolchain-native"
 PREFERRED_PROVIDER_virtual/libc = "sharprom-toolchain-native"
+PREFERRED_PROVIDER_virtual/libiconv = "sharprom-toolchain-native"
+PREFERRED_PROVIDER_virtual/libintl = "sharprom-toolchain-native"
 PREFERRED_PROVIDER_virtual/arm-linux-gcc = "sharprom-toolchain-native" 
 PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
 PREFERRED_PROVIDER_virtual/arm-linux-gcc-initial = "sharprom-toolchain-native"
============================================================
--- 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
============================================================
--- packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb	bf7366a30c3b81bb4c152fef10a1d3f481091656
+++ packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb	395167a26cd17318d047dfec7f4761b1c8546cec
@@ -8,10 +8,15 @@ PROVIDES_sharprom-compatible = "\
   virtual/arm-linux-libc-for-gcc \
   virtual/arm-linux-binutils \
   virtual/libc \
+  virtual/libintl \
+  virtual/libiconv \
   virtual/arm-linux-gcc \
   virtual/arm-linux-gcc-initial "
 PR = "r1"
 
+RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++"
+PACKAGES_DYNAMIC = "glibc-gconv-*"
+
 # This needs to be extracted to /usr/local/arm :
 # SRC_URI = "http://handhelds.org/download/projects/toolchain/archive/cross-2.95.3.tar.bz2"
 


#
# mt diff -r794e1f022e3fc8866fcadb5c7158d8521fc62a1c -r109805d1a31b4db5eb14cf0d0c8ab0a2eeedaec6
#
# 
# 
# patch "classes/packaged-staging.bbclass"
#  from [ec2561490be2fcdce7651e0ee01cb5bc8dbecf19]
#    to [38546daf325eaf4ea35dd00e659681b3fb89a516]
# 
============================================================
--- 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"