Fixes Multi-Lib & M3

index 3301319..832cce4 100644
@@ -66,13 +66,14 @@ toolchain_create_tree_env_script () {
 # This function creates an environment-setup-script for use by the ADT installer
 toolchain_create_sdk_env_script_for_installer () {
 	# Create environment setup script
-	script=${SDK_OUTPUT}/${SDKPATH}/environment-setup-${OLD_MULTIMACH_TARGET_SYS}
+	local multimach_target_sys=$1
+	script=${SDK_OUTPUT}/${SDKPATH}/environment-setup-${multimach_target_sys}
 	rm -f $script
 	touch $script
-	echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${bindir_nativesdk}/${OLD_MULTIMACH_TARGET_SYS}:$PATH' >> $script
+	echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${bindir_nativesdk}/'"${multimach_target_sys}"':$PATH' >> $script
 	echo 'export PKG_CONFIG_SYSROOT_DIR=##SDKTARGETSYSROOT##' >> $script
 	echo 'export PKG_CONFIG_PATH=##SDKTARGETSYSROOT##${target_libdir}/pkgconfig' >> $script
-	echo 'export CONFIG_SITE=${SDKPATH}/site-config-${OLD_MULTIMACH_TARGET_SYS}' >> $script
+	echo 'export CONFIG_SITE=${SDKPATH}/site-config-'"${multimach_target_sys}" >> $script
 	echo 'export CC=${TARGET_PREFIX}gcc' >> $script
 	echo 'export CXX=${TARGET_PREFIX}g++' >> $script
 	echo 'export GDB=${TARGET_PREFIX}gdb' >> $script

index 351cbf0..6d547bb 100644
@@ -2,13 +2,14 @@ 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 = "r4"
+PR = "r5"
 
 EXCLUDE_FROM_WORLD = "1"
 
 inherit toolchain-scripts
 # get target config site before inheritting cross-canadian
 TARGET_CONFIG_SITE := "${@siteinfo_get_files(d)}"
+REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}"
 
 SDK_DIR = "${WORKDIR}/sdk"
 SDK_OUTPUT = "${SDK_DIR}/image"

@@ -22,12 +23,12 @@ do_generate_content() {
     rm -rf ${SDK_OUTPUT}
     mkdir -p ${SDK_OUTPUT}/${SDKPATH}
 
-    toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${OLD_MULTIMACH_TARGET_SYS} ${TARGET_CONFIG_SITE}
+    toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${REAL_MULTIMACH_TARGET_SYS} ${TARGET_CONFIG_SITE}
 
-    toolchain_create_sdk_env_script_for_installer
+    toolchain_create_sdk_env_script_for_installer ${REAL_MULTIMACH_TARGET_SYS}
 
     # Add version information
-    toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${OLD_MULTIMACH_TARGET_SYS}
+    toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${REAL_MULTIMACH_TARGET_SYS}
 }
 addtask generate_content before do_install after do_compile
 

deleted file mode 100644
index 823195c..0000000
@@ -1,32 +0,0 @@
-#
-# glibc specific configuration
-#
-
-LIBCEXTENSION = "${@['', '-gnu'][(d.getVar('ABIEXTENSION', True) or '') != '']}"
-
-# Add glibc to the overrides.
-OVERRIDES =. "libc-glibc:"
-
-PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
-PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "glibc-nativesdk"
-PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
-PREFERRED_PROVIDER_virtual/libc ?= "glibc"
-PREFERRED_PROVIDER_virtual/libc-nativesdk ?= "glibc-nativesdk"
-PREFERRED_PROVIDER_virtual/libc-locale ?= "glibc-locale"
-
-CXXFLAGS += "-fvisibility-inlines-hidden"
-
-LIBC_DEPENDENCIES = "\
-    libsegfault \
-    glibc \
-    glibc-dbg \
-    glibc-dev \
-    glibc-utils \
-    glibc-thread-db \
-    glibc-localedata-i18n \
-    glibc-gconv-ibm850 \
-    glibc-gconv-cp1252 \
-    glibc-gconv-iso8859-1 \
-    glibc-gconv-iso8859-15 \
-    locale-base-en-gb \
-    "

index 86538f1..dce76db 100644
@@ -49,11 +49,6 @@ PREFERRED_VERSION_binutils-crosssdk ?= "${BINUVERSION}"
 PREFERRED_VERSION_binutils-cross-canadian ?= "${BINUVERSION}"
 PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}"
 PREFERRED_VERSION_linux-libc-headers-nativesdk ?= "${LINUXLIBCVERSION}"
-PREFERRED_VERSION_glibc ?= "${GLIBCVERSION}"
-PREFERRED_VERSION_glibc-locale ?= "${GLIBCVERSION}"
-PREFERRED_VERSION_glibc-nativesdk ?= "${GLIBCVERSION}"
-PREFERRED_VERSION_glibc-initial ?= "${GLIBCVERSION}"
-PREFERRED_VERSION_glibc-initial-nativesdk ?= "${GLIBCVERSION}"
 PREFERRED_VERSION_eglibc                   ?= "${EGLIBCVERSION}"
 PREFERRED_VERSION_eglibc-locale            ?= "${EGLIBCVERSION}"
 PREFERRED_VERSION_eglibc-nativesdk         ?= "${EGLIBCVERSION}"

60 lines not on this page · raw message

760 lines not on this page · raw message

deleted file mode 100644
index 199aaa6..0000000
@@ -1,12 +0,0 @@
-Upstream-Status: Inappropriate [not used]
-
---- glibc-2.4/elf/Versions.ark	2006-03-11 23:30:09.000000000 +0100
-+++ glibc-2.4/elf/Versions	2006-03-11 23:31:44.000000000 +0100
-@@ -63,5 +63,7 @@
-     _dl_debug_state;
-     # Pointer protection.
-     __pointer_chk_guard;
-+    # for ldconfig
-+    _dl_cache_libcmp;
-   }
- }

deleted file mode 100644
index ddd777d..0000000
@@ -1,2 +0,0 @@
-/usr/local/lib
-include /etc/ld.so.conf.d/*

deleted file mode 100644
index 91c6781..0000000
@@ -1,13 +0,0 @@
-Upstream-Status: Inappropriate [not used]
-
---- glibc-2.1.1/sysdeps/unix/sysv/linux/paths.h~	Thu May 27 13:16:33 1999
-+++ glibc-2.1.1/sysdeps/unix/sysv/linux/paths.h	Thu May 27 13:17:55 1999
-@@ -71,7 +71,7 @@
- /* Provide trailing slash, since mostly used for building pathnames. */
- #define	_PATH_DEV	"/dev/"
- #define	_PATH_TMP	"/tmp/"
--#define	_PATH_VARDB	"/var/db/"
-+#define	_PATH_VARDB	"/var/lib/misc/"
- #define	_PATH_VARRUN	"/var/run/"
- #define	_PATH_VARTMP	"/var/tmp/"
- 

deleted file mode 100644
index d2a28c2..0000000
@@ -1,11 +0,0 @@
-#!/usr/bin/make
-
-include $(IN)
-
-all:
-	rm -f $(OUT)
-	touch $(OUT)
-	for locale in $(SUPPORTED-LOCALES); do \
-		[ $$locale = true ] && continue; \
-		echo $$locale | sed 's,/, ,' >> $(OUT); \
-	done

deleted file mode 100644
index 07e4758..0000000
@@ -1,37 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
---- glibc-2.9.orig/configure.in	2009-10-22 15:38:13.000000000 +0200
-+++ glibc-2.9/configure.in	2009-10-22 15:37:33.000000000 +0200
-@@ -844,10 +844,10 @@
- # Accept binutils 2.13 or newer.
- AC_CHECK_PROG_VER(AS, $AS, --version,
- 		  [GNU assembler.* \([0-9]*\.[0-9.]*\)],
--		  [2.1[3-9]*], AS=: critic_missing="$critic_missing as")
-+		  [2.1[3-9]* | 2.2* ], AS=: critic_missing="$critic_missing as")
- AC_CHECK_PROG_VER(LD, $LD, --version,
- 		  [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)],
--		  [2.1[3-9]*], LD=: critic_missing="$critic_missing ld")
-+		  [2.1[3-9]* | 2.2* ], LD=: critic_missing="$critic_missing ld")
- 
- # We need the physical current working directory.  We cannot use the
- # "pwd -P" shell builtin since that's not portable.  Instead we try to
---- glibc-2.9.orig/configure	2009-02-26 22:28:17.000000000 +0100
-+++ glibc-2.9/configure	2009-10-22 15:43:11.000000000 +0200
-@@ -4531,7 +4531,7 @@
-   ac_prog_version=`$AS --version 2>&1 | sed -n 's/^.*GNU assembler.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
--    2.1[3-9]*)
-+    2.1[3-9]* | 2.2*)
-        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- 
-@@ -4594,7 +4594,7 @@
-   ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
--    2.1[3-9]*)
-+    2.1[3-9]* | 2.2*)
-        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- 

deleted file mode 100644
index 843c5e8..0000000
@@ -1,15 +0,0 @@
-Arm needs a similar fix as http://sourceware.org/ml/libc-ports/2007-12/msg00000.html
-
-Upstream-Status: Inappropriate [not used]
-
---- /tmp/stdio-lock.h	2008-03-04 18:51:15.555038993 +0100
-+++ glibc-2.7/ports/sysdeps/unix/sysv/linux/arm/bits/stdio-lock.h	2008-03-04 18:51:28.445035052 +0100
-@@ -50,6 +50,8 @@
-   _IO_cleanup_region_start ((void (*) (void *)) _IO_funlockfile, (_fp));      \
-   _IO_flockfile (_fp)
- 
-+# define _IO_acquire_lock_clear_flags2(_fp) _IO_acquire_lock (_fp)
-+
- # define _IO_release_lock(_fp) \
-   _IO_funlockfile (_fp);						      \
-   _IO_cleanup_region_end (0)

deleted file mode 100644
index 9dba9d2..0000000
@@ -1,17 +0,0 @@
-http://sourceware.org/ml/libc-ports/2008-04/msg00005.html
-
-Upstream-Status: Inappropriate [not used]
-
-
-Index: glibc-2.6.1/ports/sysdeps/unix/sysv/linux/arm/ioperm.c
-===================================================================
---- glibc-2.6.1.orig/ports/sysdeps/unix/sysv/linux/arm/ioperm.c	2008-09-12 18:08:18.000000000 -0700
-+++ glibc-2.6.1/ports/sysdeps/unix/sysv/linux/arm/ioperm.c	2008-09-12 18:08:28.000000000 -0700
-@@ -45,7 +45,6 @@
- #include <sys/mman.h>
- 
- #include <linux/version.h>
--#include <asm/page.h>
- #include <sys/sysctl.h>
- 
- #define PATH_ARM_SYSTYPE	"/etc/arm_systype"

345 lines not on this page · raw message

deleted file mode 100644
index 1601310..0000000
@@ -1,13 +0,0 @@
-Upstream-Status: Inappropriate [not used]
-
---- glibc-2.5/elf/ldd.bash.in.org	2006-04-30 16:06:20.000000000 +0000
-+++ glibc-2.5/elf/ldd.bash.in	2007-03-30 19:18:57.000000000 +0000
-@@ -110,7 +110,7 @@
- # environments where the executed program might not have permissions
- # to write to the console/tty.  But only bash 3.x supports the pipefail
- # option, and we don't bother to handle the case for older bash versions.
--if set -o pipefail 2> /dev/null; then
-+if false; then
-   try_trace() {
-     eval $add_env '"$@"' | cat
-   }

deleted file mode 100644
index c303c64..0000000
@@ -1,20 +0,0 @@
-This patch moves ld.so.cache from /etc to /var/run. This is for devices
-where /etc is JFFS2 or CRAMFS but /var is a ramdisk.
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
-Upstream-Status: Inappropriate [not used]
-
---- libc/sysdeps/generic/dl-cache.h~ldsocache-varrun
-+++ libc/sysdeps/generic/dl-cache.h
-@@ -29,7 +29,7 @@
- #endif
- 
- #ifndef LD_SO_CACHE
--# define LD_SO_CACHE SYSCONFDIR "/ld.so.cache"
-+# define LD_SO_CACHE "/var/run/ld.so.cache"
- #endif
- 
- #ifndef add_system_dir

deleted file mode 100644
index 687235c..0000000
@@ -1,39 +0,0 @@
-2007-02-15  Khem Raj  <kraj@xxxxxxxxxx>
-
-       * sysdeps/unix/sysv/linux/i386/sysdep.h: Re-define __i686.
-       * nptl/sysdeps/pthread/pt-initfini.c: Ditto.
-
-
-Upstream-Status: Inappropriate [not used]
-
-Index: sysdeps/unix/sysv/linux/i386/sysdep.h
-===================================================================
---- sysdeps/unix/sysv/linux/i386/sysdep.h	(revision 1469)
-+++ sysdeps/unix/sysv/linux/i386/sysdep.h	(working copy)
-@@ -29,6 +29,10 @@
- #include <dl-sysdep.h>
- #include <tls.h>
- 
-+#if defined __i686 && defined __ASSEMBLER__
-+#undef __i686
-+#define __i686 __i686
-+#endif
- 
- /* For Linux we can use the system call table in the header file
- 	/usr/include/asm/unistd.h
-Index: nptl/sysdeps/pthread/pt-initfini.c
-===================================================================
---- nptl/sysdeps/pthread/pt-initfini.c	(revision 1469)
-+++ nptl/sysdeps/pthread/pt-initfini.c	(working copy)
-@@ -45,6 +45,11 @@
- /* Embed an #include to pull in the alignment and .end directives. */
- asm ("\n#include \"defs.h\"");
- 
-+asm ("\n#if defined __i686 && defined __ASSEMBLER__");
-+asm ("\n#undef __i686");
-+asm ("\n#define __i686 __i686");
-+asm ("\n#endif");
-+
- /* The initial common code ends here. */
- asm ("\n/*@HEADER_ENDS*/");
- 

deleted file mode 100644
index 2599e16..0000000
@@ -1,23 +0,0 @@
-On mips target, binutils currently sets DT_MIPS_RLD_MAP to 0 in dynamic
-section if a --version-script sets _RLD_MAP to local. This is apparently
-a binutils bug, but libc shouldn't segfault in this case.
-
-see also: http://sourceware.org/bugilla/show_bug.cgi?id=11615
-
-Upstream-Status: Inappropriate [not used]
-
-9/19/2010 - added by Qing He <[email protected]>
----
-diff -ru glibc-2.10.1.orig/ports/sysdeps/mips/dl-machine.h glibc-2.10.1/ports/sysdeps/mips/dl-machine.h
---- glibc-2.10.1.orig/ports/sysdeps/mips/dl-machine.h	2009-05-16 16:36:20.000000000 +0800
-+++ glibc-2.10.1/ports/sysdeps/mips/dl-machine.h	2010-09-19 09:11:53.000000000 +0800
-@@ -70,7 +70,8 @@
- /* If there is a DT_MIPS_RLD_MAP entry in the dynamic section, fill it in
-    with the run-time address of the r_debug structure  */
- #define ELF_MACHINE_DEBUG_SETUP(l,r) \
--do { if ((l)->l_info[DT_MIPS (RLD_MAP)]) \
-+do { if ((l)->l_info[DT_MIPS (RLD_MAP)] && \
-+         (l)->l_info[DT_MIPS (RLD_MAP)]->d_un.d_ptr) \
-        *(ElfW(Addr) *)((l)->l_info[DT_MIPS (RLD_MAP)]->d_un.d_ptr) = \
-        (ElfW(Addr)) (r); \
-    } while (0)

deleted file mode 100644
index 7e3d9bb..0000000
@@ -1,28 +0,0 @@
-Upstream-Status: Inappropriate [not used]
-
---- glibc-2.4/nptl/sysdeps/pthread/configure.in.ark	2006-03-12 00:41:40.000000000 +0100
-+++ glibc-2.4/nptl/sysdeps/pthread/configure.in	2006-03-12 00:44:08.000000000 +0100
-@@ -45,5 +45,6 @@
-     AC_MSG_ERROR([the compiler must support C cleanup handling])
-   fi
- else
--  AC_MSG_ERROR(forced unwind support is required)
-+  AC_MSG_WARN([forced unwind support is required, can't be verified while crosscompiling])
-+  AC_DEFINE(HAVE_FORCED_UNWIND)
- fi
---- glibc-2.4/nptl/sysdeps/pthread/configure.ark	2006-03-12 00:42:47.000000000 +0100
-+++ glibc-2.4/nptl/sysdeps/pthread/configure	2006-03-12 00:44:08.000000000 +0100
-@@ -153,7 +153,10 @@
-    { (exit 1); exit 1; }; }
-   fi
- else
--  { { echo "$as_me:$LINENO: error: forced unwind support is required" >&5
--echo "$as_me: error: forced unwind support is required" >&2;}
--   { (exit 1); exit 1; }; }
-+  { echo "$as_me:$LINENO: WARNING: forced unwind support is required, can't be verified while crosscompiling" >&5
-+echo "$as_me: WARNING: forced unwind support is required, can't be verified while crosscompiling" >&2;}
-+  cat >>confdefs.h <<\_ACEOF
-+#define HAVE_FORCED_UNWIND 1
-+_ACEOF
-+
- fi

41 lines not on this page · raw message

deleted file mode 100644
index bbc75d1..0000000
@@ -1,27 +0,0 @@
-Upstream-Status: Inappropriate [not used]
-
-diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c
---- ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c	2006-04-14 07:44:30.000000000 +0200
-+++ glibc-2.5/sysdeps/powerpc/fpu/e_sqrt.c	2006-12-08 12:53:32.202227000 +0100
-@@ -25,6 +25,9 @@
- #include <sysdep.h>
- #include <ldsodefs.h>
- 
-+#define __CPU_HAS_FSQRT ((GLRO(dl_hwcap) & PPC_FEATURE_64) != 0)
-+
-+
- static const double almost_half = 0.5000000000000001;	/* 0.5 + 2^-53 */
- static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
- static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
-diff -Nurd ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c
---- ../glibc-initial-2.5-r4/glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c	2006-04-14 07:44:30.000000000 +0200
-+++ glibc-2.5/sysdeps/powerpc/fpu/e_sqrtf.c	2006-12-08 12:53:36.992227000 +0100
-@@ -25,6 +25,8 @@
- #include <sysdep.h>
- #include <ldsodefs.h>
- 
-+#define __CPU_HAS_FSQRT ((GLRO(dl_hwcap) & PPC_FEATURE_64) != 0)
-+
- static const float almost_half = 0.50000006;	/* 0.5 + 2^-24 */
- static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
- static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };

deleted file mode 100644
index 585bb62..0000000
@@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [not used]
-
-Index: glibc-2.9/Makerules
-===================================================================
---- glibc-2.9.orig/Makerules	2009-09-14 16:39:21.000000000 +0100
-+++ glibc-2.9/Makerules	2009-09-14 16:39:50.000000000 +0100
-@@ -173,6 +173,8 @@
- # it's used in sysd-rules, below.
- $(common-objpfx)%.h $(common-objpfx)%.h.d: $(..)scripts/gen-as-const.awk \
- 					   %.sym $(common-before-compile)
-+	rm -f $(@:.h=.h.d)
-+	rm -f $(@:.h.d=.h)
- 	$(AWK) -f $< $(filter %.sym,$^) \
- 	| $(CC) -S -o $(@:.h.d=.h)T3 $(CFLAGS) $(CPPFLAGS) -x c - \
- 		-MD -MP -MF $(@:.h=.h.d)T -MT '$(@:.h=.h.d) $(@:.h.d=.h)'

67 lines not on this page · raw message

deleted file mode 100644
index bc3d7e4..0000000
@@ -1,10 +0,0 @@
-require glibc_${PV}.bb
-require glibc-initial.inc
-
-do_install_locale() {
-	:
-}
-
-do_configure_prepend () {
-	unset CFLAGS
-}

63 lines not on this page · raw message

96 lines not on this page · raw message

deleted file mode 100644
index e69de29..0000000

60 lines not on this page · raw message

161 lines not on this page · raw message

474 lines not on this page · raw message

156 lines not on this page · raw message

deleted file mode 100644
index 178bd85..0000000
@@ -1,21 +0,0 @@
-char
-char *
-double
-float
-int
-long
-long double
-long int
-long long
-long long int
-short
-short int
-signed char
-unsigned char
-unsigned int
-unsigned long
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

index 6555bd4..a9ed639 100644
@@ -111,9 +111,9 @@ do_archgen () {
 				shift ; continue;;
 		esac
 		if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then
-		  ARCH="_$1"
+		  CARCH="_$1"
 		else
-		  ARCH="IdString(\"$1\")"
+		  CARCH="IdString(\"$1\")"
 		fi
 		shift
 		COMPAT=""

@@ -129,7 +129,7 @@ do_archgen () {
 				COMPAT="${arch_val},$COMPAT"
 			fi
 		done
-		COMPAT_WITH="${ARCH},${COMPAT} $COMPAT_WITH"
+		COMPAT_WITH="${CARCH},${COMPAT} $COMPAT_WITH"
 	done
 	for each_compat in ${COMPAT_WITH} ; do
 		echo "        defCompatibleWith( ${each_compat} );"		>> zypp/poky-arch.h

index 542600a..1b357b5 100644
@@ -20,7 +20,7 @@ SRC_URI = "http://www.docbook.org/sgml/${DTD_VERSION}/docbook-${DTD_VERSION}.zip
 # The .zip file extracts to the current dir
 S = "${WORKDIR}"
 
-INC_PR = "r2"
+INC_PR = "r3"
 
 SSTATEPOSTINSTFUNCS += "docbook_sgml_dtd_sstate_postinst"
 SYSROOT_PREPROCESS_FUNCS += "docbook_sgml_dtd_sysroot_preprocess"

@@ -45,6 +45,9 @@ docbook_sgml_dtd_sstate_postinst () {
 		# Ensure that the catalog file sgml-docbook.cat is properly
 		# updated when the package is installed from sstate cache.
 		${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-docbook-sgml-dtd-${DTD_VERSION} \
+			--add ${sysconfdir}/sgml/sgml-docbook.bak \
+			${sysconfdir}/sgml/sgml-docbook-dtd-${DTD_VERSION}.cat
+		${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-docbook-sgml-dtd-${DTD_VERSION} \
 			--add ${sysconfdir}/sgml/sgml-docbook.cat \
 			${sysconfdir}/sgml/sgml-docbook-dtd-${DTD_VERSION}.cat
 	fi

index a776ea5..c70e76d 100644
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=41;endline=74;md5=875385159b2ee76ecf
 
 DEPENDS = "sgml-common-native"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/docbook/docbook-dsssl-${PV}.tar.bz2"
 

@@ -45,6 +45,9 @@ docbook_dsssl_stylesheets_sstate_postinst () {
 		# Ensure that the catalog file sgml-docbook.cat is properly
 		# updated when the package is installed from sstate cache.
 		${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-docbook-dsssl \
+			--add ${sysconfdir}/sgml/sgml-docbook.bak \
+			${sysconfdir}/sgml/dsssl-docbook-stylesheets.cat
+		${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-docbook-dsssl \
 			--add ${sysconfdir}/sgml/sgml-docbook.cat \
 			${sysconfdir}/sgml/dsssl-docbook-stylesheets.cat
 	fi

index da59406..c71f22a 100644
@@ -7,7 +7,7 @@ SECTION = "base"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=641ff1e4511f0a87044ad42f87cb1045"
 
-PR = "r3"
+PR = "r4"
 
 DEPENDS = "opensp-native sgml-common-native"
 RDEPENDS_${PN} = "sgml-common"

@@ -69,6 +69,9 @@ openjade_sstate_postinst() {
 		# Ensure that the catalog file sgml-docbook.cat is properly
 		# updated when the package is installed from sstate cache.
 		${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-openjade \
+			--add ${sysconfdir}/sgml/sgml-docbook.bak \
+			${sysconfdir}/sgml/openjade-${PV}.cat
+		${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-openjade \
 			--add ${sysconfdir}/sgml/sgml-docbook.cat \
 			${sysconfdir}/sgml/openjade-${PV}.cat
 	fi

index 2c8d874..af7e104 100644
@@ -13,7 +13,7 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://LICENSE-GPLv2;md5=ab8a50abe86dfc859e148baae043c89b"
 SECTION = "base"
 
-PR = "r0"
+PR = "r1"
 
 require sgml-common_${PV}.bb
 inherit native

@@ -21,6 +21,8 @@ inherit native
 S = "${WORKDIR}/sgml-common-${PV}"
 
 SYSROOT_PREPROCESS_FUNCS += "sgml_common_native_mangle"
+SSTATEPOSTINSTFUNCS += "sgml_common_sstate_postinst"
+
 
 do_install_append() {
 	# install-catalog script contains hard-coded references to

@@ -46,3 +48,17 @@ sgml_common_native_mangle () {
 	# Remove ${D} path from catalog file created by install-catalog script
 	sed -i -e "s|${D}||g" ${SYSROOT_DESTDIR}${sysconfdir}/sgml/catalog
 }
+
+sgml_common_sstate_postinst() {
+	if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]
+	then
+		if [ -e ${sysconfdir}/sgml/sgml-docbook.bak ]; then
+			for catalog in `awk '{print $2}' ${sysconfdir}/sgml/sgml-docbook.bak`; do
+				if [ ! `grep $catalog ${sysconfdir}/sgml/sgml-docbook.cat 1> /dev/null 2>&1` ]; then
+					${bindir}/install-catalog \
+						--add ${sysconfdir}/sgml/sgml-docbook.cat $catalog
+				fi
+			done
+		fi
+	fi
+}

index a99f18d..e55910c 100644
@@ -1,6 +1,6 @@
 TUNEVALID[m64] = "Power ELF64 standard ABI"
 TUNE_CONFLICTS[m64] = "m32"
-TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "n64", "-m64", "", d)}"
+TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}"
 TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", [ "m64" ], "powerpc64", "", d)}"
 
 AVAILTUNES += "powerpc64 powerpc64-nf"

index e55910c..a965d59 100644
@@ -1,10 +1,8 @@
 TUNEVALID[m64] = "Power ELF64 standard ABI"
-TUNE_CONFLICTS[m64] = "m32"
+TUNE_CONFLICTS[m64] = "m32 nf"
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}"
 TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", [ "m64" ], "powerpc64", "", d)}"
 
-AVAILTUNES += "powerpc64 powerpc64-nf"
+AVAILTUNES += "powerpc64"
 TUNE_FEATURES_tune-powerpc64 ?= "m64 fpu-hard"
 BASE_LIB_tune-powerpc64 = "lib64"
-TUNE_FEATURES_tune-powerpc64-nf ?= "m64 fpu-soft"
-BASE_LIB_tune-powerpc64-nf = "lib64"

index 8cc76ab..013755d 100644
@@ -18,7 +18,7 @@ TARGET_FPU .= "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "soft", "", d)}
 
 ABIEXTENSION = "${@['','spe'][d.getVar('TARGET_FPU', True) in ['ppc-efd', 'ppc-efs']]}"
 
-PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-hard" , "", "-nf", d)}"
+PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "-nf", "", d)}"
 
 TUNE_PKGARCH ?= "${TUNE_ARCH}${PPCPKGSFX_FPU}"
 

index a4cdb1f..73217dd 100644
@@ -7,5 +7,5 @@ TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce500mc", "-mcpu=e500mc
 TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "ppce500mc", "ppce500mc", "", d)}"
 
 AVAILTUNES += "ppce500mc"
-TUNE_FEATURES_tune-ppce500mc = "m32 hard-fpu ppce500mc"
+TUNE_FEATURES_tune-ppce500mc = "m32 fpu-hard ppce500mc"
 PACKAGE_EXTRA_ARCHS_tune-ppce500mc = "powerpc ppce500mc"

index b054146..999e15d 100644
@@ -375,8 +375,10 @@ def check_sanity(e):
     elif oeroot.find (' ') != -1:
         messages = messages + "Error, you have a space in your COREBASE directory path. Please move the installation to a directory which doesn't include a space."
 
-    # Check that we don't have duplicate entries in PACKAGE_ARCHS
+    # Check that we don't have duplicate entries in PACKAGE_ARCHS & that TUNE_PKGARCH is in PACKAGE_ARCHS
     pkgarchs = data.getVar('PACKAGE_ARCHS', e.data, True)
+    tunepkg = data.getVar('TUNE_PKGARCH', e.data, True)
+    tunefound = False
     seen = {}
     dups = []
 

@@ -385,9 +387,15 @@ def check_sanity(e):
 	    dups.append(pa)
 	else:
 	    seen[pa] = 1
+	if pa == tunepkg:
+	    tunefound = True
+
     if len(dups):
        messages = messages + "Error, the PACKAGE_ARCHS variable contains duplicates. The following archs are listed more than once: %s" % " ".join(dups)
 
+    if tunefound == False:
+       messages = messages + "Error, the PACKAGE_ARCHS variable does not contain TUNE_PKGARCH (%s)." % tunepkg
+
     if messages != "":
         raise_sanity_error(messages)
 

index 999e15d..dc11c9e 100644
@@ -383,12 +383,14 @@ def check_sanity(e):
     dups = []
 
     for pa in pkgarchs.split():
-    	if seen.get(pa, 0) == 1:
+	if pa == tunepkg:
+	    tunefound = True
+            if seen.get(pa, 0) == 1:
+               pkgarchs.remove(pa)
+    	elif seen.get(pa, 0) == 1:
 	    dups.append(pa)
 	else:
 	    seen[pa] = 1
-	if pa == tunepkg:
-	    tunefound = True
 
     if len(dups):
        messages = messages + "Error, the PACKAGE_ARCHS variable contains duplicates. The following archs are listed more than once: %s" % " ".join(dups)

index a9ed639..6e8fe16 100644
@@ -14,7 +14,7 @@ RDEPENDS_${PN} = "sat-solver"
 S = "${WORKDIR}/git"
 SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433"
 PV = "0.0-git${SRCPV}"
-PR = "r11"
+PR = "r12"
 
 SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \
            file://no-doc.patch \

index 013755d..2621932 100644
@@ -8,6 +8,7 @@ DEFAULTTUNE ?= "powerpc"
 TUNEVALID[m32] = "Power ELF32 standard ABI"
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m32", "-m32", "", d)}"
 TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m32", "powerpc", "", d)}"
+PPC_PKGARCH = "ppc"
 
 TUNEVALID[fpu-hard] = "Use hardware FPU."
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "fpu-hard", "-mhard-float", "", d)}"

@@ -20,7 +21,7 @@ ABIEXTENSION = "${@['','spe'][d.getVar('TARGET_FPU', True) in ['ppc-efd', 'ppc-e
 
 PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "-nf", "", d)}"
 
-TUNE_PKGARCH ?= "${TUNE_ARCH}${PPCPKGSFX_FPU}"
+TUNE_PKGARCH ?= "${PPC_PKGARCH}${PPCPKGSFX_FPU}"
 
 # Basic tune definitions
 AVAILTUNES += "powerpc powerpc-nf" 

index a965d59..0a104a2 100644
@@ -2,6 +2,7 @@ TUNEVALID[m64] = "Power ELF64 standard ABI"
 TUNE_CONFLICTS[m64] = "m32 nf"
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}"
 TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", [ "m64" ], "powerpc64", "", d)}"
+PPC_PKGARCH = "ppc64"
 
 AVAILTUNES += "powerpc64"
 TUNE_FEATURES_tune-powerpc64 ?= "m64 fpu-hard"

index 7c05394..2eec64b 100644
@@ -4,8 +4,8 @@ require conf/machine/include/powerpc/arch-powerpc.inc
 
 TUNEVALID[ppc603e] = "Enable ppc603e specific processor optimizations"
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppc603e", "-mcpu=603e", "", d)}"
-TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "ppc603e", "ppc603e", "", d)}"
+PPC_PKGARCH_tune-ppc603e = "ppc603e"
 
 AVAILTUNES += "ppc603e"
 TUNE_FEATURES_tune-ppc603e = "m32 fpu-hard ppc603e"
-PACKAGE_EXTRA_ARCHS_tune-ppc603e = "powerpc ppc603e"
+PACKAGE_EXTRA_ARCHS_tune-ppc603e = "ppc ppc603e"

index bad2611..7763d86 100644
@@ -4,8 +4,9 @@ require conf/machine/include/powerpc/arch-powerpc.inc
 
 TUNEVALID[ppce300c2] = "Enable ppce300c2 specific processor optimizations"
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce300c2", "-mcpu=e300c2", "", d)}"
-TUNE_PKGARCH = "${@bb.utils.contains("TUNE_FEATURES", "ppce300c2", "ppce300c2", "${TUNE_ARCH}", d)}"
+PPC_PKGARCH_tune-ppce300c2 = "ppce300c2"
+TUNE_PKGARCH_tune-ppce300c2 = "ppce300c2"
 
 AVAILTUNES += "ppce300c2"
 TUNE_FEATURES_tune-ppce300c2 = "m32 fpu-soft ppce300c2"
-PACKAGE_EXTRA_ARCHS_tune-ppce300c2 = "powerpc-nf ppce300c2"
+PACKAGE_EXTRA_ARCHS_tune-ppce300c2 = "ppc-nf ppce300c2"

index c34d631..4399e3c 100644
@@ -4,12 +4,13 @@ require conf/machine/include/powerpc/arch-powerpc.inc
 
 TUNEVALID[ppce500] = "Enable ppce500 specific processor optimizations"
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce500", "-mcpu=8540", "", d)}"
-TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "ppce500", "ppce500", "", d)}"
+PPC_PKGARCH_tune-ppce500 = "ppce500"
+TUNE_PKGARCH_tune-ppce500 = "ppce500"
 
 TUNEVALID[spe] = "Enable SPE ABI extensions"
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "spe", "-mabi=spe -mspe", "", d)}"
 
-TARGET_FPU = "ppc-efs"
+TARGET_FPU .= "${@bb.utils.contains("TUNE_FEATURES", [ "ppce500", "spe" ], "ppc-efs", "", d)}"
 
 AVAILTUNES += "ppce500"
 TUNE_FEATURES_tune-ppce500 = "m32 spe ppce500"

index 73217dd..076f04c 100644
@@ -4,8 +4,9 @@ require conf/machine/include/powerpc/arch-powerpc.inc
 
 TUNEVALID[ppce500mc] = "Enable ppce500mc specific processor optimizations"
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce500mc", "-mcpu=e500mc", "", d)}"
-TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "ppce500mc", "ppce500mc", "", d)}"
+PPC_PKGARCH_tune-ppce500mc = "ppce500mc"
+TUNE_PKGARCH_tune-ppce500mc = "ppce500mc"
 
 AVAILTUNES += "ppce500mc"
 TUNE_FEATURES_tune-ppce500mc = "m32 fpu-hard ppce500mc"
-PACKAGE_EXTRA_ARCHS_tune-ppce500mc = "powerpc ppce500mc"
+PACKAGE_EXTRA_ARCHS_tune-ppce500mc = "ppc ppce500mc"

index 819d68a..2fef6d0 100644
@@ -4,12 +4,13 @@ require conf/machine/include/powerpc/arch-powerpc.inc
 
 TUNEVALID[ppce500v2] = "Enable ppce500v2 specific processor optimizations"
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce500v2", "-mcpu=8548", "", d)}"
-TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "ppce500v2", "ppce500v2", "", d)}"
+PPC_PKGARCH_tune-ppce500v2 = "ppce500v2"
+TUNE_PKGARCH_tune-ppce500v2 = "ppce500v2"
 
 TUNEVALID[spe] = "Enable SPE ABI extensions"
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "spe", "-mabi=spe -mspe", "", d)}"
 
-TARGET_FPU = "ppc-efd"
+TARGET_FPU .= "${@bb.utils.contains("TUNE_FEATURES", [ "ppce500v2", "spe" ], "ppc-efd", "", d)}"
 
 AVAILTUNES += "ppce500v2"
 TUNE_FEATURES_tune-ppce500v2 = "m32 spe ppce500v2"

index 0377100..856dfb0 100644
@@ -32,14 +32,12 @@ package_update_index_rpm () {
 		eval archs=\${${archvar}}
 		packagedirs=""
 		packagedirs_sdk=""
-		for arch in $archs; do
-			sdkarch=`echo $arch | sed -e 's/${HOST_ARCH}/${SDK_ARCH}/'`
-			extension="-nativesdk"
-			if [ "$sdkarch" = "all" -o "$sdkarch" = "any" -o "$sdkarch" = "noarch" ]; then
-			    extension=""
-			fi
+		if [ "${SDK_ARCH}-nativesdk" != "-nativesdk" ]; then
+			packagedirs_sdk="${DEPLOY_DIR_RPM}/${SDK_ARCH}-nativesdk"
+		fi
+		for arch in $archs ; do
 			packagedirs="${DEPLOY_DIR_RPM}/$arch $packagedirs"
-			packagedirs_sdk="${DEPLOY_DIR_RPM}/$sdkarch$extension $packagedirs_sdk"
+			packagedirs_sdk="${DEPLOY_DIR_RPM}/$arch $packagedirs_sdk"
 
 			rm -rf ${DEPLOY_DIR_RPM}/$arch/solvedb
 			rm -rf ${DEPLOY_DIR_RPM}/$sdkarch$extension/solvedb

@@ -95,6 +93,7 @@ package_update_index_rpm () {
 #
 package_generate_rpm_conf () {
 	printf "_solve_dbpath " > ${RPMCONF_TARGET_BASE}.macro
+	printf "_solve_dbpath " > ${RPMCONF_HOST_BASE}.macro
 	o_colon_t=false
 	o_colon_h=false
 

@@ -238,7 +237,7 @@ package_install_internal_rpm () {
 					echo "Unable to find package $pkg ($ml_pkg)!"
 					exit 1
 				fi
-				echo $pkg_name >> ${IMAGE_ROOTFS}/install/install.manifest
+				echo $pkg_name >> ${target_rootfs}/install/install.manifest
 			done
 		fi
 	fi

@@ -258,7 +257,7 @@ package_install_internal_rpm () {
 				echo "Unable to find package $pkg ($ml_pkg)!"
 				exit 1
 			fi
-			echo $pkg_name >> ${IMAGE_ROOTFS}/install/install.manifest
+			echo $pkg_name >> ${target_rootfs}/install/install.manifest
 		done
 	fi
 

@@ -303,7 +302,7 @@ package_install_internal_rpm () {
 		# Dump the full set of recommends...
 		${RPM} --predefine "_rpmds_sysinfo_path ${target_rootfs}/etc/rpm/sysinfo" \
 			--predefine "_rpmrc_platform_path ${target_rootfs}/etc/rpm/platform" \
-			-D "_dbpath ${IMAGE_ROOTFS}/install" -D "`cat ${confbase}.macro`" \
+			-D "_dbpath ${target_rootfs}/install" -D "`cat ${confbase}.macro`" \
 			-D "__dbi_txn create nofsync private" \
 			-qa --qf "[%{RECOMMENDS}\n]" | sort -u > ${target_rootfs}/install/recommend
 		# Did we add more to the list?

index a5b6384..9acc52d 100644
@@ -34,16 +34,9 @@ fakeroot populate_sdk_deb () {
 	export INSTALL_ROOTFS_DEB="${SDK_OUTPUT}"
 	export INSTALL_BASEARCH_DEB="${SDK_ARCH}"
 	export INSTALL_PACKAGES_NORMAL_DEB="${TOOLCHAIN_HOST_TASK}"
-	INSTALL_ARCHS_DEB=""
+	INSTALL_ARCHS_DEB="${SDK_ARCH}-nativesdk"
 	for arch in ${PACKAGE_ARCHS}; do
-		sdkarch=`echo $arch | sed -e 's/${HOST_ARCH}/${SDK_ARCH}/'`
-		extension="-nativesdk"
-		if [ "$sdkarch" = "all" -o "$sdkarch" = "any" -o "$sdkarch" = "noarch" ]; then
-		    extension=""
-		fi
-		if [ -e ${DEPLOY_DIR_DEB}/$sdkarch$extension ]; then
-			INSTALL_ARCHS_DEB="$INSTALL_ARCHS_DEB $sdkarch$extension"
-		fi
+		INSTALL_ARCHS_DEB="$INSTALL_ARCHS_DEB $arch"
 	done
 	export INSTALL_ARCHS_DEB
 

index da308c1..8196542 100644
@@ -53,16 +53,9 @@ fakeroot populate_sdk_rpm () {
 	export INSTALL_PLATFORM_RPM="${SDK_ARCH}"
 	export INSTALL_CONFBASE_RPM="${RPMCONF_HOST_BASE}"
 	export INSTALL_PACKAGES_NORMAL_RPM="${TOOLCHAIN_HOST_TASK}"
-	export INSTALL_PLATFORM_EXTRA_RPM=""
+	export INSTALL_PLATFORM_EXTRA_RPM="${SDK_ARCH}-nativesdk"
 	for arch in ${PACKAGE_ARCHS}; do
-		sdkarch=`echo $arch | sed -e 's/${HOST_ARCH}/${SDK_ARCH}/'`
-		extension="-nativesdk"
-		if [ "$sdkarch" = "all" -o "$sdkarch" = "any" -o "$sdkarch" = "noarch" ]; then
-		    extension=""
-		fi
-		if [ -e ${DEPLOY_DIR_RPM}/$sdkarch$extension ]; then
-			INSTALL_PLATFORM_EXTRA_RPM="$sdkarch $INSTALL_PLATFORM_EXTRA_RPM"
-		fi
+		INSTALL_PLATFORM_EXTRA_RPM="$arch $INSTALL_PLATFORM_EXTRA_RPM"
 	done
 	export INSTALL_PLATFORM_EXTRA_RPM
 

index 9c80f11..11dfb6d 100644
@@ -637,9 +637,10 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
 #
 # This works for  functions as well, they are really just environment variables.
 # Default OVERRIDES to make compilation fail fast in case of build system misconfiguration.
-OVERRIDES = "${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:forcevariable"
+OVERRIDES = "${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${TUNEOVERRIDES}:${DISTROOVERRIDES}:forcevariable"
 DISTROOVERRIDES ?= "${DISTRO}"
 MACHINEOVERRIDES ?= "${MACHINE}"
+TUNEOVERRIDES ?= "tune-${DEFAULTTUNE}"
 
 CPU_FEATURES ?= ""
 CPU_FEATURES_arm ?= "vfp"

index 4db5e98..dfe4612 100644
@@ -217,7 +217,7 @@ python () {
             overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + eext[1]
             localdata.setVar("OVERRIDES", overrides)
             # TEMP: OVERRIDES isn't working right
-            localdata.setVar("TUNENAME", localdata.getVar("TUNENAME_virtclass-multilib-" + eext[1], False) or "")
+            localdata.setVar("DEFAULTTUNE", localdata.getVar("DEFAULTTUNE_virtclass-multilib-" + eext[1], False) or "")
             ml_package_archs += localdata.getVar("PACKAGE_ARCHS", True) or ""
             #bb.note("ML_PACKAGE_ARCHS %s %s %s" % (eext[1], localdata.getVar("PACKAGE_ARCHS", True) or "(none)", overrides))
     bb.data.setVar('MULTILIB_PACKAGE_ARCHS', ml_package_archs, d)

index fb502cb..8e363f8 100644
@@ -116,7 +116,7 @@ package_install_internal_deb () {
 	local archs="${INSTALL_ARCHS_DEB}"
 	local package_to_install="${INSTALL_PACKAGES_NORMAL_DEB}"
 	local package_attemptonly="${INSTALL_PACKAGES_ATTEMPTONLY_DEB}"
-	local package_lingusa="${INSTALL_PACKAGES_LINGUAS_DEB}"
+	local package_linguas="${INSTALL_PACKAGES_LINGUAS_DEB}"
 	local task="${INSTALL_TASK_DEB}"
 
 	rm -f ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev

@@ -155,12 +155,12 @@ package_install_internal_deb () {
 
 	# Uclibc builds don't provide this stuff..
 	if [ x${TARGET_OS} = "xlinux" ] || [ x${TARGET_OS} = "xlinux-gnueabi" ] ; then
-		if [ ! -z "${package_lingusa}" ]; then
+		if [ ! -z "${package_linguas}" ]; then
 			apt-get install glibc-localedata-i18n --force-yes --allow-unauthenticated
 			if [ $? -ne 0 ]; then
 				exit 1
 			fi
-			for i in ${package_lingusa}; do
+			for i in ${package_linguas}; do
 				apt-get install $i --force-yes --allow-unauthenticated
 				if [ $? -ne 0 ]; then
 					exit 1

index b7afa83..16574e9 100644
@@ -99,7 +99,7 @@ package_install_internal_ipk() {
 	local conffile="${INSTALL_CONF_IPK}"
 	local package_to_install="${INSTALL_PACKAGES_NORMAL_IPK}"
 	local package_attemptonly="${INSTALL_PACKAGES_ATTEMPTONLY_IPK}"
-	local package_lingusa="${INSTALL_PACKAGES_LINGUAS_IPK}"
+	local package_linguas="${INSTALL_PACKAGES_LINGUAS_IPK}"
 	local package_multilib="${INSTALL_PACKAGES_MULTILIB_IPK}"
 	local task="${INSTALL_TASK_IPK}"
 

@@ -111,8 +111,8 @@ package_install_internal_ipk() {
 
 	# Uclibc builds don't provide this stuff...
 	if [ x${TARGET_OS} = "xlinux" ] || [ x${TARGET_OS} = "xlinux-gnueabi" ] ; then
-		if [ ! -z "${package_lingusa}" ]; then
-			for i in ${package_lingusa}; do
+		if [ ! -z "${package_linguas}" ]; then
+			for i in ${package_linguas}; do
 				opkg-cl ${ipkg_args} install $i
 			done
 		fi

index 856dfb0..4593876 100644
@@ -193,7 +193,7 @@ package_install_internal_rpm () {
 	local confbase="${INSTALL_CONFBASE_RPM}"
 	local package_to_install="${INSTALL_PACKAGES_NORMAL_RPM}"
 	local package_attemptonly="${INSTALL_PACKAGES_ATTEMPTONLY_RPM}"
-	local package_lingusa="${INSTALL_PACKAGES_LINGUAS_RPM}"
+	local package_linguas="${INSTALL_PACKAGES_LINGUAS_RPM}"
 	local providename="${INSTALL_PROVIDENAME_RPM}"
 	local task="${INSTALL_TASK_RPM}"
 

@@ -222,8 +222,8 @@ package_install_internal_rpm () {
 
 	# Uclibc builds don't provide this stuff...
 	if [ x${TARGET_OS} = "xlinux" ] || [ x${TARGET_OS} = "xlinux-gnueabi" ] ; then
-		if [ ! -z "${package_lingusa}" ]; then
-			for pkg in ${package_lingusa}; do
+		if [ ! -z "${package_linguas}" ]; then
+			for pkg in ${package_linguas}; do
 				echo "Processing $pkg..."
 
 				archvar=base_package_archs

index ce9cee5..6ac2950 100644
@@ -17,7 +17,7 @@ TUNE_FEATURES_tune-armv7at-neon ?= "armv7a vfp neon thumb"
 PACKAGE_EXTRA_ARCHS_tune-armv7a = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7a-vfp"
 PACKAGE_EXTRA_ARCHS_tune-armv7a-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7a} armv7a-vfp-neon"
 PACKAGE_EXTRA_ARCHS_tune-armv7at = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7a-vfp armv7at2-vfp"
-PACKAGE_EXTRA_ARCHS_tune-armv7at-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7a-vfp-neon armv7at2-vfp-neon"
+PACKAGE_EXTRA_ARCHS_tune-armv7at-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7a armv7a-vfp-neon armv7at2-vfp-neon"
 
 # VFP Tunes
 AVAILTUNES += "armv7hf armv7thf armv7hf-neon armv7thf-neon

@@ -39,7 +39,7 @@ TUNE_FEATURES_tune-armv7atb-neon ?= "${TUNE_FEATURES_tune-armv7at-neon} bigendia
 PACKAGE_EXTRA_ARCHS_tune-armv7ab = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7ab-vfp"
 PACKAGE_EXTRA_ARCHS_tune-armv7atb = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7ab-vfp armv7at2b-vfp"
 PACKAGE_EXTRA_ARCHS_tune-armv7ab-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7a} armv7ab-vfp-neon"
-PACKAGE_EXTRA_ARCHS_tune-armv7atb-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7ab-vfp-neon armv7at2b-vfp-neon"
+PACKAGE_EXTRA_ARCHS_tune-armv7atb-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7ab armv7ab-vfp-neon armv7at2b-vfp-neon"
 
 # Big Endian + VFP
 AVAILTUNES += "armv7ahfb armv7athfb armv7ahfb-neon armv7athfb-neon"

@@ -14,9 +14,9 @@ TUNE_FEATURES_tune-armv7a ?= "armv7a vfp"
 TUNE_FEATURES_tune-armv7at ?= "armv7a vfp thumb"
 TUNE_FEATURES_tune-armv7a-neon ?= "armv7a vfp neon"
 TUNE_FEATURES_tune-armv7at-neon ?= "armv7a vfp neon thumb"
-PACKAGE_EXTRA_ARCHS_tune-armv7a = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7a-vfp"
+PACKAGE_EXTRA_ARCHS_tune-armv7a = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7a-vfp testv7a"
 PACKAGE_EXTRA_ARCHS_tune-armv7a-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7a} armv7a-vfp-neon"
-PACKAGE_EXTRA_ARCHS_tune-armv7at = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7a-vfp armv7at2-vfp"
+PACKAGE_EXTRA_ARCHS_tune-armv7at = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7a-vfp armv7at2-vfp testv7at"
 PACKAGE_EXTRA_ARCHS_tune-armv7at-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7a armv7a-vfp-neon armv7at2-vfp-neon"
 

index a874c8b..1cd45d2 100644
@@ -16,9 +16,9 @@ PROVIDES = "\
 	virtual/libiconv \
 	glibc-thread-db \
 	virtual/linux-libc-headers "
-RPROVIDES = "glibc-utils libsegfault glibc-thread-db"
+RPROVIDES = "libsegfault glibc-thread-db"
 PACKAGES_DYNAMIC = "glibc-gconv-*"
-PR = "r1"
+PR = "r2"
 
 #SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-linux-gnueabi/arm-${PV}-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2"
 

index 5507746..b4b4418 100644
@@ -9,10 +9,10 @@ PROVIDES = "\
     virtual/libintl \
     virtual/libiconv \
     virtual/linux-libc-headers "
-RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++"
+RPROVIDES = "libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++"
 PACKAGES_DYNAMIC = "glibc-gconv-*"
 INHIBIT_DEFAULT_DEPS = "1"
-PR = "r1"
+PR = "r2"
 
 # License applies to this recipe code, not the toolchain itself
 LICENSE = "MIT"

index e7d392e..533eab9 100644
@@ -4,9 +4,11 @@
 # encoded RISC sub-set. Thumb code is smaller (maybe 70% of the ARM size)
 # but requires more instructions (140% for 70% smaller code) so may be
 # slower.
-TUNEVALID[thumb] = "Use thumb instructions instead of ARM"
-ARM_THUMB_M_OPT = "${@['-mno-thumb', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
+TUNEVALID[thumb] = "Use thumb instructions instead of ARM if ARM_INSTRUCTION_SET != arm"
+ARM_THUMB_M_OPT = "${@['-mthumb', '-mno-thumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) != 'arm']}"
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "thumb", "${ARM_THUMB_M_OPT}", "${ARM_THUMB_M_OPT}", d)}"
+
+TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "thumb", "-mthumb", "-mno-thumb", d)}"
 OVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "thumb", ":thumb", "", d)}"
 
 # Note armv7 will hit on armv7a as well