merge of 'c0b80d25e48faf3cabe4d83d5586401a0a5e1188'

     and 'c5251d02ae821f28febfb91fb76af9cd01b8f3fd'

239 files changed, 10875 insertions, 1126 deletions

diff --git a/packages/chicken/chicken.inc b/packages/chicken/chicken2.inc
index fbaf971f88..fbaf971f88 100644
--- a/packages/chicken/chicken.inc
+++ b/packages/chicken/chicken2.inc
diff --git a/packages/chicken/chicken3.inc b/packages/chicken/chicken3.inc
new file mode 100644
index 0000000000..2feebfb48a
--- /dev/null
+++ b/packages/chicken/chicken3.inc
@@ -0,0 +1,36 @@
+DESCRIPTION = "A compiler that translates Scheme source files to C, and an interpreter"
+HOMEPAGE = "http://www.call-with-current-continuation.org/"
+SECTION = "interpreters"
+PRIORITY = "optional"
+LICENSE = "BSD"
+
+SRC_URI = "http://chicken.wiki.br/releases/${PV}/chicken-${PV}.tar.gz"
+
+inherit autotools
+
+do_compile() {
+    export PLATFORM=linux
+    export PREFIX=${prefix}
+    export HOST=${TARGET_ARCH}-${DISTRO}-${TARGET_OS}
+    export C_COMPILER=${HOST}-gcc 
+    export LIBRARIAN=${HOST}-ar
+    # ARCH= is weird... but it's not enough to export this variable.
+    # If ARCH is not set to empty-string, then the Makefile will try to 
+    # use the apply-hack.s file applicable to the machine doing the compiling.
+    # There is no such apply-hack assembler code for arm, at least not yet.
+    make ARCH=
+}
+
+do_install() {
+    export PLATFORM=linux
+    export PREFIX=${prefix}
+    export HOST=${TARGET_ARCH}-${DISTRO}-${TARGET_OS}
+    export C_COMPILER=${HOST}-gcc 
+    export LIBRARIAN=${HOST}-ar
+    make ARCH= DESTDIR=${D} install
+}
+
+FILES_${PN} = "${bindir}/csi ${bindir}/chicken-bug"
+FILES_${PN} += "${libdir}/lib*.so.* ${libdir}/chicken"
+FILES_${PN} += "${datadir}/chicken/*.*"
+FILES_${PN}-dev += "${bindir}"
diff --git a/packages/chicken/chicken_2.6.bb b/packages/chicken/chicken_2.6.bb
index 713552b3e9..934ef4a218 100644
--- a/packages/chicken/chicken_2.6.bb
+++ b/packages/chicken/chicken_2.6.bb
@@ -1 +1 @@
-require chicken.inc
+require chicken2.inc
diff --git a/packages/chicken/chicken_3.3.0.bb b/packages/chicken/chicken_3.3.0.bb
new file mode 100644
index 0000000000..7d9fc69419
--- /dev/null
+++ b/packages/chicken/chicken_3.3.0.bb
@@ -0,0 +1 @@
+require chicken3.inc
diff --git a/packages/gpe-login/gpe-login-0.86/.mtn2git_empty b/packages/dmalloc/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gpe-login/gpe-login-0.86/.mtn2git_empty
+++ b/packages/dmalloc/.mtn2git_empty
diff --git a/packages/dmalloc/dmalloc_5.5.2.bb b/packages/dmalloc/dmalloc_5.5.2.bb
new file mode 100644
index 0000000000..c91152b537
--- /dev/null
+++ b/packages/dmalloc/dmalloc_5.5.2.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Debug Malloc Library"
+SECTION = "libs/devel"
+HOMEPAGE = "http://dmalloc.com"
+LICENSE = "CCSA"
+
+SRC_URI = "\
+  http://dmalloc.com/releases/dmalloc-${PV}.tgz \
+  file://configure-pagesize-HACK.patch;patch=1 \
+# HACK we ship a preconfigured conf.h since otherwise it misses a whole lot of stuff and compilation fails.
+# TODO find out why and get rid of it
+  file://conf.h \
+"
+inherit autotools pkgconfig
+
+do_configure_append() {
+	install -m 0644 ${WORKDIR}/conf.h ${S}
+}
+
+do_stage() {
+	oe_libinstall -a libdmalloc ${STAGING_LIBDIR}
+}
+
+do_install() {
+	:
+}
diff --git a/packages/gpe-login/gpe-login-0.87/.mtn2git_empty b/packages/dmalloc/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gpe-login/gpe-login-0.87/.mtn2git_empty
+++ b/packages/dmalloc/files/.mtn2git_empty
diff --git a/packages/dmalloc/files/conf.h b/packages/dmalloc/files/conf.h
new file mode 100644
index 0000000000..d2d9c4af0c
--- /dev/null
+++ b/packages/dmalloc/files/conf.h
@@ -0,0 +1,274 @@
+/* conf.h.  Generated by configure.  */
+/*
+ * Automatic configuration flags
+ *
+ * Copyright 2000 by Gray Watson
+ *
+ * This file is part of the dmalloc package.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose and without fee is hereby granted, provided
+ * that the above copyright notice and this permission notice appear
+ * in all copies, and that the name of Gray Watson not be used in
+ * advertising or publicity pertaining to distribution of the document
+ * or software without specific, written prior permission.
+ *
+ * Gray Watson makes no representations about the suitability of the
+ * software described herein for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ *
+ * The author may be contacted via http://dmalloc.com/
+ *
+ * $Id: conf.h.in,v 1.99 2005/12/21 13:40:27 gray Exp $
+ */
+
+#ifndef __CONF_H__
+#define __CONF_H__
+
+/* please see settings.h for manual configuration options */
+
+/*
+ * NOTE: The following settings should not need to be tuned by hand.
+ */
+
+/*
+ * Set to 1 if the mprotect function was found and the PROT_NONE,
+ * PROT_READ, and PROT_WRITE defines were found in sys/mman.h.  This
+ * is so that we can restrict access to certain blocks of memory.
+ */
+#define PROTECT_ALLOWED 1
+
+/*
+ * (char *)sbrk(const int incr) is the main heap-memory allocation
+ * routine that most systems employ.  This extends the program's data
+ * space by INCR number of bytes.
+ *
+ * NOTE: If configure generates a 0 for this and HAVE_MMAP on your
+ * system, you should see the INTERNAL_MEMORY_SPACE setting in the
+ * settings.h file which is created from the settings.dist file.
+ */
+#define HAVE_SBRK 1
+
+/*
+ * (void *)mmap(...) is another heap-memory allocation routine that
+ * systems employ.  On newer systems it is often preferable over sbrk.
+ * It allocates a block of memory in the virtual-memory system.  The
+ * USE_MMAP define is set if the standard mmap call works.
+ *
+ * NOTE: If configure generates a 0 for this and HAVE_SBRK on your
+ * system, you should see the INTERNAL_MEMORY_SPACE setting in the
+ * settings.h file which is created from the settings.dist file.
+ */
+#define HAVE_MMAP 1
+#define USE_MMAP 1
+
+/*
+ * This is the basic block size in bits.  If possible, the configure
+ * script will set this to be the value returned by the getpagesize()
+ * function.  If not then some sort of best guess will be necessary.
+ * 15 (meaning basic block size of 32k) will probably be good.
+ *
+ * NOTE: some sbrk functions round to the correct page-size.  No
+ * problems aside from a possible small increase in the administration
+ * overhead should happen if this value is too high.
+ */
+#define BASIC_BLOCK 12
+
+/*
+ * The alignment value of all allocations in number of bytes for
+ * loading admin information before an allocation.  If possible, the
+ * configure script will set this to be the value returned by
+ * sizeof(long) which in most systems is the register width.
+ *
+ * NOTE: the value will never be auto-configured to be less than 8
+ * because some system (like sparc for instance) report the sizeof(long)
+ * == 4 while the register size is 8 bytes.  Certain memory needs to be of
+ * the same base as the register size (stack frames, code, etc.).  Any
+ * ideas how I can determine the register size in a better (and portable)
+ * fashion?
+ *
+ * NOTE: larger the number the more memory may be wasted by certain
+ * debugging settings like fence-post checking.
+ */
+#define ALLOCATION_ALIGNMENT 8
+
+/*
+ * This checks to see if the abort routine does extensive cleaning up
+ * before halting a program.  If so then it may call malloc functions
+ * making the library go recursive.  If abort is set to not okay then
+ * you should tune the KILL_PROCESS and SIGNAL_INCLUDE options in
+ * settings.h if you want the library to be able to dump core.
+ */
+#define ABORT_OKAY 1
+
+/*
+ * This checks to see if we can include signal.h and get SIGHUP,
+ * SIGINT, and SIGTERM for the catch-signals token.  With this token,
+ * you can have the library do an automatic shutdown if we see the
+ * above signals.
+ */
+#define SIGNAL_OKAY 1
+#define RETSIGTYPE void
+
+/*
+ * This checks to see if we can include return.h and use the assembly
+ * macros there to call the callers address for logging.  If you do
+ * not want this behavior, then set the USE_RETURN_MACROS to 0 in the
+ * settings.h file.
+ */
+#define RETURN_MACROS_WORK 1
+
+/*
+ * Why can't the compiler folks agree about this.  I really hate Unix
+ * sometimes for its blatant disregard for anything approaching a
+ * standard.
+ */
+#define IDENT_WORKS 1
+
+/*
+ * Which pthread include file to use.
+ */
+#define HAVE_PTHREAD_H 1
+#define HAVE_PTHREADS_H 0
+
+/*
+ * What pthread functions do we have?
+ */
+#define HAVE_PTHREAD_MUTEX_INIT 1
+#define HAVE_PTHREAD_MUTEX_LOCK 1
+#define HAVE_PTHREAD_MUTEX_UNLOCK 1
+
+/*
+ * What is the pthread mutex type?  Usually (always?) it is
+ * pthread_mutex_t.
+ */
+#define THREAD_MUTEX_T pthread_mutex_t
+
+/*
+ * On some systems, you initialize mutex variables with NULL.  Others
+ * require various stupid non-portable incantations.  The OSF 3.2 guys
+ * should be ashamed of themselves.  This only is used if the
+ * LOCK_THREADS setting is enabled in the settings.h.
+ */
+#define THREAD_LOCK_INIT_VAL 0
+
+/*
+ * Under the Cygwin environment, when malloc calls getenv, it core
+ * dumps.  This is because Cygwin, as far as I know, is loading the
+ * shared libraries for the various system functions and goes
+ * recursive with a call to getenv.  Ugh.
+ *
+ * So we have to delay the getenv call.  This sets when we can do the
+ * getenv call so the environmental processing is delayed.
+ */
+#define GETENV_SAFE 1
+
+/*
+ * See whether support exists for the constructor attribute which
+ * allows the library to run code before main() is called.  I know
+ * that later versions of gcc have support for this and maybe other
+ * compilers do as well.
+ */
+#define CONSTRUCTOR_WORKS 1
+
+/*
+ * See whether support exists for the destructor attribute which
+ * allows the library to run code after main() is exited.  I know
+ * that later versions of gcc have support for this and maybe other
+ * compilers do as well.
+ */
+#define DESTRUCTOR_WORKS 1
+
+/*
+ * See if we have the GetEnvironmentVariableA Cygwin function.  This
+ * is used as a getenv replacement.
+ */
+#define HAVE_GETENVIRONMENTVARIABLEA 0
+
+/*
+ * LIBRARY DEFINES:
+ */
+
+/*
+ * Whether the compiler and OS has standard C headers.
+ */
+#define STDC_HEADERS 1
+
+/*
+ * Some systems have functions which can register routines to be
+ * called by exit(3) (or when the program returns from main).  This
+ * functionality allows the dmalloc_shutdown() routine to be called
+ * automatically upon program completion so that the library can log
+ * statistics.  Use the AUTO_SHUTDOWN define above to disable this.
+ * Please send me mail if this functionality exists on your system but
+ * in another name.
+ *
+ * NOTE: If neither is available, take a look at atexit.c in the
+ * contrib directory which may provide this useful functionality for
+ * your system.
+ */
+#define HAVE_ATEXIT 1
+#define HAVE_ON_EXIT 1
+
+/* Is the DMALLOC_SIZE type unsigned? */
+#define DMALLOC_SIZE_UNSIGNED 1
+
+/*
+ * The dmalloc library provides its own versions of the following
+ * functions, or knows how to work around their absence.
+ */
+/* bells and whistles */
+#define HAVE_FORK 1
+#define HAVE_GETHOSTNAME 1
+#define HAVE_GETPID 1
+#define HAVE_GETUID 1
+#define HAVE_TIME 1
+#define HAVE_CTIME 1
+
+#define HAVE_VPRINTF 1
+#define HAVE_SNPRINTF 1
+#define HAVE_VSNPRINTF 1
+
+#define HAVE_RECALLOC 0
+#define HAVE_MEMALIGN 1
+#define HAVE_VALLOC 1
+
+/* various functions for arg checking and/or internal use */
+
+#define HAVE_ATOI 1
+#define HAVE_ATOL 1
+#define HAVE_BCMP 1
+#define HAVE_BCOPY 1
+#define HAVE_BZERO 1
+#define HAVE_INDEX 1
+#define HAVE_MEMCCPY 1
+#define HAVE_MEMCHR 1
+#define HAVE_MEMCMP 1
+#define HAVE_MEMCPY 1
+#define HAVE_MEMMOVE 1
+#define HAVE_MEMSET 1
+#define HAVE_RINDEX 1
+#define HAVE_STRCASECMP 1
+#define HAVE_STRCAT 1
+#define HAVE_STRCHR 1
+#define HAVE_STRCMP 1
+#define HAVE_STRCPY 1
+#define HAVE_STRCSPN 1
+#define HAVE_STRDUP 0
+#define HAVE_STRLEN 1
+#define HAVE_STRNCASECMP 1
+#define HAVE_STRNCAT 1
+#define HAVE_STRNCMP 1
+#define HAVE_STRNCPY 1
+#define HAVE_STRNDUP 0
+#define HAVE_STRPBRK 1
+#define HAVE_STRRCHR 1
+#define HAVE_STRSEP 1
+#define HAVE_STRSPN 1
+#define HAVE_STRSTR 1
+#define HAVE_STRTOK 1
+
+/* manual settings */
+#include "settings.h"
+
+#endif /* ! __CONF_H__ */
diff --git a/packages/dmalloc/files/configure-pagesize-HACK.patch b/packages/dmalloc/files/configure-pagesize-HACK.patch
new file mode 100644
index 0000000000..e9c8d666a0
--- /dev/null
+++ b/packages/dmalloc/files/configure-pagesize-HACK.patch
@@ -0,0 +1,33 @@
+Index: dmalloc-5.5.2/configure.ac
+===================================================================
+--- dmalloc-5.5.2.orig/configure.ac
++++ dmalloc-5.5.2/configure.ac
+@@ -348,26 +348,8 @@ AC_MSG_RESULT([$ac_cv_use_mmap])
+ #
+ AC_CHECK_FUNCS(getpagesize)
+ AC_MSG_CHECKING([basic-block size])
+-ac_cv_page_size=0
+-if test $ac_cv_page_size = 0; then
+-   AC_RUN_IFELSE([main() { if (getpagesize()<=2048) exit(0); else exit(1); }],
+-	[ ac_cv_page_size=11 ] )
+-fi
+-if test $ac_cv_page_size = 0; then
+-   AC_RUN_IFELSE([main() { if (getpagesize()<=4096) exit(0); else exit(1); }],
+-	[ ac_cv_page_size=12 ] )
+-fi
+-if test $ac_cv_page_size = 0; then
+-   AC_RUN_IFELSE([main() { if (getpagesize()<=8192) exit(0); else exit(1); }],
+-	[ ac_cv_page_size=13 ] )
+-fi
+-if test $ac_cv_page_size = 0; then
+-   AC_RUN_IFELSE([main() { if (getpagesize()<=16384) exit(0); else exit(1); }],
+-	[ ac_cv_page_size=14 ] )
+-fi
+-if test $ac_cv_page_size = 0; then
+-    ac_cv_page_size=15
+-fi
++# fix to 4K for now
++ac_cv_page_size=12
+ AC_DEFINE_UNQUOTED([BASIC_BLOCK],[$ac_cv_page_size])
+ AC_MSG_RESULT([$ac_cv_page_size])
+ 
diff --git a/packages/dsplink/codec-engine_2.10.bb b/packages/dsplink/codec-engine_2.10.bb
index 199df5ac62..f444c24e1f 100644
--- a/packages/dsplink/codec-engine_2.10.bb
+++ b/packages/dsplink/codec-engine_2.10.bb
@@ -5,7 +5,7 @@ RDEPENDS = "update-modules"
 
 inherit module
 
-PR = "r4"
+PR = "r5"
 PV = "2.10"
 
 # Get CE tarball from TI website, place in sources and calculate
@@ -14,6 +14,7 @@ PV = "2.10"
 
 SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_10_01.tar.gz \
            file://xdcpaths.mak \
+           file://ticel-config \
           "
 
 S = "${WORKDIR}/codec_engine_2_10_01"
@@ -47,6 +48,7 @@ do_configure() {
         sed -i -e s:arm_v5t_le-:${TAGET_PREFIX}:g $cfg
     done
 
+	install -d ${S}/examples/ti/sdo/ce/examples/apps/speech/linuxonly/app/
     echo -n "${CFLAGS} -I${TITOOLSDIR}/${TIXDCTOOLSDIR}/packages -I${S}/packages -I${S}/cetools/packages" > ${S}/examples/ti/sdo/ce/examples/apps/speech/linuxonly/app/compiler.opt
 }
 
@@ -83,6 +85,19 @@ do_compile() {
 
 }
 
+export DSPLIBS = "${S}/packages/ti/sdo/ce/utils/trace/lib/*.a* \
+                  ${S}/packages/ti/sdo/ce/bioslog/lib/*.a* \
+                  ${S}/packages/ti/sdo/ce/video/lib/*.a* \
+                  ${S}/packages/ti/sdo/ce/audio/lib/*.a* \
+                  ${S}/packages/ti/sdo/ce/speech/lib/*.a* \
+                  ${S}/packages/ti/sdo/ce/lib/*.a* \
+                  ${S}/packages/ti/sdo/ce/alg/lib/*.a* \
+                  ${S}/cetools/packages/ti/sdo/fc/dman3/*.a* \
+                  ${S}/cetools/packages/ti/sdo/fc/acpy3/*.a* \
+                  ${S}/packages/ti/sdo/ce/utils/xdm/lib/*.a* \
+                  ${S}/cetools/packages/ti/sdo/utils/trace/lib/*.a* \
+                 "
+
 do_install() {
 		unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
 		cd ${S}/cetools/packages/ti/sdo/linuxutils/cmem
@@ -92,17 +107,39 @@ do_install() {
 		install -d ${D}/${base_sbindir}
 		cd ${D} ; mv apitest apitestd multi_process multi_processd translate translated ${D}/${base_sbindir}		
 
+
 		install -d ${D}/${libdir}
-		for i in ${S}/cetools/packages/ti/sdo/linuxutils/cmem/lib/*.a ; do
-			install -m 0755 $i ${D}/${libdir}/
+		for i in ${DSPLIBS}; do
+			install -m 0755 $i ${D}/${libdir}/ || true
 		done
+        install -m 0755 ${S}/cetools/packages/ti/sdo/linuxutils/cmem/lib/*.a ${D}/${libdir}
 }
 
 do_stage() {
 		install -d ${STAGING_LIBDIR}	
-		for i in ${S}/cetools/packages/ti/sdo/linuxutils/cmem/lib/*.a ; do
-			install -m 0755 $i ${STAGING_LIBDIR}/
+		for i in ${DSPLIBS} ; do
+			install -m 0755 $i ${STAGING_LIBDIR}/ 
+			ln -sf ${STAGING_LIBDIR}/$(basename $i | awk -F. '{print $1}').a470MV  ${STAGING_LIBDIR}/$(basename $i | awk -F. '{print $1}').a || true 
+		done
+
+        install -m 0755 ${S}/cetools/packages/ti/sdo/linuxutils/cmem/lib/*.a ${STAGING_LIBDIR}/
+
+		install -d ${STAGING_INCDIR}/codec-engine}
+		
+		for header in $(find ${S}/cetools/packages/ -name "*.h") ; do
+			install -d ${STAGING_INCDIR}/codec-engine/$(dirname $header | sed s:${S}::g)
+			cp -pPr  $header ${STAGING_INCDIR}/codec-engine/$(echo $header | sed s:${S}::g)
+		done
+	
+		for header in $(find ${S}/packages/ -name "*.h") ; do
+			install -d ${STAGING_INCDIR}/codec-engine/$(dirname $header | sed s:${S}::g)
+			cp -pPr  $header ${STAGING_INCDIR}/codec-engine/$(echo $header | sed s:${S}::g)
 		done
+	
+		sed -i -e s:SEDME_CFLAGS:"-I${TITOOLSDIR}/${TIBIOSDIR}/xdctools/packages -I${STAGING_INCDIR}/codec-engine/packages  -I${STAGING_INCDIR}/codec-engine/cetools/packages/":g \
+		       -e s:SEDME_STAGINGLIBDIR:${STAGING_LIBDIR}:g \
+		          ${WORKDIR}/ticel-config
+		install -m 0755 ${WORKDIR}/ticel-config ${STAGING_BINDIR_CROSS}
 }
 
 pkg_postinst_${PN}-module () {
diff --git a/packages/dsplink/dsplink_1.51.00.08.bb b/packages/dsplink/dsplink_1.51.00.08.bb
index b7f4c6f72b..26e63530b9 100644
--- a/packages/dsplink/dsplink_1.51.00.08.bb
+++ b/packages/dsplink/dsplink_1.51.00.08.bb
@@ -1,7 +1,7 @@
 require dsplink.inc
 
 
-DEFAULT_PREFERNECE = "-1"
+DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_armv7a = "1"
 
 PR = "r9"
diff --git a/packages/dsplink/files/ticel-config b/packages/dsplink/files/ticel-config
new file mode 100644
index 0000000000..13ab6b02be
--- /dev/null
+++ b/packages/dsplink/files/ticel-config
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+LIBS=""
+for lib in \
+    decode_x470MV.a \
+    TraceUtil.a \
+    bioslog.a \
+    video.a \
+    audio.a \
+    speech.a \
+    ce.a \
+    Algorithm_noOS.a \
+    alg.a \
+    osal_dsplink_linux.a \
+    osal_dsplink_linux_6446.a \
+    dman3Cfg.a \
+    acpy3.a \
+    cmem.a \
+    dsplink.lib \
+    XdmUtils.a \
+    gt.a
+do
+    LIBS="${LIBS} SEDME_STAGINGLIBDIR/${lib}"
+done
+
+CFLAGS="SEDME_CFLAGS"
+
+usage()
+{
+    echo "Usage : $0 [--cflags] [--libs]"
+    exit 1
+}
+
+test "$#" = 0 && usage
+
+OUT=""
+while test "$#" -gt 0;
+do
+    case "$1" in
+        "--cflags")
+            OUT="${OUT} ${CFLAGS}"
+        ;;
+        "--libs")
+            OUT="${OUT} ${LIBDIRS} ${LIBS}"
+        ;;
+        *)
+            usage
+        ;;
+    esac
+
+    shift
+done
+
+echo "${OUT}"
+exit 0
diff --git a/packages/eglibc/eglibc-initial.inc b/packages/eglibc/eglibc-initial.inc
index 342711c157..5fbb5dbda5 100644
--- a/packages/eglibc/eglibc-initial.inc
+++ b/packages/eglibc/eglibc-initial.inc
@@ -1,5 +1,5 @@
 SECTION = "libs"
-DEPENDS = "linux-libc-headers"
+DEPENDS = "linux-libc-headers virtual/${TARGET_PREFIX}gcc-initial"
 PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/eglibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
@@ -9,11 +9,13 @@ PACKAGES_DYNAMIC = ""
 do_configure () {
 	sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
 	chmod +x ${S}/configure
-	CC="${BUILD_CC}" CPP="${BUILD_CPP}" LD="${BUILD_LD}" \
+        (cd ${S} && gnu-configize) || die "failure in running gnu-configize"
+        find ${S} -name "configure" | xargs touch
 	${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \
+		--prefix=/usr \
 		--without-cvs --disable-sanity-checks \
 		--with-headers=${STAGING_DIR_TARGET}${layout_includedir} \
-		--enable-hacker-mode
+		--enable-hacker-mode --enable-addons
 }
 
 do_compile () {
@@ -22,8 +24,14 @@ do_compile () {
 
 do_stage () {
 	oe_runmake cross-compiling=yes install_root=${STAGING_DIR_HOST} \
-	includedir='${layout_includedir}' prefix='${layout_prefix}' install-headers
+	includedir='${layout_includedir}' prefix='${layout_prefix}' install-headers \
+	install-bootstrap-headers=yes
+        oe_runmake csu/subdir_lib
 
+        mkdir -p ${STAGING_DIR_TARGET}${layout_libdir}
+        install -m 644 csu/crt[1in].o ${STAGING_DIR_TARGET}${layout_libdir}
+        ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
+                       -o ${STAGING_DIR_TARGET}${layout_libdir}/libc.so
 }
 
 do_install () {
diff --git a/packages/eglibc/eglibc-intermediate.inc b/packages/eglibc/eglibc-intermediate.inc
deleted file mode 100644
index c226d8658d..0000000000
--- a/packages/eglibc/eglibc-intermediate.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SECTION = "libs"
-PACKAGES = ""
-PACKAGES_DYNAMIC = ""
-PROVIDES = "virtual/${TARGET_PREFIX}libc-for-gcc"
-DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers"
-
-do_install () {
-	:
-}
-
-GLIBC_ADDONS = "nptl,ports"
-GLIBC_EXTRA_OECONF = ""
diff --git a/packages/eglibc/eglibc-intermediate_svn.bb b/packages/eglibc/eglibc-intermediate_svn.bb
deleted file mode 100644
index 7150f56d26..0000000000
--- a/packages/eglibc/eglibc-intermediate_svn.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require eglibc_${PV}.bb
-require eglibc-intermediate.inc
-
-# gcc uses -Werror which break on a "you have no thumb interwork" _warning_
-do_configure_prepend() {
-	find ${S} -name "configure" | xargs touch
-	sed -i s:-Werror:: ${S}/configure
-}
diff --git a/packages/eglibc/eglibc.inc b/packages/eglibc/eglibc.inc
index e1559e46e4..5d531a7915 100644
--- a/packages/eglibc/eglibc.inc
+++ b/packages/eglibc/eglibc.inc
@@ -4,12 +4,12 @@ SECTION = "libs"
 PRIORITY = "required"
 LICENSE = "LGPL"
 # nptl needs unwind support in gcc, which can't be built without glibc.
-DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers"
+DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers"
 #this leads to circular deps, so lets not add it yet
 #RDEPENDS_ldd += " bash"
 # nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this
-RDEPENDS += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}"
-PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}"
+#RDEPENDS += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}"
+PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES += "virtual/libintl virtual/libiconv"
 
 inherit autotools
diff --git a/packages/eglibc/eglibc_svn.bb b/packages/eglibc/eglibc_svn.bb
index e7a4a1ba75..1be10c13ad 100644
--- a/packages/eglibc/eglibc_svn.bb
+++ b/packages/eglibc/eglibc_svn.bb
@@ -3,7 +3,7 @@ require eglibc.inc
 # DEFAULT_PREFERENCE = "-1"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn"
 PV = "2.8+svnr${SRCREV}"
-PR = "r6"
+PR = "r7"
 SRC_URI = "svn://svn.eglibc.org;module=trunk \
            file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \
            file://etc/ld.so.conf \
diff --git a/packages/freesmartphone/illume-theme-freesmartphone_git.bb b/packages/freesmartphone/illume-theme-freesmartphone_git.bb
new file mode 100644
index 0000000000..2d881214a0
--- /dev/null
+++ b/packages/freesmartphone/illume-theme-freesmartphone_git.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Illume theme for the freesmartphone.org project"
+HOMEPAGE = "http://illume.projects.openmoko.org/"
+LICENSE = "MIT/BSD"
+PV = "0.0+gitr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "${FREESMARTPHONE_GIT}/artwork.git;protocol=git;branch=master"
+S = "${WORKDIR}/git/illume"
+
+do_install() {
+    install -d ${D}${sysconfdir}/enlightenment
+    install -d ${D}${datadir}/enlightenment/data/themes/
+    install -d ${D}${datadir}/enlightenment/data/init/
+
+    # Make illume the default profile
+    echo 'E_PROFILE="-profile illume"' > ${D}${sysconfdir}/enlightenment/default_profile
+
+    install -m 0644 ${S}/illume.edj ${D}${datadir}/enlightenment/data/themes/
+    install -m 0644 ${S}/illume_init.edj ${D}${datadir}/enlightenment/data/init/
+}
+
+RPROVIDES_${PN} = "illume-theme"
+CONFFILES_${PN} = "${sysconfdir}/enlightenment/default_profile"
+FILES_${PN} = "${sysconfdir}/enlightenment ${datadir}/enlightenment"
+
+PACKAGE_ARCH_${PN} = "all"
+
diff --git a/packages/freesmartphone/zhone_git.bb b/packages/freesmartphone/zhone_git.bb
index 8a4a21bbed..55b56c8e26 100644
--- a/packages/freesmartphone/zhone_git.bb
+++ b/packages/freesmartphone/zhone_git.bb
@@ -2,9 +2,9 @@ DESCRIPTION = "Zhone: Zen Phone"
 LICENSE = "GPL"
 SECTION = "x11"
 DEPENDS = "edje-native python-pyrex-native python-cython-native"
-RDEPENDS = "task-python-efl python-textutils python-dbus"
+RDEPENDS = "task-python-efl python-textutils python-dbus python-pycairo"
 PV = "0.0.0+gitr${SRCREV}"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/zhone.git;protocol=git;branch=master \
            file://80zhone"
diff --git a/packages/gcc/gcc-3.4.4.inc b/packages/gcc/gcc-3.4.4.inc
index 704d9bc5c8..34204f10fa 100644
--- a/packages/gcc/gcc-3.4.4.inc
+++ b/packages/gcc/gcc-3.4.4.inc
@@ -17,8 +17,10 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://always-fixincperm.patch;patch=1 \
 	   file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch;patch=1 \
 	   file://zecke-xgcc-cpp.patch;patch=1 \
-	   file://gcc4-mtune-compat.patch;patch=1"
-
-SRC_URI += "file://gcc34-configure.in.patch;patch=1"
-SRC_URI += "file://gcc34-thumb-support.patch;patch=1"
+	   file://gcc-libgcc2-inhibit-libc.patch;patch=1 \
+	   file://gcc4-mtune-compat.patch;patch=1 \
+	   file://gcc34-configure.in.patch;patch=1 \
+	   file://gcc34-thumb-support.patch;patch=1 \
+	   file://gcc-cross-fixincl.patch;patch=1 \
+	   "
 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
diff --git a/packages/gcc/gcc-3.4.4/gcc-cross-fixincl.patch b/packages/gcc/gcc-3.4.4/gcc-cross-fixincl.patch
new file mode 100644
index 0000000000..365485497c
--- /dev/null
+++ b/packages/gcc/gcc-3.4.4/gcc-cross-fixincl.patch
@@ -0,0 +1,77 @@
+See http://gcc.gnu.org/PR22541
+
+From: Dan Kegel
+
+When building gcc-3.4.3 or gcc-4.0.0 as a cross into a clean $PREFIX
+(the only two I've tried like this), the configure script happily copies
+the glibc include files from include to sys-include; here's the line
+from the log file (with $PREFIX instead of the real prefix):
+
+Copying $PREFIX/i686-unknown-linux-gnu/include to $PREFIX/i686-unknown-linux-gnu/sys-include
+
+But later, when running fixincludes, it gives the error message
+ The directory that should contain system headers does not exist:
+  $PREFIX/lib/gcc/i686-unknown-linux-gnu/3.4.3/../../../../i686-unknown-linux-gnu/sys-include
+
+Nevertheless, it continues building; the header files it installs in
+ $PREFIX/lib/gcc/i686-unknown-linux-gnu/3.4.3/include
+do not include the boilerplate that would cause it to #include_next the
+glibc headers in the system header directory.
+Thus the resulting toolchain can't compile the following program:
+#include <limits.h>
+int x = PATH_MAX;
+because its limits.h doesn't include the glibc header.
+
+That's not nice.  I suspect the problem is that gcc/Makefile.in assumes that
+it can refer to $PREFIX/i686-unknown-linux-gnu  with the path 
+                $PREFIX/lib/../i686-unknown-linux-gnu, but
+that fails because the directory $PREFIX/lib doesn't exist during 'make all';
+it is only created later, during 'make install'.  (Which makes this problem
+confusing, since one only notices the breakage well after 'make install',
+at which point the path configure complained about does exist, and has the
+right stuff in it.)
+
+A possible fix is to replace the line in gcc/Makefile.in that says
+    SYSTEM_HEADER_DIR = @SYSTEM_HEADER_DIR@
+with a version that gets rid of extra ..'s, e.g.
+    SYSTEM_HEADER_DIR = `echo @SYSTEM_HEADER_DIR@ | sed -e :a -e "s,[^/]*/\.\.\/,,;ta"`
+(hey, that's the first time I've ever used a label in a sed script; thanks to the sed faq
+for explaining the :a ... ta method of looping to repeat a search-and-replace until it doesn't match.)
+
+
+---
+ gcc/Makefile.in |   10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+Index: gcc-3.4.4/gcc/Makefile.in
+===================================================================
+--- gcc-3.4.4.orig/gcc/Makefile.in	2008-07-23 23:44:15.000000000 -0700
++++ gcc-3.4.4/gcc/Makefile.in	2008-07-23 23:46:54.000000000 -0700
+@@ -350,7 +350,10 @@ NATIVE_SYSTEM_HEADER_DIR = /usr/include
+ CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@
+ 
+ # autoconf sets SYSTEM_HEADER_DIR to one of the above.
+-SYSTEM_HEADER_DIR = @SYSTEM_HEADER_DIR@
++# Purge it of unneccessary internal relative paths
++# to directories that might not exist yet.
++# The sed idiom for this is to repeat the search-and-replace until it doesn't match, using :a ... ta.
++SYSTEM_HEADER_DIR = `echo @SYSTEM_HEADER_DIR@ | sed -e :a -e "s,[^/]*/\.\.\/,," -e ta`
+ 
+ # Control whether to run fixproto and fixincludes.
+ STMP_FIXPROTO = @STMP_FIXPROTO@
+@@ -2548,11 +2551,14 @@ install-gcc-tooldir:
+ 	$(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(gcc_tooldir)
+ 
+ # Build fixed copies of system files.
++# Abort if no system headers available, unless building a crosscompiler.
++# FIXME: abort unless building --without-headers would be more accurate and less ugly
++
+ stmp-fixinc: fixinc.sh gsyslimits.h
+ 	@if ! $(inhibit_libc) && test ! -d ${SYSTEM_HEADER_DIR}; then \
+ 	  echo The directory that should contain system headers does not exist: >&2 ; \
+ 	  echo "  ${SYSTEM_HEADER_DIR}" >&2 ; \
+-	  if test "x${SYSTEM_HEADER_DIR}" = "x${gcc_tooldir}/sys-include"; \
++	  if test "x${SYSTEM_HEADER_DIR}" = "x`echo "${gcc_tooldir}/sys-include" | sed -e :a -e "s,[^/]*/\.\.\/,," -e ta`"; \
+ 	  then sleep 1; else exit 1; fi; \
+ 	fi
+ 	rm -rf include; mkdir include
diff --git a/packages/gcc/gcc-3.4.4/gcc-libgcc2-inhibit-libc.patch b/packages/gcc/gcc-3.4.4/gcc-libgcc2-inhibit-libc.patch
new file mode 100644
index 0000000000..4e2b5667ff
--- /dev/null
+++ b/packages/gcc/gcc-3.4.4/gcc-libgcc2-inhibit-libc.patch
@@ -0,0 +1,251 @@
+---
+ gcc/Makefile.in  |   25 ++++++++++++++++---------
+ gcc/configure    |   22 ++++++++++++++++++----
+ gcc/configure.ac |   15 ++++++++++++---
+ gcc/gcc.c        |    9 +++++++++
+ 4 files changed, 55 insertions(+), 16 deletions(-)
+
+Index: gcc-3.4.4/gcc/configure.ac
+===================================================================
+--- gcc-3.4.4.orig/gcc/configure.ac	2008-07-23 23:53:04.000000000 -0700
++++ gcc-3.4.4/gcc/configure.ac	2008-07-23 23:53:05.000000000 -0700
+@@ -567,6 +567,10 @@ AC_ARG_ENABLE(shared,
+ ], [enable_shared=yes])
+ AC_SUBST(enable_shared)
+ 
++AC_ARG_WITH(build-sysroot,
++  [  --with-build-sysroot=sysroot
++                          use sysroot as the system root during the build])
++
+ AC_ARG_WITH(sysroot,
+ [  --with-sysroot[=DIR] Search for usr/lib, usr/include, et al, within DIR.],
+ [
+@@ -577,6 +581,11 @@ AC_ARG_WITH(sysroot,
+    
+  TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"'
+  CROSS_SYSTEM_HEADER_DIR='$(TARGET_SYSTEM_ROOT)$(NATIVE_SYSTEM_HEADER_DIR)'
++ if test "x$with_build_sysroot" != x; then
++   build_system_header_dir=$with_build_sysroot'$(NATIVE_SYSTEM_HEADER_DIR)'
++ else
++   build_system_header_dir='$(CROSS_SYSTEM_HEADER_DIR)'
++ fi
+ 
+  if test "x$exec_prefix" = xNONE; then
+   if test "x$prefix" = xNONE; then
+@@ -1453,7 +1462,7 @@ if test x$host != x$target
+ then
+ 	CROSS="-DCROSS_COMPILE"
+ 	ALL=all.cross
+-	SYSTEM_HEADER_DIR='$(CROSS_SYSTEM_HEADER_DIR)'
++	SYSTEM_HEADER_DIR=$build_system_header_dir
+ 	case "$host","$target" in
+ 	# Darwin crosses can use the host system's libraries and headers,
+ 	# because of the fat library support.  Of course, it must be the
+@@ -1487,11 +1496,11 @@ fi
+ # then define inhibit_libc in LIBGCC2_CFLAGS.
+ # This prevents libgcc2 from containing any code which requires libc
+ # support.
+-inhibit_libc=
++inhibit_libc=false
+ if { { test x$host != x$target && test "x$with_sysroot" = x ; } ||
+        test x$with_newlib = xyes ; } &&
+      { test "x$with_headers" = x || test "x$with_headers" = xno ; } ; then
+-       inhibit_libc=-Dinhibit_libc
++       inhibit_libc=true
+ fi
+ AC_SUBST(inhibit_libc)
+ 
+Index: gcc-3.4.4/gcc/Makefile.in
+===================================================================
+--- gcc-3.4.4.orig/gcc/Makefile.in	2005-02-24 01:26:57.000000000 -0800
++++ gcc-3.4.4/gcc/Makefile.in	2008-07-24 00:08:18.000000000 -0700
+@@ -291,7 +291,7 @@ GCC_FOR_TARGET = $(STAGE_CC_WRAPPER) ./x
+ # This is used instead of ALL_CFLAGS when compiling with GCC_FOR_TARGET.
+ # It omits XCFLAGS, and specifies -B./.
+ # It also specifies -isystem ./include to find, e.g., stddef.h.
+-GCC_CFLAGS=$(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) $(LOOSE_WARN) -Wold-style-definition $($@-warn) -isystem ./include $(TCFLAGS)
++GCC_CFLAGS=$(CFLAGS_FOR_TARGET) $(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) $(LOOSE_WARN) -Wold-style-definition $($@-warn) -isystem ./include $(TCFLAGS)
+ 
+ # ---------------------------------------------------
+ # Programs which produce files for the target machine
+@@ -485,10 +485,17 @@ GGC_LIB=
+ LIBGCC = libgcc.a
+ INSTALL_LIBGCC = install-libgcc
+ 
++# "true" if the target C library headers are unavailable; "false"
++# otherwise.
++inhibit_libc = @inhibit_libc@
++ifeq ($(inhibit_libc),true)
++INHIBIT_LIBC_CFLAGS = -Dinhibit_libc
++endif
++
+ # Options to use when compiling libgcc2.a.
+ #
+ LIBGCC2_DEBUG_CFLAGS = -g
+-LIBGCC2_CFLAGS = -O2 $(LIBGCC2_INCLUDES) $(GCC_CFLAGS) $(TARGET_LIBGCC2_CFLAGS) $(LIBGCC2_DEBUG_CFLAGS) $(GTHREAD_FLAGS) -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED @inhibit_libc@
++LIBGCC2_CFLAGS = -O2 $(LIBGCC2_INCLUDES) $(GCC_CFLAGS) $(TARGET_LIBGCC2_CFLAGS) $(LIBGCC2_DEBUG_CFLAGS) $(GTHREAD_FLAGS) -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED $(INHIBIT_LIBC_CFLAGS)
+ 
+ # Additional options to use when compiling libgcc2.a.
+ # Some targets override this to -isystem include
+@@ -500,7 +507,7 @@ TARGET_LIBGCC2_CFLAGS =
+ # Options to use when compiling crtbegin/end.
+ CRTSTUFF_CFLAGS = -O2 $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -g0 \
+   -finhibit-size-directive -fno-inline-functions -fno-exceptions \
+-  -fno-zero-initialized-in-bss -fno-unit-at-a-time
++  -fno-zero-initialized-in-bss -fno-unit-at-a-time $(INHIBIT_LIBC_CFLAGS)
+ 
+ # Additional sources to handle exceptions; overridden by targets as needed.
+ LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde.c \
+@@ -1247,33 +1254,33 @@ stmp-multilib: $(LIBGCC_DEPS)
+ $(T)crtbegin.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \
+   gbl-ctors.h stmp-int-hdrs tsystem.h coretypes.h $(TM_H)
+ 	$(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS) \
+-	  @inhibit_libc@ -c $(srcdir)/crtstuff.c -DCRT_BEGIN \
++	  -c $(srcdir)/crtstuff.c -DCRT_BEGIN \
+ 	  -o $(T)crtbegin$(objext)
+ 
+ $(T)crtend.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \
+   gbl-ctors.h stmp-int-hdrs tsystem.h coretypes.h $(TM_H)
+ 	$(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS) \
+-	  @inhibit_libc@ -c $(srcdir)/crtstuff.c -DCRT_END \
++	  -c $(srcdir)/crtstuff.c -DCRT_END \
+ 	  -o $(T)crtend$(objext)
+ 
+ # These are versions of crtbegin and crtend for shared libraries.
+ $(T)crtbeginS.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \
+   gbl-ctors.h stmp-int-hdrs tsystem.h coretypes.h $(TM_H)
+ 	$(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS_S) \
+-	  @inhibit_libc@ -c $(srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFS_O \
++	  -c $(srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFS_O \
+ 	  -o $(T)crtbeginS$(objext)
+ 
+ $(T)crtendS.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \
+   gbl-ctors.h stmp-int-hdrs tsystem.h coretypes.h $(TM_H)
+ 	$(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS_S) \
+-	  @inhibit_libc@ -c $(srcdir)/crtstuff.c -DCRT_END -DCRTSTUFFS_O \
++	  -c $(srcdir)/crtstuff.c -DCRT_END -DCRTSTUFFS_O \
+ 	  -o $(T)crtendS$(objext)
+ 
+ # This is a version of crtbegin for -static links.
+ $(T)crtbeginT.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \
+   gbl-ctors.h stmp-int-hdrs tsystem.h coretypes.h $(TM_H)
+ 	$(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS) \
+-	  @inhibit_libc@ -c $(srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O \
++	  -c $(srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O \
+ 	  -o $(T)crtbeginT$(objext)
+ 
+ # Compile the start modules crt0.o and mcrt0.o that are linked with
+@@ -2542,7 +2549,7 @@ install-gcc-tooldir:
+ 
+ # Build fixed copies of system files.
+ stmp-fixinc: fixinc.sh gsyslimits.h
+-	@if test ! -d ${SYSTEM_HEADER_DIR}; then \
++	@if ! $(inhibit_libc) && test ! -d ${SYSTEM_HEADER_DIR}; then \
+ 	  echo The directory that should contain system headers does not exist: >&2 ; \
+ 	  echo "  ${SYSTEM_HEADER_DIR}" >&2 ; \
+ 	  if test "x${SYSTEM_HEADER_DIR}" = "x${gcc_tooldir}/sys-include"; \
+Index: gcc-3.4.4/gcc/gcc.c
+===================================================================
+--- gcc-3.4.4.orig/gcc/gcc.c	2005-05-01 03:33:14.000000000 -0700
++++ gcc-3.4.4/gcc/gcc.c	2008-07-23 23:53:05.000000000 -0700
+@@ -1069,6 +1069,7 @@ static const struct option_map option_ma
+    {"--static", "-static", 0},
+    {"--std", "-std=", "aj"},
+    {"--symbolic", "-symbolic", 0},
++   {"--sysroot", "--sysroot=", "aj"},
+    {"--time", "-time", 0},
+    {"--trace-includes", "-H", 0},
+    {"--traditional", "-traditional", 0},
+@@ -3016,6 +3017,9 @@ display_help (void)
+   fputs (_("  -time                    Time the execution of each subprocess\n"), stdout);
+   fputs (_("  -specs=<file>            Override built-in specs with the contents of <file>\n"), stdout);
+   fputs (_("  -std=<standard>          Assume that the input sources are for <standard>\n"), stdout);
++  fputs (_("\
++  --sysroot=<directory>    Use <directory> as the root directory for headers\n\
++                           for headers and libraries\n"), stdout);
+   fputs (_("  -B <directory>           Add <directory> to the compiler's search paths\n"), stdout);
+   fputs (_("  -b <machine>             Run gcc for target <machine>, if installed\n"), stdout);
+   fputs (_("  -V <version>             Run gcc version number <version>, if installed\n"), stdout);
+@@ -3884,6 +3888,11 @@ warranty; not even for MERCHANTABILITY o
+ 	;
+       else if (! strcmp (argv[i], "-fhelp"))
+ 	;
++      else if (! strncmp (argv[i], "--sysroot=", strlen ("--sysroot=")))
++	{
++	  target_system_root = argv[i] + strlen ("--sysroot=");
++	  target_system_root_changed = 1;
++	}
+       else if (argv[i][0] == '+' && argv[i][1] == 'e')
+ 	{
+ 	  /* Compensate for the +e options to the C++ front-end;
+Index: gcc-3.4.4/gcc/configure
+===================================================================
+--- gcc-3.4.4.orig/gcc/configure	2008-07-23 23:53:04.000000000 -0700
++++ gcc-3.4.4/gcc/configure	2008-07-23 23:53:05.000000000 -0700
+@@ -907,6 +907,8 @@ Optional Packages:
+   --with-as               arrange to use the specified as (full pathname)
+   --with-stabs            arrange to use stabs instead of host debug format
+   --with-dwarf2           force the default debug format to be DWARF 2
++  --with-build-sysroot=sysroot
++                          use sysroot as the system root during the build
+   --with-sysroot=DIR Search for usr/lib, usr/include, et al, within DIR.
+   --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib
+   --with-system-libunwind use installed libunwind
+@@ -4756,6 +4758,13 @@ fi;
+ 
+ 
+ 
++# Check whether --with-build-sysroot or --without-build-sysroot was given.
++if test "${with_build_sysroot+set}" = set; then
++  withval="$with_build_sysroot"
++
++fi;
++
++
+ # Check whether --with-sysroot or --without-sysroot was given.
+ if test "${with_sysroot+set}" = set; then
+   withval="$with_sysroot"
+@@ -4767,6 +4776,11 @@ if test "${with_sysroot+set}" = set; the
+ 
+  TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"'
+  CROSS_SYSTEM_HEADER_DIR='$(TARGET_SYSTEM_ROOT)$(NATIVE_SYSTEM_HEADER_DIR)'
++ if test "x$with_build_sysroot" != x; then
++   build_system_header_dir=$with_build_sysroot'$(NATIVE_SYSTEM_HEADER_DIR)'
++ else
++   build_system_header_dir='$(CROSS_SYSTEM_HEADER_DIR)'
++ fi
+ 
+  if test "x$exec_prefix" = xNONE; then
+   if test "x$prefix" = xNONE; then
+@@ -5229,7 +5243,7 @@ if test "${gcc_cv_prog_makeinfo_modern+s
+ else
+     ac_prog_version=`$MAKEINFO --version 2>&1 |
+                    sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
+-  echo "configure:5232: version of makeinfo is $ac_prog_version" >&5
++  echo "configure:5246: version of makeinfo is $ac_prog_version" >&5
+   case $ac_prog_version in
+     '')     gcc_cv_prog_makeinfo_modern=no;;
+     4.[2-9]*)
+@@ -9845,7 +9859,7 @@ if test x$host != x$target
+ then
+ 	CROSS="-DCROSS_COMPILE"
+ 	ALL=all.cross
+-	SYSTEM_HEADER_DIR='$(CROSS_SYSTEM_HEADER_DIR)'
++	SYSTEM_HEADER_DIR=$build_system_header_dir
+ 	case "$host","$target" in
+ 	# Darwin crosses can use the host system's libraries and headers,
+ 	# because of the fat library support.  Of course, it must be the
+@@ -9879,11 +9893,11 @@ fi
+ # then define inhibit_libc in LIBGCC2_CFLAGS.
+ # This prevents libgcc2 from containing any code which requires libc
+ # support.
+-inhibit_libc=
++inhibit_libc=false
+ if { { test x$host != x$target && test "x$with_sysroot" = x ; } ||
+        test x$with_newlib = xyes ; } &&
+      { test "x$with_headers" = x || test "x$with_headers" = xno ; } ; then
+-       inhibit_libc=-Dinhibit_libc
++       inhibit_libc=true
+ fi
+ 
+ 
diff --git a/packages/gcc/gcc-configure-cross.inc b/packages/gcc/gcc-configure-cross.inc
index 333cb8f9bf..d5800c78ff 100644
--- a/packages/gcc/gcc-configure-cross.inc
+++ b/packages/gcc/gcc-configure-cross.inc
@@ -7,10 +7,6 @@ EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix}
                       --with-sysroot=${STAGING_DIR_TARGET} \
                       --with-build-sysroot=${STAGING_DIR_TARGET}"
 
-do_configure_prepend () {
-	rm -f ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a
-}
-
 do_compile_prepend () {
 	export CC="${BUILD_CC}"
 	export AR_FOR_TARGET="${TARGET_SYS}-ar"
diff --git a/packages/gcc/gcc-configure-sdk.inc b/packages/gcc/gcc-configure-sdk.inc
index f8c4de8c78..faa183f8e4 100644
--- a/packages/gcc/gcc-configure-sdk.inc
+++ b/packages/gcc/gcc-configure-sdk.inc
@@ -7,6 +7,7 @@ USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d
 EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \
                       --with-gxx-include-dir=${STAGING_DIR_TARGET}/${layout_includedir}/c++ \
                       --with-sysroot=${prefix}/${TARGET_SYS} \
+                      --with-build-time-tools=${CROSS_DIR}/${TARGET_SYS}/bin \
                       --with-build-sysroot=${STAGING_DIR_TARGET}"
 
 #
diff --git a/packages/gcc/gcc-cross-initial.inc b/packages/gcc/gcc-cross-initial.inc
index e0675263ea..15e5fa62fc 100644
--- a/packages/gcc/gcc-cross-initial.inc
+++ b/packages/gcc/gcc-cross-initial.inc
@@ -1,6 +1,4 @@
 DEPENDS = "virtual/${TARGET_PREFIX}binutils"
-# @todo Please add comment on why this is (still?) needed?
-DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel', 'powerpc']]}"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
 PACKAGES = ""
 
@@ -8,6 +6,7 @@ PACKAGES = ""
 # sysroot is needed in case we use libc-initial
 EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \
 		--with-newlib \
+		--without-headers \
 		--disable-shared \
 		--disable-threads \
 		--disable-multilib \
@@ -19,11 +18,6 @@ EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \
 		--with-build-sysroot=${STAGING_DIR_TARGET} \
 		${@get_gcc_fpu_setting(bb, d)}"
 
-do_stage_prepend () {
-	mkdir -p ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}
-	ln -sf libgcc.a ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/libgcc_eh.a
-}
-
 do_install () {
 	:
 }
diff --git a/packages/gcc/gcc-cross-intermediate.inc b/packages/gcc/gcc-cross-intermediate.inc
new file mode 100644
index 0000000000..4fa12886f1
--- /dev/null
+++ b/packages/gcc/gcc-cross-intermediate.inc
@@ -0,0 +1,21 @@
+DEPENDS = "virtual/${TARGET_PREFIX}binutils"
+DEPENDS += "virtual/${TARGET_PREFIX}libc-initial"
+PROVIDES = "virtual/${TARGET_PREFIX}gcc-intermediate"
+PACKAGES = ""
+
+# This is intended to be a -very- basic config
+# sysroot is needed in case we use libc-initial
+EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \
+		--enable-shared \
+		--disable-multilib \
+		--disable-threads \
+		--enable-languages=c \
+		--enable-target-optspace \
+		--program-prefix=${TARGET_PREFIX} \
+		--with-sysroot=${STAGING_DIR_TARGET} \
+		--with-build-sysroot=${STAGING_DIR_TARGET} \
+		${@get_gcc_fpu_setting(bb, d)}"
+
+do_install () {
+	:
+}
diff --git a/packages/gcc/gcc-cross-intermediate_3.3.3.bb b/packages/gcc/gcc-cross-intermediate_3.3.3.bb
new file mode 100644
index 0000000000..eb59de9461
--- /dev/null
+++ b/packages/gcc/gcc-cross-intermediate_3.3.3.bb
@@ -0,0 +1,2 @@
+require gcc-cross_${PV}.bb
+require gcc-cross-intermediate.inc
diff --git a/packages/gcc/gcc-cross-intermediate_3.3.4.bb b/packages/gcc/gcc-cross-intermediate_3.3.4.bb
new file mode 100644
index 0000000000..eb59de9461
--- /dev/null
+++ b/packages/gcc/gcc-cross-intermediate_3.3.4.bb
@@ -0,0 +1,2 @@
+require gcc-cross_${PV}.bb
+require gcc-cross-intermediate.inc
diff --git a/packages/gcc/gcc-cross-intermediate_3.4.3.bb b/packages/gcc/gcc-cross-intermediate_3.4.3.bb
new file mode 100644
index 0000000000..eb59de9461
--- /dev/null
+++ b/packages/gcc/gcc-cross-intermediate_3.4.3.bb
@@ -0,0 +1,2 @@
+require gcc-cross_${PV}.bb
+require gcc-cross-intermediate.inc
diff --git a/packages/gcc/gcc-cross-intermediate_3.4.4.bb b/packages/gcc/gcc-cross-intermediate_3.4.4.bb
new file mode 100644
index 0000000000..eb59de9461
--- /dev/null
+++ b/packages/gcc/gcc-cross-intermediate_3.4.4.bb
@@ -0,0 +1,2 @@
+require gcc-cross_${PV}.bb
+require gcc-cross-intermediate.inc
diff --git a/packages/gcc/gcc-cross-intermediate_4.0.2.bb b/packages/gcc/gcc-cross-intermediate_4.0.2.bb
new file mode 100644
index 0000000000..8df8d597aa
--- /dev/null
+++ b/packages/gcc/gcc-cross-intermediate_4.0.2.bb
@@ -0,0 +1,4 @@
+require gcc-cross_${PV}.bb
+require gcc-cross-intermediate.inc
+
+EXTRA_OECONF += "--disable-multilib"
diff --git a/packages/gcc/gcc-cross-intermediate_4.1.0.bb b/packages/gcc/gcc-cross-intermediate_4.1.0.bb
new file mode 100644
index 0000000000..3e103aa24e
--- /dev/null
+++ b/packages/gcc/gcc-cross-intermediate_4.1.0.bb
@@ -0,0 +1,5 @@
+require gcc-cross_${PV}.bb
+require gcc-cross-intermediate.inc
+
+EXTRA_OECONF += "--disable-libmudflap \
+		--disable-libssp"
diff --git a/packages/gcc/gcc-cross-intermediate_4.1.1.bb b/packages/gcc/gcc-cross-intermediate_4.1.1.bb
new file mode 100644
index 0000000000..837237e7d4
--- /dev/null
+++ b/packages/gcc/gcc-cross-intermediate_4.1.1.bb
@@ -0,0 +1,6 @@
+require gcc-cross_${PV}.bb
+require gcc-cross-intermediate.inc
+
+EXTRA_OECONF += "--disable-libmudflap \
+		--disable-libunwind-exceptions \
+		--disable-libssp"
diff --git a/packages/gcc/gcc-cross-intermediate_4.1.2.bb b/packages/gcc/gcc-cross-intermediate_4.1.2.bb
new file mode 100644
index 0000000000..3e103aa24e
--- /dev/null
+++ b/packages/gcc/gcc-cross-intermediate_4.1.2.bb
@@ -0,0 +1,5 @@
+require gcc-cross_${PV}.bb
+require gcc-cross-intermediate.inc
+
+EXTRA_OECONF += "--disable-libmudflap \
+		--disable-libssp"
diff --git a/packages/gcc/gcc-cross-intermediate_4.2.1.bb b/packages/gcc/gcc-cross-intermediate_4.2.1.bb
new file mode 100644
index 0000000000..7acca81c3b
--- /dev/null
+++ b/packages/gcc/gcc-cross-intermediate_4.2.1.bb
@@ -0,0 +1,5 @@
+require gcc-cross_${PV}.bb
+require gcc-cross-intermediate.inc
+
+EXTRA_OECONF += "--disable-libmudflap --disable-libgomp \
+		--disable-libssp"
diff --git a/packages/gcc/gcc-cross-intermediate_4.2.2.bb b/packages/gcc/gcc-cross-intermediate_4.2.2.bb
new file mode 100644
index 0000000000..7acca81c3b
--- /dev/null
+++ b/packages/gcc/gcc-cross-intermediate_4.2.2.bb
@@ -0,0 +1,5 @@
+require gcc-cross_${PV}.bb
+require gcc-cross-intermediate.inc
+
+EXTRA_OECONF += "--disable-libmudflap --disable-libgomp \
+		--disable-libssp"
diff --git a/packages/gcc/gcc-cross-intermediate_4.2.3.bb b/packages/gcc/gcc-cross-intermediate_4.2.3.bb
new file mode 100644
index 0000000000..7acca81c3b
--- /dev/null
+++ b/packages/gcc/gcc-cross-intermediate_4.2.3.bb
@@ -0,0 +1,5 @@
+require gcc-cross_${PV}.bb
+require gcc-cross-intermediate.inc
+
+EXTRA_OECONF += "--disable-libmudflap --disable-libgomp \
+		--disable-libssp"
diff --git a/packages/gcc/gcc-cross-intermediate_4.2.4.bb b/packages/gcc/gcc-cross-intermediate_4.2.4.bb
new file mode 100644
index 0000000000..7acca81c3b
--- /dev/null
+++ b/packages/gcc/gcc-cross-intermediate_4.2.4.bb
@@ -0,0 +1,5 @@
+require gcc-cross_${PV}.bb
+require gcc-cross-intermediate.inc
+
+EXTRA_OECONF += "--disable-libmudflap --disable-libgomp \
+		--disable-libssp"
diff --git a/packages/gcc/gcc-cross-intermediate_4.3.1.bb b/packages/gcc/gcc-cross-intermediate_4.3.1.bb
new file mode 100644
index 0000000000..b0932f520d
--- /dev/null
+++ b/packages/gcc/gcc-cross-intermediate_4.3.1.bb
@@ -0,0 +1,14 @@
+require gcc-cross_${PV}.bb
+require gcc-cross-intermediate.inc
+
+DEPENDS += "gmp-native mpfr-native"
+
+EXTRA_OECONF += " --disable-libmudflap \
+		  --disable-libgomp \
+		  --disable-libssp"
+
+# Hack till we fix *libc properly
+do_stage_append() {
+        ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/
+}
+
diff --git a/packages/gcc/gcc-cross-intermediate_csl-arm-2005q3.bb b/packages/gcc/gcc-cross-intermediate_csl-arm-2005q3.bb
new file mode 100644
index 0000000000..6e9c252e7e
--- /dev/null
+++ b/packages/gcc/gcc-cross-intermediate_csl-arm-2005q3.bb
@@ -0,0 +1,2 @@
+require gcc-cross_csl-arm-2005q3.bb
+require gcc-cross-intermediate.inc
diff --git a/packages/gcc/gcc-cross-intermediate_csl-arm-2006q1.bb b/packages/gcc/gcc-cross-intermediate_csl-arm-2006q1.bb
new file mode 100644
index 0000000000..2d4b55f997
--- /dev/null
+++ b/packages/gcc/gcc-cross-intermediate_csl-arm-2006q1.bb
@@ -0,0 +1,7 @@
+require gcc-cross_${PV}.bb
+require gcc-cross-intermediate.inc
+
+S = "${WORKDIR}/gcc-2006q1"
+
+EXTRA_OECONF += "--disable-libmudflap \
+		--disable-libssp"
diff --git a/packages/gcc/gcc-cross-intermediate_csl-arm-2007q3.bb b/packages/gcc/gcc-cross-intermediate_csl-arm-2007q3.bb
new file mode 100644
index 0000000000..114d9831c6
--- /dev/null
+++ b/packages/gcc/gcc-cross-intermediate_csl-arm-2007q3.bb
@@ -0,0 +1,12 @@
+require gcc-cross_${PV}.bb
+require gcc-cross-intermediate.inc
+
+S = "${WORKDIR}/gcc-4.2"
+
+EXTRA_OECONF += "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap "
+
+# Hack till we fix *libc properly
+do_stage_append() {
+	ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/
+}
+
diff --git a/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb b/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb
new file mode 100644
index 0000000000..114d9831c6
--- /dev/null
+++ b/packages/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb
@@ -0,0 +1,12 @@
+require gcc-cross_${PV}.bb
+require gcc-cross-intermediate.inc
+
+S = "${WORKDIR}/gcc-4.2"
+
+EXTRA_OECONF += "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap "
+
+# Hack till we fix *libc properly
+do_stage_append() {
+	ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/
+}
+
diff --git a/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb b/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
index 9b5a2fed2c..e8051dde22 100644
--- a/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
@@ -7,7 +7,7 @@ DEFAULT_PREFERENCE = "-1"
 require gcc-cross-initial_csl-arm-2005q3.bb
 require gcc-cross-kernel.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://gcc-3.4.4-makefile-fix.patch;patch=1"
 
diff --git a/packages/gcc/gcc-cross-sdk_3.3.4.bb b/packages/gcc/gcc-cross-sdk_3.3.4.bb
index 4608733b58..02d860b1f7 100644
--- a/packages/gcc/gcc-cross-sdk_3.3.4.bb
+++ b/packages/gcc/gcc-cross-sdk_3.3.4.bb
@@ -1,4 +1,4 @@
-PR = "r4"
+PR = "r5"
 
 inherit sdk
 
diff --git a/packages/gcc/gcc-cross-sdk_3.4.3.bb b/packages/gcc/gcc-cross-sdk_3.4.3.bb
index 1a7faa5b8c..c76b5b3c07 100644
--- a/packages/gcc/gcc-cross-sdk_3.4.3.bb
+++ b/packages/gcc/gcc-cross-sdk_3.4.3.bb
@@ -1,4 +1,4 @@
-PR = "r3"
+PR = "r4"
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
diff --git a/packages/gcc/gcc-cross-sdk_3.4.4.bb b/packages/gcc/gcc-cross-sdk_3.4.4.bb
index c76b5b3c07..b00c86617d 100644
--- a/packages/gcc/gcc-cross-sdk_3.4.4.bb
+++ b/packages/gcc/gcc-cross-sdk_3.4.4.bb
@@ -1,4 +1,4 @@
-PR = "r4"
+PR = "r5"
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
@@ -6,3 +6,9 @@ require gcc-configure-sdk.inc
 require gcc-package-sdk.inc
 
 SRC_URI += 'file://sdk-libstdc++-includes.patch;patch=1'
+
+do_compile_prepend () {
+	mkdir -p gcc
+	ln -s ${CROSS_DIR}/bin/${TARGET_PREFIX}as gcc/as 
+	ln -s ${CROSS_DIR}/bin/${TARGET_PREFIX}ld gcc/ld
+}
diff --git a/packages/gcc/gcc-cross-sdk_4.1.0.bb b/packages/gcc/gcc-cross-sdk_4.1.0.bb
index 8329aac27f..ee769e034e 100644
--- a/packages/gcc/gcc-cross-sdk_4.1.0.bb
+++ b/packages/gcc/gcc-cross-sdk_4.1.0.bb
@@ -1,4 +1,4 @@
-PR = "r3"
+PR = "r4"
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
diff --git a/packages/gcc/gcc-cross-sdk_4.1.1.bb b/packages/gcc/gcc-cross-sdk_4.1.1.bb
index 5caec0b5a5..6b6097fb00 100644
--- a/packages/gcc/gcc-cross-sdk_4.1.1.bb
+++ b/packages/gcc/gcc-cross-sdk_4.1.1.bb
@@ -1,4 +1,4 @@
-PR = "r5"
+PR = "r6"
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
diff --git a/packages/gcc/gcc-cross-sdk_4.1.2.bb b/packages/gcc/gcc-cross-sdk_4.1.2.bb
index 51b99f882a..c632169f23 100644
--- a/packages/gcc/gcc-cross-sdk_4.1.2.bb
+++ b/packages/gcc/gcc-cross-sdk_4.1.2.bb
@@ -1,4 +1,4 @@
-PR = "r7"
+PR = "r8"
 
 require gcc-${PV}.inc
 require gcc-cross-sdk.inc
diff --git a/packages/gcc/gcc-cross-sdk_4.2.2.bb b/packages/gcc/gcc-cross-sdk_4.2.2.bb
index 8057608e0d..ee4ce855af 100644
--- a/packages/gcc/gcc-cross-sdk_4.2.2.bb
+++ b/packages/gcc/gcc-cross-sdk_4.2.2.bb
@@ -1,4 +1,4 @@
-PR = "r5"
+PR = "r6"
 
 inherit sdk
 
diff --git a/packages/gcc/gcc-cross-sdk_4.2.3.bb b/packages/gcc/gcc-cross-sdk_4.2.3.bb
index 54e7453e69..8057608e0d 100644
--- a/packages/gcc/gcc-cross-sdk_4.2.3.bb
+++ b/packages/gcc/gcc-cross-sdk_4.2.3.bb
@@ -1,4 +1,4 @@
-PR = "r4"
+PR = "r5"
 
 inherit sdk
 
diff --git a/packages/gcc/gcc-cross-sdk_4.2.4.bb b/packages/gcc/gcc-cross-sdk_4.2.4.bb
index 29ee187785..7f3e1466ce 100644
--- a/packages/gcc/gcc-cross-sdk_4.2.4.bb
+++ b/packages/gcc/gcc-cross-sdk_4.2.4.bb
@@ -1,4 +1,4 @@
-PR = "r1"
+PR = "r2"
 
 inherit sdk
 
diff --git a/packages/gcc/gcc-cross-sdk_4.3.1.bb b/packages/gcc/gcc-cross-sdk_4.3.1.bb
index 8057608e0d..ee4ce855af 100644
--- a/packages/gcc/gcc-cross-sdk_4.3.1.bb
+++ b/packages/gcc/gcc-cross-sdk_4.3.1.bb
@@ -1,4 +1,4 @@
-PR = "r5"
+PR = "r6"
 
 inherit sdk
 
diff --git a/packages/gcc/gcc-cross_3.3.3.bb b/packages/gcc/gcc-cross_3.3.3.bb
index 781214f815..38488642fd 100644
--- a/packages/gcc/gcc-cross_3.3.3.bb
+++ b/packages/gcc/gcc-cross_3.3.3.bb
@@ -1,4 +1,4 @@
-PR = "r4"
+PR = "r5"
 
 require gcc-${PV}.inc
 require gcc-cross.inc
diff --git a/packages/gcc/gcc-cross_3.3.4.bb b/packages/gcc/gcc-cross_3.3.4.bb
index bfc37e436c..7b7e51bc45 100644
--- a/packages/gcc/gcc-cross_3.3.4.bb
+++ b/packages/gcc/gcc-cross_3.3.4.bb
@@ -1,4 +1,4 @@
-PR="r7"
+PR="r8"
 
 require gcc-${PV}.inc
 require gcc-cross.inc
diff --git a/packages/gcc/gcc-cross_3.4.3.bb b/packages/gcc/gcc-cross_3.4.3.bb
index 8a2aa6a2bd..271509b32e 100644
--- a/packages/gcc/gcc-cross_3.4.3.bb
+++ b/packages/gcc/gcc-cross_3.4.3.bb
@@ -1,4 +1,4 @@
-PR = "r15"
+PR = "r16"
 
 require gcc-${PV}.inc
 require gcc-cross.inc
diff --git a/packages/gcc/gcc-cross_3.4.4.bb b/packages/gcc/gcc-cross_3.4.4.bb
index c7a4cfe857..515b41628c 100644
--- a/packages/gcc/gcc-cross_3.4.4.bb
+++ b/packages/gcc/gcc-cross_3.4.4.bb
@@ -1,4 +1,4 @@
-PR = "r10"
+PR = "r11"
 
 require gcc-${PV}.inc
 require gcc-cross.inc
diff --git a/packages/gcc/gcc-cross_4.0.0.bb b/packages/gcc/gcc-cross_4.0.0.bb
index ab990e2f80..dd3fbbc000 100644
--- a/packages/gcc/gcc-cross_4.0.0.bb
+++ b/packages/gcc/gcc-cross_4.0.0.bb
@@ -1,4 +1,4 @@
-PR = "r6"
+PR = "r7"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.0.2.bb b/packages/gcc/gcc-cross_4.0.2.bb
index ddecddb34a..bb4c6f0366 100644
--- a/packages/gcc/gcc-cross_4.0.2.bb
+++ b/packages/gcc/gcc-cross_4.0.2.bb
@@ -1,4 +1,4 @@
-PR = "r12"
+PR = "r13"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.1.0.bb b/packages/gcc/gcc-cross_4.1.0.bb
index ad73dc7cb0..33042da5a2 100644
--- a/packages/gcc/gcc-cross_4.1.0.bb
+++ b/packages/gcc/gcc-cross_4.1.0.bb
@@ -1,4 +1,4 @@
-PR = "r6"
+PR = "r7"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb
index dafa5fa79d..da797597d7 100644
--- a/packages/gcc/gcc-cross_4.1.1.bb
+++ b/packages/gcc/gcc-cross_4.1.1.bb
@@ -1,4 +1,4 @@
-PR = "r21"
+PR = "r22"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.1.2.bb b/packages/gcc/gcc-cross_4.1.2.bb
index c9e3279ffc..b3c6437467 100644
--- a/packages/gcc/gcc-cross_4.1.2.bb
+++ b/packages/gcc/gcc-cross_4.1.2.bb
@@ -1,4 +1,4 @@
-PR = "r17"
+PR = "r18"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.2.1.bb b/packages/gcc/gcc-cross_4.2.1.bb
index ece545b049..5986fad253 100644
--- a/packages/gcc/gcc-cross_4.2.1.bb
+++ b/packages/gcc/gcc-cross_4.2.1.bb
@@ -1,4 +1,4 @@
-PR = "r17"
+PR = "r18"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.2.2.bb b/packages/gcc/gcc-cross_4.2.2.bb
index 38a69aafc3..fe25ae2857 100644
--- a/packages/gcc/gcc-cross_4.2.2.bb
+++ b/packages/gcc/gcc-cross_4.2.2.bb
@@ -1,4 +1,4 @@
-PR = "r11"
+PR = "r12"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.2.3.bb b/packages/gcc/gcc-cross_4.2.3.bb
index 72f72835c3..4149179d8e 100644
--- a/packages/gcc/gcc-cross_4.2.3.bb
+++ b/packages/gcc/gcc-cross_4.2.3.bb
@@ -1,4 +1,4 @@
-PR = "r7"
+PR = "r8"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.2.4.bb b/packages/gcc/gcc-cross_4.2.4.bb
index 036ebd96b0..e07143d0d8 100644
--- a/packages/gcc/gcc-cross_4.2.4.bb
+++ b/packages/gcc/gcc-cross_4.2.4.bb
@@ -1,4 +1,4 @@
-PR = "r1"
+PR = "r2"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_4.3.1.bb b/packages/gcc/gcc-cross_4.3.1.bb
index 066fa32b86..5383079904 100644
--- a/packages/gcc/gcc-cross_4.3.1.bb
+++ b/packages/gcc/gcc-cross_4.3.1.bb
@@ -1,4 +1,4 @@
-PR = "r8"
+PR = "r9"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_csl-arm-2005q3.bb b/packages/gcc/gcc-cross_csl-arm-2005q3.bb
index 8726500ce2..858459c026 100644
--- a/packages/gcc/gcc-cross_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc-cross_csl-arm-2005q3.bb
@@ -1,4 +1,4 @@
-PR = "r4"
+PR = "r5"
 
 require gcc-csl-arm-2005q3.inc
 require gcc-cross.inc
diff --git a/packages/gcc/gcc-cross_csl-arm-2006q1.bb b/packages/gcc/gcc-cross_csl-arm-2006q1.bb
index 45ace68af9..a8c662e462 100644
--- a/packages/gcc/gcc-cross_csl-arm-2006q1.bb
+++ b/packages/gcc/gcc-cross_csl-arm-2006q1.bb
@@ -1,4 +1,4 @@
-PR = "r3"
+PR = "r4"
 
 require gcc-csl-arm-2006q1.inc
 require gcc-cross.inc
diff --git a/packages/gcc/gcc-cross_csl-arm-2007q3.bb b/packages/gcc/gcc-cross_csl-arm-2007q3.bb
index 295353a0f8..6ae42784cb 100644
--- a/packages/gcc/gcc-cross_csl-arm-2007q3.bb
+++ b/packages/gcc/gcc-cross_csl-arm-2007q3.bb
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
 
 require gcc-csl-arm-2007q3.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-cross_csl-arm-2008q1.bb b/packages/gcc/gcc-cross_csl-arm-2008q1.bb
index 01b5bdacc4..69127daea6 100644
--- a/packages/gcc/gcc-cross_csl-arm-2008q1.bb
+++ b/packages/gcc/gcc-cross_csl-arm-2008q1.bb
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
 
 require gcc-csl-arm-2008q1.inc
 require gcc-cross4.inc
diff --git a/packages/gcc/gcc-native_3.4.4.bb b/packages/gcc/gcc-native_3.4.4.bb
index 6f74a1ea46..5f39f1bbb3 100644
--- a/packages/gcc/gcc-native_3.4.4.bb
+++ b/packages/gcc/gcc-native_3.4.4.bb
@@ -1,4 +1,4 @@
-PR = "r7"
+PR = "r8"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc-native_3.4.6.bb b/packages/gcc/gcc-native_3.4.6.bb
index 5f39f1bbb3..c3f8106d3a 100644
--- a/packages/gcc/gcc-native_3.4.6.bb
+++ b/packages/gcc/gcc-native_3.4.6.bb
@@ -1,4 +1,4 @@
-PR = "r8"
+PR = "r9"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_3.3.3.bb b/packages/gcc/gcc_3.3.3.bb
index 2df12ef9ef..9fd2b0acc3 100644
--- a/packages/gcc/gcc_3.3.3.bb
+++ b/packages/gcc/gcc_3.3.3.bb
@@ -1,4 +1,4 @@
-PR = "r4"
+PR = "r5"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_3.3.4.bb b/packages/gcc/gcc_3.3.4.bb
index 2df12ef9ef..9fd2b0acc3 100644
--- a/packages/gcc/gcc_3.3.4.bb
+++ b/packages/gcc/gcc_3.3.4.bb
@@ -1,4 +1,4 @@
-PR = "r4"
+PR = "r5"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_3.4.3.bb b/packages/gcc/gcc_3.4.3.bb
index 0f31362dc1..10d868893b 100644
--- a/packages/gcc/gcc_3.4.3.bb
+++ b/packages/gcc/gcc_3.4.3.bb
@@ -1,4 +1,4 @@
-PR = "r15"
+PR = "r16"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_3.4.4.bb b/packages/gcc/gcc_3.4.4.bb
index 7ec84b6012..5bc3761068 100644
--- a/packages/gcc/gcc_3.4.4.bb
+++ b/packages/gcc/gcc_3.4.4.bb
@@ -1,4 +1,4 @@
-PR = "r9"
+PR = "r10"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_4.0.0.bb b/packages/gcc/gcc_4.0.0.bb
index 9fd2b0acc3..1bbab50930 100644
--- a/packages/gcc/gcc_4.0.0.bb
+++ b/packages/gcc/gcc_4.0.0.bb
@@ -1,4 +1,4 @@
-PR = "r5"
+PR = "r6"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_4.0.2.bb b/packages/gcc/gcc_4.0.2.bb
index 7ec84b6012..5bc3761068 100644
--- a/packages/gcc/gcc_4.0.2.bb
+++ b/packages/gcc/gcc_4.0.2.bb
@@ -1,4 +1,4 @@
-PR = "r9"
+PR = "r10"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_4.1.0.bb b/packages/gcc/gcc_4.1.0.bb
index 9fd2b0acc3..1bbab50930 100644
--- a/packages/gcc/gcc_4.1.0.bb
+++ b/packages/gcc/gcc_4.1.0.bb
@@ -1,4 +1,4 @@
-PR = "r5"
+PR = "r6"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb
index 9e23eb8af7..6ba5972fc1 100644
--- a/packages/gcc/gcc_4.1.1.bb
+++ b/packages/gcc/gcc_4.1.1.bb
@@ -1,4 +1,4 @@
-PR = "r21"
+PR = "r22"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_4.1.2.bb b/packages/gcc/gcc_4.1.2.bb
index a8c8b71648..dd88ccdc27 100644
--- a/packages/gcc/gcc_4.1.2.bb
+++ b/packages/gcc/gcc_4.1.2.bb
@@ -1,4 +1,4 @@
-PR = "r13"
+PR = "r14"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_4.2.1.bb b/packages/gcc/gcc_4.2.1.bb
index da1ecb9b17..a8c8b71648 100644
--- a/packages/gcc/gcc_4.2.1.bb
+++ b/packages/gcc/gcc_4.2.1.bb
@@ -1,4 +1,4 @@
-PR = "r12"
+PR = "r13"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_4.2.2.bb b/packages/gcc/gcc_4.2.2.bb
index ca22e0f69c..582fff49ac 100644
--- a/packages/gcc/gcc_4.2.2.bb
+++ b/packages/gcc/gcc_4.2.2.bb
@@ -1,4 +1,4 @@
-PR = "r9"
+PR = "r10"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_4.2.3.bb b/packages/gcc/gcc_4.2.3.bb
index 556fc74267..a2ae0c0e92 100644
--- a/packages/gcc/gcc_4.2.3.bb
+++ b/packages/gcc/gcc_4.2.3.bb
@@ -1,4 +1,4 @@
-PR = "r7"
+PR = "r8"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_4.2.4.bb b/packages/gcc/gcc_4.2.4.bb
index ff100fd892..43fa3a9ebc 100644
--- a/packages/gcc/gcc_4.2.4.bb
+++ b/packages/gcc/gcc_4.2.4.bb
@@ -1,4 +1,4 @@
-PR = "r1"
+PR = "r2"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_4.3.1.bb b/packages/gcc/gcc_4.3.1.bb
index 318ccd3775..c51d537d2d 100644
--- a/packages/gcc/gcc_4.3.1.bb
+++ b/packages/gcc/gcc_4.3.1.bb
@@ -1,4 +1,4 @@
-PR = "r4"
+PR = "r5"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_csl-arm-2005q3.bb b/packages/gcc/gcc_csl-arm-2005q3.bb
index 9fd2b0acc3..1bbab50930 100644
--- a/packages/gcc/gcc_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc_csl-arm-2005q3.bb
@@ -1,4 +1,4 @@
-PR = "r5"
+PR = "r6"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_csl-arm-2006q1.bb b/packages/gcc/gcc_csl-arm-2006q1.bb
index cc7540af15..2df12ef9ef 100644
--- a/packages/gcc/gcc_csl-arm-2006q1.bb
+++ b/packages/gcc/gcc_csl-arm-2006q1.bb
@@ -1,4 +1,4 @@
-PR = "r3"
+PR = "r4"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_csl-arm-2007q3.bb b/packages/gcc/gcc_csl-arm-2007q3.bb
index 4999c6a53e..cc7540af15 100644
--- a/packages/gcc/gcc_csl-arm-2007q3.bb
+++ b/packages/gcc/gcc_csl-arm-2007q3.bb
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/gcc/gcc_csl-arm-2008q1.bb b/packages/gcc/gcc_csl-arm-2008q1.bb
index 832167ca4e..4999c6a53e 100644
--- a/packages/gcc/gcc_csl-arm-2008q1.bb
+++ b/packages/gcc/gcc_csl-arm-2008q1.bb
@@ -1,4 +1,4 @@
-PR = "r1"
+PR = "r2"
 
 require gcc-${PV}.inc
 require gcc-configure-target.inc
diff --git a/packages/glibc/files/glibc-2.6.1-use-short-for-fnstsw.patch b/packages/glibc/files/glibc-2.6.1-use-short-for-fnstsw.patch
new file mode 100644
index 0000000000..6979229279
--- /dev/null
+++ b/packages/glibc/files/glibc-2.6.1-use-short-for-fnstsw.patch
@@ -0,0 +1,30 @@
+Source: http://sourceware.org/ml/libc-alpha/2008-01/msg00017.html
+
+I am checking this x86 assembler patch:
+
+http://sourceware.org/ml/binutils/2008-01/msg00148.html
+
+to check operand size. fnstsw stores 16bit into %ax. The upper
+16bit of %eax is unchanged.  The new assembler will disallow
+"fnstsw %eax".  Here is a patch for glibc.
+
+
+H.J.
+
+---
+ sysdeps/i386/fpu/ftestexcept.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: glibc-2.6.1/sysdeps/i386/fpu/ftestexcept.c
+===================================================================
+--- glibc-2.6.1.orig/sysdeps/i386/fpu/ftestexcept.c	2008-07-19 11:00:45.000000000 -0700
++++ glibc-2.6.1/sysdeps/i386/fpu/ftestexcept.c	2008-07-19 11:01:25.000000000 -0700
+@@ -26,7 +26,7 @@
+ int
+ fetestexcept (int excepts)
+ {
+-  int temp;
++  short temp;
+   int xtemp = 0;
+ 
+   /* Get current exceptions.  */
diff --git a/packages/glibc/glibc-2.3.6/glibc-2.3.6-linuxthreads-pthread-raise.patch b/packages/glibc/glibc-2.3.6/glibc-2.3.6-linuxthreads-pthread-raise.patch
new file mode 100644
index 0000000000..dae5db3846
--- /dev/null
+++ b/packages/glibc/glibc-2.3.6/glibc-2.3.6-linuxthreads-pthread-raise.patch
@@ -0,0 +1,37 @@
+--- glibc-2.3.6/linuxthreads/sysdeps/unix/sysv/linux/raise.c.org	2008-07-16 22:57:58.000000000 -0700
++++ glibc-2.3.6/linuxthreads/sysdeps/unix/sysv/linux/raise.c	2008-07-16 22:58:26.000000000 -0700
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 1991, 1996, 2002, 2003 Free Software Foundation, Inc.
++/* Copyright (C) 1991, 1996, 2002, 2003, 2005 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -18,10 +18,13 @@
+ 
+ #include <signal.h>
+ #include <unistd.h>
+-#include <bits/libc-lock.h>
+ 
+-#ifndef SHARED
++#ifndef IS_IN_rtld
++# include <bits/libc-lock.h>
++
++# ifndef SHARED
+ weak_extern (__pthread_raise)
++# endif
+ #endif
+ 
+ /* Raise the signal SIG.  */
+@@ -29,8 +32,12 @@ int
+ raise (sig)
+      int sig;
+ {
++#ifdef IS_IN_rtld
++  return __kill (__getpid (), sig);
++#else
+   return __libc_maybe_call2 (pthread_raise, (sig),
+ 			     __kill (__getpid (), sig));
++#endif
+ }
+ libc_hidden_def (raise)
+ weak_alias (raise, gsignal)
diff --git a/packages/glibc/glibc-2.3.6/glibc-arm-socket-weakalias.patch b/packages/glibc/glibc-2.3.6/glibc-arm-socket-weakalias.patch
new file mode 100644
index 0000000000..722365f122
--- /dev/null
+++ b/packages/glibc/glibc-2.3.6/glibc-arm-socket-weakalias.patch
@@ -0,0 +1,45 @@
+This one was taken from debian.
+
+# DP: Description: Fix __bind redefinition problem
+# DP: Related bugs: 
+# DP: Dpatch author: Phil Blundell
+# DP: Patch author: Daniel Jacobowitz
+# DP: Upstream status: In CVS
+# DP: Status Details:
+# DP: Date: 2005-12-25
+
+Index: sysdeps/unix/sysv/linux/arm/socket.S
+===================================================================
+RCS file: /cvs/glibc/ports/sysdeps/unix/sysv/linux/arm/socket.S,v
+retrieving revision 1.12
+retrieving revision 1.13
+diff -u -r1.12 -r1.13
+--- glibc-2.3.6.ds1.orig/sysdeps/unix/sysv/linux/arm/socket.S	4 Dec 2004 21:20:16 -0000	1.12
++++ glibc-2.3.6.ds1/sysdeps/unix/sysv/linux/arm/socket.S	27 Oct 2005 18:50:12 -0000	1.13
+@@ -1,4 +1,6 @@
+-/* Copyright (C) 1995, 1996, 1997, 1998, 2003 Free Software Foundation, Inc.
++/* Copyright (C) 1995, 1996, 1997, 1998, 2003, 2004, 2005
++   Free Software Foundation, Inc.
++
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -32,7 +34,11 @@
+    The .S files for the other calls just #define socket and #include this.  */
+ 
+ #ifndef __socket
++#ifndef NO_WEAK_ALIAS
+ #define __socket P(__,socket)
++#else
++#define __socket socket
++#endif
+ #endif
+ 
+ #define PUSHARGS_1	str a1, [sp, $-4]!
+@@ -120,4 +126,6 @@
+ 
+ PSEUDO_END (__socket)
+ 
++#ifndef NO_WEAK_ALIAS
+ weak_alias (__socket, socket)
++#endif
diff --git a/packages/glibc/glibc-2.3.6/glibc-cross_sunrpc.patch b/packages/glibc/glibc-2.3.6/glibc-cross_sunrpc.patch
new file mode 100644
index 0000000000..8e24a831b0
--- /dev/null
+++ b/packages/glibc/glibc-2.3.6/glibc-cross_sunrpc.patch
@@ -0,0 +1,79 @@
+Fix rpcsvc headers missing from glibc, also
+allows glibc to produce the rpc headers when cross compiling,
+And fix for glibc-bootstrap package doesn't currently build because the
+generated sunrpc headers are not available
+    
+
+---
+ sunrpc/Makefile |   28 ++++++++++++++++++++++++----
+ 1 file changed, 24 insertions(+), 4 deletions(-)
+
+Index: glibc-2.3.6/sunrpc/Makefile
+===================================================================
+--- glibc-2.3.6.orig/sunrpc/Makefile	2005-07-17 20:03:49.000000000 -0700
++++ glibc-2.3.6/sunrpc/Makefile	2008-07-17 15:28:04.000000000 -0700
+@@ -75,6 +75,8 @@ install-sbin := rpcinfo
+ rpcgen-objs = rpc_main.o rpc_hout.o rpc_cout.o rpc_parse.o \
+ 	      rpc_scan.o rpc_util.o rpc_svcout.o rpc_clntout.o \
+ 	      rpc_tblout.o rpc_sample.o
++host-rpcgen-objs = $(addprefix host-,$(rpcgen-objs))
++
+ # These headers are part of rpcgen.
+ distribute := proto.h rpc_util.h rpc_parse.h rpc_scan.h \
+ 	      $(rpcgen-objs:.o=.c) etc.rpc \
+@@ -98,8 +100,8 @@ otherlibs += $(nssobjdir)/libnss_files.a
+ 	     $(resolvobjdir)/libresolv.a
+ endif
+ 
+-ifeq (no,$(cross-compiling))
+-# We can only build this library if we can run the rpcgen we build.
++ifneq (,$(findstring subdir_install,$(MAKECMDGOALS)))
++## We can only build this library if we can run the rpcgen we build.
+ headers += $(rpcsvc:%.x=rpcsvc/%.h)
+ extra-libs := librpcsvc
+ extra-libs-others := librpcsvc # Make it in `others' pass, not `lib' pass.
+@@ -144,8 +146,26 @@ cpp-srcs-left := $(rpcgen-objs:.o=.c)
+ lib := nonlib
+ include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
+ 
++# Rely on the target rpcgen objects for dependency information.
++$(objpfx)host-%.o: %.c $(objpfx)%.o
++	$(patsubst %/,cd % &&,$(objpfx)) \
++	$(BUILD_CC) $($(basename $(<F))-CFLAGS) \
++		-I$(shell cd .. && pwd) \
++		-Dattribute_hidden= \
++		-include $(shell cd ../include && pwd)/libintl.h \
++		-O2 $(ALL_BUILD_CFLAGS) $(shell pwd)/$(<F) -c -o $(@F)
++
++$(objpfx)host-rpcgen: $(addprefix $(objpfx),$(host-rpcgen-objs))
++	$(BUILD_CC) $(BUILD_CFLAGS) $+ -o $(objpfx)host-rpcgen
++
+ # Tell rpcgen where to find the C preprocessor.
++ifeq ($(cross-compiling),no)
+ rpcgen-cmd = CPP='$(CC) -E -x c-header' $(built-program-cmd) -Y ../scripts
++rpcgen-prog = $(objpfx)rpcgen
++else
++rpcgen-cmd = CPP='$(CC) -E -x c-header' $(objpfx)host-rpcgen -Y ../scripts
++rpcgen-prog = $(objpfx)host-rpcgen
++endif
+ 
+ # Install the rpc data base file.
+ $(inst_sysconfdir)/rpc: etc.rpc $(+force)
+@@ -156,7 +176,7 @@ $(inst_sysconfdir)/rpc: etc.rpc $(+force
+ # relinked.
+ $(rpcsvc:%.x=$(objpfx)rpcsvc/%.h): $(objpfx)rpcsvc/%.h: $(objpfx)rpcsvc/%.stmp
+ 	@:
+-$(objpfx)rpcsvc/%.stmp: rpcsvc/%.x $(objpfx)rpcgen
++$(objpfx)rpcsvc/%.stmp: rpcsvc/%.x $(rpcgen-prog)
+ 	$(make-target-directory)
+ 	-@rm -f ${@:stmp=T} $@
+ 	$(rpcgen-cmd) -h $< -o ${@:stmp=T}
+@@ -166,7 +186,7 @@ $(objpfx)rpcsvc/%.stmp: rpcsvc/%.x $(obj
+ # Generate the rpcsvc XDR functions with rpcgen.
+ $(rpcsvc:%.x=$(objpfx)x%.c): $(objpfx)x%.c: $(objpfx)x%.stmp
+ 	@:
+-$(objpfx)x%.stmp: rpcsvc/%.x $(objpfx)rpcgen
++$(objpfx)x%.stmp: rpcsvc/%.x $(rpcgen-prog)
+ 	-@rm -f ${@:stmp=T} $@
+ 	$(rpcgen-cmd) -c $< -o ${@:stmp=T}
+ 	$(move-if-change) $(@:stmp=T) $(@:stmp=c)
diff --git a/packages/glibc/glibc-2.3.6/glibc-memusage.patch b/packages/glibc/glibc-2.3.6/glibc-memusage.patch
new file mode 100644
index 0000000000..39ca1a77b5
--- /dev/null
+++ b/packages/glibc/glibc-2.3.6/glibc-memusage.patch
@@ -0,0 +1,44 @@
+---
+ malloc/Makefile    |    4 +++-
+ malloc/memusage.sh |    6 ++++++
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+Index: glibc-2.3.6/malloc/Makefile
+===================================================================
+--- glibc-2.3.6.orig/malloc/Makefile	2008-07-17 14:40:54.000000000 -0700
++++ glibc-2.3.6/malloc/Makefile	2008-07-17 14:42:07.000000000 -0700
+@@ -80,7 +80,7 @@ ifneq ($(cross-compiling),yes)
+ ifneq ($(LIBGD),no)
+ install-bin = memusagestat
+ install-bin-script += memusage
+-generated += memusagestat memusage
++generated += memusagestat
+ extra-objs += memusagestat.o
+ 
+ # The configure.in check for libgd and its headers did not use $SYSINCLUDES.
+@@ -90,6 +90,8 @@ extra-objs += memusagestat.o
+ $(objpfx)memusagestat.o: sysincludes = # nothing
+ endif
+ endif
++install-bin-script += memusage
++generated += memusage
+ 
+ # Another goal which can be used to override the configure decision.
+ .PHONY: do-memusagestat
+Index: glibc-2.3.6/malloc/memusage.sh
+===================================================================
+--- glibc-2.3.6.orig/malloc/memusage.sh	2008-07-17 14:42:17.000000000 -0700
++++ glibc-2.3.6/malloc/memusage.sh	2008-07-17 14:42:54.000000000 -0700
+@@ -205,6 +205,12 @@ if test $# -eq 0; then
+   do_usage
+ fi
+ 
++# Find memusagestat.
++if test -n "$png" -a ! -x $memusagestat; then
++  echo >&2 $"PNG generation is not supported."
++  png=""
++fi
++
+ # This will be in the environment.
+ add_env="LD_PRELOAD=$memusageso"
+ 
diff --git a/packages/glibc/glibc-2.3.6/glibc-rtld-libcc-eh.patch b/packages/glibc/glibc-2.3.6/glibc-rtld-libcc-eh.patch
new file mode 100644
index 0000000000..a3658f4cd6
--- /dev/null
+++ b/packages/glibc/glibc-2.3.6/glibc-rtld-libcc-eh.patch
@@ -0,0 +1,25 @@
+---
+ elf/Makefile |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+Index: glibc-2.3.6/elf/Makefile
+===================================================================
+--- glibc-2.3.6.orig/elf/Makefile	2008-07-17 01:10:39.000000000 -0700
++++ glibc-2.3.6/elf/Makefile	2008-07-17 01:17:18.000000000 -0700
+@@ -279,7 +279,7 @@ $(objpfx)rtld-libc.a: $(objpfx)librtld.m
+ 	$(MAKE) -f $< -f rtld-Rules
+ 
+ $(objpfx)librtld.os: $(objpfx)dl-allobjs.os $(objpfx)rtld-libc.a
+-	$(LINK.o) -nostdlib -nostartfiles -r -o $@ '-Wl,-(' $^ -lgcc '-Wl,-)' \
++	$(LINK.o) -nostdlib -nostartfiles -r -o $@ '-Wl,-(' $^ -lgcc -lgcc_eh '-Wl,-)' \
+ 		  -Wl,-Map,$@.map
+ 
+ generated += librtld.map librtld.mk rtld-libc.a librtld.os.map
+@@ -295,6 +295,7 @@ $(objpfx)ld.so: $(objpfx)librtld.os $(ld
+ 		      -e 's/\. = 0 + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' \
+ 		  > $@.lds
+ 	$(LINK.o) -nostdlib -nostartfiles -shared -o $@			\
++		  -lgcc -lgcc_eh					\
+ 		  $(LDFLAGS-rtld) -Wl,-z,defs $(z-now-$(bind-now))	\
+ 		  $(filter-out $(map-file),$^) $(load-map-file)		\
+ 		  -Wl,-soname=$(rtld-installed-name) -T $@.lds
diff --git a/packages/gpe-login/gpe-login-0.88/.mtn2git_empty b/packages/glibc/glibc-2.7/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gpe-login/gpe-login-0.88/.mtn2git_empty
+++ b/packages/glibc/glibc-2.7/.mtn2git_empty
diff --git a/packages/glibc/glibc-2.7/all_glibc-i586-chk.patch b/packages/glibc/glibc-2.7/all_glibc-i586-chk.patch
new file mode 100644
index 0000000000..9362bcaf17
--- /dev/null
+++ b/packages/glibc/glibc-2.7/all_glibc-i586-chk.patch
@@ -0,0 +1,33 @@
+http://bugs.gentoo.org/199479
+
+2007-09-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/i386/i586/memcpy_chk.S: New file.
+	* sysdeps/i386/i586/mempcpy_chk.S: Likewise.
+	* sysdeps/i386/i586/memset_chk.S: Likewise.
+
+Index: glibc/sysdeps/i386/i586/memcpy_chk.S
+===================================================================
+RCS file: sysdeps/i386/i586/memcpy_chk.S
+diff -N sysdeps/i386/i586/memcpy_chk.S
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ glibc/sysdeps/i386/i586/memcpy_chk.S	13 Nov 2007 01:56:18 -0000	1.1
+@@ -0,0 +1 @@
++#include <sysdeps/i386/i686/memcpy_chk.S>
+Index: glibc/sysdeps/i386/i586/mempcpy_chk.S
+===================================================================
+RCS file: sysdeps/i386/i586/mempcpy_chk.S
+diff -N sysdeps/i386/i586/mempcpy_chk.S
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ glibc/sysdeps/i386/i586/mempcpy_chk.S	13 Nov 2007 01:56:18 -0000	1.1
+@@ -0,0 +1 @@
++#include <sysdeps/i386/i686/mempcpy_chk.S>
+Index: glibc/sysdeps/i386/i586/memset_chk.S
+===================================================================
+RCS file: sysdeps/i386/i586/memset_chk.S
+diff -N sysdeps/i386/i586/memset_chk.S
+--- /dev/null	1 Jan 1970 00:00:00 -0000
++++ glibc/sysdeps/i386/i586/memset_chk.S	13 Nov 2007 01:56:18 -0000	1.1
+@@ -0,0 +1 @@
++#include <sysdeps/i386/i686/memset_chk.S>
+
diff --git a/packages/glibc/glibc-initial.inc b/packages/glibc/glibc-initial.inc
index 0e5db2e729..143a662d52 100644
--- a/packages/glibc/glibc-initial.inc
+++ b/packages/glibc/glibc-initial.inc
@@ -1,5 +1,5 @@
 SECTION = "libs"
-DEPENDS = "linux-libc-headers"
+DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers"
 PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
@@ -9,7 +9,8 @@ PACKAGES_DYNAMIC = ""
 do_configure () {
 	sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
 	chmod +x ${S}/configure
-	CC="${BUILD_CC}" CPP="${BUILD_CPP}" LD="${BUILD_LD}" ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \
+	find ${S} -name "configure" | xargs touch
+	${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \
 		--without-cvs --disable-sanity-checks \
 		--with-headers=${STAGING_DIR_TARGET}${layout_includedir} \
 		--enable-hacker-mode
@@ -30,8 +31,11 @@ do_compile () {
 }
 
 do_stage () {
-	oe_runmake cross-compiling=yes install_root=${STAGING_DIR_HOST} includedir='${layout_includedir}' prefix='${layout_prefix}' install-headers
+	oe_runmake cross-compiling=yes install_root=${STAGING_DIR_HOST} \
+	includedir='${layout_includedir}' prefix='${layout_prefix}' \
+	install-bootstrap-headers=yes install-headers
 
+	oe_runmake csu/subdir_lib
 	# Two headers -- stubs.h and features.h -- aren't installed by install-headers,
 	# so do them by hand.  We can tolerate an empty stubs.h for the moment.
 	# See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
@@ -42,6 +46,10 @@ do_stage () {
 	if [ -e ${B}/bits/stdio_lim.h ]; then
 		cp ${B}/bits/stdio_lim.h  ${STAGING_INCDIR}/bits/
 	fi
+	mkdir -p ${STAGING_DIR_TARGET}${layout_libdir}
+	install -m 644 csu/crt[1in].o ${STAGING_DIR_TARGET}${layout_libdir}
+	${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
+		-o ${STAGING_DIR_TARGET}${layout_libdir}/libc.so
 }
 
 do_install () {
diff --git a/packages/glibc/glibc-initial_2.5.bb b/packages/glibc/glibc-initial_2.5.bb
index 44f5775fd7..35c9febcce 100644
--- a/packages/glibc/glibc-initial_2.5.bb
+++ b/packages/glibc/glibc-initial_2.5.bb
@@ -5,7 +5,7 @@ do_configure () {
 	sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
 	chmod +x ${S}/configure
 	unset CFLAGS
-	CC="${BUILD_CC}" CPP="${BUILD_CPP}" LD="${BUILD_LD}" ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \
+	${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \
 		--without-cvs --disable-sanity-checks \
 		--with-headers=${STAGING_INCDIR} \
 		--enable-hacker-mode
diff --git a/packages/glibc/glibc-intermediate.inc b/packages/glibc/glibc-intermediate.inc
deleted file mode 100644
index c226d8658d..0000000000
--- a/packages/glibc/glibc-intermediate.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SECTION = "libs"
-PACKAGES = ""
-PACKAGES_DYNAMIC = ""
-PROVIDES = "virtual/${TARGET_PREFIX}libc-for-gcc"
-DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers"
-
-do_install () {
-	:
-}
-
-GLIBC_ADDONS = "nptl,ports"
-GLIBC_EXTRA_OECONF = ""
diff --git a/packages/glibc/glibc-intermediate_2.3.2+cvs20040726.bb b/packages/glibc/glibc-intermediate_2.3.2+cvs20040726.bb
deleted file mode 100644
index aba5ac0451..0000000000
--- a/packages/glibc/glibc-intermediate_2.3.2+cvs20040726.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require glibc_${PV}.bb
-require glibc-intermediate.inc
-
-DEFAULT_PREFERENCE_sh3 = "-99"
-
-GLIBC_ADDONS = "linuxthreads"
diff --git a/packages/glibc/glibc-intermediate_2.3.6.bb b/packages/glibc/glibc-intermediate_2.3.6.bb
deleted file mode 100644
index f7113ba04c..0000000000
--- a/packages/glibc/glibc-intermediate_2.3.6.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require glibc_${PV}.bb
-require glibc-intermediate.inc
diff --git a/packages/glibc/glibc-intermediate_2.4.bb b/packages/glibc/glibc-intermediate_2.4.bb
deleted file mode 100644
index e1c7ecfbd1..0000000000
--- a/packages/glibc/glibc-intermediate_2.4.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require glibc_${PV}.bb
-require glibc-intermediate.inc
-
-DEFAULT_PREFERENCE = "-1"
diff --git a/packages/glibc/glibc-intermediate_2.5.bb b/packages/glibc/glibc-intermediate_2.5.bb
deleted file mode 100644
index 661a69a10d..0000000000
--- a/packages/glibc/glibc-intermediate_2.5.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require glibc_${PV}.bb
-require glibc-intermediate.inc
-
-# gcc uses -Werror which break on a "you have no thumb interwork" _warning_
-do_configure_prepend() {
-	sed -i s:-Werror:: ${S}/configure
-}
diff --git a/packages/glibc/glibc-intermediate_2.6.1.bb b/packages/glibc/glibc-intermediate_2.6.1.bb
deleted file mode 100644
index 05d6250783..0000000000
--- a/packages/glibc/glibc-intermediate_2.6.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require glibc_${PV}.bb
-require glibc-intermediate.inc
-
-# gcc uses -Werror which break on a "you have no thumb interwork" _warning_
-do_configure_prepend() {
-	sed -i s:-Werror:: ${S}/configure
-}
-
diff --git a/packages/glibc/glibc-intermediate_2.7.bb b/packages/glibc/glibc-intermediate_2.7.bb
deleted file mode 100644
index 05d6250783..0000000000
--- a/packages/glibc/glibc-intermediate_2.7.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require glibc_${PV}.bb
-require glibc-intermediate.inc
-
-# gcc uses -Werror which break on a "you have no thumb interwork" _warning_
-do_configure_prepend() {
-	sed -i s:-Werror:: ${S}/configure
-}
-
diff --git a/packages/glibc/glibc-intermediate_cvs.bb b/packages/glibc/glibc-intermediate_cvs.bb
deleted file mode 100644
index ad615a1911..0000000000
--- a/packages/glibc/glibc-intermediate_cvs.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require glibc_${PV}.bb
-require glibc-intermediate.inc
-
-DEFAULT_PREFERENCE = "-1"
-
-GLIBC_ADDONS = "linuxthreads"
diff --git a/packages/glibc/glibc-stage.inc b/packages/glibc/glibc-stage.inc
index 46220d7831..2b7b303c14 100644
--- a/packages/glibc/glibc-stage.inc
+++ b/packages/glibc/glibc-stage.inc
@@ -3,7 +3,7 @@ do_stage() {
 	oe_runmake 'install_root=${STAGING_DIR_HOST}' \
 		   'includedir=${layout_includedir}' 'libdir=${layout_libdir}' 'slibdir=${layout_base_libdir}' \
 		   '${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6' \
-		   install-headers install-lib
+		   install
 
 	install -d ${STAGING_INCDIR}/gnu \
 		   ${STAGING_INCDIR}/bits \
@@ -15,9 +15,4 @@ do_stage() {
 		h=`echo $r|sed -e's,\.x$,.h,'`
 		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
 	done
-	for i in libc.a libc_pic.a libc_nonshared.a; do
-		install -m 0644 ${B}/$i ${STAGING_DIR_HOST}/${layout_libdir}/ || die "failed to install $i"
-	done
-	echo 'GROUP ( ${layout_base_libdir}/libpthread.so.0 ${layout_libdir}/libpthread_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_libdir}/libpthread.so
-	echo 'GROUP ( ${layout_base_libdir}/libc.so.6 ${layout_libdir}/libc_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_libdir}/libc.so
 }
diff --git a/packages/glibc/glibc.inc b/packages/glibc/glibc.inc
index c8d2d3b16f..f677f62eaf 100644
--- a/packages/glibc/glibc.inc
+++ b/packages/glibc/glibc.inc
@@ -4,12 +4,12 @@ SECTION = "libs"
 PRIORITY = "required"
 LICENSE = "LGPL"
 # nptl needs unwind support in gcc, which can't be built without glibc.
-DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']} linux-libc-headers"
+DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers"
 #this leads to circular deps, so lets not add it yet
 #RDEPENDS_ldd += " bash"
 # nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this
-RDEPENDS += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}"
-PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}"
+#RDEPENDS += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}"
+PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES += "virtual/libintl virtual/libiconv"
 
 inherit autotools
diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb
index 4a94dac5b7..5afeb6421b 100644
--- a/packages/glibc/glibc_2.2.5.bb
+++ b/packages/glibc/glibc_2.2.5.bb
@@ -1,7 +1,7 @@
 require glibc.inc
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r15"
+PR = "r16"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 
diff --git a/packages/glibc/glibc_2.3.2+cvs20040726.bb b/packages/glibc/glibc_2.3.2+cvs20040726.bb
index 8beed8e8dc..d293d7a52d 100644
--- a/packages/glibc/glibc_2.3.2+cvs20040726.bb
+++ b/packages/glibc/glibc_2.3.2+cvs20040726.bb
@@ -3,7 +3,7 @@ require glibc.inc
 DEFAULT_PREFERENCE_sh3 = "-99"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r26"
+PR = "r27"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
diff --git a/packages/glibc/glibc_2.3.2.bb b/packages/glibc/glibc_2.3.2.bb
index fc06794e61..4a417a3c7c 100644
--- a/packages/glibc/glibc_2.3.2.bb
+++ b/packages/glibc/glibc_2.3.2.bb
@@ -1,6 +1,6 @@
 require glibc.inc
 
-PR = "r15"
+PR = "r16"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 
diff --git a/packages/glibc/glibc_2.3.3+cvs20041128.bb b/packages/glibc/glibc_2.3.3+cvs20041128.bb
index 4c9b3dce94..2138599ea9 100644
--- a/packages/glibc/glibc_2.3.3+cvs20041128.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20041128.bb
@@ -3,7 +3,7 @@ require glibc.inc
 DEFAULT_PREFERENCE_sh3 = "-99"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r11"
+PR = "r12"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
diff --git a/packages/glibc/glibc_2.3.3+cvs20050221.bb b/packages/glibc/glibc_2.3.3+cvs20050221.bb
index 4517adedcc..f9b948a58a 100644
--- a/packages/glibc/glibc_2.3.3+cvs20050221.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20050221.bb
@@ -3,7 +3,7 @@ require glibc.inc
 DEFAULT_PREFERENCE_sh3 = "-99"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r11"
+PR = "r12"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
diff --git a/packages/glibc/glibc_2.3.3+cvs20050420.bb b/packages/glibc/glibc_2.3.3+cvs20050420.bb
index b1a5d66b17..7d091be292 100644
--- a/packages/glibc/glibc_2.3.3+cvs20050420.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20050420.bb
@@ -5,7 +5,7 @@ DEFAULT_PREFERENCE_i586 = "0"
 DEFAULT_PREFERENCE_sh3 = "-99"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r9"
+PR = "r10"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
diff --git a/packages/glibc/glibc_2.3.3.bb b/packages/glibc/glibc_2.3.3.bb
index 510709aba9..57d380bc1d 100644
--- a/packages/glibc/glibc_2.3.3.bb
+++ b/packages/glibc/glibc_2.3.3.bb
@@ -1,6 +1,6 @@
 require glibc.inc
 
-PR = "r12"
+PR = "r13"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 
diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb
index d0a396d465..0f3be0a47e 100644
--- a/packages/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb
@@ -2,7 +2,7 @@ require glibc.inc
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
 SRCDATE = "20050627"
-PR = "r18"
+PR = "r19"
 
 #Doesnt build for sh3
 DEFAULT_PREFERENCE_sh3="-1"
diff --git a/packages/glibc/glibc_2.3.6.bb b/packages/glibc/glibc_2.3.6.bb
index 4519be9d03..898108c5d2 100644
--- a/packages/glibc/glibc_2.3.6.bb
+++ b/packages/glibc/glibc_2.3.6.bb
@@ -1,6 +1,6 @@
 require glibc.inc
 
-PR = "r0"
+PR = "r1"
 
 #FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.3.6', '${FILE_DIRNAME}/orig/glibc', '${FILE_DIRNAME}/orig/files', '${FILE_DIRNAME}/orig' ], d)}"
 
@@ -19,13 +19,16 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \
            ${CROSSTOOL_PATCH_URL}glibc-2.3.6-fix-pr631.patch;patch=1 \
            ${CROSSTOOL_PATCH_URL}glibc-fp-byteorder.patch;patch=1 \
            ${CROSSTOOL_PATCH_URL}glibc-mips-bootstrap-gcc-header-install.patch;patch=1 \
+           ${CROSSTOOL_PATCH_URL}arm-ctl_bus_isa.patch;patch=1 \
            ${CROSSTOOL_PATCH_URL}make-install-lib-all.patch;patch=1 \
            ${CROSSTOOL_PATCH_URL}maybe/glibc-2.3.6-allow-gcc-4.0-powerpc32.patch;patch=1 \
            file://glibc-2.3.6-bind-already-defined-on-powerpc.patch;patch=1 \
            file://glibc-2.3.6-allow-gcc-4.1-powerpc32-initfini.s.patch;patch=1 \
            file://glibc-2.3.6-linuxthreads-allow-gcc-4.1-powerpc32-initfini.s.patch;patch=1 \
-           file://late-install-loop-break.patch \
-	   \
+           file://late-install-loop-break.patch;patch=1 \
+           file://glibc-arm-socket-weakalias.patch;patch=1 \
+           file://glibc-2.3.6-linuxthreads-pthread-raise.patch;patch=1 \
+           file://glibc-cross_sunrpc.patch;patch=1 \
            file://etc/ld.so.conf \
 	   file://generate-supported.mk"
 
@@ -60,7 +63,7 @@ do_configure () {
 		exit 1
 	fi
 	(cd ${S} && gnu-configize) || die "failure in running gnu-configize"
-	CPPFLAGS="" oe_runconf
+	CPPFLAGS="" libc_cv_forced_unwind=yes libc_cv_c_cleanup=yes oe_runconf
 }
 
 rpcsvc = "bootparam_prot.x nlm_prot.x rstat.x \
diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb
index 1112486c50..873fc66c51 100644
--- a/packages/glibc/glibc_2.4.bb
+++ b/packages/glibc/glibc_2.4.bb
@@ -1,6 +1,6 @@
 require glibc.inc
 
-PR = "r16"
+PR = "r17"
 
 #add the hosts that are confirmed to be working to COMPATIBLE_HOSTi
 COMPATIBLE_HOST = '(i.86.*-linux|sh.*-linux)'
diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb
index 6df70076b8..6fa72ff1f6 100644
--- a/packages/glibc/glibc_2.5.bb
+++ b/packages/glibc/glibc_2.5.bb
@@ -1,5 +1,5 @@
 require glibc.inc
-PR = "r13"
+PR = "r14"
 
 ARM_INSTRUCTION_SET = "arm"
 
@@ -48,6 +48,7 @@ SRC_URI = "\
   file://glibc-check_pf.patch;patch=1;pnum=0 \
   file://zecke-sane-readelf.patch;patch=1 \
   file://ldd-unbash.patch;patch=1 \
+  file://glibc-2.6.1-use-short-for-fnstsw.patch;patch=1 \
   file://generic-bits_select.h \
   file://generic-bits_types.h \
   file://generic-bits_typesizes.h \
diff --git a/packages/glibc/glibc_2.6.1.bb b/packages/glibc/glibc_2.6.1.bb
index 8ee658c286..b2fe0f43a6 100644
--- a/packages/glibc/glibc_2.6.1.bb
+++ b/packages/glibc/glibc_2.6.1.bb
@@ -1,5 +1,5 @@
 require glibc.inc
-PR = "r7"
+PR = "r8"
 
 ARM_INSTRUCTION_SET = "arm"
 
@@ -56,6 +56,7 @@ SRC_URI = "\
   file://etc/ld.so.conf \
   file://generate-supported.mk \
   file://glibc-2.6.1-RTLD_SINGLE_THREAD_P-1.patch;patch=1 \
+  file://glibc-2.6.1-use-short-for-fnstsw.patch;patch=1 \
 "
 
 # Build fails on sh3 and sh4 without additional patches
diff --git a/packages/glibc/glibc_2.7.bb b/packages/glibc/glibc_2.7.bb
index 760883c4b6..f0170a03f5 100644
--- a/packages/glibc/glibc_2.7.bb
+++ b/packages/glibc/glibc_2.7.bb
@@ -5,14 +5,14 @@ ARM_INSTRUCTION_SET = "arm"
 PACKAGES_DYNAMIC = "libc6*"
 RPROVIDES_${PN}-dev = "libc6-dev"
 
-PR = "r3"
+PR = "r4"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
 TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
 
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4"
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
 GLIBC_ADDONS ?= "ports,nptl,libidn"
 
@@ -58,6 +58,8 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \
 #	   file://zecke-sane-readelf.patch;patch=1 \
            file://ldd-unbash.patch;patch=1 \
 	   file://glibc-arm-IO-acquire-lock-fix.diff;patch=1 \
+	   file://all_glibc-i586-chk.patch;patch=1 \
+	   file://glibc-2.6.1-use-short-for-fnstsw.patch;patch=1 \
 	   file://generic-bits_select.h \
 	   file://generic-bits_types.h \
 	   file://generic-bits_typesizes.h \
diff --git a/packages/glibc/glibc_cvs.bb b/packages/glibc/glibc_cvs.bb
index e5832e1f12..f5bb921b70 100644
--- a/packages/glibc/glibc_cvs.bb
+++ b/packages/glibc/glibc_cvs.bb
@@ -1,7 +1,7 @@
 require glibc.inc
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
-PR = "r8"
+PR = "r9"
 PV = "2.3.5+cvs${SRCDATE}"
 
 GLIBC_ADDONS ?= "ports,linuxthreads"
diff --git a/packages/gpe-login/gpe-login-0.86/chvt-keylaunch.patch b/packages/gpe-login/gpe-login-0.86/chvt-keylaunch.patch
deleted file mode 100644
index 5e62a1107e..0000000000
--- a/packages/gpe-login/gpe-login-0.86/chvt-keylaunch.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpe-login-0.86/gpe-login.keylaunchrc.orig	2006-05-28 20:38:39.846547024 +0200
-+++ gpe-login-0.86/gpe-login.keylaunchrc	2006-05-28 20:38:56.800969560 +0200
-@@ -1,3 +1,8 @@
- key=???XF86AudioRecord:xcalibrate:/usr/bin/gpe-xcalibrate.sh
- key=???XF86PowerDown:-:/usr/bin/apm --suspend
- key=???Held XF86PowerDown:-:bl toggle
-+
-+# VT changing
-+key=...*Left:-:~chvt 1
-+key=...*Right:-:~chvt 3
-+key=...*Escape:-:~/etc/init.d/gpe-dm stop
diff --git a/packages/gpe-login/gpe-login-0.87/chvt-keylaunch.patch b/packages/gpe-login/gpe-login-0.87/chvt-keylaunch.patch
deleted file mode 100644
index 798c059ccc..0000000000
--- a/packages/gpe-login/gpe-login-0.87/chvt-keylaunch.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- /tmp/gpe-login.keylaunchrc	2006-05-29 23:46:42.806081576 +0200
-+++ gpe-login-0.87/gpe-login.keylaunchrc	2006-05-29 23:48:18.476537456 +0200
-@@ -1,3 +1,9 @@
- key=????XF86AudioRecord:xcalibrate:/usr/bin/gpe-xcalibrate.sh
- key=????XF86PowerDown:-:/usr/bin/apm --suspend
- key=????Held XF86PowerDown:-:bl toggle
-+
-+# VT changing
-+key=...*Left:-:~chvt 1
-+key=...*Right:-:~chvt 3
-+key=...*Escape:-:~/etc/init.d/gpe-dm stop
-+
diff --git a/packages/gpe-login/gpe-login-0.88/chvt-keylaunch.patch b/packages/gpe-login/gpe-login-0.88/chvt-keylaunch.patch
deleted file mode 100644
index 798c059ccc..0000000000
--- a/packages/gpe-login/gpe-login-0.88/chvt-keylaunch.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- /tmp/gpe-login.keylaunchrc	2006-05-29 23:46:42.806081576 +0200
-+++ gpe-login-0.87/gpe-login.keylaunchrc	2006-05-29 23:48:18.476537456 +0200
-@@ -1,3 +1,9 @@
- key=????XF86AudioRecord:xcalibrate:/usr/bin/gpe-xcalibrate.sh
- key=????XF86PowerDown:-:/usr/bin/apm --suspend
- key=????Held XF86PowerDown:-:bl toggle
-+
-+# VT changing
-+key=...*Left:-:~chvt 1
-+key=...*Right:-:~chvt 3
-+key=...*Escape:-:~/etc/init.d/gpe-dm stop
-+
diff --git a/packages/gpe-login/gpe-login_0.87.bb b/packages/gpe-login/gpe-login_0.87.bb
deleted file mode 100644
index d75af4a3a0..0000000000
--- a/packages/gpe-login/gpe-login_0.87.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-LICENSE = "GPL"
-inherit gpe
-
-DESCRIPTION = "GPE user login screen"
-SECTION = "gpe"
-PRIORITY    = "optional"
-DEPENDS     = "gtk+ libgpewidget gpe-ownerinfo xkbd"
-RDEPENDS    = "xkbd"
-RPROVIDES_${PN}   = "gpe-session-starter"
-PR = "r3"
-
-SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
-
-SRC_URI += "file://removeblue-fontsize8.patch;patch=1"
-
-SRC_URI += " file://chvt-keylaunch.patch;patch=1 "
diff --git a/packages/gpe-login/gpe-login_0.88.bb b/packages/gpe-login/gpe-login_0.88.bb
deleted file mode 100644
index a1d4c0e7fa..0000000000
--- a/packages/gpe-login/gpe-login_0.88.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "GPE user login screen"
-SECTION = "gpe"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
-RDEPENDS = "xkbd"
-RPROVIDES_${PN} = "gpe-session-starter"
-PR = "r3"
-
-SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
-
-inherit gpe
-
-
-SRC_URI += "file://removeblue-fontsize8.patch;patch=1"
-SRC_URI += " file://chvt-keylaunch.patch;patch=1 "
-SRC_URI += " file://use-xtscal.patch;patch=1 "
-
-SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-SRC_URI_append_c7x0 = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-
diff --git a/packages/gpe-login/gpe-login_0.90.bb b/packages/gpe-login/gpe-login_0.90.bb
deleted file mode 100644
index c22d259a9f..0000000000
--- a/packages/gpe-login/gpe-login_0.90.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "GPE user login screen"
-SECTION = "gpe"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
-RDEPENDS = "xkbd gpe-theme-clearlooks"
-RPROVIDES_${PN} = "gpe-session-starter"
-PR = "r6"
-
-SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
-
-GPE_TARBALL_SUFFIX = "bz2"
-
-inherit gpe autotools pkgconfig
-
-
-SRC_URI += "file://removeblue-fontsize8.patch;patch=1"
-SRC_URI += " file://chvt-keylaunch.patch;patch=1 "
-SRC_URI += " file://lock-on-supend.patch;patch=1 "
-SRC_URI += " file://gpe-xcalibrate-rises-from-dead.patch;patch=1 "
-SRC_URI += " file://size-autolock-properly.patch;patch=1 "
-SRC_URI += " file://c-locale.patch;patch=1 "
-
-SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-SRC_URI_append_c7x0 = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-
diff --git a/packages/gpe-login/gpe-login_0.91.bb b/packages/gpe-login/gpe-login_0.91.bb
deleted file mode 100644
index 16d9e471d7..0000000000
--- a/packages/gpe-login/gpe-login_0.91.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "GPE user login screen"
-SECTION = "gpe"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
-RDEPENDS = "xkbd gpe-theme-clearlooks"
-RPROVIDES_${PN} = "gpe-session-starter"
-PR = "r0"
-
-SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
-
-GPE_TARBALL_SUFFIX = "bz2"
-
-inherit gpe autotools pkgconfig
-
-
-SRC_URI += "file://removeblue-fontsize8.patch;patch=1"
-SRC_URI += " file://chvt-keylaunch.patch;patch=1 "
-SRC_URI += " file://gpe-xcalibrate-rises-from-dead.patch;patch=1 "
-SRC_URI += " file://size-autolock-properly.patch;patch=1 "
-SRC_URI += " file://c-locale.patch;patch=1 "
-
-SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-SRC_URI_append_c7x0 = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-
diff --git a/packages/gpe-login/gpe-login_0.92.bb b/packages/gpe-login/gpe-login_0.92.bb
deleted file mode 100644
index ec168bfc93..0000000000
--- a/packages/gpe-login/gpe-login_0.92.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "GPE user login screen"
-SECTION = "gpe"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
-RDEPENDS = "xkbd gpe-theme-clearlooks"
-RPROVIDES_${PN} = "gpe-session-starter"
-PR = "r0"
-
-SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
-
-GPE_TARBALL_SUFFIX = "bz2"
-
-inherit gpe autotools pkgconfig
-
-
-SRC_URI += "file://removeblue-fontsize8.patch;patch=1"
-SRC_URI += " file://chvt-keylaunch.patch;patch=1 "
-SRC_URI += " file://c-locale.patch;patch=1 "
-
-SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-SRC_URI_append_c7x0 = "file://brightness-adjust-keyluanchrc.patch;patch=1"
-
diff --git a/packages/gpe-login/gpe-login_0.93.bb b/packages/gpe-login/gpe-login_0.93.bb
index ec168bfc93..4ea1cc235e 100644
--- a/packages/gpe-login/gpe-login_0.93.bb
+++ b/packages/gpe-login/gpe-login_0.93.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
 RDEPENDS = "xkbd gpe-theme-clearlooks"
 RPROVIDES_${PN} = "gpe-session-starter"
-PR = "r0"
+PR = "r1"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
 
@@ -22,3 +22,16 @@ SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1"
 SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1"
 SRC_URI_append_c7x0 = "file://brightness-adjust-keyluanchrc.patch;patch=1"
 
+
+CONFFILES_${PN} += " \
+${sysconfdir}/apm/suspend.d/S98lock-display \
+${sysconfdir}/gpe/gpe-login.conf \
+${sysconfdir}/gpe/locale.alias \
+${sysconfdir}/sysconfig/gpelogin \
+${sysconfdir}/X11/gpe-login.keylaunchrc \
+${sysconfdir}/X11/gpe-login.gtkrc \
+${sysconfdir}/X11/gpe-login.setup \
+${sysconfdir}/X11/gpe-login.pre-session \
+${sysconfdir}/X11/Xinit.d/99gpe-login \
+${sysconfdir}/X11/Xsession.d/50autolock \
+"
diff --git a/packages/gpe-login/gpe-login_svn.bb b/packages/gpe-login/gpe-login_svn.bb
index 9af539bad3..f02e095698 100644
--- a/packages/gpe-login/gpe-login_svn.bb
+++ b/packages/gpe-login/gpe-login_svn.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
 RDEPENDS = "xkbd"
 RPROVIDES_${PN} = "gpe-session-starter"
-PV = "0.90+svn${SRCDATE}"
+PV = "0.93+svn${SRCDATE}"
 
 inherit autotools
 
@@ -16,4 +16,18 @@ SRC_URI = "${GPE_SVN} \
 
 S = "${WORKDIR}/${PN}"
 
+CONFFILES_${PN} += " \
+${sysconfdir}/apm/suspend.d/S98lock-display \
+${sysconfdir}/gpe/gpe-login.conf \
+${sysconfdir}/gpe/locale.alias \
+${sysconfdir}/sysconfig/gpelogin \
+${sysconfdir}/X11/gpe-login.keylaunchrc \
+${sysconfdir}/X11/gpe-login.gtkrc \
+${sysconfdir}/X11/gpe-login.setup \
+${sysconfdir}/X11/gpe-login.pre-session \
+${sysconfdir}/X11/Xinit.d/99gpe-login \
+${sysconfdir}/X11/Xsession.d/50autolock \
+"
+
+
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/h2200-bootloader/h2200-bootloader.bb b/packages/h2200-bootloader/h2200-bootloader.bb
index dc7c2277a8..5db3cd058d 100644
--- a/packages/h2200-bootloader/h2200-bootloader.bb
+++ b/packages/h2200-bootloader/h2200-bootloader.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "Bootloader firmware extractor for the h2200 iPAQ"
+RRECOMMENDS_${PN} = "kernel-module-mtdblock"
 ALLOW_EMPTY = "1"
-PR="r2"
+PR = "r3"
 
 COMPATIBLE_MACHINE = "h2200"
 #it is a shell script, but lets protect the innocent some more
@@ -9,5 +10,6 @@ PACKAGE_ARCH = "h2200"
 pkg_postinst() {
 #!/bin/sh
 mkdir -p /lib/firmware
+modprobe mtdblock
 dd if=/dev/mtdblock0 of=/lib/firmware/h2200_bootloader.bin 2>/dev/null
 }
diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb
index 5d6b21647e..7ba86f901c 100644
--- a/packages/images/fso-image.bb
+++ b/packages/images/fso-image.bb
@@ -20,7 +20,7 @@ BASE_INSTALL = "\
 X_INSTALL = "\
   e-wm \
   illume \
-  illume-theme \
+  illume-theme-freesmartphone \
   ${XSERVER} \
   xserver-kdrive-common \
   xserver-nodm-init \
diff --git a/packages/initrdscripts/initramfs-kexec_1.0.bb b/packages/initrdscripts/initramfs-kexec_1.0.bb
index b14ebbe60c..6b0bb46de3 100644
--- a/packages/initrdscripts/initramfs-kexec_1.0.bb
+++ b/packages/initrdscripts/initramfs-kexec_1.0.bb
@@ -1,5 +1,5 @@
 DESCRIPTON = "A init script that mounts a device and kexecs a new kernel from it."
-PR = "r4"
+PR = "r5"
 
 do_compile() {
         cat > init.sh << EOF
@@ -21,5 +21,7 @@ PACKAGE_ARCH = "all"
 
 FILES_${PN} = "/init /proc /mnt"
 
-ROOTDEV = "mtd2"
-ROOTFS = "jffs2"
+ROOTDEV = "/dev/mmcblk0p1"
+ROOTFS = "ext2"
+#ROOTDEV = "mtd2"
+#ROOTFS = "jffs2"
diff --git a/packages/lcdproc/lcdproc5.inc b/packages/lcdproc/lcdproc5.inc
new file mode 100644
index 0000000000..de704bcad0
--- /dev/null
+++ b/packages/lcdproc/lcdproc5.inc
@@ -0,0 +1,115 @@
+DESCRIPTION = "LCDproc is a client/Server suite to drive all kinds of LCD (-like) devices. The client \
+shipped with this package can be used to acquire various kinds of system stats."
+HOMEPAGE = "http://lcdproc.org"
+SECTION = "utils"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "libusb ncurses"
+RRECOMMENDS_lcdproc = "lcdd"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/lcdproc/${P}.tar.gz"
+
+inherit autotools update-rc.d
+
+PACKAGES =+ "lcdd lcdd-driver-cfontz lcdd-driver-bayrad lcdd-driver-hd44780nousb \
+		lcdd-driver-hd44780 lcdd-driver-mtxorb lcdd-driver-serialvfd \
+		lcdd-driver-curses lcdd-driver-text \
+		lcdd-driver-sed lcdd-driver-cwlnx lcdd-driver-glk lcdd-driver-icp-a106 \
+		lcdd-driver-imon lcdd-driver-joy lcdd-driver-lb216 lcdd-driver-lcdm001 \
+		lcdd-driver-lcterm lcdd-driver-ms6931 lcdd-driver-mtc-s16209x \
+		lcdd-driver-noritakevfd lcdd-driver-pyramid lcdd-driver-sli \
+		lcdd-driver-stv5730 lcdd-driver-t6963 lcdd-driver-tyan"
+
+CONFFILES_lcdd = "${sysconfdir}/LCDd.conf"
+CONFFILES_lcdproc = "${sysconfdir}/lcdproc.conf"
+
+FILES_lcdd = "${CONFFILES_lcdd} \
+	${sbindir}/LCDd \
+	${sysconfdir}/init.d/lcdd"
+
+FILES_lcdproc = "${CONFFILES_lcdproc} \
+	${bindir}/lcdproc \
+	${sysconfdir}/init.d/lcdproc"
+
+# Driver packages
+
+FILES_lcdd-driver-cfontz 	= "${libdir}/lcdproc/CFontz*.so"
+FILES_lcdd-driver-bayrad 	= "${libdir}/lcdproc/bayrad.so"
+FILES_lcdd-driver-hd44780nousb 	= "${libdir}/lcdproc/hd44780nousb.so"
+FILES_lcdd-driver-hd44780 	= "${libdir}/lcdproc/hd44780.so"
+FILES_lcdd-driver-mtxorb 	= "${libdir}/lcdproc/MtxOrb.so"
+FILES_lcdd-driver-serialvfd 	= "${libdir}/lcdproc/serialVFD.so"
+FILES_lcdd-driver-curses 	= "${libdir}/lcdproc/curses.so"
+FILES_lcdd-driver-text 		= "${libdir}/lcdproc/text.so"
+FILES_lcdd-driver-sed 		= "${libdir}/lcdproc/sed*.so"
+FILES_lcdd-driver-cwlnx 	= "${libdir}/lcdproc/CwLnx.so"
+FILES_lcdd-driver-glk 		= "${libdir}/lcdproc/glk.so"
+FILES_lcdd-driver-icp-a106	= "${libdir}/lcdproc/icp_a106.so"
+FILES_lcdd-driver-imon		= "${libdir}/lcdproc/imon.so"
+FILES_lcdd-driver-joy		= "${libdir}/lcdproc/joy.so"
+FILES_lcdd-driver-lb216		= "${libdir}/lcdproc/lb216.so"
+FILES_lcdd-driver-lcdm001	= "${libdir}/lcdproc/lcdm001.so"
+FILES_lcdd-driver-lcterm	= "${libdir}/lcdproc/lcterm.so"
+FILES_lcdd-driver-ms6931	= "${libdir}/lcdproc/ms6931.so"
+FILES_lcdd-driver-mtc-s16209x	= "${libdir}/lcdproc/mtc_s16209x.so"
+FILES_lcdd-driver-noritakevfd	= "${libdir}/lcdproc/NoritakeVFD.so"
+FILES_lcdd-driver-pyramid	= "${libdir}/lcdproc/pyramid.so"
+FILES_lcdd-driver-sli		= "${libdir}/lcdproc/sli.so"
+FILES_lcdd-driver-stv5730	= "${libdir}/lcdproc/stv5730.so"
+FILES_lcdd-driver-t6963		= "${libdir}/lcdproc/t6963.so"
+FILES_lcdd-driver-tyan		= "${libdir}/lcdproc/tyan.so"
+
+
+# Install-all-drivers-hack:
+
+DEPENDS_lcdd-driver-all = "lcdd-driver-cfontz lcdd-driver-bayrad lcdd-driver-hd44780nousb \
+				lcdd-driver-hd44780 lcdd-driver-mtxorb lcdd-driver-serialvfd \
+				lcdd-driver-curses lcdd-driver-text \
+				lcdd-driver-sed lcdd-driver-cwlnx lcdd-driver-glk lcdd-driver-icp-a106 \
+				lcdd-driver-imon lcdd-driver-joy lcdd-driver-lb216 lcdd-driver-lcdm001 \
+				lcdd-driver-lcterm lcdd-driver-ms6931 lcdd-driver-mtc-s16209x \
+				lcdd-driver-noritakevfd lcdd-driver-pyramid lcdd-driver-sli \
+				lcdd-driver-stv5730 lcdd-driver-t6963 lcdd-driver-tyan"
+
+# USB / no USB trickery
+
+CONFLICTS_lcdd-driver-hd47780nousb = "lcdd-driver-hd44780"
+CONFLICTS_lcdd-driver-hd47780 = "lcdd-driver-hd44780nousb"
+
+INITSCRIPT_PACKAGES = "lcdd lcdproc"
+INITSCRIPT_NAME_lcdd = "lcdd"
+INITSCRIPT_NAME_lcdproc = "lcdproc"
+INITSCRIPT_PARAMS_lcdd = "defaults 70 21"
+INITSCRIPT_PARAMS_lcdproc = "defaults 71 20"
+
+EXTRA_OECONF = "--enable-drivers=all --enable-libusb"
+
+do_install () {
+	# binaries
+	install -D -m 0755 server/LCDd ${D}${sbindir}/LCDd
+	install -D -m 0755 clients/lcdproc/lcdproc ${D}${bindir}/lcdproc
+
+	# init scripts
+	install -d ${D}${sysconfdir}/init.d
+	# so far, not fixed :-( and now even uglier :-((
+	cat scripts/init-LCDd.debian | sed -e s'/--oknodo//' -e 's/ -s -f / -s 1 -f 1 /' -e 's/force-reload/force-restart/' -e 's/sleep 1/sleep 4/' > ${D}${sysconfdir}/init.d/lcdd
+	chmod 0755 ${D}${sysconfdir}/init.d/lcdd
+	# prevent lcdproc from starting if no SCREENS are set.
+	# will be fixed in next upstream release
+	cat scripts/init-lcdproc.debian | sed -e 's/C X//' | sed -e 's/case/[ -n "$SCREENS" ] || exit 0\n\ncase/' | sed -e s'/--oknodo//' > ${D}${sysconfdir}/init.d/lcdproc
+	chmod 0755 ${D}${sysconfdir}/init.d/lcdproc
+
+	# configuration files
+	install -D -m 0644 LCDd.conf ${D}${sysconfdir}/LCDd.conf
+	# don't start lcdproc by default
+	# will be fixed in next upstream release
+	cat scripts/lcdproc.conf | sed -e 's/C X//' > ${D}${sysconfdir}/lcdproc.conf
+	chmod 0644 ${D}${sysconfdir}/lcdproc.conf
+
+	# driver library files
+	install -d ${D}${libdir}/lcdproc
+	for i in server/drivers/*.so; do
+		install -m 0644 $i ${D}${libdir}/lcdproc/
+	done
+}
+
diff --git a/packages/lcdproc/lcdproc_0.5.0.bb b/packages/lcdproc/lcdproc_0.5.0.bb
index 5f95c85bf8..0c6cf669c0 100644
--- a/packages/lcdproc/lcdproc_0.5.0.bb
+++ b/packages/lcdproc/lcdproc_0.5.0.bb
@@ -1,117 +1 @@
-DESCRIPTION = "LCDproc is a client/Server suite to drive all kinds of LCD (-like) devices. The client \
-shipped with this package can be used to acquire various kinds of system stats."
-HOMEPAGE = "http://lcdproc.org"
-LICENSE = "GPL"
-PRIORITY = "optional"
-SECTION = "utils"
-PR="r2"
-
-DEPENDS = "libusb ncurses"
-RRECOMMENDS_lcdproc = "lcdd"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/lcdproc/${P}.tar.gz"
-
-inherit autotools update-rc.d
-
-PACKAGES =+ "lcdd lcdd-driver-cfontz lcdd-driver-bayrad lcdd-driver-hd44780nousb \
-		lcdd-driver-hd44780 lcdd-driver-mtxorb lcdd-driver-serialvfd \
-		lcdd-driver-curses lcdd-driver-text \
-		lcdd-driver-sed lcdd-driver-cwlnx lcdd-driver-glk lcdd-driver-icp-a106 \
-		lcdd-driver-imon lcdd-driver-joy lcdd-driver-lb216 lcdd-driver-lcdm001 \
-		lcdd-driver-lcterm lcdd-driver-ms6931 lcdd-driver-mtc-s16209x \
-		lcdd-driver-noritakevfd lcdd-driver-pyramid lcdd-driver-sli \
-		lcdd-driver-stv5730 lcdd-driver-t6963 lcdd-driver-tyan"
-
-CONFFILES_lcdd = "${sysconfdir}/LCDd.conf"
-CONFFILES_lcdproc = "${sysconfdir}/lcdproc.conf"
-
-FILES_lcdd = "${CONFFILES_lcdd} \
-	${sbindir}/LCDd \
-	${sysconfdir}/init.d/lcdd"
-
-FILES_lcdproc = "${CONFFILES_lcdproc} \
-	${bindir}/lcdproc \
-	${sysconfdir}/init.d/lcdproc"
-
-# Driver packages
-
-FILES_lcdd-driver-cfontz 	= "${libdir}/lcdproc/CFontz*.so"
-FILES_lcdd-driver-bayrad 	= "${libdir}/lcdproc/bayrad.so"
-FILES_lcdd-driver-hd44780nousb 	= "${libdir}/lcdproc/hd44780nousb.so"
-FILES_lcdd-driver-hd44780 	= "${libdir}/lcdproc/hd44780.so"
-FILES_lcdd-driver-mtxorb 	= "${libdir}/lcdproc/MtxOrb.so"
-FILES_lcdd-driver-serialvfd 	= "${libdir}/lcdproc/serialVFD.so"
-FILES_lcdd-driver-curses 	= "${libdir}/lcdproc/curses.so"
-FILES_lcdd-driver-text 		= "${libdir}/lcdproc/text.so"
-FILES_lcdd-driver-sed 		= "${libdir}/lcdproc/sed*.so"
-FILES_lcdd-driver-cwlnx 	= "${libdir}/lcdproc/CwLnx.so"
-FILES_lcdd-driver-glk 		= "${libdir}/lcdproc/glk.so"
-FILES_lcdd-driver-icp-a106	= "${libdir}/lcdproc/icp_a106.so"
-FILES_lcdd-driver-imon		= "${libdir}/lcdproc/imon.so"
-FILES_lcdd-driver-joy		= "${libdir}/lcdproc/joy.so"
-FILES_lcdd-driver-lb216		= "${libdir}/lcdproc/lb216.so"
-FILES_lcdd-driver-lcdm001	= "${libdir}/lcdproc/lcdm001.so"
-FILES_lcdd-driver-lcterm	= "${libdir}/lcdproc/lcterm.so"
-FILES_lcdd-driver-ms6931	= "${libdir}/lcdproc/ms6931.so"
-FILES_lcdd-driver-mtc-s16209x	= "${libdir}/lcdproc/mtc_s16209x.so"
-FILES_lcdd-driver-noritakevfd	= "${libdir}/lcdproc/NoritakeVFD.so"
-FILES_lcdd-driver-pyramid	= "${libdir}/lcdproc/pyramid.so"
-FILES_lcdd-driver-sli		= "${libdir}/lcdproc/sli.so"
-FILES_lcdd-driver-stv5730	= "${libdir}/lcdproc/stv5730.so"
-FILES_lcdd-driver-t6963		= "${libdir}/lcdproc/t6963.so"
-FILES_lcdd-driver-tyan		= "${libdir}/lcdproc/tyan.so"
-
-
-# Install-all-drivers-hack:
-
-DEPENDS_lcdd-driver-all = "lcdd-driver-cfontz lcdd-driver-bayrad lcdd-driver-hd44780nousb \
-				lcdd-driver-hd44780 lcdd-driver-mtxorb lcdd-driver-serialvfd \
-				lcdd-driver-curses lcdd-driver-text \
-				lcdd-driver-sed lcdd-driver-cwlnx lcdd-driver-glk lcdd-driver-icp-a106 \
-				lcdd-driver-imon lcdd-driver-joy lcdd-driver-lb216 lcdd-driver-lcdm001 \
-				lcdd-driver-lcterm lcdd-driver-ms6931 lcdd-driver-mtc-s16209x \
-				lcdd-driver-noritakevfd lcdd-driver-pyramid lcdd-driver-sli \
-				lcdd-driver-stv5730 lcdd-driver-t6963 lcdd-driver-tyan"
-
-# USB / no USB trickery
-
-CONFLICTS_lcdd-driver-hd47780nousb = "lcdd-driver-hd44780"
-CONFLICTS_lcdd-driver-hd47780 = "lcdd-driver-hd44780nousb"
-
-INITSCRIPT_PACKAGES = "lcdd lcdproc"
-INITSCRIPT_NAME_lcdd = "lcdd"
-INITSCRIPT_NAME_lcdproc = "lcdproc"
-INITSCRIPT_PARAMS_lcdd = "defaults 70 21"
-INITSCRIPT_PARAMS_lcdproc = "defaults 71 20"
-
-EXTRA_OECONF = "--enable-drivers=all --enable-libusb"
-
-do_install () {
-	# binaries
-	install -D -m 0755 server/LCDd ${D}${sbindir}/LCDd
-	install -D -m 0755 clients/lcdproc/lcdproc ${D}${bindir}/lcdproc
-
-	# init scripts
-	install -d ${D}${sysconfdir}/init.d
-	# so far, not fixed :-( and now even uglier :-((
-	cat scripts/init-LCDd.debian | sed -e s'/--oknodo//' -e 's/ -s -f / -s 1 -f 1 /' -e 's/force-reload/force-restart/' -e 's/sleep 1/sleep 4/' > ${D}${sysconfdir}/init.d/lcdd
-	chmod 0755 ${D}${sysconfdir}/init.d/lcdd
-	# prevent lcdproc from starting if no SCREENS are set.
-	# will be fixed in next upstream release
-	cat scripts/init-lcdproc.debian | sed -e 's/C X//' | sed -e 's/case/[ -n "$SCREENS" ] || exit 0\n\ncase/' | sed -e s'/--oknodo//' > ${D}${sysconfdir}/init.d/lcdproc
-	chmod 0755 ${D}${sysconfdir}/init.d/lcdproc
-
-	# configuration files
-	install -D -m 0644 LCDd.conf ${D}${sysconfdir}/LCDd.conf
-	# don't start lcdproc by default
-	# will be fixed in next upstream release
-	cat scripts/lcdproc.conf | sed -e 's/C X//' > ${D}${sysconfdir}/lcdproc.conf
-	chmod 0644 ${D}${sysconfdir}/lcdproc.conf
-
-	# driver library files
-	install -d ${D}${libdir}/lcdproc
-	for i in server/drivers/*.so; do
-		install -m 0644 $i ${D}${libdir}/lcdproc/
-	done
-}
-
+require lcdproc5.inc
\ No newline at end of file
diff --git a/packages/lcdproc/lcdproc_0.5.1.bb b/packages/lcdproc/lcdproc_0.5.1.bb
index aa1b26e544..dafcbba170 100644
--- a/packages/lcdproc/lcdproc_0.5.1.bb
+++ b/packages/lcdproc/lcdproc_0.5.1.bb
@@ -1,124 +1,19 @@
-DESCRIPTION = "LCDproc is a client/Server suite to drive all kinds of LCD (-like) devices. The client \
-shipped with this package can be used to acquire various kinds of system stats."
-HOMEPAGE = "http://lcdproc.org"
-LICENSE = "GPL"
-PRIORITY = "optional"
-SECTION = "utils"
-PR="r2"
+require lcdproc5.inc
 
-DEPENDS = "libusb ncurses libg15 g15daemon libg15render"
-RRECOMMENDS_lcdproc = "lcdd"
+DEPENDS += "libg15 g15daemon libg15render"
+DEPENDS_lcdd-driver-all += "lcdd-driver-g15"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/lcdproc/${P}.tar.gz"
+PR = "r3"
 
-inherit autotools update-rc.d
-
-PACKAGES =+ "lcdd lcdvc lcdd-driver-cfontz lcdd-driver-bayrad lcdd-driver-hd44780nousb \
-		lcdd-driver-hd44780 lcdd-driver-mtxorb lcdd-driver-serialvfd \
-		lcdd-driver-curses lcdd-driver-text \
-		lcdd-driver-sed lcdd-driver-cwlnx lcdd-driver-glk lcdd-driver-icp-a106 \
-		lcdd-driver-imon lcdd-driver-joy lcdd-driver-lb216 lcdd-driver-lcdm001 \
-		lcdd-driver-lcterm lcdd-driver-ms6931 lcdd-driver-mtc-s16209x \
-		lcdd-driver-noritakevfd lcdd-driver-pyramid lcdd-driver-sli \
-		lcdd-driver-stv5730 lcdd-driver-t6963 lcdd-driver-tyan lcdd-driver-g15"
-
-CONFFILES_lcdd = "${sysconfdir}/LCDd.conf"
-CONFFILES_lcdproc = "${sysconfdir}/lcdproc.conf"
-CONFFILES_lcdvc = "${sysconfdir}/lcdvc.conf"
-
-FILES_lcdd = "${CONFFILES_lcdd} \
-	${sbindir}/LCDd \
-	${sysconfdir}/init.d/lcdd"
-
-FILES_lcdproc = "${CONFFILES_lcdproc} \
-	${bindir}/lcdproc \
-	${sysconfdir}/init.d/lcdproc"
-
-FILES_lcdvc = "${CONFFILES_lcdvc} \
-	${sbindir}/lcdvc"
-
-# Driver packages
-
-FILES_lcdd-driver-cfontz 	= "${libdir}/lcdproc/CFontz*.so"
-FILES_lcdd-driver-bayrad 	= "${libdir}/lcdproc/bayrad.so"
-FILES_lcdd-driver-hd44780nousb 	= "${libdir}/lcdproc/hd44780nousb.so"
-FILES_lcdd-driver-hd44780 	= "${libdir}/lcdproc/hd44780.so"
-FILES_lcdd-driver-mtxorb 	= "${libdir}/lcdproc/MtxOrb.so"
-FILES_lcdd-driver-serialvfd 	= "${libdir}/lcdproc/serialVFD.so"
-FILES_lcdd-driver-curses 	= "${libdir}/lcdproc/curses.so"
-FILES_lcdd-driver-text 		= "${libdir}/lcdproc/text.so"
-FILES_lcdd-driver-sed 		= "${libdir}/lcdproc/sed*.so"
-FILES_lcdd-driver-cwlnx 	= "${libdir}/lcdproc/CwLnx.so"
-FILES_lcdd-driver-glk 		= "${libdir}/lcdproc/glk.so"
-FILES_lcdd-driver-icp-a106	= "${libdir}/lcdproc/icp_a106.so"
-FILES_lcdd-driver-imon		= "${libdir}/lcdproc/imon.so"
-FILES_lcdd-driver-joy		= "${libdir}/lcdproc/joy.so"
-FILES_lcdd-driver-lb216		= "${libdir}/lcdproc/lb216.so"
-FILES_lcdd-driver-lcdm001	= "${libdir}/lcdproc/lcdm001.so"
-FILES_lcdd-driver-lcterm	= "${libdir}/lcdproc/lcterm.so"
-FILES_lcdd-driver-ms6931	= "${libdir}/lcdproc/ms6931.so"
-FILES_lcdd-driver-mtc-s16209x	= "${libdir}/lcdproc/mtc_s16209x.so"
-FILES_lcdd-driver-noritakevfd	= "${libdir}/lcdproc/NoritakeVFD.so"
-FILES_lcdd-driver-pyramid	= "${libdir}/lcdproc/pyramid.so"
-FILES_lcdd-driver-sli		= "${libdir}/lcdproc/sli.so"
-FILES_lcdd-driver-stv5730	= "${libdir}/lcdproc/stv5730.so"
-FILES_lcdd-driver-t6963		= "${libdir}/lcdproc/t6963.so"
-FILES_lcdd-driver-tyan		= "${libdir}/lcdproc/tyan.so"
-FILES_lcdd-driver-g15		= "${libdir}/lcdproc/g15.so"
-
-
-# Install-all-drivers-hack:
-
-DEPENDS_lcdd-driver-all = "lcdd-driver-cfontz lcdd-driver-bayrad lcdd-driver-hd44780nousb \
-				lcdd-driver-hd44780 lcdd-driver-mtxorb lcdd-driver-serialvfd \
-				lcdd-driver-curses lcdd-driver-text \
-				lcdd-driver-sed lcdd-driver-cwlnx lcdd-driver-glk lcdd-driver-icp-a106 \
-				lcdd-driver-imon lcdd-driver-joy lcdd-driver-lb216 lcdd-driver-lcdm001 \
-				lcdd-driver-lcterm lcdd-driver-ms6931 lcdd-driver-mtc-s16209x \
-				lcdd-driver-noritakevfd lcdd-driver-pyramid lcdd-driver-sli \
-				lcdd-driver-stv5730 lcdd-driver-t6963 lcdd-driver-tyan lcdd-driver-g15"
-
-# USB / no USB trickery
-
-CONFLICTS_lcdd-driver-hd47780nousb = "lcdd-driver-hd44780"
-CONFLICTS_lcdd-driver-hd47780 = "lcdd-driver-hd44780nousb"
-
-INITSCRIPT_PACKAGES = "lcdd lcdproc"
-INITSCRIPT_NAME_lcdd = "lcdd"
-INITSCRIPT_NAME_lcdproc = "lcdproc"
-INITSCRIPT_PARAMS_lcdd = "defaults 70 21"
-INITSCRIPT_PARAMS_lcdproc = "defaults 71 20"
-
-EXTRA_OECONF = "--enable-drivers=all --enable-libusb"
-
-do_install () {
+do_install_append () {
 	# binaries
-	install -D -m 0755 server/LCDd ${D}${sbindir}/LCDd
-	install -D -m 0755 clients/lcdproc/lcdproc ${D}${bindir}/lcdproc
 	install -D -m 0755 clients/lcdvc/lcdvc ${D}${sbindir}/lcdvc
 
-	# init scripts
-	install -d ${D}${sysconfdir}/init.d
-	# so far, not fixed :-( and now even uglier :-((
-	cat scripts/init-LCDd.debian | sed -e s'/--oknodo//' -e 's/ -s -f / -s 1 -f 1 /' -e 's/force-reload/force-restart/' -e 's/sleep 1/sleep 4/' > ${D}${sysconfdir}/init.d/lcdd
-	chmod 0755 ${D}${sysconfdir}/init.d/lcdd
-	# prevent lcdproc from starting if no SCREENS are set.
-	# will be fixed in next upstream release
-	cat scripts/init-lcdproc.debian | sed -e 's/C X//' | sed -e 's/case/[ -n "$SCREENS" ] || exit 0\n\ncase/' | sed -e s'/--oknodo//' > ${D}${sysconfdir}/init.d/lcdproc
-	chmod 0755 ${D}${sysconfdir}/init.d/lcdproc
-
 	# configuration files
-	install -D -m 0644 LCDd.conf ${D}${sysconfdir}/LCDd.conf
 	install -D -m 0644 clients/lcdvc/lcdvc.conf ${D}${sysconfdir}/lcdvc.conf
-	# don't start lcdproc by default
-	# will be fixed in next upstream release
-	cat scripts/lcdproc.conf | sed -e 's/C X//' > ${D}${sysconfdir}/lcdproc.conf
-	chmod 0644 ${D}${sysconfdir}/lcdproc.conf
-
-	# driver library files
-	install -d ${D}${libdir}/lcdproc
-	for i in server/drivers/*.so; do
-		install -m 0644 $i ${D}${libdir}/lcdproc/
-	done
 }
 
+PACKAGES =+ "lcdvc lcdd-driver-g15"
+CONFFILES_lcdvc = "${sysconfdir}/lcdvc.conf"
+FILES_lcdvc = "${CONFFILES_lcdvc} ${sbindir}/lcdvc"
+FILES_lcdd-driver-g15 = "${libdir}/lcdproc/g15.so"
diff --git a/packages/libgpewidget/libgpewidget-hildon_0.102.bb b/packages/libgpewidget/libgpewidget-hildon_0.102.bb
index 854d0ea6da..a7d663985e 100644
--- a/packages/libgpewidget/libgpewidget-hildon_0.102.bb
+++ b/packages/libgpewidget/libgpewidget-hildon_0.102.bb
@@ -4,17 +4,14 @@ DESCRIPTION = "libgpewidget contains a collection of widgets and other common co
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "gtk+ libxrender gtk-doc intltool-native sdk-default-icons"
-RDEPENDS    = "sdk-default-icons"
 PROVIDES    = "libgpewidget"
-RPROVIDES   = "libgpewidget"
-
-SRC_URI     = "${GPE_MIRROR}/libgpewidget-${PV}.tar.bz2"
-
-S = "${WORKDIR}/libgpewidget-${PV}"
 
 DEFAULT_PREFERENCE = "-1"
 
-inherit pkgconfig autotools
+inherit autotools pkgconfig
+
+SRC_URI     = "${GPE_MIRROR}/libgpewidget-${PV}.tar.bz2"
+S = "${WORKDIR}/libgpewidget-${PV}"
 
 EXTRA_OECONF = "--enable-hildon"
 
@@ -23,3 +20,5 @@ do_stage () {
 	autotools_stage_includes
 }
 
+RDEPENDS = "sdk-default-icons"
+RPROVIDES = "libgpewidget"
diff --git a/packages/libgpewidget/libgpewidget_0.114.bb b/packages/libgpewidget/libgpewidget_0.114.bb
index d79beeb417..39a85c52e6 100644
--- a/packages/libgpewidget/libgpewidget_0.114.bb
+++ b/packages/libgpewidget/libgpewidget_0.114.bb
@@ -1,18 +1,16 @@
-LICENSE     = "LGPL"
 DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
 SECTION = "gpe/libs"
-PRIORITY    = "optional"
-DEPENDS     = "gtk+ cairo libxrender gtk-doc"
-PR          = "r1"
+LICENSE = "LGPL"
+PRIORITY = "optional"
+DEPENDS = "gtk+ cairo libxrender gtk-doc"
+PR = "r2"
 
 GPE_TARBALL_SUFFIX = "bz2"
+
 inherit gpe pkgconfig autotools
 
 SRC_URI += "file://pkgconfig.patch;patch=1;pnum=0"
 
-PACKAGES =+ "libgpewidget-bin"
-FILES_libgpewidget-bin = "${bindir}/*"
-
 EXTRA_OECONF = "--enable-cairo"
 
 LDFLAGS += " -L${STAGING_LIBDIR}"
@@ -20,3 +18,7 @@ LDFLAGS += " -L${STAGING_LIBDIR}"
 do_stage () {
 	autotools_stage_all
 }
+
+PACKAGES =+ "libgpewidget-bin"
+FILES_libgpewidget-bin = "${bindir}/*"
+RRECOMMENDS_${PN} = "gpe-icons"
diff --git a/packages/libgpewidget/libgpewidget_0.115.bb b/packages/libgpewidget/libgpewidget_0.115.bb
index 9ea3009404..2aa529f723 100644
--- a/packages/libgpewidget/libgpewidget_0.115.bb
+++ b/packages/libgpewidget/libgpewidget_0.115.bb
@@ -1,18 +1,15 @@
-LICENSE     = "LGPL"
 DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
+LICENSE = "LGPL"
 SECTION = "gpe/libs"
-PRIORITY    = "optional"
-DEPENDS     = "gtk+ cairo libxinerama libxrender gtk-doc"
-PR          = "r1"
+DEPENDS = "gtk+ cairo libxinerama libxrender gtk-doc"
+PR = "r2"
 
 GPE_TARBALL_SUFFIX = "bz2"
+
 inherit gpe pkgconfig autotools
 
 SRC_URI += "file://pkgconfig.patch;patch=1;pnum=0"
 
-PACKAGES =+ "libgpewidget-bin"
-FILES_libgpewidget-bin = "${bindir}/*"
-
 EXTRA_OECONF = "--enable-cairo"
 
 LDFLAGS += " -L${STAGING_LIBDIR}"
@@ -20,3 +17,7 @@ LDFLAGS += " -L${STAGING_LIBDIR}"
 do_stage () {
 	autotools_stage_all
 }
+
+PACKAGES =+ "libgpewidget-bin"
+FILES_libgpewidget-bin = "${bindir}/*"
+RRECOMMENDS = "gpe-icons"
diff --git a/packages/libgpewidget/libgpewidget_svn.bb b/packages/libgpewidget/libgpewidget_svn.bb
index 8b6d0ea584..324173752d 100644
--- a/packages/libgpewidget/libgpewidget_svn.bb
+++ b/packages/libgpewidget/libgpewidget_svn.bb
@@ -3,18 +3,20 @@ SECTION = "gpe/libs"
 LICENSE = "LGPL"
 PRIORITY = "optional"
 DEPENDS = "gtk+ cairo libxrender gtk-doc"
+PV = "0.114+svn${SRCDATE}"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
-S = "${WORKDIR}/${PN}"
-PV = "0.114+svn${SRCDATE}"
-
 inherit gpe autotools pkgconfig
 
 SRC_URI = "${GPE_SVN}"
+S = "${WORKDIR}/${PN}"
 
 EXTRA_OECONF = "--enable-cairo"
 
 do_stage () {
 	autotools_stage_all
 }
+
+RRECOMMENDS_${PN} = "gpe-icons"
diff --git a/packages/libsdl/libsdl-image-1.2.3/.mtn2git_empty b/packages/libsdl/libsdl-image-1.2.3/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libsdl/libsdl-image-1.2.3/.mtn2git_empty
diff --git a/packages/libsdl/libsdl-image-1.2.3/autotools.patch b/packages/libsdl/libsdl-image-1.2.3/autotools.patch
new file mode 100644
index 0000000000..c93a1dd9c3
--- /dev/null
+++ b/packages/libsdl/libsdl-image-1.2.3/autotools.patch
@@ -0,0 +1,805 @@
+Index: SDL_image-1.2.3/acinclude.m4
+===================================================================
+--- SDL_image-1.2.3.orig/acinclude.m4	2001-11-02 21:39:10.000000000 +0100
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,608 +0,0 @@
+-# Configure paths for SDL
+-# Sam Lantinga 9/21/99
+-# stolen from Manish Singh
+-# stolen back from Frank Belew
+-# stolen from Manish Singh
+-# Shamelessly stolen from Owen Taylor
+-
+-dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+-dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
+-dnl
+-AC_DEFUN(AM_PATH_SDL,
+-[dnl 
+-dnl Get the cflags and libraries from the sdl-config script
+-dnl
+-AC_ARG_WITH(sdl-prefix,[  --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)],
+-            sdl_prefix="$withval", sdl_prefix="")
+-AC_ARG_WITH(sdl-exec-prefix,[  --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
+-            sdl_exec_prefix="$withval", sdl_exec_prefix="")
+-AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
+-		    , enable_sdltest=yes)
+-
+-  if test x$sdl_exec_prefix != x ; then
+-     sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
+-     if test x${SDL_CONFIG+set} != xset ; then
+-        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
+-     fi
+-  fi
+-  if test x$sdl_prefix != x ; then
+-     sdl_args="$sdl_args --prefix=$sdl_prefix"
+-     if test x${SDL_CONFIG+set} != xset ; then
+-        SDL_CONFIG=$sdl_prefix/bin/sdl-config
+-     fi
+-  fi
+-
+-  AC_REQUIRE([AC_CANONICAL_TARGET])
+-  AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
+-  min_sdl_version=ifelse([$1], ,0.11.0,$1)
+-  AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
+-  no_sdl=""
+-  if test "$SDL_CONFIG" = "no" ; then
+-    no_sdl=yes
+-  else
+-    SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
+-    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
+-
+-    sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+-    sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+-    sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+-    if test "x$enable_sdltest" = "xyes" ; then
+-      ac_save_CFLAGS="$CFLAGS"
+-      ac_save_LIBS="$LIBS"
+-      CFLAGS="$CFLAGS $SDL_CFLAGS"
+-      LIBS="$LIBS $SDL_LIBS"
+-dnl
+-dnl Now check if the installed SDL is sufficiently new. (Also sanity
+-dnl checks the results of sdl-config to some extent
+-dnl
+-      rm -f conf.sdltest
+-      AC_TRY_RUN([
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include "SDL.h"
+-
+-char*
+-my_strdup (char *str)
+-{
+-  char *new_str;
+-  
+-  if (str)
+-    {
+-      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
+-      strcpy (new_str, str);
+-    }
+-  else
+-    new_str = NULL;
+-  
+-  return new_str;
+-}
+-
+-int main (int argc, char *argv[])
+-{
+-  int major, minor, micro;
+-  char *tmp_version;
+-
+-  /* This hangs on some systems (?)
+-  system ("touch conf.sdltest");
+-  */
+-  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
+-
+-  /* HP/UX 9 (%@#!) writes to sscanf strings */
+-  tmp_version = my_strdup("$min_sdl_version");
+-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+-     printf("%s, bad version string\n", "$min_sdl_version");
+-     exit(1);
+-   }
+-
+-   if (($sdl_major_version > major) ||
+-      (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
+-      (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
+-    {
+-      return 0;
+-    }
+-  else
+-    {
+-      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
+-      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
+-      printf("*** best to upgrade to the required version.\n");
+-      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
+-      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
+-      printf("*** config.cache before re-running configure\n");
+-      return 1;
+-    }
+-}
+-
+-],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+-       CFLAGS="$ac_save_CFLAGS"
+-       LIBS="$ac_save_LIBS"
+-     fi
+-  fi
+-  if test "x$no_sdl" = x ; then
+-     AC_MSG_RESULT(yes)
+-     ifelse([$2], , :, [$2])     
+-  else
+-     AC_MSG_RESULT(no)
+-     if test "$SDL_CONFIG" = "no" ; then
+-       echo "*** The sdl-config script installed by SDL could not be found"
+-       echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
+-       echo "*** your path, or set the SDL_CONFIG environment variable to the"
+-       echo "*** full path to sdl-config."
+-     else
+-       if test -f conf.sdltest ; then
+-        :
+-       else
+-          echo "*** Could not run SDL test program, checking why..."
+-          CFLAGS="$CFLAGS $SDL_CFLAGS"
+-          LIBS="$LIBS $SDL_LIBS"
+-          AC_TRY_LINK([
+-#include <stdio.h>
+-#include "SDL.h"
+-
+-int main(int argc, char *argv[])
+-{ return 0; }
+-#undef  main
+-#define main K_and_R_C_main
+-],      [ return 0; ],
+-        [ echo "*** The test program compiled, but did not run. This usually means"
+-          echo "*** that the run-time linker is not finding SDL or finding the wrong"
+-          echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
+-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+-          echo "*** is required on your system"
+-	  echo "***"
+-          echo "*** If you have an old version installed, it is best to remove it, although"
+-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+-          echo "*** exact error that occured. This usually means SDL was incorrectly installed"
+-          echo "*** or that you have moved SDL since it was installed. In the latter case, you"
+-          echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
+-          CFLAGS="$ac_save_CFLAGS"
+-          LIBS="$ac_save_LIBS"
+-       fi
+-     fi
+-     SDL_CFLAGS=""
+-     SDL_LIBS=""
+-     ifelse([$3], , :, [$3])
+-  fi
+-  AC_SUBST(SDL_CFLAGS)
+-  AC_SUBST(SDL_LIBS)
+-  rm -f conf.sdltest
+-])
+-## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*-
+-## Copyright (C) 1996-1999, 2000 Free Software Foundation, Inc.
+-## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+-##
+-## This program is free software; you can redistribute it and/or modify
+-## it under the terms of the GNU General Public License as published by
+-## the Free Software Foundation; either version 2 of the License, or
+-## (at your option) any later version.
+-##
+-## This program is distributed in the hope that it will be useful, but
+-## WITHOUT ANY WARRANTY; without even the implied warranty of
+-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-## General Public License for more details.
+-##
+-## You should have received a copy of the GNU General Public License
+-## along with this program; if not, write to the Free Software
+-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-##
+-## As a special exception to the GNU General Public License, if you
+-## distribute this file as part of a program that contains a
+-## configuration script generated by Autoconf, you may include it under
+-## the same distribution terms that you use for the rest of that program.
+-
+-# serial 40 AC_PROG_LIBTOOL
+-AC_DEFUN(AC_PROG_LIBTOOL,
+-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+-
+-# Save cache, so that ltconfig can load it
+-AC_CACHE_SAVE
+-
+-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
+-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+-LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+-DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
+-|| AC_MSG_ERROR([libtool configure failed])
+-
+-# Reload cache, that may have been modified by ltconfig
+-AC_CACHE_LOAD
+-
+-# This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+-
+-# Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+-AC_SUBST(LIBTOOL)dnl
+-
+-# Redirect the config.log output again, so that the ltconfig log is not
+-# clobbered by the next message.
+-exec 5>>./config.log
+-])
+-
+-AC_DEFUN(AC_LIBTOOL_SETUP,
+-[AC_PREREQ(2.13)dnl
+-AC_REQUIRE([AC_ENABLE_SHARED])dnl
+-AC_REQUIRE([AC_ENABLE_STATIC])dnl
+-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+-AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+-AC_REQUIRE([AC_PROG_RANLIB])dnl
+-AC_REQUIRE([AC_PROG_CC])dnl
+-AC_REQUIRE([AC_PROG_LD])dnl
+-AC_REQUIRE([AC_PROG_NM])dnl
+-AC_REQUIRE([AC_PROG_LN_S])dnl
+-dnl
+-
+-case "$target" in
+-NONE) lt_target="$host" ;;
+-*) lt_target="$target" ;;
+-esac
+-
+-# Check for any special flags to pass to ltconfig.
+-libtool_flags="--cache-file=$cache_file"
+-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
+-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
+-test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
+-test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+-ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
+-[libtool_flags="$libtool_flags --enable-dlopen"])
+-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+-[libtool_flags="$libtool_flags --enable-win32-dll"])
+-AC_ARG_ENABLE(libtool-lock,
+-  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
+-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
+-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
+-
+-# Some flags need to be propagated to the compiler or linker for good
+-# libtool support.
+-case "$lt_target" in
+-*-*-irix6*)
+-  # Find out which ABI we are using.
+-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+-  if AC_TRY_EVAL(ac_compile); then
+-    case "`/usr/bin/file conftest.o`" in
+-    *32-bit*)
+-      LD="${LD-ld} -32"
+-      ;;
+-    *N32*)
+-      LD="${LD-ld} -n32"
+-      ;;
+-    *64-bit*)
+-      LD="${LD-ld} -64"
+-      ;;
+-    esac
+-  fi
+-  rm -rf conftest*
+-  ;;
+-
+-*-*-sco3.2v5*)
+-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+-  SAVE_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS -belf"
+-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+-    [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
+-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+-    CFLAGS="$SAVE_CFLAGS"
+-  fi
+-  ;;
+-
+-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+-[*-*-cygwin* | *-*-mingw*)
+-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+-  AC_CHECK_TOOL(AS, as, false)
+-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+-  ;;
+-])
+-esac
+-])
+-
+-# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
+-AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
+-
+-# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
+-AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
+-
+-# AC_ENABLE_SHARED - implement the --enable-shared flag
+-# Usage: AC_ENABLE_SHARED[(DEFAULT)]
+-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
+-#   `yes'.
+-AC_DEFUN(AC_ENABLE_SHARED, [dnl
+-define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE(shared,
+-changequote(<<, >>)dnl
+-<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
+-changequote([, ])dnl
+-[p=${PACKAGE-default}
+-case "$enableval" in
+-yes) enable_shared=yes ;;
+-no) enable_shared=no ;;
+-*)
+-  enable_shared=no
+-  # Look at the argument we got.  We use all the common list separators.
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+-  for pkg in $enableval; do
+-    if test "X$pkg" = "X$p"; then
+-      enable_shared=yes
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  ;;
+-esac],
+-enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
+-])
+-
+-# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
+-AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_SHARED(no)])
+-
+-# AC_ENABLE_STATIC - implement the --enable-static flag
+-# Usage: AC_ENABLE_STATIC[(DEFAULT)]
+-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
+-#   `yes'.
+-AC_DEFUN(AC_ENABLE_STATIC, [dnl
+-define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE(static,
+-changequote(<<, >>)dnl
+-<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
+-changequote([, ])dnl
+-[p=${PACKAGE-default}
+-case "$enableval" in
+-yes) enable_static=yes ;;
+-no) enable_static=no ;;
+-*)
+-  enable_static=no
+-  # Look at the argument we got.  We use all the common list separators.
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+-  for pkg in $enableval; do
+-    if test "X$pkg" = "X$p"; then
+-      enable_static=yes
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  ;;
+-esac],
+-enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
+-])
+-
+-# AC_DISABLE_STATIC - set the default static flag to --disable-static
+-AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_STATIC(no)])
+-
+-
+-# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
+-# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
+-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
+-#   `yes'.
+-AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
+-define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE(fast-install,
+-changequote(<<, >>)dnl
+-<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
+-changequote([, ])dnl
+-[p=${PACKAGE-default}
+-case "$enableval" in
+-yes) enable_fast_install=yes ;;
+-no) enable_fast_install=no ;;
+-*)
+-  enable_fast_install=no
+-  # Look at the argument we got.  We use all the common list separators.
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+-  for pkg in $enableval; do
+-    if test "X$pkg" = "X$p"; then
+-      enable_fast_install=yes
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  ;;
+-esac],
+-enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
+-])
+-
+-# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
+-AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_FAST_INSTALL(no)])
+-
+-# AC_PROG_LD - find the path to the GNU or non-GNU linker
+-AC_DEFUN(AC_PROG_LD,
+-[AC_ARG_WITH(gnu-ld,
+-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
+-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+-AC_REQUIRE([AC_PROG_CC])dnl
+-AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+-ac_prog=ld
+-if test "$ac_cv_prog_gcc" = yes; then
+-  # Check if gcc -print-prog-name=ld gives a path.
+-  AC_MSG_CHECKING([for ld used by GCC])
+-  ac_prog=`($CC -print-prog-name=ld) 2>&5`
+-  case "$ac_prog" in
+-    # Accept absolute paths.
+-changequote(,)dnl
+-    [\\/]* | [A-Za-z]:[\\/]*)
+-      re_direlt='/[^/][^/]*/\.\./'
+-changequote([,])dnl
+-      # Canonicalize the path of ld
+-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+-      done
+-      test -z "$LD" && LD="$ac_prog"
+-      ;;
+-  "")
+-    # If it fails, then pretend we aren't using GCC.
+-    ac_prog=ld
+-    ;;
+-  *)
+-    # If it is relative, then search for the first ld in PATH.
+-    with_gnu_ld=unknown
+-    ;;
+-  esac
+-elif test "$with_gnu_ld" = yes; then
+-  AC_MSG_CHECKING([for GNU ld])
+-else
+-  AC_MSG_CHECKING([for non-GNU ld])
+-fi
+-AC_CACHE_VAL(ac_cv_path_LD,
+-[if test -z "$LD"; then
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+-  for ac_dir in $PATH; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+-      ac_cv_path_LD="$ac_dir/$ac_prog"
+-      # Check to see if the program is GNU ld.  I'd rather use --version,
+-      # but apparently some GNU ld's only accept -v.
+-      # Break only if it was the GNU/non-GNU ld that we prefer.
+-      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+-	test "$with_gnu_ld" != no && break
+-      else
+-	test "$with_gnu_ld" != yes && break
+-      fi
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-else
+-  ac_cv_path_LD="$LD" # Let the user override the test with a path.
+-fi])
+-LD="$ac_cv_path_LD"
+-if test -n "$LD"; then
+-  AC_MSG_RESULT($LD)
+-else
+-  AC_MSG_RESULT(no)
+-fi
+-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+-AC_PROG_LD_GNU
+-])
+-
+-AC_DEFUN(AC_PROG_LD_GNU,
+-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
+-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+-  ac_cv_prog_gnu_ld=yes
+-else
+-  ac_cv_prog_gnu_ld=no
+-fi])
+-])
+-
+-# AC_PROG_NM - find the path to a BSD-compatible name lister
+-AC_DEFUN(AC_PROG_NM,
+-[AC_MSG_CHECKING([for BSD-compatible nm])
+-AC_CACHE_VAL(ac_cv_path_NM,
+-[if test -n "$NM"; then
+-  # Let the user override the test.
+-  ac_cv_path_NM="$NM"
+-else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
+-      # Check to see if the nm accepts a BSD-compat flag.
+-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+-      #   nm: unknown option "B" ignored
+-      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+-	ac_cv_path_NM="$ac_dir/nm -B"
+-	break
+-      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+-	ac_cv_path_NM="$ac_dir/nm -p"
+-	break
+-      else
+-	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
+-	continue # so that we can try to find one that supports BSD flags
+-      fi
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
+-fi])
+-NM="$ac_cv_path_NM"
+-AC_MSG_RESULT([$NM])
+-])
+-
+-# AC_CHECK_LIBM - check for math library
+-AC_DEFUN(AC_CHECK_LIBM,
+-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-LIBM=
+-case "$lt_target" in
+-*-*-beos* | *-*-cygwin*)
+-  # These system don't have libm
+-  ;;
+-*-ncr-sysv4.3*)
+-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+-  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
+-  ;;
+-*)
+-  AC_CHECK_LIB(m, main, LIBM="-lm")
+-  ;;
+-esac
+-])
+-
+-# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
+-# the libltdl convenience library and INCLTDL to the include flags for
+-# the libltdl header and adds --enable-ltdl-convenience to the
+-# configure arguments.  Note that LIBLTDL and INCLTDL are not
+-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
+-# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
+-# with '${top_builddir}/' and INCLTDL will be prefixed with
+-# '${top_srcdir}/' (note the single quotes!).  If your package is not
+-# flat and you're not using automake, define top_builddir and
+-# top_srcdir appropriately in the Makefiles.
+-AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-  case "$enable_ltdl_convenience" in
+-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+-  "") enable_ltdl_convenience=yes
+-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+-  esac
+-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
+-  INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+-])
+-
+-# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
+-# the libltdl installable library and INCLTDL to the include flags for
+-# the libltdl header and adds --enable-ltdl-install to the configure
+-# arguments.  Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
+-# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
+-# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
+-# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
+-# with '${top_srcdir}/' (note the single quotes!).  If your package is
+-# not flat and you're not using automake, define top_builddir and
+-# top_srcdir appropriately in the Makefiles.
+-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+-AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-  AC_CHECK_LIB(ltdl, main,
+-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+-  [if test x"$enable_ltdl_install" = xno; then
+-     AC_MSG_WARN([libltdl not installed, but installation disabled])
+-   else
+-     enable_ltdl_install=yes
+-   fi
+-  ])
+-  if test x"$enable_ltdl_install" = x"yes"; then
+-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
+-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
+-    INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+-  else
+-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+-    LIBLTDL="-lltdl"
+-    INCLTDL=
+-  fi
+-])
+-
+-dnl old names
+-AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
+-AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
+-AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
+-AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
+-AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
+-AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
+-AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
+-
+-dnl This is just to silence aclocal about the macro not being used
+-ifelse([AC_DISABLE_FAST_INSTALL])dnl
+Index: SDL_image-1.2.3/m4/sdl.m4
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ SDL_image-1.2.3/m4/sdl.m4	2008-07-24 01:32:20.220875043 +0200
+@@ -0,0 +1,174 @@
++# Configure paths for SDL
++# Sam Lantinga 9/21/99
++# stolen from Manish Singh
++# stolen back from Frank Belew
++# stolen from Manish Singh
++# Shamelessly stolen from Owen Taylor
++
++dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
++dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
++dnl
++AC_DEFUN(AM_PATH_SDL,
++[dnl 
++dnl Get the cflags and libraries from the sdl-config script
++dnl
++AC_ARG_WITH(sdl-prefix,[  --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)],
++            sdl_prefix="$withval", sdl_prefix="")
++AC_ARG_WITH(sdl-exec-prefix,[  --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
++            sdl_exec_prefix="$withval", sdl_exec_prefix="")
++AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
++		    , enable_sdltest=yes)
++
++  if test x$sdl_exec_prefix != x ; then
++     sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
++     if test x${SDL_CONFIG+set} != xset ; then
++        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
++     fi
++  fi
++  if test x$sdl_prefix != x ; then
++     sdl_args="$sdl_args --prefix=$sdl_prefix"
++     if test x${SDL_CONFIG+set} != xset ; then
++        SDL_CONFIG=$sdl_prefix/bin/sdl-config
++     fi
++  fi
++
++  AC_REQUIRE([AC_CANONICAL_TARGET])
++  AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
++  min_sdl_version=ifelse([$1], ,0.11.0,$1)
++  AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
++  no_sdl=""
++  if test "$SDL_CONFIG" = "no" ; then
++    no_sdl=yes
++  else
++    SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
++    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
++
++    sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++    sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++    sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++    if test "x$enable_sdltest" = "xyes" ; then
++      ac_save_CFLAGS="$CFLAGS"
++      ac_save_LIBS="$LIBS"
++      CFLAGS="$CFLAGS $SDL_CFLAGS"
++      LIBS="$LIBS $SDL_LIBS"
++dnl
++dnl Now check if the installed SDL is sufficiently new. (Also sanity
++dnl checks the results of sdl-config to some extent
++dnl
++      rm -f conf.sdltest
++      AC_TRY_RUN([
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include "SDL.h"
++
++char*
++my_strdup (char *str)
++{
++  char *new_str;
++  
++  if (str)
++    {
++      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
++      strcpy (new_str, str);
++    }
++  else
++    new_str = NULL;
++  
++  return new_str;
++}
++
++int main (int argc, char *argv[])
++{
++  int major, minor, micro;
++  char *tmp_version;
++
++  /* This hangs on some systems (?)
++  system ("touch conf.sdltest");
++  */
++  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
++
++  /* HP/UX 9 (%@#!) writes to sscanf strings */
++  tmp_version = my_strdup("$min_sdl_version");
++  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
++     printf("%s, bad version string\n", "$min_sdl_version");
++     exit(1);
++   }
++
++   if (($sdl_major_version > major) ||
++      (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
++      (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
++    {
++      return 0;
++    }
++  else
++    {
++      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
++      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
++      printf("*** best to upgrade to the required version.\n");
++      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
++      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
++      printf("*** config.cache before re-running configure\n");
++      return 1;
++    }
++}
++
++],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++       CFLAGS="$ac_save_CFLAGS"
++       LIBS="$ac_save_LIBS"
++     fi
++  fi
++  if test "x$no_sdl" = x ; then
++     AC_MSG_RESULT(yes)
++     ifelse([$2], , :, [$2])     
++  else
++     AC_MSG_RESULT(no)
++     if test "$SDL_CONFIG" = "no" ; then
++       echo "*** The sdl-config script installed by SDL could not be found"
++       echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
++       echo "*** your path, or set the SDL_CONFIG environment variable to the"
++       echo "*** full path to sdl-config."
++     else
++       if test -f conf.sdltest ; then
++        :
++       else
++          echo "*** Could not run SDL test program, checking why..."
++          CFLAGS="$CFLAGS $SDL_CFLAGS"
++          LIBS="$LIBS $SDL_LIBS"
++          AC_TRY_LINK([
++#include <stdio.h>
++#include "SDL.h"
++
++int main(int argc, char *argv[])
++{ return 0; }
++#undef  main
++#define main K_and_R_C_main
++],      [ return 0; ],
++        [ echo "*** The test program compiled, but did not run. This usually means"
++          echo "*** that the run-time linker is not finding SDL or finding the wrong"
++          echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
++          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
++          echo "*** is required on your system"
++	  echo "***"
++          echo "*** If you have an old version installed, it is best to remove it, although"
++          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
++        [ echo "*** The test program failed to compile or link. See the file config.log for the"
++          echo "*** exact error that occured. This usually means SDL was incorrectly installed"
++          echo "*** or that you have moved SDL since it was installed. In the latter case, you"
++          echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
++          CFLAGS="$ac_save_CFLAGS"
++          LIBS="$ac_save_LIBS"
++       fi
++     fi
++     SDL_CFLAGS=""
++     SDL_LIBS=""
++     ifelse([$3], , :, [$3])
++  fi
++  AC_SUBST(SDL_CFLAGS)
++  AC_SUBST(SDL_LIBS)
++  rm -f conf.sdltest
++])
+Index: SDL_image-1.2.3/configure.in
+===================================================================
+--- SDL_image-1.2.3.orig/configure.in	2008-07-24 01:34:07.807534207 +0200
++++ SDL_image-1.2.3/configure.in	2008-07-24 01:34:16.960864590 +0200
+@@ -44,6 +44,8 @@
+ AM_INIT_AUTOMAKE(SDL_image, $VERSION)
+ AM_MAINTAINER_MODE
+ 
++AC_CONFIG_MACRO_DIR([m4])
++
+ dnl Check for tools
+ 
+ AC_LIBTOOL_WIN32_DLL
diff --git a/packages/libsdl/libsdl-image_1.2.3.bb b/packages/libsdl/libsdl-image_1.2.3.bb
index b35aa3bf1e..1a911f9f62 100644
--- a/packages/libsdl/libsdl-image_1.2.3.bb
+++ b/packages/libsdl/libsdl-image_1.2.3.bb
@@ -3,15 +3,19 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "zlib libpng jpeg virtual/libsdl"
 LICENSE = "LGPL"
+PR = "r1"
+
+SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz \
+	   file://autotools.patch;patch=1 \
+	  "
 
-SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz"
 S = "${WORKDIR}/SDL_image-${PV}"
 
+export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
+
 inherit autotools
 
 do_stage() {
-	oe_libinstall -so libSDL_image ${STAGING_LIBDIR}
-	ln -sf libSDL_image.so ${STAGING_LIBDIR}/libSDL_image-1.2.so
-	install -m 0644 SDL_image.h ${STAGING_INCDIR}/SDL/SDL_image.h
+	autotools_stage_all
 }
 
diff --git a/packages/libsdl/libsdl-net-1.2.7/.mtn2git_empty b/packages/libsdl/libsdl-net-1.2.7/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libsdl/libsdl-net-1.2.7/.mtn2git_empty
diff --git a/packages/libsdl/libsdl-net-1.2.7/libtool2.patch b/packages/libsdl/libsdl-net-1.2.7/libtool2.patch
new file mode 100644
index 0000000000..ea6daf7d48
--- /dev/null
+++ b/packages/libsdl/libsdl-net-1.2.7/libtool2.patch
@@ -0,0 +1,13 @@
+Index: SDL_net-1.2.7/configure.in
+===================================================================
+--- SDL_net-1.2.7.orig/configure.in	2007-07-20 14:40:02.000000000 +0200
++++ SDL_net-1.2.7/configure.in	2008-07-24 00:41:04.282718579 +0200
+@@ -42,6 +42,8 @@
+ dnl Setup for automake
+ AM_INIT_AUTOMAKE(SDL_net, $VERSION)
+ 
++dnl got macros
++AC_CONFIG_MACRO_DIR([acinclude])
+ dnl Check for tools
+ 
+ AC_LIBTOOL_WIN32_DLL
diff --git a/packages/libsdl/libsdl-net_1.2.7.bb b/packages/libsdl/libsdl-net_1.2.7.bb
index 8149cce379..8cbea5bd01 100644
--- a/packages/libsdl/libsdl-net_1.2.7.bb
+++ b/packages/libsdl/libsdl-net_1.2.7.bb
@@ -3,16 +3,19 @@ SECTION = "libs/network"
 PRIORITY = "optional"
 DEPENDS = "virtual/libsdl"
 LICENSE = "LGPL"
+PR = "r1"
+
+SRC_URI = "http://www.libsdl.org/projects/SDL_net/release/SDL_net-${PV}.tar.gz \
+	   file://libtool2.patch;patch=1 \
+	  "
 
-SRC_URI = "http://www.libsdl.org/projects/SDL_net/release/SDL_net-${PV}.tar.gz"
 S = "${WORKDIR}/SDL_net-${PV}"
 
 inherit autotools
+
 EXTRA_OECONF += "SDL_CONFIG=${STAGING_BINDIR_CROSS}/sdl-config"
 
 do_stage() {
-	oe_libinstall -so libSDL_net ${STAGING_LIBDIR}
-	ln -sf libSDL_net.so ${STAGING_LIBDIR}/libSDL_net-1.2.so
-	install -m 0644 SDL_net.h ${STAGING_INCDIR}/SDL/SDL_net.h
+	autotools_stage_all
 }
 
diff --git a/packages/libsdl/libsdl-ttf_2.0.3.bb b/packages/libsdl/libsdl-ttf_2.0.3.bb
index 59e9174fac..250fb698ce 100644
--- a/packages/libsdl/libsdl-ttf_2.0.3.bb
+++ b/packages/libsdl/libsdl-ttf_2.0.3.bb
@@ -3,6 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "virtual/libsdl freetype"
 LICENSE = "LGPL"
+PR = "r1"
 
 SRC_URI = "http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-${PV}.tar.gz \
            file://new-freetype-includes.patch;patch=1"
@@ -11,7 +12,5 @@ S = "${WORKDIR}/SDL_ttf-${PV}"
 inherit autotools
 
 do_stage() {
-	oe_libinstall -so libSDL_ttf ${STAGING_LIBDIR}
-	ln -sf libSDL_ttf.so ${STAGING_LIBDIR}/libSDL_ttf-2.0.so
-	install -m 0644 SDL_ttf.h ${STAGING_INCDIR}/SDL/SDL_ttf.h
+	autotools_stage_all
 }
diff --git a/packages/linux/linux-omap2-git/beagleboard/400khz-i2c.diff b/packages/linux/linux-omap2-git/beagleboard/400khz-i2c.diff
new file mode 100644
index 0000000000..f749dbcf5b
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/400khz-i2c.diff
@@ -0,0 +1,22 @@
+From: Steve Sakoman <steve@sakoman.com>
+Date: Wed, 16 Jul 2008 19:38:43 +0000 (-0700)
+Subject: omap3beagle:  set data rate on i2c-1 to 400, since 2600 seems to be
+X-Git-Url: http://www.sakoman.net/cgi-bin/gitweb.cgi?p=linux-omap-2.6.git;a=commitdiff_plain;h=12d6504334a830774ff1d42cee4b7296ac9fb7d2
+
+omap3beagle:  set data rate on i2c-1 to 400, since 2600 seems to be
+flakey
+---
+
+diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
+index fdce787..938ad73 100644
+--- a/arch/arm/mach-omap2/board-omap3beagle.c
++++ b/arch/arm/mach-omap2/board-omap3beagle.c
+@@ -39,7 +39,7 @@ static struct omap_uart_config omap3_beagle_uart_config __initdata = {
+ 
+ static int __init omap3_beagle_i2c_init(void)
+ {
+-	omap_register_i2c_bus(1, 2600, NULL, 0);
++	omap_register_i2c_bus(1, 400, NULL, 0);
+ 	omap_register_i2c_bus(2, 400, NULL, 0);
+ 	omap_register_i2c_bus(3, 400, NULL, 0);
+ 	return 0;
diff --git a/packages/linux/linux-omap2-git/beagleboard/4bitmmc.diff b/packages/linux/linux-omap2-git/beagleboard/4bitmmc.diff
new file mode 100644
index 0000000000..5cd120c544
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/4bitmmc.diff
@@ -0,0 +1,38 @@
+From: Purushotam Kumar <purushotam@ti.com>
+Date: Fri, 18 Jul 2008 23:28:57 +0000 (-0700)
+Subject: OMAP3:devices.c:Enabling 4-bit for SD card
+X-Git-Url: http://www.sakoman.net/cgi-bin/gitweb.cgi?p=linux-omap-2.6.git;a=commitdiff_plain;h=6c4d34031c80ca4b50ffe73a4ef7fe197a760a60
+
+OMAP3:devices.c:Enabling 4-bit for SD card
+
+SD card was working in 1-bit mode.This patch will configure SD card in
+4-bit mode and hence performance  will increase.
+
+Signed-off-by: Purushotam Kumar <purushotam@ti.com>
+Acked-by: Madhusudhan Chikkature Rajashekar <madhu.cr@ti.com>
+---
+
+diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
+index b83f9a6..d0cfceb 100644
+--- a/arch/arm/plat-omap/devices.c
++++ b/arch/arm/plat-omap/devices.c
+@@ -296,13 +296,17 @@ static void __init omap_init_mmc(void)
+ 	mmc = &mmc_conf->mmc[0];
+ 
+ 	if (cpu_is_omap2430() || cpu_is_omap34xx()) {
+-		if (mmc->enabled)
++		if (mmc->enabled) {
++			mmc1_data.conf = *mmc;
+ 			(void) platform_device_register(&mmc_omap_device1);
++		}
+ 
+ #if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX)
+ 		mmc = &mmc_conf->mmc[1];
+-		if (mmc->enabled)
++		if (mmc->enabled) {
++			mmc2_data.conf = *mmc;
+ 			(void) platform_device_register(&mmc_omap_device2);
++		}
+ #endif
+ 
+ 		return;
diff --git a/packages/linux/linux-omap2-git/beagleboard/mru-clocks1.diff b/packages/linux/linux-omap2-git/beagleboard/mru-clocks1.diff
index a17cc52c16..d7dadbc85e 100644
--- a/packages/linux/linux-omap2-git/beagleboard/mru-clocks1.diff
+++ b/packages/linux/linux-omap2-git/beagleboard/mru-clocks1.diff
@@ -1,7 +1,7 @@
 From: Mans Rullgard <mans@mansr.com>
 Date: Tue, 22 Jul 2008 00:31:11 +0000 (+0100)
 Subject: ARM: OMAP: make dpll4_m4_ck programmable with clk_set_rate()
-X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=edc6cd29284f64f524dd410fdc5e6133bc177a8f
+X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=2b7b958dc79e51127d7a4ecf88ce12dbc6c31426
 
 ARM: OMAP: make dpll4_m4_ck programmable with clk_set_rate()
 
diff --git a/packages/linux/linux-omap2-git/beagleboard/mru-clocks2.diff b/packages/linux/linux-omap2-git/beagleboard/mru-clocks2.diff
index 99c8f7c285..c8b370da03 100644
--- a/packages/linux/linux-omap2-git/beagleboard/mru-clocks2.diff
+++ b/packages/linux/linux-omap2-git/beagleboard/mru-clocks2.diff
@@ -1,7 +1,7 @@
 From: Mans Rullgard <mans@mansr.com>
 Date: Tue, 22 Jul 2008 00:58:18 +0000 (+0100)
 Subject: ARM: OMAP: add clk_get_parent() for OMAP2/3
-X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=76a35ce79194b60e3697378e726e1e510c9349d1
+X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=e2de5e5578fbaa9b4b75074796da0608fc93e6ae
 
 ARM: OMAP: add clk_get_parent() for OMAP2/3
 
diff --git a/packages/linux/linux-omap2-git/beagleboard/mru-clocks3.diff b/packages/linux/linux-omap2-git/beagleboard/mru-clocks3.diff
new file mode 100644
index 0000000000..f8407fc2d5
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/mru-clocks3.diff
@@ -0,0 +1,94 @@
+From: Mans Rullgard <mans@mansr.com>
+Date: Wed, 23 Jul 2008 08:40:07 +0000 (+0100)
+Subject: ARM: OMAP: Set DSS1_ALWON_FCLK to a multiple of the pixel clock
+X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=01ee28c50701caa94739e764c3dae9298edd8216
+
+ARM: OMAP: Set DSS1_ALWON_FCLK to a multiple of the pixel clock
+
+This sets the DSS1_ALWON_FCLK clock as close as possible to a
+multiple of the requested pixel clock, while keeping it below
+the 173MHz limit.
+
+Due to of the structure of the clock tree, dss1_alwon_fck cannot
+be set directly, and we must use dpll4_m4_ck instead.
+
+Signed-off-by: Mans Rullgard <mans@mansr.com>
+---
+
+diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c
+index fd06ca2..e0e8528 100644
+--- a/drivers/video/omap/dispc.c
++++ b/drivers/video/omap/dispc.c
+@@ -176,6 +176,7 @@ static struct {
+ 
+ 	struct clk	*dss_ick, *dss1_fck;
+ 	struct clk	*dss_54m_fck;
++	struct clk	*dpll4_m4_ck;
+ 
+ 	enum omapfb_update_mode	update_mode;
+ 	struct omapfb_device	*fbdev;
+@@ -738,21 +739,34 @@ static void setup_color_conv_coef(void)
+ 	MOD_REG_FLD(at2_reg, (1 << 11), ct->full_range);
+ }
+ 
+-#define MAX_FCK_LCD 173000000
++#define MAX_FCK 173000000
+ 
+ static void calc_ck_div(int is_tft, int pck, int *lck_div, int *pck_div)
+ {
++	unsigned long prate = clk_get_rate(clk_get_parent(dispc.dpll4_m4_ck));
++	unsigned long pcd_min = is_tft? 2: 3;
++	unsigned long fck_div;
+ 	unsigned long fck, lck;
+ 
+ 	pck = max(1, pck);
++
++	if (pck * pcd_min > MAX_FCK) {
++		dev_warn(dispc.fbdev->dev, "pixclock %d kHz too high.\n",
++			 pck / 1000);
++		pck = MAX_FCK / pcd_min;
++	}
++
++	fck = pck * 2;
++	fck_div = (prate + pck) / fck;
++	if (fck_div > 16)
++		fck_div /= (fck_div + 15) / 16;
++	if (fck_div < 1)
++		fck_div = 1;
++	clk_set_rate(dispc.dpll4_m4_ck, prate / fck_div);
+ 	fck = clk_get_rate(dispc.dss1_fck);
+-	*lck_div = (fck + MAX_FCK_LCD - 1) / MAX_FCK_LCD;
+-	lck = fck / *lck_div;
+-	*pck_div = (lck + pck - 1) / pck;
+-	if (is_tft)
+-		*pck_div = max(2, *pck_div);
+-	else
+-		*pck_div = max(3, *pck_div);
++
++	*lck_div = 1;
++	*pck_div = (fck + pck - 1) / pck;
+ 	if (*pck_div > 255) {
+ 		*pck_div = 255;
+ 		lck = pck * *pck_div;
+@@ -914,11 +928,21 @@ static int get_dss_clocks(void)
+ 		return PTR_ERR(dispc.dss_54m_fck);
+ 	}
+ 
++	if (IS_ERR((dispc.dpll4_m4_ck =
++				clk_get(dispc.fbdev->dev, "dpll4_m4_ck")))) {
++		dev_err(dispc.fbdev->dev, "can't get dpll4_m4_ck");
++		clk_put(dispc.dss_ick);
++		clk_put(dispc.dss1_fck);
++		clk_put(dispc.dss_54m_fck);
++		return PTR_ERR(dispc.dss_54m_fck);
++	}
++
+ 	return 0;
+ }
+ 
+ static void put_dss_clocks(void)
+ {
++	clk_put(dispc.dpll4_m4_ck);
+ 	clk_put(dispc.dss_54m_fck);
+ 	clk_put(dispc.dss1_fck);
+ 	clk_put(dispc.dss_ick);
diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb
index c6ffd347de..2cba2fe537 100644
--- a/packages/linux/linux-omap2_git.bb
+++ b/packages/linux/linux-omap2_git.bb
@@ -6,7 +6,7 @@ SRCREV = "d3b3ae0fe6c71641da19c8de466ec366d39847e3"
 
 PV = "2.6.26"
 #PV = "2.6.25+2.6.26-rc9+${PR}+git${SRCREV}"
-PR = "r46"
+PR = "r48"
 
 SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
 	   file://defconfig"
@@ -23,7 +23,6 @@ SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \
            file://logo_linux_clut224.ppm \
            file://oprofile-0.9.3.armv7.diff;patch=1 \
            file://01-fix-timing-print.diff;patch=1 \
-           file://02-set-clkseld11.diff;patch=1 \
            file://03-enable-overlay-opt.diff;patch=1 \
            file://04-use-pcd.diff;patch=1 \
            file://05-fix-display-panning.diff;patch=1 \
@@ -43,6 +42,9 @@ SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \
            file://TWL4030-09.patch;patch=1 \
            file://mru-clocks1.diff;patch=1 \
            file://mru-clocks2.diff;patch=1 \
+           file://mru-clocks3.diff;patch=1 \	
+           file://4bitmmc.diff;patch=1 \
+	   file://400khz-i2c.diff;patch=1 \
 "
 
 SRC_URI_append_omap3evm = " file://no-harry-potter.diff;patch=1 \
diff --git a/packages/linux/linux-rp-2.6.26/collie.patch b/packages/linux/linux-rp-2.6.26/collie.patch
new file mode 100644
index 0000000000..00b7d881a5
--- /dev/null
+++ b/packages/linux/linux-rp-2.6.26/collie.patch
@@ -0,0 +1,1883 @@
+diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
+index c7ad324..daa2e0a 100644
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
+@@ -998,7 +998,7 @@ config CPU_FREQ_SA1100
+ 
+ config CPU_FREQ_SA1110
+ 	bool
+-	depends on CPU_FREQ && (SA1100_ASSABET || SA1100_CERF || SA1100_PT_SYSTEM3)
++	depends on CPU_FREQ && (SA1100_ASSABET || SA1100_CERF || SA1100_PT_SYSTEM3 || SA1100_COLLIE)
+ 	default y
+ 
+ config CPU_FREQ_INTEGRATOR
+diff --git a/arch/arm/mach-sa1100/dma.c b/arch/arm/mach-sa1100/dma.c
+index e508028..36f726c 100644
+--- a/arch/arm/mach-sa1100/dma.c
++++ b/arch/arm/mach-sa1100/dma.c
+@@ -39,7 +39,7 @@ typedef struct {
+ 
+ static sa1100_dma_t dma_chan[SA1100_DMA_CHANNELS];
+ 
+-static spinlock_t dma_list_lock;
++static  DEFINE_SPINLOCK(dma_list_lock);
+ 
+ 
+ static irqreturn_t dma_irq_handler(int irq, void *dev_id)
+diff --git a/drivers/input/keyboard/locomokbd.c b/drivers/input/keyboard/locomokbd.c
+index 9caed30..79e19bf 100644
+--- a/drivers/input/keyboard/locomokbd.c
++++ b/drivers/input/keyboard/locomokbd.c
+@@ -265,6 +265,7 @@ static int __devinit locomokbd_probe(struct locomo_dev *dev)
+ 	for (i = 0; i < LOCOMOKBD_NUMKEYS; i++)
+ 		set_bit(locomokbd->keycode[i], input_dev->keybit);
+ 	clear_bit(0, input_dev->keybit);
++	locomo_writel(0, locomokbd->base + LOCOMO_KSC);
+ 
+ 	/* attempt to get the interrupt */
+ 	err = request_irq(dev->irq[0], locomokbd_interrupt, 0, "locomokbd", locomokbd);
+diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
+index 9f93c29..33fc5d6 100644
+--- a/drivers/mfd/Kconfig
++++ b/drivers/mfd/Kconfig
+@@ -72,4 +72,10 @@ config MCP_UCB1200_TS
+ 	tristate "Touchscreen interface support"
+ 	depends on MCP_UCB1200 && INPUT
+ 
++config MCP_COLLIE_TS
++	tristate "Touchscreen collie support"
++	depends on MCP_UCB1200 && INPUT && !MCP_UCB1200_TS
++	 ---help---
++	  Driver for touchscreen on collie - sharp sl-5500.
++
+ endmenu
+diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
+index 33daa2f..0885ccd 100644
+--- a/drivers/mfd/Makefile
++++ b/drivers/mfd/Makefile
+@@ -16,7 +16,7 @@ obj-$(CONFIG_MCP)		+= mcp-core.o
+ obj-$(CONFIG_MCP_SA11X0)	+= mcp-sa11x0.o
+ obj-$(CONFIG_MCP_UCB1200)	+= ucb1x00-core.o
+ obj-$(CONFIG_MCP_UCB1200_TS)	+= ucb1x00-ts.o
+-
++obj-$(CONFIG_MCP_COLLIE_TS)     += collie-ts.o
+ ifeq ($(CONFIG_SA1100_ASSABET),y)
+ obj-$(CONFIG_MCP_UCB1200)	+= ucb1x00-assabet.o
+ endif
+diff --git a/drivers/mfd/collie-ts.c b/drivers/mfd/collie-ts.c
+new file mode 100644
+index 0000000..ddde5fc
+--- /dev/null
++++ b/drivers/mfd/collie-ts.c
+@@ -0,0 +1,449 @@
++/*
++ *  Touchscreen driver for UCB1x00-based touchscreens
++ *
++ *  Copyright (C) 2001 Russell King, All Rights Reserved.
++ *  Copyright (C) 2005 Pavel Machek
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ *
++ * 21-Jan-2002 <jco@ict.es> :
++ *
++ * Added support for synchronous A/D mode. This mode is useful to
++ * avoid noise induced in the touchpanel by the LCD, provided that
++ * the UCB1x00 has a valid LCD sync signal routed to its ADCSYNC pin.
++ * It is important to note that the signal connected to the ADCSYNC
++ * pin should provide pulses even when the LCD is blanked, otherwise
++ * a pen touch needed to unblank the LCD will never be read.
++ */
++#include <linux/module.h>
++#include <linux/moduleparam.h>
++#include <linux/init.h>
++#include <linux/smp.h>
++#include <linux/smp_lock.h>
++#include <linux/sched.h>
++#include <linux/completion.h>
++#include <linux/delay.h>
++#include <linux/string.h>
++#include <linux/input.h>
++#include <linux/device.h>
++#include <linux/freezer.h>
++#include <linux/slab.h>
++#include <linux/kthread.h>
++
++#include <asm/dma.h>
++#include <asm/semaphore.h>
++#include <asm/arch/collie.h>
++#include <asm/mach-types.h>
++
++#include "ucb1x00.h"
++
++struct ucb1x00_ts {
++	struct input_dev	*idev;
++	struct ucb1x00		*ucb;
++
++	wait_queue_head_t	irq_wait;
++	struct task_struct	*rtask;
++	u16			x_res;
++	u16			y_res;
++
++	unsigned int		adcsync:1;
++};
++
++static int adcsync;
++
++/**********************************
++
++     ................
++     .              . = 340
++     .              .
++     .             ^.
++     .             ^.
++     .             ^.
++     .             ^.
++     .              .
++     .             X. = 10
++     .  <<<<<<<<  Y .
++     ................
++     .   Sharp    =200
++     .              .
++     .  -   O    -  .
++     .              .
++     ................
++
++**********************************/
++
++
++static inline void ucb1x00_ts_evt_add(struct ucb1x00_ts *ts, u16 pressure, u16 x, u16 y)
++{
++	struct input_dev *idev = ts->idev;
++
++	input_report_abs(idev, ABS_X, x);
++	input_report_abs(idev, ABS_Y, y);
++	input_report_abs(idev, ABS_PRESSURE, pressure);
++        input_report_key(idev, BTN_TOUCH, 1);
++	input_sync(idev);
++}
++
++static inline void ucb1x00_ts_event_release(struct ucb1x00_ts *ts)
++{
++	struct input_dev *idev = ts->idev;
++
++	input_report_abs(idev, ABS_PRESSURE, 0);
++        input_report_key(idev, BTN_TOUCH, 0);
++	input_sync(idev);
++}
++
++/*
++ * Switch to interrupt mode. This set touchscreen to interrupt 
++ * mode, so that chip is able to send interrupt.
++ */
++static inline void ucb1x00_ts_mode_int(struct ucb1x00_ts *ts)
++{
++	ucb1x00_reg_write(ts->ucb, UCB_TS_CR,
++			UCB_TS_CR_TSMX_POW | UCB_TS_CR_TSPX_POW |
++			UCB_TS_CR_TSMY_GND | UCB_TS_CR_TSPY_GND |
++			UCB_TS_CR_MODE_INT);
++}
++
++/*
++ * Switch to pressure mode, and read pressure.  We don't need to wait
++ * here, since both plates are being driven.
++ *
++ * set_read_pressure() in sharp code
++ */
++static inline void ucb1x00_ts_read_pressure(struct ucb1x00_ts *ts)
++{
++	ucb1x00_io_write(ts->ucb, COLLIE_TC35143_GPIO_TBL_CHK, 0);
++	ucb1x00_reg_write(ts->ucb, UCB_TS_CR,
++			  UCB_TS_CR_TSPX_POW | UCB_TS_CR_TSMX_POW |
++			  UCB_TS_CR_MODE_POS | UCB_TS_CR_BIAS_ENA);
++
++	ucb1x00_reg_write(ts->ucb, UCB_ADC_CR, ts->ucb->adc_cr | 
++			  UCB_ADC_INP_AD2 | 
++			  UCB_ADC_SYNC_ENA);
++	udelay(100);
++	ucb1x00_reg_write(ts->ucb, UCB_ADC_CR, ts->ucb->adc_cr | 
++			  UCB_ADC_INP_AD2 | 
++			  UCB_ADC_SYNC_ENA | UCB_ADC_START);
++}
++
++/*
++ * Switch to X position mode and measure Y plate.  We switch the plate
++ * configuration in pressure mode, then switch to position mode.  This
++ * gives a faster response time.  Even so, we need to wait about 55us
++ * for things to stabilise.
++ */
++static inline void ucb1x00_ts_read_xpos(struct ucb1x00_ts *ts)
++{
++	ucb1x00_io_write(ts->ucb, 0, COLLIE_TC35143_GPIO_TBL_CHK);
++	ucb1x00_reg_write(ts->ucb, UCB_TS_CR,
++			UCB_TS_CR_TSMX_GND | UCB_TS_CR_TSPX_POW |
++			UCB_TS_CR_MODE_POS | UCB_TS_CR_BIAS_ENA);
++
++
++	ucb1x00_reg_write(ts->ucb, UCB_ADC_CR, ts->ucb->adc_cr | 
++			  UCB_ADC_INP_TSPY | UCB_ADC_SYNC_ENA);
++	udelay(100);
++	ucb1x00_reg_write(ts->ucb, UCB_ADC_CR, ts->ucb->adc_cr | 
++			  UCB_ADC_INP_TSPY | UCB_ADC_SYNC_ENA | 
++		 	  UCB_ADC_START);
++}
++
++/*
++ * Switch to Y position mode and measure X plate.  We switch the plate
++ * configuration in pressure mode, then switch to position mode.  This
++ * gives a faster response time.  Even so, we need to wait about 55us
++ * for things to stabilise.
++ */
++static inline void ucb1x00_ts_read_ypos(struct ucb1x00_ts *ts)
++{
++	ucb1x00_io_write(ts->ucb, 0, COLLIE_TC35143_GPIO_TBL_CHK);
++
++	ucb1x00_reg_write(ts->ucb, UCB_TS_CR,
++			UCB_TS_CR_TSMY_GND | UCB_TS_CR_TSPY_POW |
++			UCB_TS_CR_MODE_POS | UCB_TS_CR_BIAS_ENA);
++
++
++	ucb1x00_reg_write(ts->ucb, UCB_ADC_CR, ts->ucb->adc_cr | 
++			  UCB_ADC_INP_TSPX | UCB_ADC_SYNC_ENA);
++	udelay(100);
++	ucb1x00_reg_write(ts->ucb, UCB_ADC_CR, ts->ucb->adc_cr |
++			  UCB_ADC_INP_TSPX | UCB_ADC_SYNC_ENA | 
++			  UCB_ADC_START);
++}
++
++/*
++ * Switch to X plate resistance mode.  Set MX to ground, PX to
++ * supply.  Measure current.
++ */
++static inline unsigned int ucb1x00_ts_read_xres(struct ucb1x00_ts *ts)
++{
++	ucb1x00_reg_write(ts->ucb, UCB_TS_CR,
++			UCB_TS_CR_TSMX_GND | UCB_TS_CR_TSPX_POW |
++			UCB_TS_CR_MODE_PRES | UCB_TS_CR_BIAS_ENA);
++	return ucb1x00_adc_read(ts->ucb, 0, ts->adcsync);
++}
++
++/*
++ * Switch to Y plate resistance mode.  Set MY to ground, PY to
++ * supply.  Measure current.
++ */
++static inline unsigned int ucb1x00_ts_read_yres(struct ucb1x00_ts *ts)
++{
++	ucb1x00_reg_write(ts->ucb, UCB_TS_CR,
++			UCB_TS_CR_TSMY_GND | UCB_TS_CR_TSPY_POW |
++			UCB_TS_CR_MODE_PRES | UCB_TS_CR_BIAS_ENA);
++	return ucb1x00_adc_read(ts->ucb, 0, ts->adcsync);
++}
++
++/*
++ * This is a RT kernel thread that handles the ADC accesses
++ * (mainly so we can use semaphores in the UCB1200 core code
++ * to serialise accesses to the ADC).
++ */
++static int ucb1x00_thread(void *_ts)
++{
++	struct ucb1x00_ts *ts = _ts;
++	struct task_struct *tsk = current;
++	DECLARE_WAITQUEUE(wait, tsk);
++	int state;
++
++	/*
++	 * We could run as a real-time thread.  However, thus far
++	 * this doesn't seem to be necessary.
++	 */
++
++	add_wait_queue(&ts->irq_wait, &wait);	
++
++	while (!kthread_should_stop()) {
++		unsigned int data[3];
++			
++		for (state=0; state<3; state++) {
++			
++			ucb1x00_adc_enable(ts->ucb);
++			ucb1x00_enable_irq(ts->ucb, UCB_IRQ_ADC, UCB_FALLING);
++			switch (state) {
++			/* Order matters here; last measurement seems to be more noisy then the
++			   rest, and we care about pressure least */
++				case 2: ucb1x00_ts_read_pressure(ts);
++					break;
++				case 0: ucb1x00_ts_read_ypos(ts);
++					break;
++				case 1: ucb1x00_ts_read_xpos(ts);
++					break;
++			}
++			/* wait for adc */
++			try_to_freeze();
++			schedule_timeout(1000 * HZ);
++			ucb1x00_disable_irq(ts->ucb, UCB_IRQ_ADC, UCB_FALLING);
++			data[state] = UCB_ADC_DAT(ucb1x00_reg_read(ts->ucb, UCB_ADC_DATA));
++			ucb1x00_adc_disable(ts->ucb);
++		}	
++		
++		/* If not pressed any more, try to sleep! */
++		if (data[2] < 300) {
++			set_task_state(tsk, TASK_INTERRUPTIBLE);
++			ucb1x00_enable_irq(ts->ucb, UCB_IRQ_TSPX, UCB_RISING);
++			ucb1x00_ts_mode_int(ts);
++			ucb1x00_disable(ts->ucb);
++			ucb1x00_ts_event_release(ts);
++			try_to_freeze();
++			schedule_timeout(1000 * HZ);
++			ucb1x00_disable_irq(ts->ucb, UCB_IRQ_TSPX, UCB_RISING);
++			ucb1x00_enable(ts->ucb);
++		} else {	
++			ucb1x00_ts_evt_add(ts, data[2], data[1], data[0]);
++		}
++		ucb1x00_disable(ts->ucb);
++		msleep(20);
++		ucb1x00_enable(ts->ucb);
++	}
++
++	remove_wait_queue(&ts->irq_wait, &wait);
++
++	ts->rtask = NULL;
++	return 0;
++}
++
++/*
++ * We only detect touch screen _touches_ with this interrupt
++ * handler, and even then we just schedule our task.
++ */
++static void ucb1x00_ts_irq(int idx, void *id)
++{
++	struct ucb1x00_ts *ts = id;
++	wake_up(&ts->irq_wait);
++}
++
++static void ucb1x00_adc_irq(int idx, void *id)
++{
++	struct ucb1x00_ts *ts = id;
++	wake_up(&ts->irq_wait);
++}
++
++static int ucb1x00_ts_open(struct input_dev *idev)
++{
++	struct ucb1x00_ts *ts = input_get_drvdata(idev);
++	int ret = 0;
++
++	BUG_ON(ts->rtask);
++
++	init_waitqueue_head(&ts->irq_wait);
++	
++	ret = ucb1x00_hook_irq(ts->ucb, UCB_IRQ_TSPX, ucb1x00_ts_irq, ts);
++	if (ret < 0)
++		return ret;
++	
++	ret = ucb1x00_hook_irq(ts->ucb, UCB_IRQ_ADC, ucb1x00_adc_irq, ts);
++	if (ret < 0) {
++		ucb1x00_free_irq(ts->ucb, UCB_IRQ_TSPX, ts);
++		return ret;
++	}
++
++	ucb1x00_enable_irq(ts->ucb, UCB_IRQ_TSPX, UCB_RISING);
++	
++	/*
++	 * If we do this at all, we should allow the user to
++	 * measure and read the X and Y resistance at any time.
++	 */
++	ucb1x00_adc_enable(ts->ucb);
++	ts->x_res = ucb1x00_ts_read_xres(ts);
++	ts->y_res = ucb1x00_ts_read_yres(ts);
++	ucb1x00_adc_disable(ts->ucb);
++
++	if (machine_is_collie()) {
++		ucb1x00_io_set_dir(ts->ucb, 0, COLLIE_TC35143_GPIO_TBL_CHK);
++	}
++
++	ts->rtask = kthread_run(ucb1x00_thread, ts, "ktsd");
++	if (!IS_ERR(ts->rtask)) {
++		ret = 0;
++	} else {
++		ucb1x00_free_irq(ts->ucb, UCB_IRQ_TSPX, ts);
++		ts->rtask = NULL;
++		ret = -EFAULT;
++	}
++	
++	return ret;
++}
++
++/*
++ * Release touchscreen resources.  Disable IRQs.
++ */
++static void ucb1x00_ts_close(struct input_dev *idev)
++{
++	struct ucb1x00_ts *ts = input_get_drvdata(idev);
++
++	if (ts->rtask)
++		kthread_stop(ts->rtask);
++
++	ucb1x00_enable(ts->ucb);
++	ucb1x00_free_irq(ts->ucb, UCB_IRQ_TSPX, ts);
++	ucb1x00_free_irq(ts->ucb, UCB_IRQ_ADC, ts);
++	ucb1x00_reg_write(ts->ucb, UCB_TS_CR, 0);
++	ucb1x00_disable(ts->ucb);
++}
++
++#ifdef CONFIG_PM
++static int ucb1x00_ts_resume(struct ucb1x00_dev *dev)
++{
++	struct ucb1x00_ts *ts = dev->priv;
++
++	if (ts->rtask != NULL) {
++		/*
++		 * Restart the TS thread to ensure the
++		 * TS interrupt mode is set up again
++		 * after sleep.
++		 */
++		wake_up(&ts->irq_wait);
++	}
++	return 0;
++}
++#else
++#define ucb1x00_ts_resume NULL
++#endif
++
++
++/*
++ * Initialisation.
++ */
++static int ucb1x00_ts_add(struct ucb1x00_dev *dev)
++{
++	struct ucb1x00_ts *ts;
++	struct input_dev *idev;
++	int err;
++
++	ts = kzalloc(sizeof(struct ucb1x00_ts), GFP_KERNEL);
++	idev = input_allocate_device();
++	if (!ts || !idev) {
++		err = -ENOMEM;
++		goto fail;
++	}
++
++	ts->ucb = dev->ucb;
++	ts->idev = idev;
++	ts->adcsync = adcsync ? UCB_SYNC : UCB_NOSYNC;
++
++	input_set_drvdata(idev, ts);
++	idev->name       = "Touchscreen panel";
++	idev->id.product = ts->ucb->id;
++	idev->open       = ucb1x00_ts_open;
++	idev->close      = ucb1x00_ts_close;
++
++	__set_bit(EV_ABS, idev->evbit);
++	__set_bit(ABS_X, idev->absbit);
++	__set_bit(ABS_Y, idev->absbit);
++	__set_bit(ABS_PRESSURE, idev->absbit);
++
++        input_set_abs_params(ts->idev, ABS_X, 0, 450, 0, 0);
++        input_set_abs_params(ts->idev, ABS_Y, 200, 800, 0, 0);
++        input_set_abs_params(ts->idev, ABS_PRESSURE, 400, 800, 0, 0);
++
++
++	err = input_register_device(idev);
++	if (err)
++		goto fail;
++
++	dev->priv = ts;
++
++	return 0;
++
++ fail:
++	input_free_device(idev);
++	kfree(ts);
++	return err;
++}
++
++static void ucb1x00_ts_remove(struct ucb1x00_dev *dev)
++{
++	struct ucb1x00_ts *ts = dev->priv;
++
++	input_unregister_device(ts->idev);
++	kfree(ts);
++}
++
++static struct ucb1x00_driver ucb1x00_ts_driver = {
++	.add		= ucb1x00_ts_add,
++	.remove		= ucb1x00_ts_remove,
++	.resume		= ucb1x00_ts_resume,
++};
++
++static int __init ucb1x00_ts_init(void)
++{
++	return ucb1x00_register_driver(&ucb1x00_ts_driver);
++}
++
++static void __exit ucb1x00_ts_exit(void)
++{
++	ucb1x00_unregister_driver(&ucb1x00_ts_driver);
++}
++
++module_param(adcsync, int, 0444);
++module_init(ucb1x00_ts_init);
++module_exit(ucb1x00_ts_exit);
++
++MODULE_AUTHOR("Russell King <rmk@arm.linux.org.uk>");
++MODULE_DESCRIPTION("UCB1x00 touchscreen driver");
++MODULE_LICENSE("GPL");
+diff --git a/drivers/mfd/ucb1x00.h b/drivers/mfd/ucb1x00.h
+index a8ad8a0..137b043 100644
+--- a/drivers/mfd/ucb1x00.h
++++ b/drivers/mfd/ucb1x00.h
+@@ -34,7 +34,10 @@
+ #define UCB_IE_TCLIP		(1 << 14)
+ #define UCB_IE_ACLIP		(1 << 15)
+ 
++/* UCB1200 irqs */
++#define UCB_IRQ_ADC		11
+ #define UCB_IRQ_TSPX		12
++#define UCB_IRQ_TSMX		13
+ 
+ #define UCB_TC_A	0x05
+ #define UCB_TC_A_LOOP		(1 << 7)	/* UCB1200 */
+diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
+index 3b4e55c..0ae741d 100644
+--- a/drivers/net/wireless/hostap/hostap_cs.c
++++ b/drivers/net/wireless/hostap/hostap_cs.c
+@@ -35,7 +35,7 @@ static int ignore_cis_vcc;
+ module_param(ignore_cis_vcc, int, 0444);
+ MODULE_PARM_DESC(ignore_cis_vcc, "Ignore broken CIS VCC entry");
+ 
+-
++int activar=0;
+ /* struct local_info::hw_priv */
+ struct hostap_cs_priv {
+ 	dev_node_t node;
+@@ -499,11 +499,13 @@ static int hostap_cs_probe(struct pcmcia_device *p_dev)
+ 
+ 	PDEBUG(DEBUG_HW, "%s: setting Vcc=33 (constant)\n", dev_info);
+ 	p_dev->conf.IntType = INT_MEMORY_AND_IO;
+-
++	
++	activar=0;
+ 	ret = prism2_config(p_dev);
+ 	if (ret) {
+ 		PDEBUG(DEBUG_EXTRA, "prism2_config() failed\n");
+ 	}
++	activar=1;
+ 
+ 	return ret;
+ }
+diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c
+index 13d5882..6f24d66 100644
+--- a/drivers/net/wireless/hostap/hostap_hw.c
++++ b/drivers/net/wireless/hostap/hostap_hw.c
+@@ -54,6 +54,7 @@
+ #include "hostap.h"
+ #include "hostap_ap.h"
+ 
++extern int activar;
+ 
+ /* #define final_version */
+ 
+@@ -1497,6 +1498,8 @@ static int prism2_hw_config(struct net_device *dev, int initial)
+ 	if (local->hw_downloading)
+ 		return 1;
+ 
++	activar=1;
++
+ 	if (prism2_hw_init(dev, initial)) {
+ 		return local->no_pri ? 0 : 1;
+ 	}
+@@ -2628,8 +2631,15 @@ static irqreturn_t prism2_interrupt(int irq, void *dev_id)
+ 	int events = 0;
+ 	u16 ev;
+ 
+-	iface = netdev_priv(dev);
+-	local = iface->local;
++
++	// Todos los parametros de entrada son correctos (no son nulos). De momento esta es la unica forma que conozco de detectar el problema.
++	if (!activar) {
++		printk("hostap_hw.c: INTERRUPT BEFORE DEVICE INIT!\n");
++		return IRQ_HANDLED;
++	}
++
++ 	iface = netdev_priv(dev);
++ 	local = iface->local;
+ 
+ 	prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INTERRUPT, 0, 0);
+ 
+diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c
+index 3a874fc..df58aa3 100644
+--- a/drivers/net/wireless/hostap/hostap_pci.c
++++ b/drivers/net/wireless/hostap/hostap_pci.c
+@@ -19,6 +19,7 @@
+ 
+ #include "hostap_wlan.h"
+ 
++int activar=1;
+ 
+ static char *dev_info = "hostap_pci";
+ 
+diff --git a/drivers/net/wireless/hostap/hostap_plx.c b/drivers/net/wireless/hostap/hostap_plx.c
+index cbf15d7..4475174 100644
+--- a/drivers/net/wireless/hostap/hostap_plx.c
++++ b/drivers/net/wireless/hostap/hostap_plx.c
+@@ -21,7 +21,7 @@
+ #include <asm/io.h>
+ 
+ #include "hostap_wlan.h"
+-
++int activar=1;
+ 
+ static char *dev_info = "hostap_plx";
+ 
+diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c
+index c5b2a44..eecbe8c 100644
+--- a/drivers/pcmcia/sa1100_generic.c
++++ b/drivers/pcmcia/sa1100_generic.c
+@@ -81,13 +81,14 @@ static int sa11x0_drv_pcmcia_probe(struct device *dev)
+ 	return ret;
+ }
+ 
+-static struct device_driver sa11x0_pcmcia_driver = {
+-	.probe		= sa11x0_drv_pcmcia_probe,
+-	.remove		= soc_common_drv_pcmcia_remove,
+-	.name		= "sa11x0-pcmcia",
+-	.bus		= &platform_bus_type,
+-	.suspend 	= pcmcia_socket_dev_suspend,
+-	.resume 	= pcmcia_socket_dev_resume,
++static struct platform_driver sa11x0_pcmcia_driver = {
++	.driver 	= {
++		.name   = "sa11x0-pcmcia",
++		.probe	= sa11x0_drv_pcmcia_probe,
++		.remove	= soc_common_drv_pcmcia_remove,
++		.suspend= pcmcia_socket_dev_suspend,
++		.resume	= pcmcia_socket_dev_resume,
++	},
+ };
+ 
+ /* sa11x0_pcmcia_init()
+@@ -100,7 +101,7 @@ static struct device_driver sa11x0_pcmcia_driver = {
+  */
+ static int __init sa11x0_pcmcia_init(void)
+ {
+-	return driver_register(&sa11x0_pcmcia_driver);
++	return platform_driver_register(&sa11x0_pcmcia_driver);
+ }
+ 
+ /* sa11x0_pcmcia_exit()
+@@ -110,7 +111,7 @@ static int __init sa11x0_pcmcia_init(void)
+  */
+ static void __exit sa11x0_pcmcia_exit(void)
+ {
+-	driver_unregister(&sa11x0_pcmcia_driver);
++	platform_driver_unregister(&sa11x0_pcmcia_driver);
+ }
+ 
+ MODULE_AUTHOR("John Dorsey <john+@cs.cmu.edu>");
+diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
+index 66ec5d8..aba38d7 100644
+--- a/drivers/spi/Kconfig
++++ b/drivers/spi/Kconfig
+@@ -123,6 +123,10 @@ config SPI_MPC52xx_PSC
+ 	  This enables using the Freescale MPC52xx Programmable Serial
+ 	  Controller in master SPI mode.
+ 
++config SPI_LOCOMO
++	tristate "Locomo SPI master"
++	depends on SPI_MASTER && SHARP_LOCOMO && EXPERIMENTAL
++
+ config SPI_MPC83xx
+ 	tristate "Freescale MPC83xx/QUICC Engine SPI controller"
+ 	depends on SPI_MASTER && (PPC_83xx || QUICC_ENGINE) && EXPERIMENTAL
+diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
+index 7fca043..b89992b 100644
+--- a/drivers/spi/Makefile
++++ b/drivers/spi/Makefile
+@@ -28,6 +28,7 @@ obj-$(CONFIG_SPI_S3C24XX)		+= spi_s3c24xx.o
+ obj-$(CONFIG_SPI_TXX9)			+= spi_txx9.o
+ obj-$(CONFIG_SPI_XILINX)		+= xilinx_spi.o
+ obj-$(CONFIG_SPI_SH_SCI)		+= spi_sh_sci.o
++obj-$(CONFIG_SPI_LOCOMO)                += locomo_spi.o
+ # 	... add above this line ...
+ 
+ # SPI protocol drivers (device/link on bus)
+diff --git a/drivers/spi/locomo_spi.c b/drivers/spi/locomo_spi.c
+new file mode 100644
+index 0000000..d3a4bd9
+--- /dev/null
++++ b/drivers/spi/locomo_spi.c
+@@ -0,0 +1,1097 @@
++#include <asm/io.h>
++#include <asm/irq.h>
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/device.h>
++#include <linux/stat.h>
++#include <linux/delay.h>
++#include <linux/wait.h>
++#include <linux/interrupt.h>
++#include <asm/hardware/locomo.h>
++#include <asm/errno.h>
++#include <linux/mmc/host.h>
++#include <linux/spi/spi.h>
++#include <linux/spi/mmc_spi.h>
++#include <linux/workqueue.h>
++#include <linux/spinlock.h>
++#include <linux/list.h>
++#include "locomo_spi.h"
++static struct locomospi_dev * spidev;
++static struct work_struct transfer_wq;
++int  delay;
++
++char* transtxbuf=(char*)NULL;
++char* transrxbuf=(char*)NULL;
++int transfercount=0, transfersize=0;
++static DECLARE_WAIT_QUEUE_HEAD(transferqueue);
++/* MMC_SPI functions *********************************************************/
++
++static int locomommcspi_init(struct device *dev, irqreturn_t (*isr)(int, void*), void *mmc)
++{
++	int result;
++	result=request_irq(IRQ_LOCOMO_CARDDETECT, isr, IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING, "locomo-spi",  mmc);
++	return result;
++}
++
++static void locomommcspi_exit(struct device *dev, void* mmc)
++{
++	free_irq(IRQ_LOCOMO_CARDDETECT, mmc);
++}
++
++static int locomommcspi_getro(struct device *dev)
++{
++	return locomo_gpio_read_level(spidev->ldev->dev.parent,LOCOMO_GPIO_WRITE_PROT) > 0 ? 1 : 0;
++}
++
++static void locomommcspi_setpower(struct device *dev, unsigned int mask)
++{
++	if(!mask && spidev->card_power)
++		locomospi_power(0);
++	else if( !spidev->card_power )
++		locomospi_power(1);
++
++}
++
++
++static struct mmc_spi_platform_data colliemmc ={
++	.init 		= locomommcspi_init,
++	.exit 		= locomommcspi_exit,
++	.detect_delay 	= 200,
++	.get_ro 	= locomommcspi_getro,
++	.ocr_mask 	= MMC_VDD_32_33 | MMC_VDD_33_34,
++	.setpower	= locomommcspi_setpower,
++	.powerup_msecs  = 200,
++};
++
++/* Utility function **********************************************************/
++
++static void locomospi_power(int on)
++{
++	locomo_gpio_write(spidev->ldev->dev.parent, LOCOMO_GPIO_CARD_POWER, on);
++	spidev->card_power=on;
++	printk(KERN_DEBUG "locomospi: power %d\n",on);
++}
++
++static void locomospi_setclock(unsigned int div, unsigned int clock)
++{
++	u16 r = ioread16(spidev->base+LOCOMO_SPIMD);
++	div &= 0x7;
++	clock &= 0x3;
++	if(clock != spidev->clock_base || div != spidev->clock_div){
++		r &= ~(LOCOMO_SPI_XSEL  | LOCOMO_SPI_CLKSEL | LOCOMO_SPI_XEN);
++		iowrite16(r,spidev->base+LOCOMO_SPIMD);
++		r |=  (div | (clock <<3) | LOCOMO_SPI_XEN);
++		iowrite16(r,spidev->base+LOCOMO_SPIMD);
++		spidev->clock_div = div;
++		spidev->clock_base = clock;
++		udelay(300);
++	}
++
++}
++// returns 1 if card ist present, 0 otherwise
++static int locomospi_carddetect()
++{
++	return (locomo_gpio_read_level(spidev->ldev->dev.parent,LOCOMO_GPIO_CARD_DETECT)>0)?0:1;
++}
++
++static void locomospi_setcs(int high)
++{
++	u16 r;
++	printk(KERN_DEBUG "locomospi: cs %d\n",high);
++	r = ioread16(spidev->base + LOCOMO_SPICT);
++	if(high)
++		r |= LOCOMO_SPI_CS;
++	else
++		r &= ~LOCOMO_SPI_CS;
++	iowrite16(r, spidev->base + LOCOMO_SPICT);
++}
++
++static void locomospi_reg_open()
++{
++	u16 r;
++	spidev->clock_div = DIV_64;
++	spidev->clock_base = CLOCK_18MHZ;
++	locomospi_power(1);
++	msleep(100);
++//	iowrite16( 0xec00 | (CLOCK_18MHZ <<3)|DIV_64, spidev->base+LOCOMO_SPIMD);
++	iowrite16( LOCOMO_SPI_MSB1ST | LOCOMO_SPI_DOSTAT | LOCOMO_SPI_RCPOL | LOCOMO_SPI_TCPOL 
++			|(CLOCK_18MHZ <<3) | DIV_64, spidev->base+LOCOMO_SPIMD);
++//	if(locomospi_carddetect()){
++		r = ioread16(spidev->base+LOCOMO_SPIMD);
++		r |= LOCOMO_SPI_XON;
++		iowrite16( r, spidev->base+LOCOMO_SPIMD);
++		r = ioread16(spidev->base+LOCOMO_SPIMD);
++		r |= LOCOMO_SPI_XEN;
++		iowrite16( r, spidev->base+LOCOMO_SPIMD);
++//	}
++	iowrite16( LOCOMO_SPI_CS, spidev->base+LOCOMO_SPICT);
++	r = ioread16(spidev->base+LOCOMO_SPICT);
++	r |= (LOCOMO_SPI_CEN | LOCOMO_SPI_RXUEN | LOCOMO_SPI_ALIGNEN);
++	iowrite16( r, spidev->base+LOCOMO_SPICT);
++	udelay(200);
++	r = ioread16(spidev->base+LOCOMO_SPICT);
++	iowrite16(r, spidev->base+LOCOMO_SPICT);
++	r = ioread16(spidev->base+LOCOMO_SPICT);
++	r &= ~LOCOMO_SPI_CS;
++	iowrite16(r, spidev->base+LOCOMO_SPICT);
++}
++
++static void locomospi_reg_release()
++{
++	u16 r;
++	r = ioread16(spidev->base+LOCOMO_SPICT);
++	r &= ~LOCOMO_SPI_CEN;
++	iowrite16(r, spidev->base+LOCOMO_SPICT);
++	r = ioread16(spidev->base+LOCOMO_SPIMD);
++	r &= ~LOCOMO_SPI_XEN;
++	iowrite16(r, spidev->base+LOCOMO_SPIMD);
++	r = ioread16(spidev->base+LOCOMO_SPIMD);
++	r &= ~LOCOMO_SPI_XON;
++	iowrite16(r, spidev->base+LOCOMO_SPIMD);
++	r = ioread16(spidev->base+LOCOMO_SPICT);
++	r |= LOCOMO_SPI_XEN;
++	iowrite16(r, spidev->base+LOCOMO_SPICT);
++	locomospi_power(0);
++}
++#if 0
++static int txrx(const char* txbuffer, char* rxbuffer, int size)
++{
++	u16 r = ioread16(spidev->base+LOCOMO_SPICT);
++	r |= LOCOMO_SPI_ALIGNEN;
++	iowrite16(r, spidev->base+LOCOMO_SPICT);
++	printk(KERN_DEBUG "locomospi: %d bytes to prozess\n",size);
++	/* initialize global vars for isr */
++	transfercount=0; transfersize=size; 
++	transtxbuf=txbuffer; transrxbuf=rxbuffer;
++
++	/* start transmit and go sleep  isr will wake us*/
++	enable_irq(IRQ_LOCOMO_SPI_TEND);
++	iowrite8(txbuffer[0], spidev->base+LOCOMO_SPITD);
++	wait_event(transferqueue, transfercount >= transfersize);
++	disable_irq(IRQ_LOCOMO_SPI_TEND);
++	transrxbuf=NULL; transtxbuf=NULL;
++	
++	r = ioread16(spidev->base+LOCOMO_SPICT);
++	r &= ~LOCOMO_SPI_ALIGNEN;
++	iowrite16(r, spidev->base+LOCOMO_SPICT);
++	int i;
++	for(i=0; i< size; i++)
++		printk(KERN_DEBUG "locomospi: sent: %x  received: %x \n",txbuffer[i], rxbuffer[i]);
++	
++	
++	return size;
++}
++
++
++static int tx(const char* txbuffer, int size)
++{
++	printk(KERN_DEBUG "locomospi: %d bytes to send\n",size);
++	/* initialize global vars for isr */
++	transfercount=0; transfersize=size; 
++	transtxbuf=txbuffer; 
++
++	/* start transmit and go sleep  isr will wake us*/
++	enable_irq(IRQ_LOCOMO_SPI_RFW);
++	iowrite8(txbuffer[0], spidev->base+LOCOMO_SPITD);
++	wait_event(transferqueue, transfercount >= transfersize);
++	disable_irq(IRQ_LOCOMO_SPI_RFW);
++	transtxbuf=NULL;
++	
++	int i;
++	for(i=0; i< size; i++)
++		printk(KERN_DEBUG "locomospi: sent: %x\n",txbuffer[i]);
++	
++	
++	return size;
++}
++
++static int rx(char* rxbuffer, int size)
++{
++	printk(KERN_DEBUG "locomospi: %d bytes to read\n",size);
++	/* initialize global vars for isr */
++	transfercount=0; transfersize=size; 
++	transrxbuf=rxbuffer;
++
++	/* start transmit and go sleep  isr will wake us*/
++	enable_irq(IRQ_LOCOMO_SPI_RFR);
++	rxbuffer[0]=ioread8(spidev->base+LOCOMO_SPIRD);
++	wait_event(transferqueue, transfercount >= transfersize);
++	disable_irq(IRQ_LOCOMO_SPI_RFR);
++	transrxbuf=NULL;
++	
++	int i;
++	for(i=0; i< size; i++)
++		printk(KERN_DEBUG "locomospi: received: %x \n", rxbuffer[i]);
++	
++	
++	return size;
++}
++
++#else
++static int txrx(const char* txbuffer, char* rxbuffer, int size)
++{
++	int i=0,j=0;
++	int wait;
++	u16 r;
++/*	char * txback = kmalloc(size * sizeof(char), GFP_KERNEL);
++	memcpy(txback, txbuffer, size);	
++*/	
++	if(spidev->clock_div == 4)
++		wait = 0x10000;
++	else
++		wait = 8;
++	
++//	printk(KERN_DEBUG "locomospi: txrx %d bytes to prozess\n",size);
++	
++//	r = ioread16(spidev->base+LOCOMO_SPICT);
++//	r |= LOCOMO_SPI_ALIGNEN;
++//	iowrite16(r, spidev->base+LOCOMO_SPICT);
++	//discard first bogus byte
++
++	ioread8(spidev->base+LOCOMO_SPIRD);
++	for(i=0; i<size; i++){
++		for(j=0; j <= wait; j++){
++			if(ioread16(spidev->base+LOCOMO_SPIST) & LOCOMO_SPI_RFW)
++				break;
++		}
++		iowrite8(txbuffer[i], spidev->base+LOCOMO_SPITD);
++		ndelay(delay);
++		
++		for(j=0; j <= wait; j++){
++			if(ioread16(spidev->base+LOCOMO_SPIST) & LOCOMO_SPI_RFR)
++				break;
++		}
++		rxbuffer[i] = ioread8(spidev->base+LOCOMO_SPIRD);
++		ndelay(delay);
++	}
++//	r = ioread16(spidev->base+LOCOMO_SPICT);
++//	r &= ~LOCOMO_SPI_ALIGNEN;
++//	iowrite16(r, spidev->base+LOCOMO_SPICT);
++	
++/*	for(j=0; j< size; j++)
++		printk(KERN_DEBUG "locomospi: sent: %x  received: %x \n",txback[j], rxbuffer[j]);
++	
++	kfree(txback);	
++*/	return i;
++}
++
++static int tx(const char* buffer, int size)
++{
++	int i=0,j=0;
++	int wait;
++	u16 r;
++	if(spidev->clock_div == 4)
++		wait = 0x10000;
++	else
++		wait = 8;
++	r = ioread16(spidev->base+LOCOMO_SPICT);
++	r &= ~LOCOMO_SPI_ALIGNEN;
++	iowrite16(r, spidev->base+LOCOMO_SPICT);
++
++//	printk(KERN_DEBUG "locomospi: tx %d bytes to transmit\n",size);
++	for(i=0; i<size; i++){
++		for(j=0; j <= wait; j++){
++			if(ioread16(spidev->base+LOCOMO_SPIST) & LOCOMO_SPI_RFW)
++				break;
++		}
++		iowrite8(buffer[i], spidev->base+LOCOMO_SPITD);
++		ndelay(delay);
++	}
++
++	for(j=0; j <= wait; j++){
++		if(ioread16(spidev->base+LOCOMO_SPIST) & LOCOMO_SPI_TEND)
++			break;
++	}
++	
++	r = ioread16(spidev->base+LOCOMO_SPICT);
++	r |= LOCOMO_SPI_ALIGNEN;
++	iowrite16(r, spidev->base+LOCOMO_SPICT);
++	
++//	for(j=0; j< size; j++)
++//		printk(KERN_DEBUG "locomospi: sent: %x \n", buffer[j]);
++//	printk(KERN_DEBUG "locomospi: tx %d bytes transmitted\n",i);
++	return i;
++}
++
++static int rx(char* buffer, int size)
++{
++	int i,j;
++	int wait;
++	u16 r; 	
++	printk(KERN_DEBUG "locomospi: rx %d bytes to receive\n",size);
++	if(spidev->clock_div == 4)
++		wait = 0x10000;
++	else
++		wait = 8;
++	r = ioread16(spidev->base+LOCOMO_SPICT);
++	r &= ~LOCOMO_SPI_ALIGNEN;
++	iowrite16(r, spidev->base+LOCOMO_SPICT);
++
++	for(i=0; i<size; i++){
++
++		for(j=0; j <= wait; j++){
++			if(ioread16(spidev->base+LOCOMO_SPIST) & LOCOMO_SPI_RFR)
++				break;
++		}
++		buffer[i]= ioread8(spidev->base+LOCOMO_SPIRD);
++		ndelay(delay);
++	}
++	
++	r = ioread16(spidev->base+LOCOMO_SPICT);
++	r |= LOCOMO_SPI_ALIGNEN;
++	iowrite16(r, spidev->base+LOCOMO_SPICT);
++	
++	for(j=0; j< size; j++)
++		printk(KERN_DEBUG "locomospi: received: %x \n", buffer[j]);
++	printk(KERN_DEBUG "locomospi: rx %d bytes received\n",i);
++	return i;
++}
++#endif
++/*
++static irqreturn_t locomospi_rwready(int irq, void *dev_id)
++{
++	struct locomospi_dev* dev=(struct locomospi_dev*) dev_id;
++//	dev_dbg(&spidev->sdev->dev, "IRQ: %d\n", irq);
++//	printk(KERN_DEBUG "locomospi: IRQ: %d\n", irq);
++	wake_up_interruptible(&dev->waitqueue);
++	return IRQ_HANDLED;
++}
++*/
++static irqreturn_t locomospi_testisr(int irq, void *dev_id)
++{
++	char *buf="";
++	switch(irq){
++		case IRQ_LOCOMO_SPI_RFR: buf="RFR";
++					 break;
++		case IRQ_LOCOMO_SPI_RFW: buf="RFW";
++					 break;
++		case IRQ_LOCOMO_SPI_REND:buf="REND";
++					 break;
++		case IRQ_LOCOMO_SPI_TEND:buf="TEND";
++					 break;
++		case IRQ_LOCOMO_CARDDETECT:
++					 buf="CARD_DETECT";
++					 break;
++		default:		return IRQ_NONE;
++	}
++	printk(KERN_DEBUG "locomospi: IRQ: %s\n",buf);
++//	dev_dbg(&spidev->sdev->dev, "IRQ: %s\n",buf);
++	return IRQ_HANDLED;
++}
++static irqreturn_t locomospi_txrxisr(int irq, void *dev_id)
++{
++	if(transfercount < transfersize){
++		transrxbuf[transfercount++] = ioread8(spidev->base+LOCOMO_SPIRD);
++		iowrite8(transtxbuf[transfercount], spidev->base+LOCOMO_SPITD); 		
++	}
++	else{
++		/* transfer complete. wake up txrx */
++		wake_up(&transferqueue);
++	}
++	return IRQ_HANDLED;	
++}	
++
++static irqreturn_t locomospi_txisr(int irq, void *dev_id)
++{
++	if(transfercount < transfersize){
++		iowrite8(transtxbuf[transfercount++], spidev->base+LOCOMO_SPITD); 		
++	}
++	else{
++		/* transfer complete. wake up txrx */
++		wake_up(&transferqueue);
++	}
++	return IRQ_HANDLED;	
++}	
++
++static irqreturn_t locomospi_rxisr(int irq, void *dev_id)
++{
++	if(transfercount < transfersize){
++		transrxbuf[transfercount++] = ioread8(spidev->base+LOCOMO_SPIRD);
++	}
++	else{
++		/* transfer complete. wake up txrx */
++		wake_up(&transferqueue);
++	}
++	return IRQ_HANDLED;	
++}	
++
++static void locomospi_clock(unsigned int Hz)
++{
++	u16 r;
++	printk(KERN_DEBUG "locomospi: changing clock to: %d\n", Hz);
++	if(Hz == 0){
++		r = ioread16(spidev->base+LOCOMO_SPIMD);
++		r &= ~LOCOMO_SPI_XON;
++		iowrite16(r, spidev->base+LOCOMO_SPIMD);
++	}
++	else if(Hz >= 24576000){
++		r = ioread16(spidev->base+LOCOMO_SPIMD);
++		r |= LOCOMO_SPI_XON;
++		iowrite16(r, spidev->base+LOCOMO_SPIMD);
++		locomospi_setclock(DIV_1, CLOCK_25MHZ);
++		delay=41;
++	}
++	else if(Hz >= 22579200){
++		r = ioread16(spidev->base+LOCOMO_SPIMD);
++		r |= LOCOMO_SPI_XON;
++		iowrite16(r, spidev->base+LOCOMO_SPIMD);
++		locomospi_setclock(DIV_1, CLOCK_22MHZ);
++		delay=45;
++	}
++	else if(Hz >= 18432000){
++		r = ioread16(spidev->base+LOCOMO_SPIMD);
++		r |= LOCOMO_SPI_XON;
++		iowrite16(r, spidev->base+LOCOMO_SPIMD);
++		locomospi_setclock(DIV_1, CLOCK_18MHZ);
++		delay=55;
++	}
++	else if(Hz >= 12288000){
++		r = ioread16(spidev->base+LOCOMO_SPIMD);
++		r |= LOCOMO_SPI_XON;
++		iowrite16(r, spidev->base+LOCOMO_SPIMD);
++		locomospi_setclock(DIV_2, CLOCK_25MHZ);
++		delay=82;
++	}
++	else if(Hz >= 11289600){
++		r = ioread16(spidev->base+LOCOMO_SPIMD);
++		r |= LOCOMO_SPI_XON;
++		iowrite16(r, spidev->base+LOCOMO_SPIMD);
++		locomospi_setclock(DIV_2, CLOCK_22MHZ);
++		delay=89;
++	}
++	else if(Hz >= 9216000){
++		r = ioread16(spidev->base+LOCOMO_SPIMD);
++		r |= LOCOMO_SPI_XON;
++		iowrite16(r, spidev->base+LOCOMO_SPIMD);
++		locomospi_setclock(DIV_2, CLOCK_18MHZ);
++		delay=110;
++	}
++	else if(Hz >= 6144000){
++		r = ioread16(spidev->base+LOCOMO_SPIMD);
++		r |= LOCOMO_SPI_XON;
++		iowrite16(r, spidev->base+LOCOMO_SPIMD);
++		locomospi_setclock(DIV_4, CLOCK_25MHZ);
++		delay=164;
++	}
++	else if(Hz >= 5644800){
++		r = ioread16(spidev->base+LOCOMO_SPIMD);
++		r |= LOCOMO_SPI_XON;
++		iowrite16(r, spidev->base+LOCOMO_SPIMD);
++		locomospi_setclock(DIV_4, CLOCK_22MHZ);
++		delay=178;
++	}
++	else if(Hz >= 4608000){
++		r = ioread16(spidev->base+LOCOMO_SPIMD);
++		r |= LOCOMO_SPI_XON;
++		iowrite16(r, spidev->base+LOCOMO_SPIMD);
++		locomospi_setclock(DIV_4, CLOCK_18MHZ);
++		delay=218;
++	}
++	else if(Hz >= 3072000){
++		r = ioread16(spidev->base+LOCOMO_SPIMD);
++		r |= LOCOMO_SPI_XON;
++		iowrite16(r, spidev->base+LOCOMO_SPIMD);
++		locomospi_setclock(DIV_8, CLOCK_25MHZ);
++		delay=327;
++	}
++	else if(Hz >= 2822400){
++		r = ioread16(spidev->base+LOCOMO_SPIMD);
++		r |= LOCOMO_SPI_XON;
++		iowrite16(r, spidev->base+LOCOMO_SPIMD);
++		locomospi_setclock(DIV_8, CLOCK_22MHZ);
++		delay=355;
++	}
++	else if(Hz >= 2304000){
++		r = ioread16(spidev->base+LOCOMO_SPIMD);
++		r |= LOCOMO_SPI_XON;
++		iowrite16(r, spidev->base+LOCOMO_SPIMD);
++		locomospi_setclock(DIV_8, CLOCK_18MHZ);
++		delay=435;
++	}
++	else if(Hz >= 384000){
++		r = ioread16(spidev->base+LOCOMO_SPIMD);
++		r |= LOCOMO_SPI_XON;
++		iowrite16(r, spidev->base+LOCOMO_SPIMD);
++		locomospi_setclock(DIV_64, CLOCK_25MHZ);
++		delay=2605;
++	}
++	else if(Hz >= 352800){
++		r = ioread16(spidev->base+LOCOMO_SPIMD);
++		r |= LOCOMO_SPI_XON;
++		iowrite16(r, spidev->base+LOCOMO_SPIMD);
++		locomospi_setclock(DIV_64, CLOCK_22MHZ);
++		delay=2834;
++	}
++	else{ /* set to 288 KHz */
++		r = ioread16(spidev->base+LOCOMO_SPIMD);
++		r |= LOCOMO_SPI_XON;
++		iowrite16(r, spidev->base+LOCOMO_SPIMD);
++		locomospi_setclock(DIV_64, CLOCK_18MHZ);
++		delay=3473;
++	}
++	spidev->clock = Hz;
++}
++
++/* sysfs attributes used for debug *******************************************/
++
++/* SPI registers */
++ssize_t locomospi_showspimd(struct device_driver *drv, char *buf)
++{
++	return sprintf(buf, "0x%x\n", ioread16(spidev->base+LOCOMO_SPIMD));
++}
++
++ssize_t locomospi_storespimd(struct device_driver *drv, const char *buf, size_t count)
++{
++	iowrite16(simple_strtoul(buf, NULL, 16), spidev->base+LOCOMO_SPIMD);
++	return count;
++}
++static DRIVER_ATTR(spimd, S_IWUSR | S_IRUGO, locomospi_showspimd, locomospi_storespimd);
++
++ssize_t locomospi_showspict(struct device_driver *drv, char *buf)
++{
++	return sprintf(buf, "0x%x\n", ioread16(spidev->base+LOCOMO_SPICT));
++}
++
++ssize_t locomospi_storespict(struct device_driver *drv, const char *buf, size_t count)
++{
++	iowrite16(simple_strtoul(buf, NULL, 16), spidev->base+LOCOMO_SPICT);
++	return count;
++}
++static DRIVER_ATTR(spict, S_IWUSR | S_IRUGO, locomospi_showspict, locomospi_storespict);
++
++ssize_t locomospi_showspist(struct device_driver *drv, char *buf)
++{
++	return sprintf(buf, "0x%x\n", ioread16(spidev->base+LOCOMO_SPIST));
++}
++
++ssize_t locomospi_storespist(struct device_driver *drv, const char *buf, size_t count)
++{
++	iowrite16(simple_strtoul(buf, NULL, 16), spidev->base+LOCOMO_SPIST);
++	return count;
++}
++static DRIVER_ATTR(spist, S_IWUSR | S_IRUGO, locomospi_showspist, locomospi_storespist);
++
++ssize_t locomospi_showspitd(struct device_driver *drv, char *buf)
++{
++	return sprintf(buf, "0x%x\n", ioread16(spidev->base+LOCOMO_SPITD));
++}
++
++ssize_t locomospi_storespitd(struct device_driver *drv, const char *buf, size_t count)
++{
++	iowrite16(simple_strtoul(buf, NULL, 16), spidev->base+LOCOMO_SPITD);
++	return count;
++}
++static DRIVER_ATTR(spitd, S_IWUSR | S_IRUGO, locomospi_showspitd, locomospi_storespitd);
++
++ssize_t locomospi_showspird(struct device_driver *drv, char *buf)
++{
++	return sprintf(buf, "0x%x\n", ioread16(spidev->base+LOCOMO_SPIRD));
++}
++
++ssize_t locomospi_storespird(struct device_driver *drv, const char *buf, size_t count)
++{
++	iowrite16(simple_strtoul(buf, NULL, 16), spidev->base+LOCOMO_SPIRD);
++	return count;
++}
++static DRIVER_ATTR(spird, S_IWUSR | S_IRUGO, locomospi_showspird, locomospi_storespird);
++
++ssize_t locomospi_showspits(struct device_driver *drv, char *buf)
++{
++	return sprintf(buf, "0x%x\n", ioread16(spidev->base+LOCOMO_SPITS));
++}
++
++ssize_t locomospi_storespits(struct device_driver *drv, const char *buf, size_t count)
++{
++	iowrite16(simple_strtoul(buf, NULL, 16), spidev->base+LOCOMO_SPITS);
++	return count;
++}
++static DRIVER_ATTR(spits, S_IWUSR | S_IRUGO, locomospi_showspits, locomospi_storespits);
++
++ssize_t locomospi_showspirs(struct device_driver *drv, char *buf)
++{
++	return sprintf(buf, "0x%x\n", ioread16(spidev->base+LOCOMO_SPIRS));
++}
++
++ssize_t locomospi_storespirs(struct device_driver *drv, const char *buf, size_t count)
++{
++	iowrite16(simple_strtoul(buf, NULL, 16), spidev->base+LOCOMO_SPIRS);
++	return count;
++}
++static DRIVER_ATTR(spirs, S_IWUSR | S_IRUGO, locomospi_showspirs, locomospi_storespirs);
++
++/* MMC Card status */
++
++ssize_t locomospi_showpower(struct device_driver *drv, char *buf)
++{
++	return sprintf(buf, "%d\n", spidev->card_power);
++}
++
++ssize_t locomospi_storepower(struct device_driver *drv, const char *buf, size_t count)
++{
++	locomospi_power(simple_strtoul(buf, NULL, 10));
++	return count;
++}
++static DRIVER_ATTR(cardpower, S_IWUSR | S_IRUGO, locomospi_showpower, locomospi_storepower);
++
++ssize_t locomospi_detectcard(struct device_driver *drv, char *buf)
++{
++	return sprintf(buf, "%d\n",(locomo_gpio_read_level(spidev->ldev->dev.parent,LOCOMO_GPIO_CARD_DETECT)>0)?0:1);
++}
++static DRIVER_ATTR(carddetect, S_IRUGO, locomospi_detectcard, NULL);
++
++ssize_t locomospi_writeprotect(struct device_driver *drv, char *buf)
++{
++	return sprintf(buf, "%d\n",(locomo_gpio_read_level(spidev->ldev->dev.parent,LOCOMO_GPIO_WRITE_PROT)>0)?1:0);
++}
++static DRIVER_ATTR(cardwriteprotect, S_IRUGO, locomospi_writeprotect, NULL);
++
++
++ssize_t locomospi_showclock(struct device_driver *drv, char *buf)
++{
++	return sprintf(buf, "%d\n", spidev->clock);
++}
++
++ssize_t locomospi_storeclock(struct device_driver *drv, const char *buf, size_t count)
++{
++	locomospi_clock(simple_strtoul(buf, NULL, 10));
++	return count;
++}
++static DRIVER_ATTR(clock, S_IWUSR | S_IRUGO, locomospi_showclock, locomospi_storeclock);
++
++/* debug */
++ssize_t locomospi_showdelay(struct device_driver *drv, char *buf)
++{
++	return sprintf(buf, "%d\n", delay);
++}
++
++ssize_t locomospi_storedelay(struct device_driver *drv, const char *buf, size_t count)
++{
++	delay=simple_strtoul(buf,NULL,10);
++	return count;
++}
++static DRIVER_ATTR(delay, S_IWUSR | S_IRUGO, locomospi_showdelay, locomospi_storedelay);
++
++ssize_t locomospi_reset(struct device_driver *drv, const char *buf, size_t count)
++{
++	int choice = simple_strtoul(buf, NULL, 10);
++	char   buff[100];
++	u16 r; 
++	switch(choice){
++		case 0: locomospi_reg_release();
++			schedule_timeout(2*HZ);
++			locomospi_reg_open();
++			break;
++		case 1: {
++				char b1[] = "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff";
++				char b2[] = "\xff\x40\x00\x00\x00\x00\x95\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff";
++				locomospi_setcs(1);
++				txrx(b1,b1,17);
++				locomospi_setcs(0);
++				txrx(b2,b2,18);
++
++			}
++			break;
++		case 2: locomospi_setcs(1);
++			txrx("\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff",buff,18);
++			locomospi_setcs(0);
++			txrx("\xff\x40\x00\x00\x00\x00\x95\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff",buff,17);
++			break;
++		case 3: 
++			r = ioread16(spidev->base+LOCOMO_SPIMD);
++			r |= LOCOMO_SPI_LOOPBACK;
++			iowrite16(r, spidev->base+LOCOMO_SPIMD);
++			txrx("X",buff,1);
++			txrx("abcdefghijklmnopqrstuvwxyz1234567890",buff,36);
++			txrx("Y",buff,1);
++			udelay(100);
++			txrx("Z",buff,1);
++			schedule_timeout(HZ);	
++			txrx("abcdefghijklmnopqrstuvwxyz1234567890",buff,36);
++			
++			r = ioread16(spidev->base+LOCOMO_SPIMD);
++			r &= ~LOCOMO_SPI_LOOPBACK;
++			iowrite16(r, spidev->base+LOCOMO_SPIMD);
++			break;
++		default: /* do nothing */;
++	}
++	return count;
++}
++static DRIVER_ATTR(reset, S_IWUSR, NULL, locomospi_reset);
++
++typedef struct locomo_reg_entry {
++        u32 addr;
++        char* name;
++} locomo_reg_entry_t;
++#define LCM     (sizeof(locomo_regs)/sizeof(locomo_reg_entry_t))
++static locomo_reg_entry_t locomo_regs[] =
++{
++/*      { addr,    name,     description } */
++        { 0x00, "VER" },
++        { 0x04, "ST" },
++        { 0x08, "C32K" },
++        { 0x0C, "ICR" },
++        { 0x10, "MCSX0" },
++        { 0x14, "MCSX1" },
++        { 0x18, "MCSX2" },
++        { 0x1C, "MCSX3" },
++        { 0x20, "ASD" },
++        { 0x28, "HSD" },
++        { 0x2C, "HSC" },
++        { 0x30, "TADC" },
++        { 0x38, "TC" },
++        { 0x3C, "CPSD" },
++        { 0x40, "KIB" },
++        { 0x44, "KSC" },
++        { 0x48, "KCMD" },
++        { 0x4C, "KIC" },
++        { 0x54, "ACC" },
++        { 0x60, "SPIMD" },
++        { 0x64, "SPICT" },
++        { 0x68, "SPIST" },
++        { 0x70, "SPIIS" },
++        { 0x74, "SPIWE" },
++        { 0x78, "SPIIE" },
++        { 0x7C, "SPIIR" },
++        { 0x80, "SPITD" },
++        { 0x84, "SPIRD" },
++        { 0x88, "SPITS" },
++        { 0x8C, "SPIRS" },
++        { 0x90, "GPD" },
++        { 0x94, "GPE" },
++        { 0x98, "GPL" },
++        { 0x9C, "GPO" },
++        { 0xa0, "GRIE" },
++        { 0xa4, "GFIE" },
++        { 0xa8, "GIS" },
++        { 0xac, "GWE" },
++        { 0xb0, "GIE" },
++        { 0xb4, "GIR" },
++        { 0xc8, "ALC" },
++        { 0xcc, "ALR" },
++        { 0xd0, "PAIF" },
++        { 0xd8, "LTC" },
++        { 0xdc, "LTINT" },
++        { 0xe0, "DAC" },
++        { 0xe8, "LPT0" },
++        { 0xec, "LPT1" },
++        { 0xfc, "TCR" },
++};
++
++static ssize_t lcm_show(struct device *dev, struct device_attribute *attr, char *buf)
++{
++	int base = spidev->base - LOCOMO_SPI; 
++	char b[4000]="";
++	char c[30];
++	int i;
++	for(i=0; i<LCM; i++){
++		sprintf(c,"%s:\t\t 0x%x\n",locomo_regs[i].name, ioread16(base + locomo_regs[i].addr));
++		strcat(b,c);
++	}
++	return sprintf(buf,"%s",b);
++}
++
++static DRIVER_ATTR(regs, 0444, lcm_show, NULL);
++
++
++/* SPI functions *************************************************************/
++
++static void locomospi_do_transfer(struct work_struct *wrk)
++{
++	struct list_head *mptr, *tptr, *mptr2;
++	struct spi_transfer *entry;
++	struct spi_message *msg;
++
++	list_for_each_safe(mptr, mptr2, &spidev->message_list){
++		msg = list_entry(mptr, struct spi_message, queue);
++
++		msg->status = 0;
++		msg->actual_length = 0;
++		list_for_each(tptr, &msg->transfers){
++			entry = list_entry(tptr, struct spi_transfer, transfer_list);
++			if(entry->tx_buf && entry->rx_buf){ //duplex
++				txrx((char*) entry->tx_buf, (char*) entry->rx_buf, entry->len);				
++				msg->actual_length += entry->len;
++			} else if(entry->tx_buf && !entry->rx_buf){ //write
++				tx((char*) entry->tx_buf, entry->len);
++				msg->actual_length += entry->len;
++			} else if(!entry->tx_buf && entry->rx_buf){ //read
++				rx((char*) entry->rx_buf, entry->len);
++				msg->actual_length += entry->len;
++			} else if(!entry->tx_buf && !entry->rx_buf){ //error
++				dev_err(&spidev->sdev->dev, "do_transfer: no buffers allocated\n");
++				msg->status = -EFAULT;
++			}
++		}
++		spin_lock(&spidev->message_lock);
++		list_del(mptr);
++		spin_unlock(&spidev->message_lock);
++		msg->complete(msg->context);
++	}
++}
++
++static int locomospi_setup(struct spi_device *spi)
++{
++	if((spi->mode & SPI_CS_HIGH) != (spidev->spimode & SPI_CS_HIGH)) 
++		locomospi_setcs(spi->mode & SPI_CS_HIGH ? 1 : 0 );
++	if(spidev->clock != spi->max_speed_hz){
++		locomospi_clock(spi->max_speed_hz);
++	}
++	spidev->spimode = spi->mode;
++
++	return 0;
++}
++
++static int locomospi_transfer(struct spi_device *spi, struct spi_message *msg)
++{
++
++	spin_lock(&spidev->message_lock);
++	list_add_tail(&msg->queue, &spidev->message_list);
++	spin_unlock(&spidev->message_lock);
++	schedule_work(&transfer_wq);
++	return 0;
++}
++
++static struct locomo_driver locomo_spi_driver = {
++	.drv = {
++		.name = "locomo-spi",
++	},
++	.devid	= LOCOMO_DEVID_SPI,
++	.probe	= locomospi_probe,
++	.remove	= locomospi_remove,
++#ifdef CONFIG_PM
++	.suspend = locomospi_suspend,
++	.resume = locomospi_resume,
++#endif
++};
++
++static struct spi_board_info board = {
++	.modalias 	= "mmc_spi",
++	.platform_data 	= (void*) &colliemmc,
++	.controller_data= NULL,
++	.irq		= 0,
++	.max_speed_hz	= 25000000,
++	.bus_num	= 0,
++	.chip_select	= 0,
++	.mode		= 0,
++};
++
++#ifdef CONFIG_PM
++static int locomospi_suspend(struct locomo_dev *dev, pm_message_t state)
++{
++	disable_irq(IRQ_LOCOMO_CARDDETECT);
++	return 0;
++}
++
++static int locomospi_resume(struct locomo_dev *dev)
++{
++	enable_irq(IRQ_LOCOMO_CARDDETECT);
++	return 0;
++}
++#endif
++
++static int locomospi_probe(struct locomo_dev *dev)
++{
++	int result=0;
++	printk(KERN_DEBUG "Collie MMC over SPI Driver\n");
++	spidev=kmalloc(sizeof(struct locomospi_dev),GFP_KERNEL);
++	if(!spidev){
++		return -ENOMEM;
++	}
++	spidev->ldev = dev;
++	spidev->card_power = 1;
++	spidev->spimode = 0;
++
++	if(!request_mem_region((unsigned long) dev->mapbase, dev->length, LOCOMO_DRIVER_NAME(dev))) {
++		dev_err(&dev->dev, " Can't aquire access to io memory\n");
++		return -EBUSY;
++	}
++	spidev->base=(unsigned long) dev->mapbase;
++	locomospi_reg_open();
++
++	locomo_gpio_set_dir(dev->dev.parent, LOCOMO_GPIO_CARD_POWER, 0);
++	locomo_gpio_set_dir(dev->dev.parent, LOCOMO_GPIO_CARD_DETECT, 1);
++	locomo_gpio_set_dir(dev->dev.parent, LOCOMO_GPIO_WRITE_PROT, 1);
++
++	result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_cardpower);
++	if(result){
++		dev_err(&dev->dev, "error creating driver attribute\n");
++		goto region;
++	}
++	result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_carddetect);
++	if(result){
++		dev_err(&dev->dev,"error creating driver attribute\n");
++		goto region;
++	}
++	result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_cardwriteprotect);
++	if(result){
++		dev_err(&dev->dev, "error creating driver attribute\n");
++		goto region;
++	}
++	result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_spimd);
++	if(result){
++		dev_err(&dev->dev, "error creating driver attribute\n");
++		goto region;
++	}
++	result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_spict);
++	if(result){
++		dev_err(&dev->dev, "error creating driver attribute\n");
++		goto region;
++	}
++	result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_spist);
++	if(result){
++		dev_err(&dev->dev, "error creating driver attribute\n");
++		goto region;
++	}
++	result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_spitd);
++	if(result){
++		dev_err(&dev->dev, "error creating driver attribute\n");
++		goto region;
++	}
++	result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_spird);
++	if(result){
++		dev_err(&dev->dev, "error creating driver attribute\n");
++		goto region;
++	}
++	result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_spits);
++	if(result){
++		dev_err(&dev->dev, "error creating driver attribute\n");
++		goto region;
++	}
++	result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_spirs);
++	if(result){
++		dev_err(&dev->dev, "error creating driver attribute\n");
++		goto region;
++	}
++	result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_clock);
++	if(result){
++		dev_err(&dev->dev, "error creating driver attribute\n");
++		goto region;
++	}
++	result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_delay);
++	if(result){
++		dev_err(&dev->dev, "error creating driver attribute\n");
++		goto region;
++	}
++	result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_reset);
++	if(result){
++		dev_err(&dev->dev, "error creating driver attribute\n");
++		goto region;
++	}
++	result=driver_create_file(&locomo_spi_driver.drv, &driver_attr_regs);
++        if(result){
++                dev_err(&dev->dev, "error creating driver attribute\n");
++                goto region;
++        }
++	INIT_WORK(&transfer_wq, locomospi_do_transfer);
++	INIT_LIST_HEAD(&spidev->message_list);
++	spin_lock_init(&spidev->message_lock);
++	init_waitqueue_head(&spidev->waitqueue);
++	spidev->master=spi_alloc_master(&dev->dev,0);
++	if(!spidev->master){
++		result=-ENOMEM;
++		goto region;
++	}
++	spidev->master->bus_num = 0;
++	spidev->master->num_chipselect = 1;
++	spidev->master->setup = locomospi_setup;
++	spidev->master->transfer = locomospi_transfer;
++	spidev->sdev = spi_new_device(spidev->master, &board);
++	if(!spidev->sdev){
++		dev_err(&dev->dev, "failed to register spi device\n");
++		result = -EINVAL;
++		goto master;
++	}
++/*	result=request_irq(IRQ_LOCOMO_SPI_RFR, locomospi_testisr, IRQF_SHARED, "locomo-spi", (void*) spidev);
++	if(result) {
++		dev_err(&dev->dev, "Could not get IRQ: RFR\n");
++		goto regdev;
++	}
++	//disable_irq(IRQ_LOCOMO_SPI_RFR);
++*//*	result=request_irq(IRQ_LOCOMO_SPI_RFW, locomospi_testisr, IRQF_SHARED, "locomo-spi", (void*) spidev);
++	if(result) {
++		dev_err(&dev->dev, "Could not get IRQ: RFW\n");
++		goto irq1;
++	}
++	//disable_irq(IRQ_LOCOMO_SPI_RFW);
++*//*	result=request_irq(IRQ_LOCOMO_SPI_REND, locomospi_testisr, IRQF_SHARED, "locomo-spi", (void*) spidev);
++	if(result) {
++		dev_err(&dev->dev, "Could not get IRQ: REND\n");
++		goto irq2;
++	}
++*//*	result=request_irq(IRQ_LOCOMO_SPI_TEND, locomospi_testisr, IRQF_SHARED, "locomo-spi", (void*) spidev);
++	if(result) {
++		dev_err(&dev->dev, "Could not get IRQ: TEND\n");
++		goto irq3;
++	}
++	//disable_irq(IRQ_LOCOMO_SPI_TEND);	
++*/	spidev->workqueue = create_singlethread_workqueue("locomo-spi");
++	if(!spidev->workqueue){
++		dev_err(&dev->dev, "failed to create workqueue\n");
++		goto irq4;
++	}
++	result=spi_register_master(spidev->master);
++	if(result){
++		dev_err(&dev->dev, "failed to register spimaster\n");
++		goto wq;
++	}
++	return 0;
++wq:
++	destroy_workqueue(spidev->workqueue);
++irq4:
++//	free_irq(IRQ_LOCOMO_SPI_TEND, (void*) spidev);
++irq3:
++//	free_irq(IRQ_LOCOMO_SPI_REND, (void*) spidev);
++irq2:
++//	free_irq(IRQ_LOCOMO_SPI_RFW, (void*) spidev);
++irq1:
++//	free_irq(IRQ_LOCOMO_SPI_RFR, (void*) spidev);
++regdev:
++	spi_unregister_device(spidev->sdev);
++master:
++	spi_master_put(spidev->master);
++region:
++	release_mem_region((unsigned long) dev->mapbase, dev->length);
++	kfree(spidev);
++	return result;
++
++}
++
++static int locomospi_remove(struct locomo_dev *dev)
++{
++	spi_unregister_device(spidev->sdev);
++	spi_unregister_master(spidev->master);
++	destroy_workqueue(spidev->workqueue);
++	locomospi_reg_release();
++//	free_irq(IRQ_LOCOMO_SPI_TEND, (void*) spidev);
++//	free_irq(IRQ_LOCOMO_SPI_REND, (void*) spidev);
++//	free_irq(IRQ_LOCOMO_SPI_RFW, (void*) spidev);
++//	free_irq(IRQ_LOCOMO_SPI_RFR, (void*) spidev);
++	spi_master_put(spidev->master);
++	release_mem_region((unsigned long) dev->mapbase, dev->length);
++	kfree(spidev);
++	return 0;
++}
++
++
++
++static int __init locomospi_init(void)
++{
++	int ret = locomo_driver_register(&locomo_spi_driver);
++	if (ret)
++		return ret;
++
++
++	return 0;
++}
++
++static void __exit locomospi_exit(void)
++{
++	locomo_driver_unregister(&locomo_spi_driver);
++}
++
++module_init(locomospi_init);
++module_exit(locomospi_exit);
++
++MODULE_AUTHOR("Thomas Kunze thommy@tabao.de");
++MODULE_DESCRIPTION("Collie mmc driver");
++MODULE_LICENSE("GPL");
+diff --git a/drivers/spi/locomo_spi.h b/drivers/spi/locomo_spi.h
+new file mode 100644
+index 0000000..7e1c0ce
+--- /dev/null
++++ b/drivers/spi/locomo_spi.h
+@@ -0,0 +1,75 @@
++#include <asm/hardware/locomo.h>
++#ifndef __LOCOMO_SPI_H__
++#define __LOCOMO_SPI_H__
++
++/* locomo-spi status register LOCOMO_SPIST */
++#define LOCOMO_SPI_TEND (1 << 3)        /* Transfer end bit */
++#define LOCOMO_SPI_REND (1 << 2)        /* Receive end bit */
++#define LOCOMO_SPI_RFW  (1 << 1)        /* write buffer bit */
++#define LOCOMO_SPI_RFR  (1)             /* read buffer bit */
++
++/* locomo-spi mode register LOCOMO_SPIMD */
++#define LOCOMO_SPI_LOOPBACK (1 << 15)	/* loopback tx to rx 	*/
++#define LOCOMO_SPI_MSB1ST   (1 << 14)	/* send MSB first 	*/
++#define LOCOMO_SPI_DOSTAT   (1 << 13)	/* transmit line is idle high */
++#define LOCOMO_SPI_TCPOL    (1 << 11) 	/* transmit CPOL (maybe affects CPHA too) */
++#define LOCOMO_SPI_RCPOL    (1 << 10)	/* receive CPOL (maybe affects CPHA too) */
++#define	LOCOMO_SPI_TDINV    (1 << 9)	/* invert transmit line */
++#define LOCOMO_SPI_RDINV    (1 << 8)	/* invert receive line */
++#define LOCOMO_SPI_XON	    (1 << 7)	/* enable spi controller clock */
++#define LOCOMO_SPI_XEN	    (1 << 6)	/* clock bit write enable xon must be off, wait 300 us before xon->1 */ 
++#define LOCOMO_SPI_XSEL	    0x0018 	/* clock select 		*/
++#define CLOCK_18MHZ	    0		/* 18,432 MHz clock 	*/
++#define CLOCK_22MHZ	    1		/* 22,5792 MHz clock	*/
++#define CLOCK_25MHZ	    2		/* 24,576 MHz clock	*/
++#define LOCOMO_SPI_CLKSEL   0x7	
++#define DIV_1		    0		/* don't divide clock   */
++#define DIV_2		    1		/* divide clock by two	*/
++#define DIV_4		    2		/* divide clock by four */
++#define DIV_8		    3		/* divide clock by eight*/
++#define DIV_64		    4		/* divide clock by 64 */
++
++/* locomo-spi control register LOCOMO_SPICT */
++#define LOCOMO_SPI_CRC16_7_B 	(1 << 15) 	/* 0: crc16 1: crc7 */
++#define LOCOMO_SPI_CRCRX_TX_B	(1 << 14)
++#define LOCOMO_SPI_CRCRESET_B	(1 << 13)
++#define LOCOMO_SPI_CEN		(1 << 7)	/* ?? enable */
++#define LOCOMO_SPI_CS		(1 << 6)	/* chip select */
++#define LOCOMO_SPI_UNIT16	(1 << 5) 	/* 0: 8 bit units, 1: 16 bit unit */
++#define LOCOMO_SPI_ALIGNEN	(1 << 2)	/* align transfer enable */
++#define LOCOMO_SPI_RXWEN	(1 << 1)	/* continous receive */
++#define LOCOMO_SPI_RXUEN	(1 << 0)	/* aligned receive */
++
++#define IRQ_LOCOMO_CARDDETECT	IRQ_LOCOMO_GPIO13
++
++
++struct locomospi_dev {
++	struct locomo_dev *ldev;
++	struct spi_master *master;
++	struct spi_device *sdev;
++	int card_power;
++	int clock_base;
++	int clock_div;
++	int clock;
++	unsigned long base;
++	u8 spimode;
++	wait_queue_head_t waitqueue;
++	struct workqueue_struct *workqueue;
++	struct list_head message_list;
++	spinlock_t message_lock;
++};
++
++
++static irqreturn_t 	locomospi_cardisr(int, void*);
++static int 	locomospi_probe(struct locomo_dev*);
++static int 	locomospi_remove(struct locomo_dev*);
++static int 	locomospi_carddetect(void);
++static void 	locomospi_reg_open(void);
++static void	locomospi_reg_release(void);
++static int 	tx(const char*, int);
++static int 	rx(char *, int);
++static void 	locomospi_power(int on);
++static int locomospi_suspend(struct locomo_dev *dev, pm_message_t state);
++static int locomospi_resume(struct locomo_dev *dev);
++static void locomospi_setcs(int high);
++#endif
diff --git a/packages/linux/linux-rp-2.6.26/collie_keymap.patch b/packages/linux/linux-rp-2.6.26/collie_keymap.patch
new file mode 100644
index 0000000000..648821f577
--- /dev/null
+++ b/packages/linux/linux-rp-2.6.26/collie_keymap.patch
@@ -0,0 +1,420 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+Index: linux-2.6.26/drivers/char/defkeymap.map
+===================================================================
+--- linux-2.6.26.orig/drivers/char/defkeymap.map	2008-07-13 23:51:29.000000000 +0200
++++ linux-2.6.26/drivers/char/defkeymap.map	2008-07-24 22:09:38.663284352 +0200
+@@ -1,264 +1,170 @@
+-# Default kernel keymap. This uses 7 modifier combinations.
+-keymaps 0-2,4-5,8,12
+-# Change the above line into
+-#	keymaps 0-2,4-6,8,12
+-# in case you want the entries
+-#	altgr   control keycode  83 = Boot            
+-#	altgr   control keycode 111 = Boot            
+-# below.
+-#
+-# In fact AltGr is used very little, and one more keymap can
+-# be saved by mapping AltGr to Alt (and adapting a few entries):
+-# keycode 100 = Alt
+-#
+-keycode   1 = Escape           Escape          
+-	alt     keycode   1 = Meta_Escape     
+-keycode   2 = one              exclam          
+-	alt     keycode   2 = Meta_one        
+-keycode   3 = two              at               at              
+-	control	keycode   3 = nul             
+-	shift	control	keycode   3 = nul             
+-	alt	keycode   3 = Meta_two        
+-keycode   4 = three            numbersign      
+-	control keycode   4 = Escape          
+-	alt     keycode   4 = Meta_three      
+-keycode   5 = four             dollar           dollar          
+-	control keycode   5 = Control_backslash
+-	alt     keycode   5 = Meta_four       
+-keycode   6 = five             percent         
+-	control keycode   6 = Control_bracketright
+-	alt     keycode   6 = Meta_five       
+-keycode   7 = six              asciicircum     
+-	control keycode   7 = Control_asciicircum
+-	alt     keycode   7 = Meta_six        
+-keycode   8 = seven            ampersand        braceleft       
+-	control keycode   8 = Control_underscore
+-	alt     keycode   8 = Meta_seven      
+-keycode   9 = eight            asterisk         bracketleft     
+-	control keycode   9 = Delete          
+-	alt     keycode   9 = Meta_eight      
+-keycode  10 = nine             parenleft        bracketright    
+-	alt     keycode  10 = Meta_nine       
+-keycode  11 = zero             parenright       braceright      
+-	alt     keycode  11 = Meta_zero       
+-keycode  12 = minus            underscore       backslash       
+-	control	keycode  12 = Control_underscore
+-	shift	control	keycode  12 = Control_underscore
+-	alt	keycode  12 = Meta_minus      
+-keycode  13 = equal            plus            
+-	alt     keycode  13 = Meta_equal      
+-keycode  14 = Delete           Delete          
+-	control keycode  14 = BackSpace
+-	alt     keycode  14 = Meta_Delete     
++# Note:
++# The way in which the modifiers are handled are quite different
++# than how they were handled in the 2.4.6-rmk1-np2-embedix kernel.
++# 
++# Here, we simply pass up Fn as Control, and the german accent key
++# as Altgr, and simply use a proper keymap.  Said keymap is as
++# follows.
++# keymaps 0-2,4-5,8,12,20
++keycode  14 = BackSpace
++	shift   keycode  14 = BackSpace
++	control keycode  14 = Delete
++	shiftl  control keycode  14 = bracketleft
++	control shiftr  keycode  14 = bracketleft
+ keycode  15 = Tab              Tab             
+-	alt     keycode  15 = Meta_Tab        
++	shift   keycode  15 = backslash
++	control keycode  15 = Caps_Lock
++	shiftl  control keycode  15 = Caps_Lock
++	control shiftr  keycode  15 = Caps_Lock
+ keycode  16 = q               
++	control	keycode  16 = one             
++	shiftl	control	keycode  16 = Control_q       
++	control	shiftr	keycode  16 = Meta_q       
+ keycode  17 = w               
+-keycode  18 = e
+-	altgr   keycode  18 = Hex_E   
++	control	keycode  17 = two       
++	shiftl	control	keycode  17 = Control_w       
++	control	shiftr	keycode  17 = Meta_w       
++keycode  18 = e               
++	control	keycode  18 = three       
++	shiftl	control	keycode  18 = Control_e       
++	control	shiftr	keycode  18 = Meta_e       
+ keycode  19 = r               
++	control	keycode  19 = four       
++	shiftr	control	keycode  19 = Control_r       
++	control	shiftl	keycode  19 = Meta_r       
+ keycode  20 = t               
++	control	keycode  20 = five       
++	shiftl	control	keycode  20 = Control_t       
++	control	shiftr	keycode  20 = Meta_t       
+ keycode  21 = y               
++	control	keycode  21 = six       
++	shiftl	control	keycode  21 = Control_y       
++	control	shiftr	keycode  21 = Meta_y       
+ keycode  22 = u               
++	control	keycode  22 = seven       
++	shiftl	control	keycode  22 = Control_u       
++	control	shiftr	keycode  22 = Meta_u       
+ keycode  23 = i               
++	control	keycode  23 = eight             
++	shiftl	control	keycode  23 = Control_i             
++	control	shiftr	keycode  23 = Meta_i             
+ keycode  24 = o               
++	control	keycode  24 = nine       
++	shiftl	control	keycode  24 = Control_o       
++	control	shiftr	keycode  24 = Meta_o       
+ keycode  25 = p               
+-keycode  26 = bracketleft      braceleft       
+-	control keycode  26 = Escape          
+-	alt     keycode  26 = Meta_bracketleft
+-keycode  27 = bracketright     braceright       asciitilde      
+-	control keycode  27 = Control_bracketright
+-	alt     keycode  27 = Meta_bracketright
++	control	keycode  25 = zero       
++	shiftl	control	keycode  25 = Control_p       
++	control	shiftr	keycode  25 = Meta_p       
+ keycode  28 = Return          
+-	alt     keycode  28 = Meta_Control_m  
++	control keycode  28 = greater
++	shiftl  control keycode  28 = braceright
++	control shiftr  keycode  28 = braceright
+ keycode  29 = Control         
+-keycode  30 = a
+-	altgr   keycode  30 = Hex_A
++keycode  30 = a               
++	control	keycode  30 = exclam       
++	shiftl	control	keycode  30 = Control_a       
++	control	shiftr	keycode  30 = Meta_a       
+ keycode  31 = s               
+-keycode  32 = d
+-	altgr   keycode  32 = Hex_D   
+-keycode  33 = f
+-	altgr   keycode  33 = Hex_F               
++	control	keycode  31 = at       
++	shiftl	control	keycode  31 = Control_s       
++	control	shiftr	keycode  31 = Meta_s       
++keycode  32 = d               
++	control	keycode  32 = numbersign
++	shiftl	control	keycode  32 = Control_d       
++	control	shiftr	keycode  32 = Meta_d       
++keycode  33 = f               
++	control	keycode  33 = dollar       
++	shiftl	control	keycode  33 = Control_f       
++	control	shiftr	keycode  33 = Meta_f       
+ keycode  34 = g               
++	control	keycode  34 = percent       
++	shiftl	control	keycode  34 = Control_g       
++	control	shiftr	keycode  34 = Meta_g       
+ keycode  35 = h               
++	control	keycode  35 = underscore       
++	shiftl	control	keycode  35 = BackSpace       
++	control	shiftr	keycode  35 = BackSpace       
+ keycode  36 = j               
++	control	keycode  36 = ampersand        
++	shiftl	control	keycode  36 = Linefeed        
++	control	shiftr	keycode  36 = Linefeed        
+ keycode  37 = k               
++	control	keycode  37 = asterisk       
++	shiftl	control	keycode  37 = Control_k       
++	control	shiftr	keycode  37 = Meta_k       
+ keycode  38 = l               
+-keycode  39 = semicolon        colon           
+-	alt     keycode  39 = Meta_semicolon  
+-keycode  40 = apostrophe       quotedbl        
+-	control keycode  40 = Control_g       
+-	alt     keycode  40 = Meta_apostrophe 
+-keycode  41 = grave            asciitilde      
+-	control keycode  41 = nul             
+-	alt     keycode  41 = Meta_grave      
++	control	keycode  38 = bracketleft       
++	shiftl  control keycode  51 = parenleft
++	control shiftr  keycode  51 = parenleft
++keycode  40 = apostrophe       quotedbl
++	control	keycode  40 = asciitilde       
++	shiftl	control	keycode  40 = asciicircum
++	control	shiftr	keycode  40 = asciicircum       
+ keycode  42 = Shift           
+-keycode  43 = backslash        bar             
+-	control keycode  43 = Control_backslash
+-	alt     keycode  43 = Meta_backslash  
+ keycode  44 = z               
++	control	keycode  44 = Control_z       
++	shiftl	control	keycode  44 = Control_z       
++	control	shiftr	keycode  44 = Meta_z       
+ keycode  45 = x               
+-keycode  46 = c
+-	altgr   keycode  46 = Hex_C   
++	control	keycode  45 = Control_x       
++	shiftl	control	keycode  45 = Control_x       
++	control	shiftr	keycode  45 = Meta_x       
++keycode  46 = c               
++	control	keycode  46 = Control_c       
++	shiftl	control	keycode  46 = Control_c       
++	control	shiftr	keycode  46 = Meta_c       
+ keycode  47 = v               
+-keycode  48 = b
+-	altgr   keycode  48 = Hex_B
++	control	keycode  47 = Control_v       
++	shiftl	control	keycode  47 = Control_v       
++	control	shiftr	keycode  47 = Meta_v       
++## current location ##
++keycode  48 = b               
++	control	keycode  48 = minus       
++	shiftl	control	keycode  48 = Control_b       
++	control	shiftr	keycode  48 = Meta_b       
+ keycode  49 = n               
++	control	keycode  49 = plus       
++	shiftl	control	keycode  49 = Control_n       
++	control	shiftr	keycode  49 = Meta_n       
+ keycode  50 = m               
+-keycode  51 = comma            less            
+-	alt     keycode  51 = Meta_comma      
+-keycode  52 = period           greater         
+-	control keycode  52 = Compose         
+-	alt     keycode  52 = Meta_period     
+-keycode  53 = slash            question        
+-	control keycode  53 = Delete          
+-	alt     keycode  53 = Meta_slash      
+-keycode  54 = Shift           
++	control	keycode  50 = equal       
++	shiftl	control	keycode  50 = Control_m       
++	control	shiftr	keycode  50 = Meta_m       
++keycode  51 = comma
++	shift   keycode  51 = semicolon
++	control keycode  51 = bracketright
++	shiftl  control keycode  51 = parenright
++	control shiftr  keycode  51 = parenright
++keycode  52 = period
++	shift   keycode  52 = colon
++	control keycode  52 = less
++	shiftl  control keycode  52 = braceleft
++	control shiftr  keycode  52 = braceleft
++keycode  53 = slash
++	shift   keycode  53 = question
++	control	keycode  53 = Num_Lock
++	shiftl  control keycode  53 = Num_Lock
++	control shiftr  keycode  53 = Num_Lock
++keycode  54 = AltGr
+ keycode  55 = KP_Multiply     
+ keycode  56 = Alt             
+-keycode  57 = space            space           
+-	control keycode  57 = nul             
+-	alt     keycode  57 = Meta_space      
+-keycode  58 = Caps_Lock       
+-keycode  59 = F1               F11              Console_13      
+-	control keycode  59 = F1              
+-	alt     keycode  59 = Console_1       
+-	control alt     keycode  59 = Console_1       
+-keycode  60 = F2               F12              Console_14      
+-	control keycode  60 = F2              
+-	alt     keycode  60 = Console_2       
+-	control alt     keycode  60 = Console_2       
+-keycode  61 = F3               F13              Console_15      
+-	control keycode  61 = F3              
+-	alt     keycode  61 = Console_3       
+-	control alt     keycode  61 = Console_3       
+-keycode  62 = F4               F14              Console_16      
+-	control keycode  62 = F4              
+-	alt     keycode  62 = Console_4       
+-	control alt     keycode  62 = Console_4       
+-keycode  63 = F5               F15              Console_17      
+-	control keycode  63 = F5              
+-	alt     keycode  63 = Console_5       
+-	control alt     keycode  63 = Console_5       
+-keycode  64 = F6               F16              Console_18      
+-	control keycode  64 = F6              
+-	alt     keycode  64 = Console_6       
+-	control alt     keycode  64 = Console_6       
+-keycode  65 = F7               F17              Console_19      
+-	control keycode  65 = F7              
+-	alt     keycode  65 = Console_7       
+-	control alt     keycode  65 = Console_7       
+-keycode  66 = F8               F18              Console_20      
+-	control keycode  66 = F8              
+-	alt     keycode  66 = Console_8       
+-	control alt     keycode  66 = Console_8       
+-keycode  67 = F9               F19              Console_21      
+-	control keycode  67 = F9              
+-	alt     keycode  67 = Console_9       
+-	control alt     keycode  67 = Console_9       
+-keycode  68 = F10              F20              Console_22      
+-	control keycode  68 = F10             
+-	alt     keycode  68 = Console_10      
+-	control alt     keycode  68 = Console_10      
+-keycode  69 = Num_Lock
+-	shift   keycode  69 = Bare_Num_Lock
+-keycode  70 = Scroll_Lock      Show_Memory      Show_Registers  
+-	control keycode  70 = Show_State      
+-	alt     keycode  70 = Scroll_Lock     
+-keycode  71 = KP_7            
+-	alt     keycode  71 = Ascii_7         
+-	altgr   keycode  71 = Hex_7         
+-keycode  72 = KP_8            
+-	alt     keycode  72 = Ascii_8         
+-	altgr   keycode  72 = Hex_8         
+-keycode  73 = KP_9            
+-	alt     keycode  73 = Ascii_9         
+-	altgr   keycode  73 = Hex_9         
+-keycode  74 = KP_Subtract     
+-keycode  75 = KP_4            
+-	alt     keycode  75 = Ascii_4         
+-	altgr   keycode  75 = Hex_4         
+-keycode  76 = KP_5            
+-	alt     keycode  76 = Ascii_5         
+-	altgr   keycode  76 = Hex_5         
+-keycode  77 = KP_6            
+-	alt     keycode  77 = Ascii_6         
+-	altgr   keycode  77 = Hex_6         
+-keycode  78 = KP_Add          
+-keycode  79 = KP_1            
+-	alt     keycode  79 = Ascii_1         
+-	altgr   keycode  79 = Hex_1         
+-keycode  80 = KP_2            
+-	alt     keycode  80 = Ascii_2         
+-	altgr   keycode  80 = Hex_2         
+-keycode  81 = KP_3            
+-	alt     keycode  81 = Ascii_3         
+-	altgr   keycode  81 = Hex_3         
+-keycode  82 = KP_0            
+-	alt     keycode  82 = Ascii_0         
+-	altgr   keycode  82 = Hex_0         
+-keycode  83 = KP_Period       
+-#	altgr   control keycode  83 = Boot            
+-	control alt     keycode  83 = Boot            
+-keycode  84 = Last_Console    
+-keycode  85 =
+-keycode  86 = less             greater          bar             
+-	alt     keycode  86 = Meta_less       
+-keycode  87 = F11              F11              Console_23      
+-	control keycode  87 = F11             
+-	alt     keycode  87 = Console_11      
+-	control alt     keycode  87 = Console_11      
+-keycode  88 = F12              F12              Console_24      
+-	control keycode  88 = F12             
+-	alt     keycode  88 = Console_12      
+-	control alt     keycode  88 = Console_12      
+-keycode  89 =
+-keycode  90 =
+-keycode  91 =
+-keycode  92 =
+-keycode  93 =
+-keycode  94 =
+-keycode  95 =
+-keycode  96 = KP_Enter        
+-keycode  97 = Control         
+-keycode  98 = KP_Divide       
++keycode  57 = space
++	shift   keycode  57 = bar
++	control	keycode  57 = nul
++	shiftl  control keycode  57 = grave
++	control shiftr  keycode  57 = grave
++keycode  67 = Control
++keycode  87 = Return
+ keycode  99 = Control_backslash
+ 	control keycode  99 = Control_backslash
+-	alt     keycode  99 = Control_backslash
+ keycode 100 = AltGr           
+-keycode 101 = Break           
+-keycode 102 = Find            
+ keycode 103 = Up              
+-keycode 104 = Prior           
+-	shift   keycode 104 = Scroll_Backward 
+ keycode 105 = Left            
+-	alt     keycode 105 = Decr_Console
+ keycode 106 = Right           
+-	alt     keycode 106 = Incr_Console
+ keycode 107 = Select          
+ keycode 108 = Down            
+-keycode 109 = Next            
+-	shift   keycode 109 = Scroll_Forward  
+-keycode 110 = Insert          
+-keycode 111 = Remove          
+-#	altgr   control keycode 111 = Boot            
+-	control alt     keycode 111 = Boot            
+-keycode 112 = Macro           
+-keycode 113 = F13             
+-keycode 114 = F14             
+-keycode 115 = Help            
+-keycode 116 = Do              
+-keycode 117 = F17             
+-keycode 118 = KP_MinPlus      
+-keycode 119 = Pause           
+-keycode 120 =
+-keycode 121 =
+-keycode 122 =
+-keycode 123 =
+-keycode 124 =
+-keycode 125 =
+-keycode 126 =
+-keycode 127 =
++keycode 116  = Escape          
+ string F1 = "\033[[A"
+ string F2 = "\033[[B"
+ string F3 = "\033[[C"
+Index: linux-2.6.26/drivers/char/Makefile
+===================================================================
+--- linux-2.6.26.orig/drivers/char/Makefile	2008-07-13 23:51:29.000000000 +0200
++++ linux-2.6.26/drivers/char/Makefile	2008-07-24 21:57:12.744280423 +0200
+@@ -127,7 +127,7 @@
+ # Uncomment if you're changing the keymap and have an appropriate
+ # loadkeys version for the map. By default, we'll use the shipped
+ # versions.
+-# GENERATE_KEYMAP := 1
++ GENERATE_KEYMAP := 1
+ 
+ ifdef GENERATE_KEYMAP
+ 
diff --git a/packages/linux/linux-rp-2.6.26/defconfig-collie b/packages/linux/linux-rp-2.6.26/defconfig-collie
index 271bfd5881..9e3e96288a 100644
--- a/packages/linux/linux-rp-2.6.26/defconfig-collie
+++ b/packages/linux/linux-rp-2.6.26/defconfig-collie
@@ -1,13 +1,13 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.24-rc8
-# Mon Jan 21 22:14:20 2008
+# Linux kernel version: 2.6.26
+# Fri Jul 25 00:01:53 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_GENERIC_GPIO=y
-# CONFIG_GENERIC_TIME is not set
-# CONFIG_GENERIC_CLOCKEVENTS is not set
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_MMU=y
 # CONFIG_NO_IOPORT is not set
 CONFIG_GENERIC_HARDIRQS=y
@@ -21,6 +21,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_SUPPORTS_AOUT=y
 CONFIG_ZONE_DMA=y
 CONFIG_ARCH_MTD_XIP=y
 CONFIG_VECTORS_BASE=0xffff0000
@@ -42,23 +43,22 @@ CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 # CONFIG_TASKSTATS is not set
-# CONFIG_USER_NS is not set
-# CONFIG_PID_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_CGROUPS is not set
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_FAIR_USER_SCHED=y
-# CONFIG_FAIR_CGROUP_SCHED is not set
-# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_GROUP_SCHED is not set
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
 # CONFIG_RELAY is not set
-# CONFIG_BLK_DEV_INITRD is not set
+# CONFIG_NAMESPACES is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
 CONFIG_UID16=y
 CONFIG_SYSCTL_SYSCALL=y
+CONFIG_SYSCTL_SYSCALL_CHECK=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -66,27 +66,37 @@ CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 # CONFIG_ELF_CORE is not set
+CONFIG_COMPAT_BRK=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_ANON_INODES=y
 CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLAB=y
 # CONFIG_SLUB is not set
 # CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+# CONFIG_HAVE_DMA_ATTRS is not set
+CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+# CONFIG_MODULE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_KMOD=y
+# CONFIG_KMOD is not set
 CONFIG_BLOCK=y
 # CONFIG_LBD is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
@@ -105,6 +115,7 @@ CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_CLASSIC_RCU=y
 
 #
 # System Type
@@ -133,6 +144,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 # CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_NS9XXX is not set
 # CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_ORION5X is not set
 # CONFIG_ARCH_PNX4008 is not set
 # CONFIG_ARCH_PXA is not set
 # CONFIG_ARCH_RPC is not set
@@ -142,6 +154,7 @@ CONFIG_ARCH_SA1100=y
 # CONFIG_ARCH_LH7A40X is not set
 # CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_MSM7X00A is not set
 
 #
 # SA11x0 Implementations
@@ -176,6 +189,7 @@ CONFIG_CPU_32=y
 CONFIG_CPU_SA1100=y
 CONFIG_CPU_32v4=y
 CONFIG_CPU_ABRT_EV4=y
+CONFIG_CPU_PABRT_NOIFAR=y
 CONFIG_CPU_CACHE_V4WB=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_TLB_V4WB=y
@@ -190,7 +204,6 @@ CONFIG_CPU_CP15_MMU=y
 # CONFIG_OUTER_CACHE is not set
 CONFIG_SHARP_LOCOMO=y
 CONFIG_SHARP_PARAM=y
-CONFIG_SHARPSL_PM=y
 CONFIG_SHARP_SCOOP=y
 
 #
@@ -199,9 +212,9 @@ CONFIG_SHARP_SCOOP=y
 CONFIG_ISA=y
 # CONFIG_PCI_SYSCALL is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_PCCARD=m
+CONFIG_PCCARD=y
 # CONFIG_PCMCIA_DEBUG is not set
-CONFIG_PCMCIA=m
+CONFIG_PCMCIA=y
 CONFIG_PCMCIA_LOAD_CIS=y
 CONFIG_PCMCIA_IOCTL=y
 
@@ -210,18 +223,21 @@ CONFIG_PCMCIA_IOCTL=y
 #
 # CONFIG_I82365 is not set
 # CONFIG_TCIC is not set
-CONFIG_PCMCIA_SA1100=m
+CONFIG_PCMCIA_SA1100=y
 
 #
 # Kernel Features
 #
-# CONFIG_TICK_ONESHOT is not set
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_PREEMPT=y
-CONFIG_NO_IDLE_HZ=y
 CONFIG_HZ=100
-CONFIG_AEABI=y
-CONFIG_OABI_COMPAT=y
+# CONFIG_AEABI is not set
 CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_NODES_SHIFT=2
 CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_FLATMEM_MANUAL is not set
@@ -232,6 +248,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_NEED_MULTIPLE_NODES=y
 # CONFIG_SPARSEMEM_STATIC is not set
 # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 # CONFIG_RESOURCES_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
@@ -245,7 +262,7 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 mem=32M fbcon=rotate:1 dyntick=enable debug"
+CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 mem=64M fbcon=rotate:1 dyntick=enable debug"
 # CONFIG_XIP_KERNEL is not set
 CONFIG_KEXEC=y
 CONFIG_ATAGS_PROC=y
@@ -262,9 +279,8 @@ CONFIG_ATAGS_PROC=y
 #
 # At least one emulation must be selected
 #
-CONFIG_FPE_NWFPE=y
-# CONFIG_FPE_NWFPE_XP is not set
-# CONFIG_FPE_FASTFPE is not set
+# CONFIG_FPE_NWFPE is not set
+CONFIG_FPE_FASTFPE=y
 
 #
 # Userspace binary formats
@@ -272,18 +288,13 @@ CONFIG_FPE_NWFPE=y
 CONFIG_BINFMT_ELF=y
 CONFIG_BINFMT_AOUT=m
 CONFIG_BINFMT_MISC=m
+CONFIG_ARTHUR=m
 
 #
 # Power management options
 #
-CONFIG_PM=y
-# CONFIG_PM_LEGACY is not set
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_SLEEP=y
-CONFIG_SUSPEND_UP_POSSIBLE=y
-CONFIG_SUSPEND=y
-CONFIG_APM_EMULATION=m
-CONFIG_INPUT_APMPOWER=m
+# CONFIG_PM is not set
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
 
 #
 # Networking
@@ -293,34 +304,36 @@ CONFIG_NET=y
 #
 # Networking options
 #
-CONFIG_PACKET=m
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=m
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
 CONFIG_XFRM=y
-CONFIG_XFRM_USER=m
+# CONFIG_XFRM_USER is not set
 # CONFIG_XFRM_SUB_POLICY is not set
 # CONFIG_XFRM_MIGRATE is not set
-# CONFIG_NET_KEY is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_NET_KEY=y
+# CONFIG_NET_KEY_MIGRATE is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
 CONFIG_IP_FIB_HASH=y
 # CONFIG_IP_PNP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
 # CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_SYN_COOKIES is not set
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
-# CONFIG_INET_LRO is not set
-CONFIG_INET_DIAG=m
-CONFIG_INET_TCP_DIAG=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+CONFIG_INET_LRO=m
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
@@ -333,114 +346,288 @@ CONFIG_IPV6=m
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
-# CONFIG_IPV6_MIP6 is not set
+CONFIG_IPV6_MIP6=m
 CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET6_TUNNEL=m
 CONFIG_INET6_XFRM_MODE_TRANSPORT=m
 CONFIG_INET6_XFRM_MODE_TUNNEL=m
 CONFIG_INET6_XFRM_MODE_BEET=m
-# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_IPV6_SIT=m
+CONFIG_IPV6_NDISC_NODETYPE=y
 CONFIG_IPV6_TUNNEL=m
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
 # CONFIG_NETWORK_SECMARK is not set
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
 
 #
 # Core Netfilter Configuration
 #
-# CONFIG_NETFILTER_NETLINK is not set
-# CONFIG_NF_CONNTRACK_ENABLED is not set
-# CONFIG_NF_CONNTRACK is not set
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CT_ACCT=y
+CONFIG_NF_CONNTRACK_MARK=y
+# CONFIG_NF_CONNTRACK_EVENTS is not set
+CONFIG_NF_CT_PROTO_DCCP=m
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
 CONFIG_NETFILTER_XTABLES=m
-# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
 # CONFIG_NETFILTER_XT_TARGET_DSCP is not set
-# CONFIG_NETFILTER_XT_TARGET_MARK is not set
-# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
-# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
 # CONFIG_NETFILTER_XT_TARGET_TRACE is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
-# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
-# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
-# CONFIG_NETFILTER_XT_MATCH_ESP is not set
-# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
-# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_MAC is not set
-# CONFIG_NETFILTER_XT_MATCH_MARK is not set
-# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
-# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
-# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
-# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
-# CONFIG_NETFILTER_XT_MATCH_REALM is not set
-# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
-# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
-# CONFIG_NETFILTER_XT_MATCH_STRING is not set
-# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
-# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 #
 # IP: Netfilter Configuration
 #
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_IPRANGE=m
-CONFIG_IP_NF_MATCH_TOS=m
 CONFIG_IP_NF_MATCH_RECENT=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_OWNER=m
 CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_DCCP=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_SIP=m
 CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_TOS=m
 CONFIG_IP_NF_TARGET_ECN=m
 CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_RAW=m
 CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
 
 #
-# IPv6: Netfilter Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP6_NF_QUEUE is not set
-# CONFIG_IP6_NF_IPTABLES is not set
-# CONFIG_IP_DCCP is not set
-# CONFIG_IP_SCTP is not set
-# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_RAW=m
+
+#
+# DECnet: Netfilter Configuration
+#
+CONFIG_DECNET_NF_GRABULATOR=m
+
+#
+# Bridge: Netfilter Configuration
+#
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_ULOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+CONFIG_IP_DCCP_ACKVEC=y
+
+#
+# DCCP CCIDs Configuration (EXPERIMENTAL)
+#
+CONFIG_IP_DCCP_CCID2=m
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+CONFIG_IP_DCCP_CCID3=m
+# CONFIG_IP_DCCP_CCID3_DEBUG is not set
+CONFIG_IP_DCCP_CCID3_RTO=100
+CONFIG_IP_DCCP_TFRC_LIB=m
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+CONFIG_SCTP_HMAC_MD5=y
+CONFIG_TIPC=m
+# CONFIG_TIPC_ADVANCED is not set
+# CONFIG_TIPC_DEBUG is not set
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_BRIDGE=m
+CONFIG_VLAN_8021Q=m
+CONFIG_DECNET=m
+# CONFIG_DECNET_ROUTER is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_IPX=m
+# CONFIG_IPX_INTERN is not set
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_COPS=m
+# CONFIG_COPS_DAYNA is not set
+# CONFIG_COPS_TANGENT is not set
+CONFIG_IPDDP=m
+# CONFIG_IPDDP_ENCAP is not set
+# CONFIG_IPDDP_DECAP is not set
+CONFIG_X25=m
+CONFIG_LAPB=m
 # CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_NET_SCHED is not set
+CONFIG_WAN_ROUTER=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_ROUTE=y
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+# CONFIG_CLS_U32_MARK is not set
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+# CONFIG_NET_EMATCH is not set
+# CONFIG_NET_CLS_ACT is not set
+# CONFIG_NET_CLS_IND is not set
+CONFIG_NET_SCH_FIFO=y
 
 #
 # Network testing
 #
-# CONFIG_NET_PKTGEN is not set
+CONFIG_NET_PKTGEN=m
 # CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
 CONFIG_IRDA=m
 
 #
 # IrDA protocols
 #
 CONFIG_IRLAN=m
-CONFIG_IRNET=m
+# CONFIG_IRNET is not set
 CONFIG_IRCOMM=m
 # CONFIG_IRDA_ULTRA is not set
 
@@ -466,15 +653,6 @@ CONFIG_IRTTY_SIR=m
 # CONFIG_DONGLE is not set
 
 #
-# Old SIR device drivers
-#
-# CONFIG_IRPORT_SIR is not set
-
-#
-# Old Serial dongle support
-#
-
-#
 # FIR device drivers
 #
 CONFIG_SA1100_FIR=m
@@ -482,41 +660,64 @@ CONFIG_BT=m
 CONFIG_BT_L2CAP=m
 CONFIG_BT_SCO=m
 CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
+# CONFIG_BT_RFCOMM_TTY is not set
 CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
+# CONFIG_BT_BNEP_MC_FILTER is not set
+# CONFIG_BT_BNEP_PROTO_FILTER is not set
 CONFIG_BT_HIDP=m
 
 #
 # Bluetooth device drivers
 #
-# CONFIG_BT_HCIBTSDIO is not set
+CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
+# CONFIG_BT_HCIUART_H4 is not set
+# CONFIG_BT_HCIUART_BCSP is not set
 # CONFIG_BT_HCIUART_LL is not set
 CONFIG_BT_HCIDTL1=m
 CONFIG_BT_HCIBT3C=m
 CONFIG_BT_HCIBLUECARD=m
 CONFIG_BT_HCIBTUART=m
 CONFIG_BT_HCIVHCI=m
-# CONFIG_AF_RXRPC is not set
+CONFIG_AF_RXRPC=m
+# CONFIG_AF_RXRPC_DEBUG is not set
+# CONFIG_RXKAD is not set
 
 #
 # Wireless
 #
-# CONFIG_CFG80211 is not set
+CONFIG_CFG80211=m
+CONFIG_NL80211=y
 CONFIG_WIRELESS_EXT=y
-# CONFIG_MAC80211 is not set
+CONFIG_MAC80211=m
+
+#
+# Rate control algorithm selection
+#
+CONFIG_MAC80211_RC_DEFAULT_PID=y
+# CONFIG_MAC80211_RC_DEFAULT_NONE is not set
+
+#
+# Selecting 'y' for an algorithm will
+#
+
+#
+# build the algorithm into mac80211.
+#
+CONFIG_MAC80211_RC_DEFAULT="pid"
+CONFIG_MAC80211_RC_PID=y
+# CONFIG_MAC80211_MESH is not set
+# CONFIG_MAC80211_LEDS is not set
+# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set
+# CONFIG_MAC80211_DEBUG is not set
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
 CONFIG_IEEE80211_CRYPT_TKIP=m
-# CONFIG_IEEE80211_SOFTMAC is not set
 # CONFIG_RFKILL is not set
-# CONFIG_NET_9P is not set
+CONFIG_NET_9P=m
+# CONFIG_NET_9P_DEBUG is not set
 
 #
 # Device Drivers
@@ -527,38 +728,39 @@ CONFIG_IEEE80211_CRYPT_TKIP=m
 #
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_PREVENT_FIRMWARE_BUILD is not set
 CONFIG_FW_LOADER=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_CONNECTOR is not set
-CONFIG_MTD=y
+CONFIG_MTD=m
 # CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_CONCAT is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_CMDLINE_PARTS is not set
-# CONFIG_MTD_AFS_PARTS is not set
+CONFIG_MTD_CONCAT=m
+# CONFIG_MTD_PARTITIONS is not set
 
 #
 # User Modules And Translation Layers
 #
 CONFIG_MTD_CHAR=m
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_SSFDC is not set
-# CONFIG_MTD_OOPS is not set
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+CONFIG_FTL=m
+CONFIG_NFTL=m
+# CONFIG_NFTL_RW is not set
+CONFIG_INFTL=m
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+CONFIG_MTD_OOPS=m
 
 #
 # RAM/ROM/Flash chip drivers
 #
-# CONFIG_MTD_CFI is not set
+CONFIG_MTD_CFI=m
 # CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=m
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
 CONFIG_MTD_MAP_BANK_WIDTH_1=y
 CONFIG_MTD_MAP_BANK_WIDTH_2=y
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
@@ -569,27 +771,37 @@ CONFIG_MTD_CFI_I1=y
 CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_CFI_I4 is not set
 # CONFIG_MTD_CFI_I8 is not set
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ABSENT is not set
-CONFIG_MTD_SHARP=y
+CONFIG_MTD_CFI_INTELEXT=m
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=m
+CONFIG_MTD_RAM=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+# CONFIG_MTD_XIP is not set
 
 #
 # Mapping drivers for chip access
 #
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
-CONFIG_MTD_SA1100=y
-# CONFIG_MTD_PLATRAM is not set
+CONFIG_MTD_PHYSMAP=m
+CONFIG_MTD_PHYSMAP_START=0x8000000
+CONFIG_MTD_PHYSMAP_LEN=0
+CONFIG_MTD_PHYSMAP_BANKWIDTH=2
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+CONFIG_MTD_PLATRAM=m
 
 #
 # Self-contained MTD device drivers
 #
 # CONFIG_MTD_DATAFLASH is not set
 # CONFIG_MTD_M25P80 is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLOCK2MTD is not set
+CONFIG_MTD_SLRAM=m
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLOCK2MTD=m
 
 #
 # Disk-On-Chip Device Drivers
@@ -603,58 +815,56 @@ CONFIG_MTD_SA1100=y
 #
 # UBI - Unsorted block images
 #
-# CONFIG_MTD_UBI is not set
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_RESERVE=1
+# CONFIG_MTD_UBI_GLUEBI is not set
+
+#
+# UBI debugging options
+#
+# CONFIG_MTD_UBI_DEBUG is not set
 # CONFIG_PARPORT is not set
 # CONFIG_PNP is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=m
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_ATA_OVER_ETH is not set
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+# CONFIG_BLK_DEV_XIP is not set
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
 # CONFIG_MISC_DEVICES is not set
+CONFIG_HAVE_IDE=y
 CONFIG_IDE=m
 CONFIG_IDE_MAX_HWIFS=4
 CONFIG_BLK_DEV_IDE=m
 
 #
-# Please see Documentation/ide.txt for help/info on IDE drives
+# Please see Documentation/ide/ide.txt for help/info on IDE drives
 #
 # CONFIG_BLK_DEV_IDE_SATA is not set
 CONFIG_BLK_DEV_IDEDISK=m
 # CONFIG_IDEDISK_MULTI_MODE is not set
 CONFIG_BLK_DEV_IDECS=m
-# CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_BLK_DEV_IDESCSI is not set
+CONFIG_BLK_DEV_IDECD=m
+# CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS is not set
+CONFIG_BLK_DEV_IDETAPE=m
+CONFIG_BLK_DEV_IDEFLOPPY=m
+CONFIG_BLK_DEV_IDESCSI=m
 # CONFIG_IDE_TASK_IOCTL is not set
 CONFIG_IDE_PROC_FS=y
 
 #
 # IDE chipset support/bugfixes
 #
-# CONFIG_IDE_GENERIC is not set
-# CONFIG_BLK_DEV_PLATFORM is not set
-# CONFIG_IDE_ARM is not set
-
-#
-# Other IDE chipsets support
-#
-
-#
-# Note: most of these also require special kernel boot parameters
-#
-# CONFIG_BLK_DEV_4DRIVES is not set
-# CONFIG_BLK_DEV_ALI14XX is not set
-# CONFIG_BLK_DEV_DTC2278 is not set
-# CONFIG_BLK_DEV_HT6560B is not set
-# CONFIG_BLK_DEV_QD65XX is not set
-# CONFIG_BLK_DEV_UMC8672 is not set
+CONFIG_BLK_DEV_PLATFORM=m
 # CONFIG_BLK_DEV_IDEDMA is not set
-CONFIG_IDE_ARCH_OBSOLETE_INIT=y
 # CONFIG_BLK_DEV_HD is not set
 
 #
@@ -663,8 +873,8 @@ CONFIG_IDE_ARCH_OBSOLETE_INIT=y
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=m
 CONFIG_SCSI_DMA=y
-# CONFIG_SCSI_TGT is not set
-# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_TGT=m
+CONFIG_SCSI_NETLINK=y
 CONFIG_SCSI_PROC_FS=y
 
 #
@@ -676,12 +886,12 @@ CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SR_VENDOR is not set
 CONFIG_CHR_DEV_SG=m
-# CONFIG_CHR_DEV_SCH is not set
+CONFIG_CHR_DEV_SCH=m
 
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
 #
-CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_MULTI_LUN is not set
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
@@ -690,30 +900,34 @@ CONFIG_SCSI_WAIT_SCAN=m
 #
 # SCSI Transports
 #
-# CONFIG_SCSI_SPI_ATTRS is not set
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_LIBSAS is not set
-# CONFIG_SCSI_SRP_ATTRS is not set
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_ISCSI_TCP is not set
-# CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_IN2000 is not set
-# CONFIG_SCSI_DTC3280 is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-# CONFIG_SCSI_NCR53C406A is not set
-# CONFIG_SCSI_PAS16 is not set
-# CONFIG_SCSI_PSI240I is not set
-# CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_SYM53C416 is not set
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
-# CONFIG_ATA is not set
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+# CONFIG_SCSI_FC_TGT_ATTRS is not set
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+# CONFIG_SCSI_SAS_ATA is not set
+CONFIG_SCSI_SAS_HOST_SMP=y
+CONFIG_SCSI_SAS_LIBSAS_DEBUG=y
+CONFIG_SCSI_SRP_ATTRS=m
+# CONFIG_SCSI_SRP_TGT_ATTRS is not set
+# CONFIG_SCSI_LOWLEVEL is not set
+CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+CONFIG_PCMCIA_AHA152X=m
+CONFIG_PCMCIA_FDOMAIN=m
+CONFIG_PCMCIA_NINJA_SCSI=m
+CONFIG_PCMCIA_QLOGIC=m
+CONFIG_PCMCIA_SYM53C500=m
+CONFIG_ATA=m
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_SATA_PMP=y
+CONFIG_ATA_SFF=y
+# CONFIG_SATA_MV is not set
+# CONFIG_PATA_LEGACY is not set
+CONFIG_PATA_PCMCIA=m
+# CONFIG_PATA_QDI is not set
+# CONFIG_PATA_WINBOND_VLB is not set
+# CONFIG_PATA_PLATFORM is not set
 # CONFIG_MD is not set
 CONFIG_NETDEVICES=y
 # CONFIG_NETDEVICES_MULTIQUEUE is not set
@@ -722,29 +936,12 @@ CONFIG_NETDEVICES=y
 # CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=m
-# CONFIG_VETH is not set
+CONFIG_VETH=m
 # CONFIG_ARCNET is not set
-# CONFIG_PHYLIB is not set
-CONFIG_NET_ETHERNET=y
+# CONFIG_NET_ETHERNET is not set
 CONFIG_MII=m
-# CONFIG_AX88796 is not set
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NET_VENDOR_SMC is not set
-# CONFIG_SMC91X is not set
-# CONFIG_DM9000 is not set
-# CONFIG_NET_VENDOR_RACAL is not set
-# CONFIG_AT1700 is not set
-# CONFIG_DEPCA is not set
-# CONFIG_HP100 is not set
-# CONFIG_NET_ISA is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_NET_PCI is not set
-# CONFIG_B44 is not set
-CONFIG_NETDEV_1000=y
-CONFIG_NETDEV_10000=y
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
 # CONFIG_TR is not set
 
 #
@@ -764,36 +961,56 @@ CONFIG_ATMEL=m
 CONFIG_PCMCIA_ATMEL=m
 CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_WL3501=m
+CONFIG_P54_COMMON=m
+# CONFIG_IWLWIFI_LEDS is not set
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
 CONFIG_HOSTAP_CS=m
+CONFIG_B43=m
+CONFIG_B43_PCMCIA=y
+CONFIG_B43_PIO=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_DEBUG=y
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_RT2X00=m
 CONFIG_NET_PCMCIA=y
-# CONFIG_PCMCIA_3C589 is not set
-# CONFIG_PCMCIA_3C574 is not set
-# CONFIG_PCMCIA_FMVJ18X is not set
+CONFIG_PCMCIA_3C589=m
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_FMVJ18X=m
 CONFIG_PCMCIA_PCNET=m
-# CONFIG_PCMCIA_NMCLAN is not set
-# CONFIG_PCMCIA_SMC91C92 is not set
-# CONFIG_PCMCIA_XIRC2PS is not set
-# CONFIG_PCMCIA_AXNET is not set
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_PCMCIA_AXNET=m
 # CONFIG_WAN is not set
+# CONFIG_ATM_DRIVERS is not set
 CONFIG_PPP=m
 # CONFIG_PPP_MULTILINK is not set
 # CONFIG_PPP_FILTER is not set
 CONFIG_PPP_ASYNC=m
-# CONFIG_PPP_SYNC_TTY is not set
+CONFIG_PPP_SYNC_TTY=m
 CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_BSDCOMP=m
-# CONFIG_PPP_MPPE is not set
-# CONFIG_PPPOE is not set
+CONFIG_PPP_MPPE=m
+CONFIG_PPPOE=m
+# CONFIG_PPPOATM is not set
 # CONFIG_PPPOL2TP is not set
-# CONFIG_SLIP is not set
+CONFIG_SLIP=m
+# CONFIG_SLIP_COMPRESSED is not set
 CONFIG_SLHC=m
-# CONFIG_SHAPER is not set
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_SLIP_SMART is not set
+# CONFIG_SLIP_MODE_SLIP6 is not set
+CONFIG_NETCONSOLE=m
+# CONFIG_NETCONSOLE_DYNAMIC is not set
+CONFIG_NETPOLL=y
+# CONFIG_NETPOLL_TRAP is not set
+CONFIG_NET_POLL_CONTROLLER=y
 # CONFIG_ISDN is not set
 
 #
@@ -806,14 +1023,10 @@ CONFIG_INPUT=y
 #
 # Userland interfaces
 #
-CONFIG_INPUT_MOUSEDEV=m
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
-# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_MOUSEDEV is not set
+CONFIG_INPUT_JOYDEV=m
 CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
-CONFIG_INPUT_POWER=m
+CONFIG_INPUT_EVBUG=m
 
 #
 # Input Device Drivers
@@ -822,7 +1035,7 @@ CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_ATKBD is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_LKKBD is not set
-CONFIG_KEYBOARD_LOCOMO=m
+CONFIG_KEYBOARD_LOCOMO=y
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
@@ -830,8 +1043,19 @@ CONFIG_KEYBOARD_LOCOMO=m
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_FUJITSU is not set
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_UCB1400 is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=m
 
 #
 # Hardware I/O ports
@@ -846,13 +1070,14 @@ CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_DEVKMEM=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 
 #
 # Serial drivers
 #
 CONFIG_SERIAL_8250=m
-CONFIG_SERIAL_8250_CS=m
+# CONFIG_SERIAL_8250_CS is not set
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SERIAL_8250_EXTENDED is not set
@@ -875,17 +1100,46 @@ CONFIG_HW_RANDOM=m
 #
 # PCMCIA character devices
 #
-# CONFIG_SYNCLINK_CS is not set
-# CONFIG_CARDMAN_4000 is not set
-# CONFIG_CARDMAN_4040 is not set
+CONFIG_SYNCLINK_CS=m
+CONFIG_CARDMAN_4000=m
+CONFIG_CARDMAN_4040=m
+CONFIG_IPWIRELESS=m
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
-# CONFIG_I2C is not set
-
-#
-# SPI support
-#
+CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_ALGOBIT=m
+
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_ELEKTOR is not set
+CONFIG_I2C_GPIO=m
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_PCA_ISA is not set
+# CONFIG_I2C_PCA_PLATFORM is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_DS1682 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_PCF8575 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
 CONFIG_SPI=y
 # CONFIG_SPI_DEBUG is not set
 CONFIG_SPI_MASTER=y
@@ -894,6 +1148,7 @@ CONFIG_SPI_MASTER=y
 # SPI Master Controller Drivers
 #
 # CONFIG_SPI_BITBANG is not set
+CONFIG_SPI_LOCOMO=y
 
 #
 # SPI Protocol Masters
@@ -901,21 +1156,66 @@ CONFIG_SPI_MASTER=y
 # CONFIG_SPI_AT25 is not set
 # CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_TLE62X0 is not set
+CONFIG_HAVE_GPIO_LIB=y
+
+#
+# GPIO Support
+#
+# CONFIG_DEBUG_GPIO is not set
+
+#
+# I2C GPIO expanders:
+#
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_PCF857X is not set
+
+#
+# SPI GPIO expanders:
+#
+# CONFIG_GPIO_MCP23S08 is not set
 # CONFIG_W1 is not set
-# CONFIG_POWER_SUPPLY is not set
+CONFIG_POWER_SUPPLY=m
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_PDA_POWER=m
+# CONFIG_BATTERY_DS2760 is not set
 # CONFIG_HWMON is not set
-# CONFIG_WATCHDOG is not set
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_SA1100_WATCHDOG=m
+
+#
+# ISA-based Watchdog Cards
+#
+# CONFIG_PCWATCHDOG is not set
+# CONFIG_MIXCOMWD is not set
+# CONFIG_WDT is not set
 
 #
 # Sonics Silicon Backplane
 #
 CONFIG_SSB_POSSIBLE=y
-# CONFIG_SSB is not set
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+CONFIG_SSB_PCMCIAHOST=y
+# CONFIG_SSB_SILENT is not set
+# CONFIG_SSB_DEBUG is not set
 
 #
 # Multifunction device drivers
 #
 # CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_ASIC3 is not set
+# CONFIG_HTC_EGPIO is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_HTC_ASIC3 is not set
+# CONFIG_HTC_ASIC3_DS1WM is not set
 
 #
 # Multimedia Capabilities Port drivers
@@ -923,22 +1223,49 @@ CONFIG_SSB_POSSIBLE=y
 CONFIG_MCP=y
 CONFIG_MCP_SA11X0=y
 CONFIG_MCP_UCB1200=y
-CONFIG_MCP_UCB1200_TS=m
-# CONFIG_MCP_COLLIE_TS is not set
+# CONFIG_MCP_UCB1200_TS is not set
+CONFIG_MCP_COLLIE_TS=y
 
 #
 # Multimedia devices
 #
+
+#
+# Multimedia core support
+#
 CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L1=y
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_VIDEO_ALLOW_V4L1=y
 CONFIG_VIDEO_V4L1_COMPAT=y
-CONFIG_VIDEO_V4L2=y
+# CONFIG_DVB_CORE is not set
+CONFIG_VIDEO_MEDIA=m
+
+#
+# Multimedia drivers
+#
+CONFIG_MEDIA_ATTACH=y
+CONFIG_MEDIA_TUNER=m
+# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEO_V4L1=m
 CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
 # CONFIG_VIDEO_VIVI is not set
 # CONFIG_VIDEO_PMS is not set
 # CONFIG_VIDEO_CPIA is not set
+# CONFIG_VIDEO_SAA5246A is not set
+# CONFIG_VIDEO_SAA5249 is not set
+# CONFIG_TUNER_3036 is not set
+# CONFIG_SOC_CAMERA is not set
 CONFIG_RADIO_ADAPTERS=y
 # CONFIG_RADIO_CADET is not set
 # CONFIG_RADIO_RTRACK is not set
@@ -951,7 +1278,6 @@ CONFIG_RADIO_ADAPTERS=y
 # CONFIG_RADIO_TRUST is not set
 # CONFIG_RADIO_TYPHOON is not set
 # CONFIG_RADIO_ZOLTRIX is not set
-# CONFIG_DVB_CORE is not set
 CONFIG_DAB=y
 
 #
@@ -969,8 +1295,8 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_SYS_FILLRECT is not set
 # CONFIG_FB_SYS_COPYAREA is not set
 # CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_SYS_FOPS is not set
-# CONFIG_FB_DEFERRED_IO is not set
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
@@ -1020,87 +1346,33 @@ CONFIG_FONT_8x8=y
 #
 # Sound
 #
-CONFIG_SOUND=m
-
-#
-# Advanced Linux Sound Architecture
-#
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-# CONFIG_SND_SEQUENCER is not set
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
-# CONFIG_SND_DYNAMIC_MINORS is not set
-CONFIG_SND_SUPPORT_OLD_API=y
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-
-#
-# Generic devices
-#
-CONFIG_SND_DUMMY=m
-# CONFIG_SND_MTPAV is not set
-# CONFIG_SND_SERIAL_U16550 is not set
-# CONFIG_SND_MPU401 is not set
-
-#
-# ALSA ARM devices
-#
-
-#
-# SPI devices
-#
-
-#
-# PCMCIA devices
-#
-# CONFIG_SND_VXPOCKET is not set
-# CONFIG_SND_PDAUDIOCF is not set
-
-#
-# System on Chip audio support
-#
-# CONFIG_SND_SOC is not set
-
-#
-# SoC Audio support for SuperH
-#
-
-#
-# Open Sound System
-#
-# CONFIG_SOUND_PRIME is not set
-CONFIG_HID_SUPPORT=y
+# CONFIG_SOUND is not set
+# CONFIG_HID_SUPPORT is not set
 CONFIG_HID=m
-# CONFIG_HID_DEBUG is not set
-# CONFIG_HIDRAW is not set
 # CONFIG_USB_SUPPORT is not set
-CONFIG_MMC=m
-CONFIG_MMC_DEBUG=y
-CONFIG_MMC_UNSAFE_RESUME=y
+CONFIG_MMC=y
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
 
 #
 # MMC/SD Card Drivers
 #
-CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_BOUNCE=y
 # CONFIG_SDIO_UART is not set
+# CONFIG_MMC_TEST is not set
 
 #
 # MMC/SD Host Controller Drivers
 #
-CONFIG_MMC_SPI=m
+CONFIG_MMC_SPI=y
 CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=m
+CONFIG_LEDS_CLASS=y
 
 #
 # LED drivers
 #
-CONFIG_LEDS_LOCOMO=m
+CONFIG_LEDS_LOCOMO=y
 # CONFIG_LEDS_GPIO is not set
 
 #
@@ -1108,10 +1380,14 @@ CONFIG_LEDS_LOCOMO=m
 #
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
-# CONFIG_LEDS_TRIGGER_IDE_DISK is not set
+CONFIG_LEDS_TRIGGER_IDE_DISK=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=m
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
 
 #
 # RTC interfaces
@@ -1119,22 +1395,40 @@ CONFIG_RTC_CLASS=m
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
 # CONFIG_RTC_DRV_TEST is not set
 
 #
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+
+#
 # SPI RTC drivers
 #
-# CONFIG_RTC_DRV_RS5C348 is not set
 # CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
 
 #
 # Platform RTC drivers
 #
 # CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_DS1511 is not set
 # CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_STK17TA8 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
 # CONFIG_RTC_DRV_M48T59 is not set
 # CONFIG_RTC_DRV_V3020 is not set
@@ -1142,33 +1436,50 @@ CONFIG_RTC_INTF_DEV=y
 #
 # on-CPU RTC drivers
 #
-CONFIG_RTC_DRV_SA1100=m
+CONFIG_RTC_DRV_SA1100=y
+CONFIG_UIO=m
+CONFIG_UIO_SMX=m
 
 #
 # File systems
 #
-CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS=y
 CONFIG_EXT3_FS_XATTR=y
 # CONFIG_EXT3_FS_POSIX_ACL is not set
 # CONFIG_EXT3_FS_SECURITY is not set
-# CONFIG_EXT4DEV_FS is not set
-CONFIG_JBD=m
-CONFIG_FS_MBCACHE=m
-# CONFIG_REISERFS_FS is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_FS_POSIX_ACL is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_OCFS2_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_ROMFS_FS is not set
+CONFIG_EXT4DEV_FS=m
+CONFIG_EXT4DEV_FS_XATTR=y
+# CONFIG_EXT4DEV_FS_POSIX_ACL is not set
+# CONFIG_EXT4DEV_FS_SECURITY is not set
+CONFIG_JBD=y
+CONFIG_JBD2=m
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+CONFIG_JFS_FS=m
+# CONFIG_JFS_POSIX_ACL is not set
+# CONFIG_JFS_SECURITY is not set
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_FS_POSIX_ACL=y
+CONFIG_XFS_FS=m
+# CONFIG_XFS_QUOTA is not set
+# CONFIG_XFS_POSIX_ACL is not set
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_DEBUG_MASKLOG=y
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_DNOTIFY=y
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
 # CONFIG_QUOTA is not set
-CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
 CONFIG_FUSE_FS=m
@@ -1176,8 +1487,11 @@ CONFIG_FUSE_FS=m
 #
 # CD-ROM/DVD Filesystems
 #
-# CONFIG_ISO9660_FS is not set
-# CONFIG_UDF_FS is not set
+CONFIG_ISO9660_FS=m
+# CONFIG_JOLIET is not set
+# CONFIG_ZISOFS is not set
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
 
 #
 # DOS/FAT/NT Filesystems
@@ -1187,7 +1501,9 @@ CONFIG_MSDOS_FS=m
 CONFIG_VFAT_FS=m
 CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-# CONFIG_NTFS_FS is not set
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
 
 #
 # Pseudo filesystems
@@ -1198,66 +1514,89 @@ CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 # CONFIG_TMPFS_POSIX_ACL is not set
 # CONFIG_HUGETLB_PAGE is not set
-# CONFIG_CONFIGFS_FS is not set
+CONFIG_CONFIGFS_FS=m
 
 #
 # Miscellaneous filesystems
 #
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-CONFIG_JFFS2_FS=y
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+# CONFIG_ECRYPT_FS is not set
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+CONFIG_BFS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_JFFS2_FS=m
 CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_JFFS2_FS_WRITEBUFFER=y
 # CONFIG_JFFS2_FS_WBUF_VERIFY is not set
 # CONFIG_JFFS2_SUMMARY is not set
 # CONFIG_JFFS2_FS_XATTR is not set
 # CONFIG_JFFS2_SYSFS is not set
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
 CONFIG_JFFS2_ZLIB=y
-# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_LZO=y
 CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
+CONFIG_JFFS2_RUBIN=y
+# CONFIG_JFFS2_CMODE_NONE is not set
+# CONFIG_JFFS2_CMODE_PRIORITY is not set
+# CONFIG_JFFS2_CMODE_SIZE is not set
+CONFIG_JFFS2_CMODE_FAVOURLZO=y
 CONFIG_CRAMFS=m
-CONFIG_SQUASHFS=m
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_VXFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
+CONFIG_VXFS_FS=m
+CONFIG_MINIX_FS=m
+CONFIG_HPFS_FS=m
+CONFIG_QNX4FS_FS=m
+CONFIG_ROMFS_FS=m
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
-# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
-# CONFIG_NFS_DIRECTIO is not set
-# CONFIG_NFSD is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_NFS_ACL_SUPPORT=m
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m
-# CONFIG_SUNRPC_BIND34 is not set
+CONFIG_SUNRPC_BIND34=y
 CONFIG_RPCSEC_GSS_KRB5=m
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
+CONFIG_RPCSEC_GSS_SPKM3=m
 CONFIG_SMB_FS=m
-CONFIG_SMB_NLS_DEFAULT=y
-CONFIG_SMB_NLS_REMOTE="cp437"
+# CONFIG_SMB_NLS_DEFAULT is not set
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS is not set
 # CONFIG_CIFS_WEAK_PW_HASH is not set
 # CONFIG_CIFS_XATTR is not set
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_EXPERIMENTAL is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
+CONFIG_NCP_FS=m
+# CONFIG_NCPFS_PACKET_SIGNING is not set
+# CONFIG_NCPFS_IOCTL_LOCKING is not set
+# CONFIG_NCPFS_STRONG is not set
+# CONFIG_NCPFS_NFS_NS is not set
+# CONFIG_NCPFS_OS2_NS is not set
+# CONFIG_NCPFS_SMALLDOS is not set
+# CONFIG_NCPFS_NLS is not set
+# CONFIG_NCPFS_EXTRAS is not set
+CONFIG_CODA_FS=m
+# CONFIG_CODA_FS_OLD_API is not set
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+CONFIG_9P_FS=m
 
 #
 # Partition Types
@@ -1281,7 +1620,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_EFI_PARTITION is not set
 # CONFIG_SYSV68_PARTITION is not set
 CONFIG_NLS=m
-CONFIG_NLS_DEFAULT="cp437"
+CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_NLS_CODEPAGE_437=m
 CONFIG_NLS_CODEPAGE_737=m
 CONFIG_NLS_CODEPAGE_775=m
@@ -1321,9 +1660,6 @@ CONFIG_NLS_KOI8_R=m
 CONFIG_NLS_KOI8_U=m
 CONFIG_NLS_UTF8=m
 # CONFIG_DLM is not set
-CONFIG_INSTRUMENTATION=y
-# CONFIG_PROFILING is not set
-# CONFIG_MARKERS is not set
 
 #
 # Kernel hacking
@@ -1331,6 +1667,7 @@ CONFIG_INSTRUMENTATION=y
 # CONFIG_PRINTK_TIME is not set
 CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_DEBUG_FS is not set
@@ -1341,6 +1678,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_PREEMPT is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
@@ -1356,81 +1694,127 @@ CONFIG_SCHED_DEBUG=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_DEBUG_SG is not set
 CONFIG_FRAME_POINTER=y
-# CONFIG_FORCED_INLINING is not set
 # CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_SAMPLES is not set
 # CONFIG_DEBUG_USER is not set
 CONFIG_DEBUG_ERRORS=y
+# CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_LL is not set
 
 #
 # Security options
 #
-# CONFIG_KEYS is not set
+CONFIG_KEYS=y
+# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
 # CONFIG_SECURITY is not set
 # CONFIG_SECURITY_FILE_CAPABILITIES is not set
 CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
 CONFIG_CRYPTO_ALGAPI=m
+CONFIG_CRYPTO_AEAD=m
 CONFIG_CRYPTO_BLKCIPHER=m
 CONFIG_CRYPTO_HASH=m
 CONFIG_CRYPTO_MANAGER=m
-CONFIG_CRYPTO_HMAC=m
-# CONFIG_CRYPTO_XCBC is not set
+CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=m
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=m
+CONFIG_CRYPTO_XCBC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_SHA1=m
 CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m
-# CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_GF128MUL is not set
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_CBC=m
-# CONFIG_CRYPTO_PCBC is not set
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_XTS is not set
-# CONFIG_CRYPTO_CRYPTD is not set
-CONFIG_CRYPTO_DES=m
-# CONFIG_CRYPTO_FCRYPT is not set
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_SERPENT=m
+
+#
+# Ciphers
+#
 CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_ANUBIS=m
-# CONFIG_CRYPTO_SEED is not set
+CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+
+#
+# Compression
+#
 CONFIG_CRYPTO_DEFLATE=m
-# CONFIG_CRYPTO_LZO is not set
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_CRC32C=m
-# CONFIG_CRYPTO_CAMELLIA is not set
-CONFIG_CRYPTO_TEST=m
-# CONFIG_CRYPTO_AUTHENC is not set
+CONFIG_CRYPTO_LZO=m
 # CONFIG_CRYPTO_HW is not set
 
 #
 # Library routines
 #
 CONFIG_BITREVERSE=y
+# CONFIG_GENERIC_FIND_FIRST_BIT is not set
+# CONFIG_GENERIC_FIND_NEXT_BIT is not set
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
-CONFIG_CRC_ITU_T=m
+CONFIG_CRC_ITU_T=y
 CONFIG_CRC32=y
-CONFIG_CRC7=m
+CONFIG_CRC7=y
 CONFIG_LIBCRC32C=m
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
+CONFIG_ZLIB_INFLATE=m
+CONFIG_ZLIB_DEFLATE=m
+CONFIG_LZO_COMPRESS=m
+CONFIG_LZO_DECOMPRESS=m
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
diff --git a/packages/linux/linux-rp-2.6.26/initramfs-config-collie b/packages/linux/linux-rp-2.6.26/initramfs-config-collie
new file mode 100644
index 0000000000..925d498b21
--- /dev/null
+++ b/packages/linux/linux-rp-2.6.26/initramfs-config-collie
@@ -0,0 +1,810 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.26
+# Thu Jul 24 23:13:04 2008
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_SUPPORTS_AOUT=y
+CONFIG_ZONE_DMA=y
+CONFIG_ARCH_MTD_XIP=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+# CONFIG_GROUP_SCHED is not set
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
+# CONFIG_RELAY is not set
+# CONFIG_NAMESPACES is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_SYSCTL_SYSCALL_CHECK=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+# CONFIG_ELF_CORE is not set
+CONFIG_COMPAT_BRK=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
+CONFIG_HAVE_OPROFILE=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+# CONFIG_HAVE_DMA_ATTRS is not set
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_MODULES is not set
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_AS is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
+CONFIG_CLASSIC_RCU=y
+
+#
+# System Type
+#
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_ORION5X is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_RPC is not set
+CONFIG_ARCH_SA1100=y
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_DAVINCI is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_MSM7X00A is not set
+
+#
+# SA11x0 Implementations
+#
+# CONFIG_SA1100_ASSABET is not set
+# CONFIG_SA1100_CERF is not set
+CONFIG_SA1100_COLLIE=y
+# CONFIG_SA1100_H3100 is not set
+# CONFIG_SA1100_H3600 is not set
+# CONFIG_SA1100_H3800 is not set
+# CONFIG_SA1100_BADGE4 is not set
+# CONFIG_SA1100_JORNADA720 is not set
+# CONFIG_SA1100_HACKKIT is not set
+# CONFIG_SA1100_LART is not set
+# CONFIG_SA1100_PLEB is not set
+# CONFIG_SA1100_SHANNON is not set
+# CONFIG_SA1100_SIMPAD is not set
+# CONFIG_SA1100_SSP is not set
+
+#
+# Boot options
+#
+
+#
+# Power management
+#
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_SA1100=y
+CONFIG_CPU_32v4=y
+CONFIG_CPU_ABRT_EV4=y
+CONFIG_CPU_PABRT_NOIFAR=y
+CONFIG_CPU_CACHE_V4WB=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_TLB_V4WB=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_OUTER_CACHE is not set
+CONFIG_SHARP_LOCOMO=y
+CONFIG_SHARP_PARAM=y
+CONFIG_SHARP_SCOOP=y
+
+#
+# Bus support
+#
+CONFIG_ISA=y
+# CONFIG_PCI_SYSCALL is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+CONFIG_PCCARD=y
+# CONFIG_PCMCIA_DEBUG is not set
+CONFIG_PCMCIA=y
+# CONFIG_PCMCIA_LOAD_CIS is not set
+# CONFIG_PCMCIA_IOCTL is not set
+
+#
+# PC-card bridges
+#
+# CONFIG_I82365 is not set
+# CONFIG_TCIC is not set
+CONFIG_PCMCIA_SA1100=y
+
+#
+# Kernel Features
+#
+CONFIG_TICK_ONESHOT=y
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+# CONFIG_PREEMPT is not set
+CONFIG_HZ=100
+# CONFIG_AEABI is not set
+CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_NODES_SHIFT=2
+CONFIG_SELECT_MEMORY_MODEL=y
+# CONFIG_FLATMEM_MANUAL is not set
+CONFIG_DISCONTIGMEM_MANUAL=y
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_DISCONTIGMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_NEED_MULTIPLE_NODES=y
+# CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_LEDS is not set
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 mem=64M fbcon=rotate:1 dyntick=enable debug"
+# CONFIG_XIP_KERNEL is not set
+CONFIG_KEXEC=y
+CONFIG_ATAGS_PROC=y
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+# CONFIG_FPE_NWFPE is not set
+CONFIG_FPE_FASTFPE=y
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_ARTHUR is not set
+
+#
+# Power management options
+#
+# CONFIG_PM is not set
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+
+#
+# Networking
+#
+# CONFIG_NET is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_FW_LOADER is not set
+# CONFIG_SYS_HYPERVISOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_CMDLINE_PARTS is not set
+# CONFIG_MTD_AFS_PARTS is not set
+# CONFIG_MTD_AR7_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+# CONFIG_MTD_CHAR is not set
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+# CONFIG_MTD_CFI_NOSWAP is not set
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_XIP is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+CONFIG_MTD_SA1100=y
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
+# CONFIG_PARPORT is not set
+# CONFIG_PNP is not set
+# CONFIG_BLK_DEV is not set
+# CONFIG_MISC_DEVICES is not set
+CONFIG_HAVE_IDE=y
+CONFIG_IDE=y
+CONFIG_IDE_MAX_HWIFS=4
+CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+# CONFIG_BLK_DEV_IDEDISK is not set
+# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_BLK_DEV_IDECS=y
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+# CONFIG_IDE_PROC_FS is not set
+
+#
+# IDE chipset support/bugfixes
+#
+# CONFIG_BLK_DEV_PLATFORM is not set
+# CONFIG_BLK_DEV_IDEDMA is not set
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ATKBD is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+CONFIG_KEYBOARD_LOCOMO=y
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_GPIO is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+# CONFIG_DEVKMEM is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_SA1100=y
+CONFIG_SERIAL_SA1100_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_UNIX98_PTYS is not set
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_NVRAM is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+
+#
+# PCMCIA character devices
+#
+# CONFIG_SYNCLINK_CS is not set
+# CONFIG_CARDMAN_4000 is not set
+# CONFIG_CARDMAN_4040 is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
+# CONFIG_I2C is not set
+CONFIG_SPI=y
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_BITBANG is not set
+CONFIG_SPI_LOCOMO=y
+
+#
+# SPI Protocol Masters
+#
+# CONFIG_SPI_AT25 is not set
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_TLE62X0 is not set
+CONFIG_HAVE_GPIO_LIB=y
+
+#
+# GPIO Support
+#
+
+#
+# I2C GPIO expanders:
+#
+
+#
+# SPI GPIO expanders:
+#
+# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
+# CONFIG_WATCHDOG is not set
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_ASIC3 is not set
+# CONFIG_HTC_EGPIO is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_HTC_ASIC3 is not set
+# CONFIG_HTC_ASIC3_DS1WM is not set
+
+#
+# Multimedia Capabilities Port drivers
+#
+# CONFIG_MCP_SA11X0 is not set
+
+#
+# Multimedia devices
+#
+
+#
+# Multimedia core support
+#
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_VIDEO_MEDIA is not set
+
+#
+# Multimedia drivers
+#
+# CONFIG_DAB is not set
+
+#
+# Graphics support
+#
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+# CONFIG_FB_SYS_FOPS is not set
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
+CONFIG_FB_SA1100=y
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# CONFIG_LCD_CLASS_DEVICE is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_BACKLIGHT_CORGI is not set
+CONFIG_BACKLIGHT_LOCOMO=y
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+# CONFIG_MDA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+# CONFIG_FONT_8x16 is not set
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+# CONFIG_LOGO is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+# CONFIG_HID_SUPPORT is not set
+# CONFIG_USB_SUPPORT is not set
+CONFIG_MMC=y
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+
+#
+# MMC/SD Card Drivers
+#
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_BOUNCE=y
+# CONFIG_SDIO_UART is not set
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD Host Controller Drivers
+#
+CONFIG_MMC_SPI=y
+# CONFIG_NEW_LEDS is not set
+CONFIG_RTC_LIB=y
+# CONFIG_RTC_CLASS is not set
+# CONFIG_UIO is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_EXT4DEV_FS is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_DNOTIFY is not set
+# CONFIG_INOTIFY is not set
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_SYSFS is not set
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RTIME=y
+CONFIG_JFFS2_RUBIN=y
+# CONFIG_JFFS2_CMODE_NONE is not set
+# CONFIG_JFFS2_CMODE_PRIORITY is not set
+# CONFIG_JFFS2_CMODE_SIZE is not set
+CONFIG_JFFS2_CMODE_FAVOURLZO=y
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
+# CONFIG_NLS is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+# CONFIG_ENABLE_WARN_DEPRECATED is not set
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_FRAME_WARN=1024
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_FRAME_POINTER=y
+# CONFIG_SAMPLES is not set
+# CONFIG_DEBUG_USER is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+# CONFIG_CRYPTO is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+# CONFIG_GENERIC_FIND_FIRST_BIT is not set
+# CONFIG_GENERIC_FIND_NEXT_BIT is not set
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC_ITU_T=y
+CONFIG_CRC32=y
+CONFIG_CRC7=y
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/packages/linux/linux-rp.inc b/packages/linux/linux-rp.inc
index 2309235139..28f3d0dc00 100644
--- a/packages/linux/linux-rp.inc
+++ b/packages/linux/linux-rp.inc
@@ -24,6 +24,7 @@ CMDLINE_CON_collie = "console=ttySA0,115200n8 console=tty1 noinitrd"
 CMDLINE_CON_qemuarm = "console=ttyAMA0,115200n8 console=tty1 noinitrd"
 CMDLINE_CON_zylonite = "console=ttyS0,38400"
 CMDLINE_ROOT ?= "root=/dev/mtdblock2 rootfstype=jffs2"
+CMDLINE_ROOT_collie = "root=/dev/mmcblk0p1 rootfstype=ext2 rootdelay=3 rw"
 CMDLINE_ROOT_spitz ?= "root=/dev/hda1 rootfstype=ext3 rootdelay=1 rw"
 #CMDLINE_ROOT_spitz = "root=/dev/mmcblk0p2 rootfstype=ext2 rootdelay=3 rw"
 CMDLINE_OTHER = "dyntick=enable"
diff --git a/packages/linux/linux-rp_2.6.24.bb b/packages/linux/linux-rp_2.6.24.bb
index 8c5d2f8ea5..ca249ef7ff 100644
--- a/packages/linux/linux-rp_2.6.24.bb
+++ b/packages/linux/linux-rp_2.6.24.bb
@@ -102,12 +102,10 @@ SRC_URI_append_collie = "\
 	${TKSRC}/pcmcia_suspend.patch;patch=1 \
 	${TKSRC}/locomo_spi-6.patch;patch=1 \
 	${TKSRC}/config.patch;patch=1 \
-	${TKSRC}/locomokeyb-2.patch;patch=1 \
 	${TKSRC}/mmc-spi.patch;patch=1 \
 	${TKSRC}/linux-2.6.24-SIMpad-rtc-sa1100.patch;patch=1 \
 	${TKSRC}/sa1100_spinlock.patch;patch=1 \
 	${TKSRC}/sa1100-dma.patch;patch=1 \
-	${TKSRC}/sa1100_udc_g_ether-2.patch;patch=1 \
 "
 
 SRC_URI_append_poodle = "\
diff --git a/packages/linux/linux-rp_2.6.26.bb b/packages/linux/linux-rp_2.6.26.bb
index 74ed5920e8..6284f0510f 100644
--- a/packages/linux/linux-rp_2.6.26.bb
+++ b/packages/linux/linux-rp_2.6.26.bb
@@ -6,6 +6,7 @@ DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_qemuarm = "-1"
 DEFAULT_PREFERENCE_qemux86 = "-1"
 DEFAULT_PREFERENCE_spitz = "1"
+DEFAULT_PREFERENCE_collie = "1"
 
 # Handy URLs
 # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
@@ -59,10 +60,11 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.26.tar.bz2 \
            file://defconfig-qemux86 \
            file://defconfig-bootcdx86 \
            file://defconfig-htcuniversal \
+           file://defconfig-collie \
+           file://initramfs-config-collie \
            file://defconfig-zylonite"
 # Disabled until the patchset is updated:
 #           file://defconfig-tosa
-#           file://defconfig-collie
 #           file://defconfig-poodle
 
 
@@ -78,23 +80,8 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.26.tar.bz2 \
 
 
 SRC_URI_append_collie = "\
-	${TKSRC}/mtd-sharp-flash-hack-r4.patch;patch=1 \
-	${TKSRC}/mcp-sa11x0-r0.patch;patch=1 \
-	${TKSRC}/locomo-r1.patch;patch=1 \
-	${TKSRC}/collie-kexec-r1.patch;patch=1 \
-	${TKSRC}/sharpsl_pm-4.patch;patch=1 \
-	${TKSRC}/collie_pm-3.patch;patch=1 \
-	${TKSRC}/ucb1x00_suspend.patch;patch=1 \
-	${TKSRC}/collie-ts.patch;patch=1 \
-	${TKSRC}/pcmcia_suspend.patch;patch=1 \
-	${TKSRC}/locomo_spi-6.patch;patch=1 \
-	${TKSRC}/config.patch;patch=1 \
-	${TKSRC}/locomokeyb-2.patch;patch=1 \
-	${TKSRC}/mmc-spi.patch;patch=1 \
-	${TKSRC}/linux-2.6.24-SIMpad-rtc-sa1100.patch;patch=1 \
-	${TKSRC}/sa1100_spinlock.patch;patch=1 \
-	${TKSRC}/sa1100-dma.patch;patch=1 \
-	${TKSRC}/sa1100_udc_g_ether-2.patch;patch=1 \
+	file://collie.patch;patch=1 \
+	file://collie_keymap.patch;patch=1 \
 "
 
 SRC_URI_append_poodle = "\
diff --git a/packages/lirc/lirc-modules_0.8.3+cvs20080713.bb b/packages/lirc/lirc-modules_0.8.3+cvs20080713.bb
new file mode 100644
index 0000000000..094c6fd380
--- /dev/null
+++ b/packages/lirc/lirc-modules_0.8.3+cvs20080713.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls. This package contains the lirc kernel modules."
+SECTION = "base"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.lirc.org"
+LICENSE = "GPL"
+DEPENDS = "virtual/kernel fakeroot-native setserial"
+PR = "r0"
+
+SRCDATE=${@bb.data.getVar('PV', d, 1)[9:]}
+
+SRC_URI = "cvs://anonymous@lirc.cvs.sourceforge.net/cvsroot/lirc;module=lirc;method=pserver;cvsdate=${SRCDATE}"
+S = "${WORKDIR}/lirc"
+
+
+inherit autotools module
+
+require lirc-config.inc
+
+MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make -e V=1' -C drivers"
+
+fakeroot do_install() {
+	oe_runmake -C drivers DESTDIR="${D}" moduledir="/lib/modules/${KERNEL_VERSION}/lirc" install
+	rm -rf ${D}/dev
+}
+
+# this is for distributions that don't use udev
+pkg_postinst_append() {
+if [ ! -c $D/dev/lirc -a ! -f /sbin/udevd ]; then mknod $D/dev/lirc c 61 0; fi
+}
+
+FILES_${PN} = "/lib/modules"
diff --git a/packages/meta/external-toolchain.bb b/packages/meta/external-toolchain.bb
index c7e1d5d3c4..ad30ff7c50 100644
--- a/packages/meta/external-toolchain.bb
+++ b/packages/meta/external-toolchain.bb
@@ -6,6 +6,7 @@ PROVIDES = "\
     linux-libc-headers \
     virtual/${TARGET_PREFIX}gcc \
     virtual/${TARGET_PREFIX}gcc-initial \
+    virtual/${TARGET_PREFIX}gcc-intermediate \
     virtual/${TARGET_PREFIX}binutils \
     virtual/${TARGET_PREFIX}libc-for-gcc \
     virtual/libc \
diff --git a/packages/mono/README b/packages/mono/README
index 61bba80c07..7f777718c1 100644
--- a/packages/mono/README
+++ b/packages/mono/README
@@ -1,6 +1,12 @@
 Notes on Mono support in OE.
 
 ===============================
+Mono 1.9.1 status
+
+- mono-native and mono-mcs-intermediate error out during compile, but in a
+  dev shell they compile fine -- very strange.
+
+===============================
 Cross Compiling Mono
 
 Cross compiling mono requires a two stage build because the mono mcs directory
diff --git a/packages/mono/files/libgc_cppflags.patch b/packages/mono/files/libgc_cppflags.patch
new file mode 100644
index 0000000000..d4a51179d1
--- /dev/null
+++ b/packages/mono/files/libgc_cppflags.patch
@@ -0,0 +1,46 @@
+Index: mono-1.9.1/configure.in
+===================================================================
+--- mono-1.9.1.orig/configure.in	2008-07-16 23:37:52.000000000 -0400
++++ mono-1.9.1/configure.in	2008-07-16 23:38:23.000000000 -0400
+@@ -660,13 +660,6 @@
+ 		;;
+ 
+ 	xincluded)
+-		AC_CONFIG_SUBDIRS(libgc)
+-
+-		# Pass CPPFLAGS to libgc configure
+-		# Maybe we should use a separate variable for this to avoid passing useless and
+-		# potentially problematic defines to libgc (like -D_FILE_OFFSET_BITS=64)
+-		export CPPFLAGS
+-
+ 		found_boehm=yes
+ 		gc_headers=yes
+ 		use_included_gc=yes
+@@ -714,9 +707,6 @@
+    CPPFLAGS="$CPPFLAGS -DLARGE_CONFIG"
+ fi
+ 
+-# tell libgc/configure about what we want
+-ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args"
+-
+ AM_CONDITIONAL(INCLUDED_LIBGC, test x$use_included_gc = xyes)
+ AC_SUBST(LIBGC_CFLAGS)
+ AC_SUBST(LIBGC_LIBS)
+@@ -1970,6 +1960,17 @@
+ 	CPPFLAGS="$CPPFLAGS -DNO_UNALIGNED_ACCESS"
+ fi
+ 
++case "x$gc" in
++	xincluded)
++		# Pass CPPFLAGS to libgc configure
++		# We should use a separate variable for this to avoid passing useless and
++		# potentially problematic defines to libgc (like -D_FILE_OFFSET_BITS=64)
++		# This should be executed late so we pick up the final version of CPPFLAGS
++		ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args \"CPPFLAGS=$CPPFLAGS\""
++		AC_CONFIG_SUBDIRS(libgc)
++		;;
++esac
++
+ PREVIEW=yes
+ AC_ARG_WITH(preview,  [ --with-preview=yes,no     If you want to install the 2.0 FX preview],[
+ 	if test x$with_preview = xno; then
diff --git a/packages/mono/mono-1.9.1/.mtn2git_empty b/packages/mono/mono-1.9.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mono/mono-1.9.1/.mtn2git_empty
diff --git a/packages/mono/mono-mcs-intermediate_1.9.1.bb b/packages/mono/mono-mcs-intermediate_1.9.1.bb
new file mode 100644
index 0000000000..afa2d2be32
--- /dev/null
+++ b/packages/mono/mono-mcs-intermediate_1.9.1.bb
@@ -0,0 +1,15 @@
+# This is a straw-man recipe for step 1 in the two-step build of
+# mono. Because it's impossible to build the mcs directory
+# in cross-compile mode, this recipe will do a native build,
+# then tar the resulting install tree for usage by the mono
+# package in step 2.
+# See http://www.mono-project.com/Mono:ARM
+
+require mono_1.9.1.inc
+require mono-mcs-intermediate.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI += "file://libgc_cppflags.patch;patch=1"
+
+
diff --git a/packages/mono/mono-native_1.9.1.bb b/packages/mono/mono-native_1.9.1.bb
new file mode 100644
index 0000000000..3c18cf7601
--- /dev/null
+++ b/packages/mono/mono-native_1.9.1.bb
@@ -0,0 +1,27 @@
+require mono_1.9.1.inc
+PR = "r3"
+DEPENDS = "glib-2.0-native perl-native"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI += "file://mono-fix-libdir-path.patch;patch=1 \
+	    file://libgc_cppflags.patch;patch=1 \
+           "
+
+PARALLEL_MAKE = ""
+
+inherit native
+
+do_stage_prepend() {
+	install -m 755 ${S}/mono/monoburg/monoburg ${STAGING_BINDIR}
+}
+
+do_fix_libtool_name() {
+	# inherit native will make that all native tools that are being
+	# built are prefixed with something like "i686-linux-",
+	# including libtool. Fix up some hardcoded libtool names:
+	for i in "${S}"/runtime/*-wrapper.in; do
+		sed -e "s/libtool/${BUILD_SYS}-libtool/" -i "${i}"
+	done
+}
+addtask fix_libtool_name after do_patch before do_configure
diff --git a/packages/mono/mono_1.9.1-files.inc b/packages/mono/mono_1.9.1-files.inc
new file mode 100644
index 0000000000..461eb85ff5
--- /dev/null
+++ b/packages/mono/mono_1.9.1-files.inc
@@ -0,0 +1,1426 @@
+# This is a generated file, please do not edit directly
+# Use collect-files.py instead. -- Henryk <henryk@openmoko.org>
+FILES_mono-jit-dbg = "/usr/bin/mono*.mdb \
+	/usr/bin/mono*/*.mdb"
+FILES_mono-jit = "/usr/bin/mono"
+FILES_mono-gac-dbg = "/usr/bin/gacutil*.mdb \
+	/usr/bin/gacutil*/*.mdb \
+	/usr/lib/mono/1.0/gacutil.exe*.mdb \
+	/usr/lib/mono/1.0/gacutil.exe*/*.mdb"
+FILES_mono-gac = "/usr/bin/gacutil \
+	/usr/lib/mono/1.0/gacutil.exe"
+FILES_mono-mjs-dbg = "/usr/bin/mjs*.mdb \
+	/usr/bin/mjs*/*.mdb \
+	/usr/lib/mono/1.0/mjs.exe*.mdb \
+	/usr/lib/mono/1.0/mjs.exe*/*.mdb"
+FILES_mono-mjs = "/usr/bin/mjs \
+	/usr/lib/mono/1.0/mjs.exe*"
+FILES_mono-gmcs-dbg = "/usr/bin/gmcs*.mdb \
+	/usr/bin/gmcs*/*.mdb \
+	/usr/lib/mono/2.0/gmcs.exe*.mdb \
+	/usr/lib/mono/2.0/gmcs.exe*/*.mdb"
+FILES_mono-gmcs = "/usr/bin/gmcs \
+	/usr/lib/mono/2.0/gmcs.exe*"
+FILES_mono-utils-dbg = "/usr/bin/pedump*.mdb \
+	/usr/bin/pedump*/*.mdb \
+	/usr/bin/monodis*.mdb \
+	/usr/bin/monodis*/*.mdb \
+	/usr/bin/monograph*.mdb \
+	/usr/bin/monograph*/*.mdb \
+	/usr/bin/mono-find-provides*.mdb \
+	/usr/bin/mono-find-provides*/*.mdb \
+	/usr/bin/mono-find-requires*.mdb \
+	/usr/bin/mono-find-requires*/*.mdb"
+FILES_mono-utils = "/usr/bin/pedump \
+	/usr/bin/monodis \
+	/usr/bin/monograph \
+	/usr/bin/mono-find-provides \
+	/usr/bin/mono-find-requires"
+FILES_libmono-peapi1.0-cil-dbg = "/usr/lib/mono/gac/PEAPI/1.0.*/*.mdb \
+	/usr/lib/mono/gac/PEAPI/1.0.*/*/*.mdb \
+	/usr/lib/mono/gac/PEAPI/1.0.*/.debug/ \
+	/usr/lib/mono/gac/PEAPI/1.0.*/../.debug/ \
+	/usr/lib/mono/1.0/PEAPI.dll*.mdb \
+	/usr/lib/mono/1.0/PEAPI.dll*/*.mdb"
+FILES_libmono-peapi1.0-cil = "/usr/lib/mono/gac/PEAPI/1.0.*/ \
+	/usr/lib/mono/1.0/PEAPI.dll"
+FILES_libmono-cairo1.0-cil-dbg = "/usr/lib/mono/gac/Mono.Cairo/1.0.*/*.mdb \
+	/usr/lib/mono/gac/Mono.Cairo/1.0.*/*/*.mdb \
+	/usr/lib/mono/gac/Mono.Cairo/1.0.*/.debug/ \
+	/usr/lib/mono/gac/Mono.Cairo/1.0.*/../.debug/ \
+	/usr/lib/mono/1.0/Mono.Cairo.dll*.mdb \
+	/usr/lib/mono/1.0/Mono.Cairo.dll*/*.mdb \
+	/usr/lib/pkgconfig/mono-cairo.pc*.mdb \
+	/usr/lib/pkgconfig/mono-cairo.pc*/*.mdb"
+FILES_libmono-cairo1.0-cil = "/usr/lib/mono/gac/Mono.Cairo/1.0.*/ \
+	/usr/lib/mono/1.0/Mono.Cairo.dll \
+	/usr/lib/pkgconfig/mono-cairo.pc"
+FILES_libmono-system-web2.0-cil-dbg = "/usr/lib/mono/gac/System.Web/2.0.0.0__*/*.mdb \
+	/usr/lib/mono/gac/System.Web/2.0.0.0__*/*/*.mdb \
+	/usr/lib/mono/gac/System.Web/2.0.0.0__*/.debug/ \
+	/usr/lib/mono/gac/System.Web/2.0.0.0__*/../.debug/ \
+	/usr/lib/mono/gac/System.Web.Services/2.0.0.0__*/*.mdb \
+	/usr/lib/mono/gac/System.Web.Services/2.0.0.0__*/*/*.mdb \
+	/usr/lib/mono/gac/System.Web.Services/2.0.0.0__*/.debug/ \
+	/usr/lib/mono/gac/System.Web.Services/2.0.0.0__*/../.debug/ \
+	/usr/lib/mono/2.0/System.Web.dll*.mdb \
+	/usr/lib/mono/2.0/System.Web.dll*/*.mdb \
+	/usr/lib/mono/2.0/System.Web.Services.dll*.mdb \
+	/usr/lib/mono/2.0/System.Web.Services.dll*/*.mdb"
+FILES_libmono-system-web2.0-cil = "/usr/lib/mono/gac/System.Web/2.0.0.0__*/ \
+	/usr/lib/mono/gac/System.Web.Services/2.0.0.0__*/ \
+	/usr/lib/mono/2.0/System.Web.dll \
+	/usr/lib/mono/2.0/System.Web.Services.dll"
+FILES_mono-1.0-devel-dbg = "/usr/bin/al*.mdb \
+	/usr/bin/al*/*.mdb \
+	/usr/bin/caspol*.mdb \
+	/usr/bin/caspol*/*.mdb \
+	/usr/bin/cert2spc*.mdb \
+	/usr/bin/cert2spc*/*.mdb \
+	/usr/bin/certmgr*.mdb \
+	/usr/bin/certmgr*/*.mdb \
+	/usr/bin/chktrust*.mdb \
+	/usr/bin/chktrust*/*.mdb \
+	/usr/bin/cilc*.mdb \
+	/usr/bin/cilc*/*.mdb \
+	/usr/bin/disco*.mdb \
+	/usr/bin/disco*/*.mdb \
+	/usr/bin/dtd2xsd*.mdb \
+	/usr/bin/dtd2xsd*/*.mdb \
+	/usr/bin/dtd2rng*.mdb \
+	/usr/bin/dtd2rng*/*.mdb \
+	/usr/bin/genxs*.mdb \
+	/usr/bin/genxs*/*.mdb \
+	/usr/bin/ilasm*.mdb \
+	/usr/bin/ilasm*/*.mdb \
+	/usr/bin/installvst*.mdb \
+	/usr/bin/installvst*/*.mdb \
+	/usr/bin/macpack*.mdb \
+	/usr/bin/macpack*/*.mdb \
+	/usr/bin/mkbundle*.mdb \
+	/usr/bin/mkbundle*/*.mdb \
+	/usr/bin/mono-api-diff*.mdb \
+	/usr/bin/mono-api-diff*/*.mdb \
+	/usr/bin/mono-api-info*.mdb \
+	/usr/bin/mono-api-info*/*.mdb \
+	/usr/bin/mono-shlib-cop*.mdb \
+	/usr/bin/mono-shlib-cop*/*.mdb \
+	/usr/bin/mono-xmltool*.mdb \
+	/usr/bin/mono-xmltool*/*.mdb \
+	/usr/bin/monop*.mdb \
+	/usr/bin/monop*/*.mdb \
+	/usr/bin/monolinker*.mdb \
+	/usr/bin/monolinker*/*.mdb \
+	/usr/bin/mozroots*.mdb \
+	/usr/bin/mozroots*/*.mdb \
+	/usr/bin/permview*.mdb \
+	/usr/bin/permview*/*.mdb \
+	/usr/bin/resgen*.mdb \
+	/usr/bin/resgen*/*.mdb \
+	/usr/bin/secutil*.mdb \
+	/usr/bin/secutil*/*.mdb \
+	/usr/bin/setreg*.mdb \
+	/usr/bin/setreg*/*.mdb \
+	/usr/bin/signcode*.mdb \
+	/usr/bin/signcode*/*.mdb \
+	/usr/bin/sn*.mdb \
+	/usr/bin/sn*/*.mdb \
+	/usr/bin/soapsuds*.mdb \
+	/usr/bin/soapsuds*/*.mdb \
+	/usr/bin/sqlsharp*.mdb \
+	/usr/bin/sqlsharp*/*.mdb \
+	/usr/bin/wsdl*.mdb \
+	/usr/bin/wsdl*/*.mdb \
+	/usr/bin/xsd*.mdb \
+	/usr/bin/xsd*/*.mdb \
+	/usr/lib/mono/1.0/CorCompare.exe*.mdb \
+	/usr/lib/mono/1.0/CorCompare.exe*/*.mdb \
+	/usr/lib/mono/1.0/al.exe*.mdb \
+	/usr/lib/mono/1.0/al.exe*/*.mdb \
+	/usr/lib/mono/1.0/browsercaps-updater.exe*.mdb \
+	/usr/lib/mono/1.0/browsercaps-updater.exe*/*.mdb \
+	/usr/lib/mono/1.0/caspol.exe*.mdb \
+	/usr/lib/mono/1.0/caspol.exe*/*.mdb \
+	/usr/lib/mono/1.0/cert2spc.exe*.mdb \
+	/usr/lib/mono/1.0/cert2spc.exe*/*.mdb \
+	/usr/lib/mono/1.0/certmgr.exe*.mdb \
+	/usr/lib/mono/1.0/certmgr.exe*/*.mdb \
+	/usr/lib/mono/1.0/chktrust.exe*.mdb \
+	/usr/lib/mono/1.0/chktrust.exe*/*.mdb \
+	/usr/lib/mono/1.0/cilc.exe*.mdb \
+	/usr/lib/mono/1.0/cilc.exe*/*.mdb \
+	/usr/lib/mono/1.0/culevel.exe*.mdb \
+	/usr/lib/mono/1.0/culevel.exe*/*.mdb \
+	/usr/lib/mono/1.0/disco.exe*.mdb \
+	/usr/lib/mono/1.0/disco.exe*/*.mdb \
+	/usr/lib/mono/1.0/dtd2rng.exe*.mdb \
+	/usr/lib/mono/1.0/dtd2rng.exe*/*.mdb \
+	/usr/lib/mono/1.0/dtd2xsd.exe*.mdb \
+	/usr/lib/mono/1.0/dtd2xsd.exe*/*.mdb \
+	/usr/lib/mono/1.0/genxs.exe*.mdb \
+	/usr/lib/mono/1.0/genxs.exe*/*.mdb \
+	/usr/lib/mono/1.0/ictool.exe*.mdb \
+	/usr/lib/mono/1.0/ictool.exe*/*.mdb \
+	/usr/lib/mono/1.0/ilasm.exe*.mdb \
+	/usr/lib/mono/1.0/ilasm.exe*/*.mdb \
+	/usr/lib/mono/1.0/installvst.exe*.mdb \
+	/usr/lib/mono/1.0/installvst.exe*/*.mdb \
+	/usr/lib/mono/1.0/macpack.exe*.mdb \
+	/usr/lib/mono/1.0/macpack.exe*/*.mdb \
+	/usr/lib/mono/1.0/makecert.exe*.mdb \
+	/usr/lib/mono/1.0/makecert.exe*/*.mdb \
+	/usr/lib/mono/1.0/mkbundle.exe*.mdb \
+	/usr/lib/mono/1.0/mkbundle.exe*/*.mdb \
+	/usr/lib/mono/1.0/mono-api-diff.exe*.mdb \
+	/usr/lib/mono/1.0/mono-api-diff.exe*/*.mdb \
+	/usr/lib/mono/1.0/mono-api-info.exe*.mdb \
+	/usr/lib/mono/1.0/mono-api-info.exe*/*.mdb \
+	/usr/lib/mono/1.0/mono-shlib-cop.exe*.mdb \
+	/usr/lib/mono/1.0/mono-shlib-cop.exe*/*.mdb \
+	/usr/lib/mono/1.0/mono-xmltool.exe*.mdb \
+	/usr/lib/mono/1.0/mono-xmltool.exe*/*.mdb \
+	/usr/lib/mono/1.0/monolinker.exe*.mdb \
+	/usr/lib/mono/1.0/monolinker.exe*/*.mdb \
+	/usr/lib/mono/1.0/monop.exe*.mdb \
+	/usr/lib/mono/1.0/monop.exe*/*.mdb \
+	/usr/lib/mono/1.0/mozroots.exe*.mdb \
+	/usr/lib/mono/1.0/mozroots.exe*/*.mdb \
+	/usr/lib/mono/1.0/permview.exe*.mdb \
+	/usr/lib/mono/1.0/permview.exe*/*.mdb \
+	/usr/lib/mono/1.0/resgen.exe*.mdb \
+	/usr/lib/mono/1.0/resgen.exe*/*.mdb \
+	/usr/lib/mono/1.0/secutil.exe*.mdb \
+	/usr/lib/mono/1.0/secutil.exe*/*.mdb \
+	/usr/lib/mono/1.0/setreg.exe*.mdb \
+	/usr/lib/mono/1.0/setreg.exe*/*.mdb \
+	/usr/lib/mono/1.0/signcode.exe*.mdb \
+	/usr/lib/mono/1.0/signcode.exe*/*.mdb \
+	/usr/lib/mono/1.0/sn.exe*.mdb \
+	/usr/lib/mono/1.0/sn.exe*/*.mdb \
+	/usr/lib/mono/1.0/soapsuds.exe*.mdb \
+	/usr/lib/mono/1.0/soapsuds.exe*/*.mdb \
+	/usr/lib/mono/1.0/sqlsharp.exe*.mdb \
+	/usr/lib/mono/1.0/sqlsharp.exe*/*.mdb \
+	/usr/lib/mono/1.0/wsdl.exe*.mdb \
+	/usr/lib/mono/1.0/wsdl.exe*/*.mdb \
+	/usr/lib/mono/1.0/xsd.exe*.mdb \
+	/usr/lib/mono/1.0/xsd.exe*/*.mdb"
+FILES_mono-1.0-devel = "/usr/bin/al \
+	/usr/bin/caspol \
+	/usr/bin/cert2spc \
+	/usr/bin/certmgr \
+	/usr/bin/chktrust \
+	/usr/bin/cilc \
+	/usr/bin/disco \
+	/usr/bin/dtd2xsd \
+	/usr/bin/dtd2rng \
+	/usr/bin/genxs \
+	/usr/bin/ilasm \
+	/usr/bin/installvst \
+	/usr/bin/macpack \
+	/usr/bin/mkbundle \
+	/usr/bin/mono-api-diff \
+	/usr/bin/mono-api-info \
+	/usr/bin/mono-shlib-cop \
+	/usr/bin/mono-xmltool \
+	/usr/bin/monop \
+	/usr/bin/monolinker \
+	/usr/bin/mozroots \
+	/usr/bin/permview \
+	/usr/bin/resgen \
+	/usr/bin/secutil \
+	/usr/bin/setreg \
+	/usr/bin/signcode \
+	/usr/bin/sn \
+	/usr/bin/soapsuds \
+	/usr/bin/sqlsharp \
+	/usr/bin/wsdl \
+	/usr/bin/xsd \
+	/usr/lib/mono/1.0/CorCompare.exe \
+	/usr/lib/mono/1.0/al.exe \
+	/usr/lib/mono/1.0/browsercaps-updater.exe \
+	/usr/lib/mono/1.0/caspol.exe \
+	/usr/lib/mono/1.0/cert2spc.exe \
+	/usr/lib/mono/1.0/certmgr.exe \
+	/usr/lib/mono/1.0/chktrust.exe \
+	/usr/lib/mono/1.0/cilc.exe \
+	/usr/lib/mono/1.0/culevel.exe \
+	/usr/lib/mono/1.0/disco.exe \
+	/usr/lib/mono/1.0/dtd2rng.exe \
+	/usr/lib/mono/1.0/dtd2xsd.exe \
+	/usr/lib/mono/1.0/genxs.exe \
+	/usr/lib/mono/1.0/ictool.exe \
+	/usr/lib/mono/1.0/ilasm.exe \
+	/usr/lib/mono/1.0/installvst.exe \
+	/usr/lib/mono/1.0/macpack.exe \
+	/usr/lib/mono/1.0/makecert.exe \
+	/usr/lib/mono/1.0/mkbundle.exe \
+	/usr/lib/mono/1.0/mono-api-diff.exe \
+	/usr/lib/mono/1.0/mono-api-info.exe \
+	/usr/lib/mono/1.0/mono-shlib-cop.exe* \
+	/usr/lib/mono/1.0/mono-xmltool.exe \
+	/usr/lib/mono/1.0/monolinker.exe \
+	/usr/lib/mono/1.0/monop.exe \
+	/usr/lib/mono/1.0/mozroots.exe \
+	/usr/lib/mono/1.0/permview.exe \
+	/usr/lib/mono/1.0/resgen.exe \
+	/usr/lib/mono/1.0/secutil.exe \
+	/usr/lib/mono/1.0/setreg.exe \
+	/usr/lib/mono/1.0/signcode.exe \
+	/usr/lib/mono/1.0/sn.exe \
+	/usr/lib/mono/1.0/soapsuds.exe \
+	/usr/lib/mono/1.0/sqlsharp.exe \
+	/usr/lib/mono/1.0/wsdl.exe \
+	/usr/lib/mono/1.0/xsd.exe"
+FILES_prj2make-sharp-dbg = "/usr/bin/prj2make*.mdb \
+	/usr/bin/prj2make*/*.mdb \
+	/usr/lib/mono/1.0/prj2make.exe*.mdb \
+	/usr/lib/mono/1.0/prj2make.exe*/*.mdb"
+FILES_prj2make-sharp = "/usr/bin/prj2make \
+	/usr/lib/mono/1.0/prj2make.exe*"
+FILES_libmono-accessibility2.0-cil-dbg = "/usr/lib/mono/gac/Accessibility/2.0.*/*.mdb \
+	/usr/lib/mono/gac/Accessibility/2.0.*/*/*.mdb \
+	/usr/lib/mono/gac/Accessibility/2.0.*/.debug/ \
+	/usr/lib/mono/gac/Accessibility/2.0.*/../.debug/ \
+	/usr/lib/mono/2.0/Accessibility.dll*.mdb \
+	/usr/lib/mono/2.0/Accessibility.dll*/*.mdb"
+FILES_libmono-accessibility2.0-cil = "/usr/lib/mono/gac/Accessibility/2.0.*/ \
+	/usr/lib/mono/2.0/Accessibility.dll"
+FILES_libmono-microsoft7.0-cil-dbg = "/usr/lib/mono/gac/Microsoft.JScript/7.0.*/*.mdb \
+	/usr/lib/mono/gac/Microsoft.JScript/7.0.*/*/*.mdb \
+	/usr/lib/mono/gac/Microsoft.JScript/7.0.*/.debug/ \
+	/usr/lib/mono/gac/Microsoft.JScript/7.0.*/../.debug/ \
+	/usr/lib/mono/gac/Microsoft.VisualC/7.0.*/*.mdb \
+	/usr/lib/mono/gac/Microsoft.VisualC/7.0.*/*/*.mdb \
+	/usr/lib/mono/gac/Microsoft.VisualC/7.0.*/.debug/ \
+	/usr/lib/mono/gac/Microsoft.VisualC/7.0.*/../.debug/ \
+	/usr/lib/mono/gac/Microsoft.Vsa/7.0.*/*.mdb \
+	/usr/lib/mono/gac/Microsoft.Vsa/7.0.*/*/*.mdb \
+	/usr/lib/mono/gac/Microsoft.Vsa/7.0.*/.debug/ \
+	/usr/lib/mono/gac/Microsoft.Vsa/7.0.*/../.debug/ \
+	/usr/lib/mono/1.0/Microsoft.JScript.dll*.mdb \
+	/usr/lib/mono/1.0/Microsoft.JScript.dll*/*.mdb \
+	/usr/lib/mono/1.0/Microsoft.VisualC.dll*.mdb \
+	/usr/lib/mono/1.0/Microsoft.VisualC.dll*/*.mdb \
+	/usr/lib/mono/1.0/Microsoft.Vsa.dll*.mdb \
+	/usr/lib/mono/1.0/Microsoft.Vsa.dll*/*.mdb"
+FILES_libmono-microsoft7.0-cil = "/usr/lib/mono/gac/Microsoft.JScript/7.0.*/ \
+	/usr/lib/mono/gac/Microsoft.VisualC/7.0.*/ \
+	/usr/lib/mono/gac/Microsoft.Vsa/7.0.*/ \
+	/usr/lib/mono/1.0/Microsoft.JScript.dll \
+	/usr/lib/mono/1.0/Microsoft.VisualC.dll \
+	/usr/lib/mono/1.0/Microsoft.Vsa.dll"
+FILES_libmono-mozilla0.2-cil-dbg = "/usr/lib/mono/gac/Mono.Mozilla/0.2.0.0__*/*.mdb \
+	/usr/lib/mono/gac/Mono.Mozilla/0.2.0.0__*/*/*.mdb \
+	/usr/lib/mono/gac/Mono.Mozilla/0.2.0.0__*/.debug/ \
+	/usr/lib/mono/gac/Mono.Mozilla/0.2.0.0__*/../.debug/ \
+	/usr/lib/mono/2.0/Mono.Mozilla.dll*.mdb \
+	/usr/lib/mono/2.0/Mono.Mozilla.dll*/*.mdb"
+FILES_libmono-mozilla0.2-cil = "/usr/lib/mono/gac/Mono.Mozilla/0.2.0.0__*/ \
+	/usr/lib/mono/2.0/Mono.Mozilla.dll"
+FILES_libmono-security1.0-cil-dbg = "/usr/lib/mono/gac/Mono.Security/1.0.*/*.mdb \
+	/usr/lib/mono/gac/Mono.Security/1.0.*/*/*.mdb \
+	/usr/lib/mono/gac/Mono.Security/1.0.*/.debug/ \
+	/usr/lib/mono/gac/Mono.Security/1.0.*/../.debug/ \
+	/usr/lib/mono/1.0/Mono.Security.dll*.mdb \
+	/usr/lib/mono/1.0/Mono.Security.dll*/*.mdb"
+FILES_libmono-security1.0-cil = "/usr/lib/mono/gac/Mono.Security/1.0.*/ \
+	/usr/lib/mono/1.0/Mono.Security.dll"
+FILES_libmono-relaxng2.0-cil-dbg = "/usr/lib/mono/gac/Commons.Xml.Relaxng/2.0.*/*.mdb \
+	/usr/lib/mono/gac/Commons.Xml.Relaxng/2.0.*/*/*.mdb \
+	/usr/lib/mono/gac/Commons.Xml.Relaxng/2.0.*/.debug/ \
+	/usr/lib/mono/gac/Commons.Xml.Relaxng/2.0.*/../.debug/ \
+	/usr/lib/mono/2.0/Commons.Xml.Relaxng.dll*.mdb \
+	/usr/lib/mono/2.0/Commons.Xml.Relaxng.dll*/*.mdb"
+FILES_libmono-relaxng2.0-cil = "/usr/lib/mono/gac/Commons.Xml.Relaxng/2.0.*/ \
+	/usr/lib/mono/2.0/Commons.Xml.Relaxng.dll"
+FILES_libmono-sharpzip2.84-cil-dbg = "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.84.*/*.mdb \
+	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.84.*/*/*.mdb \
+	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.84.*/.debug/ \
+	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.84.*/../.debug/ \
+	/usr/lib/mono/2.0/ICSharpCode.SharpZipLib.dll*.mdb \
+	/usr/lib/mono/2.0/ICSharpCode.SharpZipLib.dll*/*.mdb"
+FILES_libmono-sharpzip2.84-cil = "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.84.*/ \
+	/usr/lib/mono/2.0/ICSharpCode.SharpZipLib.dll"
+FILES_libmono-system-data2.0-cil-dbg = "/usr/lib/mono/gac/System.Data/2.0.*/*.mdb \
+	/usr/lib/mono/gac/System.Data/2.0.*/*/*.mdb \
+	/usr/lib/mono/gac/System.Data/2.0.*/.debug/ \
+	/usr/lib/mono/gac/System.Data/2.0.*/../.debug/ \
+	/usr/lib/mono/2.0/System.Data.dll*.mdb \
+	/usr/lib/mono/2.0/System.Data.dll*/*.mdb"
+FILES_libmono-system-data2.0-cil = "/usr/lib/mono/gac/System.Data/2.0.*/ \
+	/usr/lib/mono/2.0/System.Data.dll"
+FILES_libmono-cairo2.0-cil-dbg = "/usr/lib/mono/gac/Mono.Cairo/2.0.*/*.mdb \
+	/usr/lib/mono/gac/Mono.Cairo/2.0.*/*/*.mdb \
+	/usr/lib/mono/gac/Mono.Cairo/2.0.*/.debug/ \
+	/usr/lib/mono/gac/Mono.Cairo/2.0.*/../.debug/ \
+	/usr/lib/mono/2.0/Mono.Cairo.dll*.mdb \
+	/usr/lib/mono/2.0/Mono.Cairo.dll*/*.mdb"
+FILES_libmono-cairo2.0-cil = "/usr/lib/mono/gac/Mono.Cairo/2.0.*/ \
+	/usr/lib/mono/2.0/Mono.Cairo.dll"
+FILES_libmono-corlib2.0-cil-dbg = "/usr/lib/mono/2.0/mscorlib.dll*.mdb \
+	/usr/lib/mono/2.0/mscorlib.dll*/*.mdb"
+FILES_libmono-corlib2.0-cil = "/usr/lib/mono/2.0/mscorlib.dll*"
+FILES_libmono-security2.0-cil-dbg = "/usr/lib/mono/gac/Mono.Security/2.0.*/*.mdb \
+	/usr/lib/mono/gac/Mono.Security/2.0.*/*/*.mdb \
+	/usr/lib/mono/gac/Mono.Security/2.0.*/.debug/ \
+	/usr/lib/mono/gac/Mono.Security/2.0.*/../.debug/ \
+	/usr/lib/mono/2.0/Mono.Security.dll*.mdb \
+	/usr/lib/mono/2.0/Mono.Security.dll*/*.mdb"
+FILES_libmono-security2.0-cil = "/usr/lib/mono/gac/Mono.Security/2.0.*/ \
+	/usr/lib/mono/2.0/Mono.Security.dll"
+FILES_libmono-microsoft8.0-cil-dbg = "/usr/lib/mono/gac/Microsoft.JScript/8.0.*/*.mdb \
+	/usr/lib/mono/gac/Microsoft.JScript/8.0.*/*/*.mdb \
+	/usr/lib/mono/gac/Microsoft.JScript/8.0.*/.debug/ \
+	/usr/lib/mono/gac/Microsoft.JScript/8.0.*/../.debug/ \
+	/usr/lib/mono/gac/Microsoft.VisualC/8.0.*/*.mdb \
+	/usr/lib/mono/gac/Microsoft.VisualC/8.0.*/*/*.mdb \
+	/usr/lib/mono/gac/Microsoft.VisualC/8.0.*/.debug/ \
+	/usr/lib/mono/gac/Microsoft.VisualC/8.0.*/../.debug/ \
+	/usr/lib/mono/gac/Microsoft.Vsa/8.0.*/*.mdb \
+	/usr/lib/mono/gac/Microsoft.Vsa/8.0.*/*/*.mdb \
+	/usr/lib/mono/gac/Microsoft.Vsa/8.0.*/.debug/ \
+	/usr/lib/mono/gac/Microsoft.Vsa/8.0.*/../.debug/ \
+	/usr/lib/mono/2.0/Microsoft.JScript.dll*.mdb \
+	/usr/lib/mono/2.0/Microsoft.JScript.dll*/*.mdb \
+	/usr/lib/mono/2.0/Microsoft.VisualC.dll*.mdb \
+	/usr/lib/mono/2.0/Microsoft.VisualC.dll*/*.mdb \
+	/usr/lib/mono/2.0/Microsoft.Vsa.dll*.mdb \
+	/usr/lib/mono/2.0/Microsoft.Vsa.dll*/*.mdb"
+FILES_libmono-microsoft8.0-cil = "/usr/lib/mono/gac/Microsoft.JScript/8.0.*/ \
+	/usr/lib/mono/gac/Microsoft.VisualC/8.0.*/ \
+	/usr/lib/mono/gac/Microsoft.Vsa/8.0.*/ \
+	/usr/lib/mono/2.0/Microsoft.JScript.dll \
+	/usr/lib/mono/2.0/Microsoft.VisualC.dll \
+	/usr/lib/mono/2.0/Microsoft.Vsa.dll"
+FILES_libmono-corlib1.0-cil-dbg = "/usr/lib/mono/1.0/mscorlib.dll*.mdb \
+	/usr/lib/mono/1.0/mscorlib.dll*/*.mdb"
+FILES_libmono-corlib1.0-cil = "/usr/lib/mono/1.0/mscorlib.dll*"
+FILES_libmono-system-web1.0-cil-dbg = "/usr/lib/mono/gac/System.Web/1.0.*/*.mdb \
+	/usr/lib/mono/gac/System.Web/1.0.*/*/*.mdb \
+	/usr/lib/mono/gac/System.Web/1.0.*/.debug/ \
+	/usr/lib/mono/gac/System.Web/1.0.*/../.debug/ \
+	/usr/lib/mono/gac/System.Web.Services/1.0.*/*.mdb \
+	/usr/lib/mono/gac/System.Web.Services/1.0.*/*/*.mdb \
+	/usr/lib/mono/gac/System.Web.Services/1.0.*/.debug/ \
+	/usr/lib/mono/gac/System.Web.Services/1.0.*/../.debug/ \
+	/usr/lib/mono/1.0/System.Web.dll*.mdb \
+	/usr/lib/mono/1.0/System.Web.dll*/*.mdb \
+	/usr/lib/mono/1.0/System.Web.Services.dll*.mdb \
+	/usr/lib/mono/1.0/System.Web.Services.dll*/*.mdb"
+FILES_libmono-system-web1.0-cil = "/usr/lib/mono/gac/System.Web/1.0.*/ \
+	/usr/lib/mono/gac/System.Web.Services/1.0.*/ \
+	/usr/lib/mono/1.0/System.Web.dll \
+	/usr/lib/mono/1.0/System.Web.Services.dll"
+FILES_libmono-system-runtime2.0-cil-dbg = "/usr/lib/mono/gac/System.Runtime.*/2.0.*/*.mdb \
+	/usr/lib/mono/gac/System.Runtime.*/2.0.*/*/*.mdb \
+	/usr/lib/mono/gac/System.Runtime.*/2.0.*/.debug/ \
+	/usr/lib/mono/gac/System.Runtime.*/2.0.*/../.debug/ \
+	/usr/lib/mono/2.0/System.Runtime.*.dll*.mdb \
+	/usr/lib/mono/2.0/System.Runtime.*.dll*/*.mdb"
+FILES_libmono-system-runtime2.0-cil = "/usr/lib/mono/gac/System.Runtime.*/2.0.*/ \
+	/usr/lib/mono/2.0/System.Runtime.*.dll"
+FILES_libmono-cscompmgd8.0-cil-dbg = "/usr/lib/mono/gac/cscompmgd/8.0.*/*.mdb \
+	/usr/lib/mono/gac/cscompmgd/8.0.*/*/*.mdb \
+	/usr/lib/mono/gac/cscompmgd/8.0.*/.debug/ \
+	/usr/lib/mono/gac/cscompmgd/8.0.*/../.debug/ \
+	/usr/lib/mono/2.0/cscompmgd.dll*.mdb \
+	/usr/lib/mono/2.0/cscompmgd.dll*/*.mdb"
+FILES_libmono-cscompmgd8.0-cil = "/usr/lib/mono/gac/cscompmgd/8.0.*/ \
+	/usr/lib/mono/2.0/cscompmgd.dll"
+FILES_libmono-cscompmgd7.0-cil-dbg = "/usr/lib/mono/gac/cscompmgd/7.0.*/*.mdb \
+	/usr/lib/mono/gac/cscompmgd/7.0.*/*/*.mdb \
+	/usr/lib/mono/gac/cscompmgd/7.0.*/.debug/ \
+	/usr/lib/mono/gac/cscompmgd/7.0.*/../.debug/ \
+	/usr/lib/mono/1.0/cscompmgd.dll*.mdb \
+	/usr/lib/mono/1.0/cscompmgd.dll*/*.mdb"
+FILES_libmono-cscompmgd7.0-cil = "/usr/lib/mono/gac/cscompmgd/7.0.*/ \
+	/usr/lib/mono/1.0/cscompmgd.dll"
+FILES_libmono-firebirdsql1.7-cil-dbg = "/usr/lib/mono/gac/FirebirdSql.Data.Firebird/1.7.*/*.mdb \
+	/usr/lib/mono/gac/FirebirdSql.Data.Firebird/1.7.*/*/*.mdb \
+	/usr/lib/mono/gac/FirebirdSql.Data.Firebird/1.7.*/.debug/ \
+	/usr/lib/mono/gac/FirebirdSql.Data.Firebird/1.7.*/../.debug/ \
+	/usr/lib/mono/1.0/FirebirdSql.Data.Firebird.dll*.mdb \
+	/usr/lib/mono/1.0/FirebirdSql.Data.Firebird.dll*/*.mdb"
+FILES_libmono-firebirdsql1.7-cil = "/usr/lib/mono/gac/FirebirdSql.Data.Firebird/1.7.*/ \
+	/usr/lib/mono/1.0/FirebirdSql.Data.Firebird.dll"
+FILES_mono-jay-dbg = "/usr/bin/jay*.mdb \
+	/usr/bin/jay*/*.mdb"
+FILES_mono-jay = "/usr/bin/jay"
+FILES_libmono-data-tds1.0-cil-dbg = "/usr/lib/mono/gac/Mono.Data.Tds/1.0.*/*.mdb \
+	/usr/lib/mono/gac/Mono.Data.Tds/1.0.*/*/*.mdb \
+	/usr/lib/mono/gac/Mono.Data.Tds/1.0.*/.debug/ \
+	/usr/lib/mono/gac/Mono.Data.Tds/1.0.*/../.debug/ \
+	/usr/lib/mono/1.0/Mono.Data.Tds.dll*.mdb \
+	/usr/lib/mono/1.0/Mono.Data.Tds.dll*/*.mdb"
+FILES_libmono-data-tds1.0-cil = "/usr/lib/mono/gac/Mono.Data.Tds/1.0.*/ \
+	/usr/lib/mono/1.0/Mono.Data.Tds.dll"
+FILES_libmono-sqlite1.0-cil-dbg = "/usr/lib/mono/gac/Mono.Data.Sqlite/1.0.*/*.mdb \
+	/usr/lib/mono/gac/Mono.Data.Sqlite/1.0.*/*/*.mdb \
+	/usr/lib/mono/gac/Mono.Data.Sqlite/1.0.*/.debug/ \
+	/usr/lib/mono/gac/Mono.Data.Sqlite/1.0.*/../.debug/ \
+	/usr/lib/mono/gac/Mono.Data.SqliteClient/1.0.*/*.mdb \
+	/usr/lib/mono/gac/Mono.Data.SqliteClient/1.0.*/*/*.mdb \
+	/usr/lib/mono/gac/Mono.Data.SqliteClient/1.0.*/.debug/ \
+	/usr/lib/mono/gac/Mono.Data.SqliteClient/1.0.*/../.debug/ \
+	/usr/lib/mono/1.0/Mono.Data.Sqlite.dll*.mdb \
+	/usr/lib/mono/1.0/Mono.Data.Sqlite.dll*/*.mdb \
+	/usr/lib/mono/1.0/Mono.Data.SqliteClient.dll*.mdb \
+	/usr/lib/mono/1.0/Mono.Data.SqliteClient.dll*/*.mdb"
+FILES_libmono-sqlite1.0-cil = "/usr/lib/mono/gac/Mono.Data.Sqlite/1.0.*/ \
+	/usr/lib/mono/gac/Mono.Data.SqliteClient/1.0.*/ \
+	/usr/lib/mono/1.0/Mono.Data.Sqlite.dll \
+	/usr/lib/mono/1.0/Mono.Data.SqliteClient.dll"
+FILES_mono-2.0-devel-dbg = "/etc/mono/mconfig*.mdb \
+	/etc/mono/mconfig*/*.mdb \
+	/usr/bin/al2*.mdb \
+	/usr/bin/al2*/*.mdb \
+	/usr/bin/httpcfg*.mdb \
+	/usr/bin/httpcfg*/*.mdb \
+	/usr/bin/ilasm2*.mdb \
+	/usr/bin/ilasm2*/*.mdb \
+	/usr/bin/mconfig*.mdb \
+	/usr/bin/mconfig*/*.mdb \
+	/usr/bin/mkbundle2*.mdb \
+	/usr/bin/mkbundle2*/*.mdb \
+	/usr/bin/mono-api-info2*.mdb \
+	/usr/bin/mono-api-info2*/*.mdb \
+	/usr/bin/monop2*.mdb \
+	/usr/bin/monop2*/*.mdb \
+	/usr/bin/resgen2*.mdb \
+	/usr/bin/resgen2*/*.mdb \
+	/usr/bin/sgen*.mdb \
+	/usr/bin/sgen*/*.mdb \
+	/usr/bin/wsdl2*.mdb \
+	/usr/bin/wsdl2*/*.mdb \
+	/usr/lib/mono/2.0/al.exe*.mdb \
+	/usr/lib/mono/2.0/al.exe*/*.mdb \
+	/usr/lib/mono/2.0/httpcfg.exe*.mdb \
+	/usr/lib/mono/2.0/httpcfg.exe*/*.mdb \
+	/usr/lib/mono/2.0/ilasm.exe*.mdb \
+	/usr/lib/mono/2.0/ilasm.exe*/*.mdb \
+	/usr/lib/mono/2.0/mconfig.exe*.mdb \
+	/usr/lib/mono/2.0/mconfig.exe*/*.mdb \
+	/usr/lib/mono/2.0/mkbundle.exe*.mdb \
+	/usr/lib/mono/2.0/mkbundle.exe*/*.mdb \
+	/usr/lib/mono/2.0/mono-api-info.exe*.mdb \
+	/usr/lib/mono/2.0/mono-api-info.exe*/*.mdb \
+	/usr/lib/mono/2.0/monop.exe*.mdb \
+	/usr/lib/mono/2.0/monop.exe*/*.mdb \
+	/usr/lib/mono/2.0/resgen.exe*.mdb \
+	/usr/lib/mono/2.0/resgen.exe*/*.mdb \
+	/usr/lib/mono/2.0/sgen.exe*.mdb \
+	/usr/lib/mono/2.0/sgen.exe*/*.mdb \
+	/usr/lib/mono/2.0/wsdl.exe*.mdb \
+	/usr/lib/mono/2.0/wsdl.exe*/*.mdb"
+FILES_mono-2.0-devel = "/etc/mono/mconfig \
+	/usr/bin/al2 \
+	/usr/bin/httpcfg \
+	/usr/bin/ilasm2 \
+	/usr/bin/mconfig \
+	/usr/bin/mkbundle2 \
+	/usr/bin/mono-api-info2 \
+	/usr/bin/monop2 \
+	/usr/bin/resgen2 \
+	/usr/bin/sgen \
+	/usr/bin/wsdl2 \
+	/usr/lib/mono/2.0/al.exe \
+	/usr/lib/mono/2.0/httpcfg.exe \
+	/usr/lib/mono/2.0/ilasm.exe \
+	/usr/lib/mono/2.0/mconfig.exe \
+	/usr/lib/mono/2.0/mkbundle.exe \
+	/usr/lib/mono/2.0/mono-api-info.exe \
+	/usr/lib/mono/2.0/monop.exe \
+	/usr/lib/mono/2.0/resgen.exe \
+	/usr/lib/mono/2.0/sgen.exe \
+	/usr/lib/mono/2.0/wsdl.exe"
+FILES_libmono-relaxng1.0-cil-dbg = "/usr/lib/mono/gac/Commons.Xml.Relaxng/1.0.*/*.mdb \
+	/usr/lib/mono/gac/Commons.Xml.Relaxng/1.0.*/*/*.mdb \
+	/usr/lib/mono/gac/Commons.Xml.Relaxng/1.0.*/.debug/ \
+	/usr/lib/mono/gac/Commons.Xml.Relaxng/1.0.*/../.debug/ \
+	/usr/lib/mono/1.0/Commons.Xml.Relaxng.dll*.mdb \
+	/usr/lib/mono/1.0/Commons.Xml.Relaxng.dll*/*.mdb"
+FILES_libmono-relaxng1.0-cil = "/usr/lib/mono/gac/Commons.Xml.Relaxng/1.0.*/ \
+	/usr/lib/mono/1.0/Commons.Xml.Relaxng.dll"
+FILES_libmono-i18n2.0-cil-dbg = "/usr/lib/mono/gac/I18N*/2.0.*/*.mdb \
+	/usr/lib/mono/gac/I18N*/2.0.*/*/*.mdb \
+	/usr/lib/mono/gac/I18N*/2.0.*/.debug/ \
+	/usr/lib/mono/gac/I18N*/2.0.*/../.debug/ \
+	/usr/lib/mono/2.0/I18N*.dll*.mdb \
+	/usr/lib/mono/2.0/I18N*.dll*/*.mdb"
+FILES_libmono-i18n2.0-cil = "/usr/lib/mono/gac/I18N*/2.0.*/ \
+	/usr/lib/mono/2.0/I18N*.dll"
+FILES_libmono-accessibility1.0-cil-dbg = "/usr/lib/mono/gac/Accessibility/1.0.*/*.mdb \
+	/usr/lib/mono/gac/Accessibility/1.0.*/*/*.mdb \
+	/usr/lib/mono/gac/Accessibility/1.0.*/.debug/ \
+	/usr/lib/mono/gac/Accessibility/1.0.*/../.debug/ \
+	/usr/lib/mono/1.0/Accessibility.dll*.mdb \
+	/usr/lib/mono/1.0/Accessibility.dll*/*.mdb"
+FILES_libmono-accessibility1.0-cil = "/usr/lib/mono/gac/Accessibility/1.0.*/ \
+	/usr/lib/mono/1.0/Accessibility.dll"
+FILES_mono-common-dbg = "/etc/mono*.mdb \
+	/etc/mono*/*.mdb \
+	/usr/share/mono-1.0/mono/cil/cil-opcodes.xml*.mdb \
+	/usr/share/mono-1.0/mono/cil/cil-opcodes.xml*/*.mdb"
+FILES_mono-common = "/etc/mono \
+	/usr/share/mono-1.0/mono/cil/cil-opcodes.xml"
+FILES_libmono-oracle1.0-cil-dbg = "/usr/lib/mono/gac/System.Data.OracleClient/1.0.*/*.mdb \
+	/usr/lib/mono/gac/System.Data.OracleClient/1.0.*/*/*.mdb \
+	/usr/lib/mono/gac/System.Data.OracleClient/1.0.*/.debug/ \
+	/usr/lib/mono/gac/System.Data.OracleClient/1.0.*/../.debug/ \
+	/usr/lib/mono/1.0/System.Data.OracleClient.dll*.mdb \
+	/usr/lib/mono/1.0/System.Data.OracleClient.dll*/*.mdb"
+FILES_libmono-oracle1.0-cil = "/usr/lib/mono/gac/System.Data.OracleClient/1.0.*/ \
+	/usr/lib/mono/1.0/System.Data.OracleClient.dll"
+FILES_libmono-system-data1.0-cil-dbg = "/usr/lib/mono/gac/System.Data/1.0.*/*.mdb \
+	/usr/lib/mono/gac/System.Data/1.0.*/*/*.mdb \
+	/usr/lib/mono/gac/System.Data/1.0.*/.debug/ \
+	/usr/lib/mono/gac/System.Data/1.0.*/../.debug/ \
+	/usr/lib/mono/1.0/System.Data.dll*.mdb \
+	/usr/lib/mono/1.0/System.Data.dll*/*.mdb"
+FILES_libmono-system-data1.0-cil = "/usr/lib/mono/gac/System.Data/1.0.*/ \
+	/usr/lib/mono/1.0/System.Data.dll"
+FILES_libmono-bytefx0.7.6.2-cil-dbg = "/usr/lib/mono/gac/ByteFX.Data/0.7.6.2*/*.mdb \
+	/usr/lib/mono/gac/ByteFX.Data/0.7.6.2*/*/*.mdb \
+	/usr/lib/mono/gac/ByteFX.Data/0.7.6.2*/.debug/ \
+	/usr/lib/mono/gac/ByteFX.Data/0.7.6.2*/../.debug/ \
+	/usr/lib/mono/2.0/ByteFX.Data.dll*.mdb \
+	/usr/lib/mono/2.0/ByteFX.Data.dll*/*.mdb"
+FILES_libmono-bytefx0.7.6.2-cil = "/usr/lib/mono/gac/ByteFX.Data/0.7.6.2*/ \
+	/usr/lib/mono/2.0/ByteFX.Data.dll"
+FILES_libmono0-dbg = "/usr/lib/libmono*.so.*.mdb \
+	/usr/lib/libmono*.so.*/*.mdb \
+	/usr/lib/libMonoPosixHelper.so*.mdb \
+	/usr/lib/libMonoPosixHelper.so*/*.mdb \
+	/usr/lib/libMonoSupportW.so*.mdb \
+	/usr/lib/libMonoSupportW.so*/*.mdb"
+FILES_libmono0 = "/usr/lib/libmono*.so.* \
+	/usr/lib/libMonoPosixHelper.so \
+	/usr/lib/libMonoSupportW.so"
+FILES_libmono-dev-dbg = "/usr/lib/libmono*.a*.mdb \
+	/usr/lib/libmono*.a*/*.mdb \
+	/usr/lib/libMono*.a*.mdb \
+	/usr/lib/libMono*.a*/*.mdb \
+	/usr/lib/libmono*.so*.mdb \
+	/usr/lib/libmono*.so*/*.mdb \
+	/usr/lib/libMonoSupportW.a*.mdb \
+	/usr/lib/libMonoSupportW.a*/*.mdb \
+	/usr/lib/pkgconfig/mono.pc*.mdb \
+	/usr/lib/pkgconfig/mono.pc*/*.mdb \
+	/usr/lib/pkgconfig/dotnet.pc*.mdb \
+	/usr/lib/pkgconfig/dotnet.pc*/*.mdb \
+	/usr/include/*.mdb \
+	/usr/include/*/*.mdb \
+	/usr/include/.debug/ \
+	/usr/include/../.debug/"
+FILES_libmono-dev = "/usr/lib/libmono*.a \
+	/usr/lib/libMono*.a \
+	/usr/lib/libmono*.so \
+	/usr/lib/libMonoSupportW.a \
+	/usr/lib/pkgconfig/mono.pc \
+	/usr/lib/pkgconfig/dotnet.pc \
+	/usr/include/"
+FILES_mono-xbuild-dbg = "/usr/bin/xbuild*.mdb \
+	/usr/bin/xbuild*/*.mdb \
+	/usr/lib/mono/2.0/xbuild.exe*.mdb \
+	/usr/lib/mono/2.0/xbuild.exe*/*.mdb \
+	/usr/lib/mono/2.0/xbuild.rsp*.mdb \
+	/usr/lib/mono/2.0/xbuild.rsp*/*.mdb \
+	/usr/lib/mono/2.0/Microsoft.Build.xsd*.mdb \
+	/usr/lib/mono/2.0/Microsoft.Build.xsd*/*.mdb \
+	/usr/lib/mono/2.0/Microsoft.CSharp.targets*.mdb \
+	/usr/lib/mono/2.0/Microsoft.CSharp.targets*/*.mdb \
+	/usr/lib/mono/2.0/Microsoft.Common.tasks*.mdb \
+	/usr/lib/mono/2.0/Microsoft.Common.tasks*/*.mdb \
+	/usr/lib/mono/2.0/Microsoft.Common.targets*.mdb \
+	/usr/lib/mono/2.0/Microsoft.Common.targets*/*.mdb \
+	/usr/lib/mono/2.0/Microsoft.VisualBasic.targets*.mdb \
+	/usr/lib/mono/2.0/Microsoft.VisualBasic.targets*/*.mdb \
+	/usr/lib/mono/2.0/MSBuild/*.mdb \
+	/usr/lib/mono/2.0/MSBuild/*/*.mdb \
+	/usr/lib/mono/2.0/MSBuild/.debug/ \
+	/usr/lib/mono/2.0/MSBuild/../.debug/"
+FILES_mono-xbuild = "/usr/bin/xbuild \
+	/usr/lib/mono/2.0/xbuild.exe* \
+	/usr/lib/mono/2.0/xbuild.rsp \
+	/usr/lib/mono/2.0/Microsoft.Build.xsd \
+	/usr/lib/mono/2.0/Microsoft.CSharp.targets \
+	/usr/lib/mono/2.0/Microsoft.Common.tasks \
+	/usr/lib/mono/2.0/Microsoft.Common.targets \
+	/usr/lib/mono/2.0/Microsoft.VisualBasic.targets \
+	/usr/lib/mono/2.0/MSBuild/"
+FILES_libmono-sharpzip0.6-cil-dbg = "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.6.*/*.mdb \
+	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.6.*/*/*.mdb \
+	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.6.*/.debug/ \
+	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.6.*/../.debug/ \
+	/usr/lib/mono/compat-1.0/ICSharpCode.SharpZipLib.dll*.mdb \
+	/usr/lib/mono/compat-1.0/ICSharpCode.SharpZipLib.dll*/*.mdb"
+FILES_libmono-sharpzip0.6-cil = "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.6.*/ \
+	/usr/lib/mono/compat-1.0/ICSharpCode.SharpZipLib.dll"
+FILES_mono-smcs-dbg = "/usr/bin/smcs*.mdb \
+	/usr/bin/smcs*/*.mdb \
+	/usr/lib/mono/2.1/smcs.exe*.mdb \
+	/usr/lib/mono/2.1/smcs.exe*/*.mdb"
+FILES_mono-smcs = "/usr/bin/smcs \
+	/usr/lib/mono/2.1/smcs.exe*"
+FILES_libmono-data-tds2.0-cil-dbg = "/usr/lib/mono/gac/Mono.Data.Tds/2.0.*/*.mdb \
+	/usr/lib/mono/gac/Mono.Data.Tds/2.0.*/*/*.mdb \
+	/usr/lib/mono/gac/Mono.Data.Tds/2.0.*/.debug/ \
+	/usr/lib/mono/gac/Mono.Data.Tds/2.0.*/../.debug/ \
+	/usr/lib/mono/2.0/Mono.Data.Tds.dll*.mdb \
+	/usr/lib/mono/2.0/Mono.Data.Tds.dll*/*.mdb"
+FILES_libmono-data-tds2.0-cil = "/usr/lib/mono/gac/Mono.Data.Tds/2.0.*/ \
+	/usr/lib/mono/2.0/Mono.Data.Tds.dll"
+FILES_libmono-system2.1-cil-dbg = "/usr/lib/mono/gac/System/2.1.0.0__*/*.mdb \
+	/usr/lib/mono/gac/System/2.1.0.0__*/*/*.mdb \
+	/usr/lib/mono/gac/System/2.1.0.0__*/.debug/ \
+	/usr/lib/mono/gac/System/2.1.0.0__*/../.debug/ \
+	/usr/lib/mono/gac/System.Core/2.1.0.0__*/*.mdb \
+	/usr/lib/mono/gac/System.Core/2.1.0.0__*/*/*.mdb \
+	/usr/lib/mono/gac/System.Core/2.1.0.0__*/.debug/ \
+	/usr/lib/mono/gac/System.Core/2.1.0.0__*/../.debug/ \
+	/usr/lib/mono/gac/System.Xml.Core/2.1.0.0__*/*.mdb \
+	/usr/lib/mono/gac/System.Xml.Core/2.1.0.0__*/*/*.mdb \
+	/usr/lib/mono/gac/System.Xml.Core/2.1.0.0__*/.debug/ \
+	/usr/lib/mono/gac/System.Xml.Core/2.1.0.0__*/../.debug/ \
+	/usr/lib/mono/2.1/System.dll*.mdb \
+	/usr/lib/mono/2.1/System.dll*/*.mdb \
+	/usr/lib/mono/2.1/System.Core.dll*.mdb \
+	/usr/lib/mono/2.1/System.Core.dll*/*.mdb \
+	/usr/lib/mono/2.1/System.Xml.Core.dll*.mdb \
+	/usr/lib/mono/2.1/System.Xml.Core.dll*/*.mdb"
+FILES_libmono-system2.1-cil = "/usr/lib/mono/gac/System/2.1.0.0__*/ \
+	/usr/lib/mono/gac/System.Core/2.1.0.0__*/ \
+	/usr/lib/mono/gac/System.Xml.Core/2.1.0.0__*/ \
+	/usr/lib/mono/2.1/System.dll \
+	/usr/lib/mono/2.1/System.Core.dll \
+	/usr/lib/mono/2.1/System.Xml.Core.dll"
+FILES_mono-1.0-service-dbg = "/usr/bin/mono-service*.mdb \
+	/usr/bin/mono-service*/*.mdb \
+	/usr/lib/mono/1.0/mono-service.exe*.mdb \
+	/usr/lib/mono/1.0/mono-service.exe*/*.mdb"
+FILES_mono-1.0-service = "/usr/bin/mono-service \
+	/usr/lib/mono/1.0/mono-service.exe*"
+FILES_libmono-system-messaging1.0-cil-dbg = "/usr/lib/mono/gac/System.Messaging/1.0.*/*.mdb \
+	/usr/lib/mono/gac/System.Messaging/1.0.*/*/*.mdb \
+	/usr/lib/mono/gac/System.Messaging/1.0.*/.debug/ \
+	/usr/lib/mono/gac/System.Messaging/1.0.*/../.debug/ \
+	/usr/lib/mono/1.0/System.Messaging.dll*.mdb \
+	/usr/lib/mono/1.0/System.Messaging.dll*/*.mdb"
+FILES_libmono-system-messaging1.0-cil = "/usr/lib/mono/gac/System.Messaging/1.0.*/ \
+	/usr/lib/mono/1.0/System.Messaging.dll"
+FILES_libmono-winforms2.0-cil-dbg = "/usr/lib/mono/gac/System.Windows.Forms/2.0.*/*.mdb \
+	/usr/lib/mono/gac/System.Windows.Forms/2.0.*/*/*.mdb \
+	/usr/lib/mono/gac/System.Windows.Forms/2.0.*/.debug/ \
+	/usr/lib/mono/gac/System.Windows.Forms/2.0.*/../.debug/ \
+	/usr/lib/mono/gac/System.Drawing.Design/2.0.*/*.mdb \
+	/usr/lib/mono/gac/System.Drawing.Design/2.0.*/*/*.mdb \
+	/usr/lib/mono/gac/System.Drawing.Design/2.0.*/.debug/ \
+	/usr/lib/mono/gac/System.Drawing.Design/2.0.*/../.debug/ \
+	/usr/lib/mono/gac/System.Design/2.0.*/*.mdb \
+	/usr/lib/mono/gac/System.Design/2.0.*/*/*.mdb \
+	/usr/lib/mono/gac/System.Design/2.0.*/.debug/ \
+	/usr/lib/mono/gac/System.Design/2.0.*/../.debug/ \
+	/usr/lib/mono/2.0/System.Windows.Forms.dll*.mdb \
+	/usr/lib/mono/2.0/System.Windows.Forms.dll*/*.mdb \
+	/usr/lib/mono/2.0/System.Drawing.Design.dll*.mdb \
+	/usr/lib/mono/2.0/System.Drawing.Design.dll*/*.mdb \
+	/usr/lib/mono/2.0/System.Design.dll*.mdb \
+	/usr/lib/mono/2.0/System.Design.dll*/*.mdb"
+FILES_libmono-winforms2.0-cil = "/usr/lib/mono/gac/System.Windows.Forms/2.0.*/ \
+	/usr/lib/mono/gac/System.Drawing.Design/2.0.*/ \
+	/usr/lib/mono/gac/System.Design/2.0.*/ \
+	/usr/lib/mono/2.0/System.Windows.Forms.dll \
+	/usr/lib/mono/2.0/System.Drawing.Design.dll \
+	/usr/lib/mono/2.0/System.Design.dll"
+FILES_libmono-npgsql1.0-cil-dbg = "/usr/lib/mono/gac/Npgsql/1.0.*/*.mdb \
+	/usr/lib/mono/gac/Npgsql/1.0.*/*/*.mdb \
+	/usr/lib/mono/gac/Npgsql/1.0.*/.debug/ \
+	/usr/lib/mono/gac/Npgsql/1.0.*/../.debug/ \
+	/usr/lib/mono/1.0/Npgsql.dll*.mdb \
+	/usr/lib/mono/1.0/Npgsql.dll*/*.mdb"
+FILES_libmono-npgsql1.0-cil = "/usr/lib/mono/gac/Npgsql/1.0.*/ \
+	/usr/lib/mono/1.0/Npgsql.dll"
+FILES_libmono-winforms1.0-cil-dbg = "/usr/lib/mono/gac/System.Windows.Forms/1.0.*/*.mdb \
+	/usr/lib/mono/gac/System.Windows.Forms/1.0.*/*/*.mdb \
+	/usr/lib/mono/gac/System.Windows.Forms/1.0.*/.debug/ \
+	/usr/lib/mono/gac/System.Windows.Forms/1.0.*/../.debug/ \
+	/usr/lib/mono/gac/System.Drawing.Design/1.0.*/*.mdb \
+	/usr/lib/mono/gac/System.Drawing.Design/1.0.*/*/*.mdb \
+	/usr/lib/mono/gac/System.Drawing.Design/1.0.*/.debug/ \
+	/usr/lib/mono/gac/System.Drawing.Design/1.0.*/../.debug/ \
+	/usr/lib/mono/gac/System.Design/1.0.*/*.mdb \
+	/usr/lib/mono/gac/System.Design/1.0.*/*/*.mdb \
+	/usr/lib/mono/gac/System.Design/1.0.*/.debug/ \
+	/usr/lib/mono/gac/System.Design/1.0.*/../.debug/ \
+	/usr/lib/mono/1.0/System.Windows.Forms.dll*.mdb \
+	/usr/lib/mono/1.0/System.Windows.Forms.dll*/*.mdb \
+	/usr/lib/mono/1.0/System.Drawing.Design.dll*.mdb \
+	/usr/lib/mono/1.0/System.Drawing.Design.dll*/*.mdb \
+	/usr/lib/mono/1.0/System.Design.dll*.mdb \
+	/usr/lib/mono/1.0/System.Design.dll*/*.mdb"
+FILES_libmono-winforms1.0-cil = "/usr/lib/mono/gac/System.Windows.Forms/1.0.*/ \
+	/usr/lib/mono/gac/System.Drawing.Design/1.0.*/ \
+	/usr/lib/mono/gac/System.Design/1.0.*/ \
+	/usr/lib/mono/1.0/System.Windows.Forms.dll \
+	/usr/lib/mono/1.0/System.Drawing.Design.dll \
+	/usr/lib/mono/1.0/System.Design.dll"
+FILES_libmono-i18n1.0-cil-dbg = "/usr/lib/mono/gac/I18N*/1.0.*/*.mdb \
+	/usr/lib/mono/gac/I18N*/1.0.*/*/*.mdb \
+	/usr/lib/mono/gac/I18N*/1.0.*/.debug/ \
+	/usr/lib/mono/gac/I18N*/1.0.*/../.debug/ \
+	/usr/lib/mono/1.0/I18N*.dll*.mdb \
+	/usr/lib/mono/1.0/I18N*.dll*/*.mdb"
+FILES_libmono-i18n1.0-cil = "/usr/lib/mono/gac/I18N*/1.0.*/ \
+	/usr/lib/mono/1.0/I18N*.dll"
+FILES_libmono-bytefx0.7.6.1-cil-dbg = "/usr/lib/mono/gac/ByteFX.Data/0.7.6.1*/*.mdb \
+	/usr/lib/mono/gac/ByteFX.Data/0.7.6.1*/*/*.mdb \
+	/usr/lib/mono/gac/ByteFX.Data/0.7.6.1*/.debug/ \
+	/usr/lib/mono/gac/ByteFX.Data/0.7.6.1*/../.debug/ \
+	/usr/lib/mono/1.0/ByteFX.Data.dll*.mdb \
+	/usr/lib/mono/1.0/ByteFX.Data.dll*/*.mdb"
+FILES_libmono-bytefx0.7.6.1-cil = "/usr/lib/mono/gac/ByteFX.Data/0.7.6.1*/ \
+	/usr/lib/mono/1.0/ByteFX.Data.dll"
+FILES_libmono-db2-1.0-cil-dbg = "/usr/lib/mono/gac/IBM.Data.DB2/1.0.*/*.mdb \
+	/usr/lib/mono/gac/IBM.Data.DB2/1.0.*/*/*.mdb \
+	/usr/lib/mono/gac/IBM.Data.DB2/1.0.*/.debug/ \
+	/usr/lib/mono/gac/IBM.Data.DB2/1.0.*/../.debug/ \
+	/usr/lib/mono/1.0/IBM.Data.DB2.dll*.mdb \
+	/usr/lib/mono/1.0/IBM.Data.DB2.dll*/*.mdb"
+FILES_libmono-db2-1.0-cil = "/usr/lib/mono/gac/IBM.Data.DB2/1.0.*/ \
+	/usr/lib/mono/1.0/IBM.Data.DB2.dll"
+FILES_libmono-microsoft-build2.0-cil-dbg = "/usr/lib/mono/gac/Microsoft.Build.*/2.0.*/*.mdb \
+	/usr/lib/mono/gac/Microsoft.Build.*/2.0.*/*/*.mdb \
+	/usr/lib/mono/gac/Microsoft.Build.*/2.0.*/.debug/ \
+	/usr/lib/mono/gac/Microsoft.Build.*/2.0.*/../.debug/ \
+	/usr/lib/mono/2.0/Microsoft.Build.*.dll*.mdb \
+	/usr/lib/mono/2.0/Microsoft.Build.*.dll*/*.mdb"
+FILES_libmono-microsoft-build2.0-cil = "/usr/lib/mono/gac/Microsoft.Build.*/2.0.*/ \
+	/usr/lib/mono/2.0/Microsoft.Build.*.dll"
+FILES_libmono-system-ldap1.0-cil-dbg = "/usr/lib/mono/gac/System.DirectoryServices/1.0.*/*.mdb \
+	/usr/lib/mono/gac/System.DirectoryServices/1.0.*/*/*.mdb \
+	/usr/lib/mono/gac/System.DirectoryServices/1.0.*/.debug/ \
+	/usr/lib/mono/gac/System.DirectoryServices/1.0.*/../.debug/ \
+	/usr/lib/mono/1.0/System.DirectoryServices.dll*.mdb \
+	/usr/lib/mono/1.0/System.DirectoryServices.dll*/*.mdb"
+FILES_libmono-system-ldap1.0-cil = "/usr/lib/mono/gac/System.DirectoryServices/1.0.*/ \
+	/usr/lib/mono/1.0/System.DirectoryServices.dll"
+FILES_libmono-ldap1.0-cil-dbg = "/usr/lib/mono/gac/Novell.Directory.Ldap/1.0.*/*.mdb \
+	/usr/lib/mono/gac/Novell.Directory.Ldap/1.0.*/*/*.mdb \
+	/usr/lib/mono/gac/Novell.Directory.Ldap/1.0.*/.debug/ \
+	/usr/lib/mono/gac/Novell.Directory.Ldap/1.0.*/../.debug/ \
+	/usr/lib/mono/1.0/Novell.Directory.Ldap.dll*.mdb \
+	/usr/lib/mono/1.0/Novell.Directory.Ldap.dll*/*.mdb"
+FILES_libmono-ldap1.0-cil = "/usr/lib/mono/gac/Novell.Directory.Ldap/1.0.*/ \
+	/usr/lib/mono/1.0/Novell.Directory.Ldap.dll"
+FILES_libmono-system-ldap2.0-cil-dbg = "/usr/lib/mono/gac/System.DirectoryServices/2.0.*/*.mdb \
+	/usr/lib/mono/gac/System.DirectoryServices/2.0.*/*/*.mdb \
+	/usr/lib/mono/gac/System.DirectoryServices/2.0.*/.debug/ \
+	/usr/lib/mono/gac/System.DirectoryServices/2.0.*/../.debug/ \
+	/usr/lib/mono/2.0/System.DirectoryServices.dll*.mdb \
+	/usr/lib/mono/2.0/System.DirectoryServices.dll*/*.mdb"
+FILES_libmono-system-ldap2.0-cil = "/usr/lib/mono/gac/System.DirectoryServices/2.0.*/ \
+	/usr/lib/mono/2.0/System.DirectoryServices.dll"
+FILES_libmono-system-messaging2.0-cil-dbg = "/usr/lib/mono/gac/System.Messaging/2.0.*/*.mdb \
+	/usr/lib/mono/gac/System.Messaging/2.0.*/*/*.mdb \
+	/usr/lib/mono/gac/System.Messaging/2.0.*/.debug/ \
+	/usr/lib/mono/gac/System.Messaging/2.0.*/../.debug/ \
+	/usr/lib/mono/2.0/System.Messaging.dll*.mdb \
+	/usr/lib/mono/2.0/System.Messaging.dll*/*.mdb"
+FILES_libmono-system-messaging2.0-cil = "/usr/lib/mono/gac/System.Messaging/2.0.*/ \
+	/usr/lib/mono/2.0/System.Messaging.dll"
+FILES_mono-2.0-service-dbg = "/usr/bin/mono-service2*.mdb \
+	/usr/bin/mono-service2*/*.mdb \
+	/usr/lib/mono/2.0/mono-service.exe*.mdb \
+	/usr/lib/mono/2.0/mono-service.exe*/*.mdb"
+FILES_mono-2.0-service = "/usr/bin/mono-service2 \
+	/usr/lib/mono/2.0/mono-service.exe*"
+FILES_libmono-sharpzip0.84-cil-dbg = "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.84.*/*.mdb \
+	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.84.*/*/*.mdb \
+	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.84.*/.debug/ \
+	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.84.*/../.debug/ \
+	/usr/lib/mono/1.0/ICSharpCode.SharpZipLib.dll*.mdb \
+	/usr/lib/mono/1.0/ICSharpCode.SharpZipLib.dll*/*.mdb"
+FILES_libmono-sharpzip0.84-cil = "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.84.*/ \
+	/usr/lib/mono/1.0/ICSharpCode.SharpZipLib.dll"
+FILES_libmono-corlib2.1-cil-dbg = "/usr/lib/mono/2.1/mscorlib.dll*.mdb \
+	/usr/lib/mono/2.1/mscorlib.dll*/*.mdb"
+FILES_libmono-corlib2.1-cil = "/usr/lib/mono/2.1/mscorlib.dll*"
+FILES_libmono-sqlite2.0-cil-dbg = "/usr/lib/mono/gac/Mono.Data.Sqlite/2.0.*/*.mdb \
+	/usr/lib/mono/gac/Mono.Data.Sqlite/2.0.*/*/*.mdb \
+	/usr/lib/mono/gac/Mono.Data.Sqlite/2.0.*/.debug/ \
+	/usr/lib/mono/gac/Mono.Data.Sqlite/2.0.*/../.debug/ \
+	/usr/lib/mono/gac/Mono.Data.SqliteClient/2.0.*/*.mdb \
+	/usr/lib/mono/gac/Mono.Data.SqliteClient/2.0.*/*/*.mdb \
+	/usr/lib/mono/gac/Mono.Data.SqliteClient/2.0.*/.debug/ \
+	/usr/lib/mono/gac/Mono.Data.SqliteClient/2.0.*/../.debug/ \
+	/usr/lib/mono/2.0/Mono.Data.Sqlite.dll*.mdb \
+	/usr/lib/mono/2.0/Mono.Data.Sqlite.dll*/*.mdb \
+	/usr/lib/mono/2.0/Mono.Data.SqliteClient.dll*.mdb \
+	/usr/lib/mono/2.0/Mono.Data.SqliteClient.dll*/*.mdb"
+FILES_libmono-sqlite2.0-cil = "/usr/lib/mono/gac/Mono.Data.Sqlite/2.0.*/ \
+	/usr/lib/mono/gac/Mono.Data.SqliteClient/2.0.*/ \
+	/usr/lib/mono/2.0/Mono.Data.Sqlite.dll \
+	/usr/lib/mono/2.0/Mono.Data.SqliteClient.dll"
+FILES_libmono-ldap2.0-cil-dbg = "/usr/lib/mono/gac/Novell.Directory.Ldap/2.0.*/*.mdb \
+	/usr/lib/mono/gac/Novell.Directory.Ldap/2.0.*/*/*.mdb \
+	/usr/lib/mono/gac/Novell.Directory.Ldap/2.0.*/.debug/ \
+	/usr/lib/mono/gac/Novell.Directory.Ldap/2.0.*/../.debug/ \
+	/usr/lib/mono/2.0/Novell.Directory.Ldap.dll*.mdb \
+	/usr/lib/mono/2.0/Novell.Directory.Ldap.dll*/*.mdb"
+FILES_libmono-ldap2.0-cil = "/usr/lib/mono/gac/Novell.Directory.Ldap/2.0.*/ \
+	/usr/lib/mono/2.0/Novell.Directory.Ldap.dll"
+FILES_libmono-npgsql2.0-cil-dbg = "/usr/lib/mono/gac/Npgsql/2.0.*/*.mdb \
+	/usr/lib/mono/gac/Npgsql/2.0.*/*/*.mdb \
+	/usr/lib/mono/gac/Npgsql/2.0.*/.debug/ \
+	/usr/lib/mono/gac/Npgsql/2.0.*/../.debug/ \
+	/usr/lib/mono/2.0/Npgsql.dll*.mdb \
+	/usr/lib/mono/2.0/Npgsql.dll*/*.mdb"
+FILES_libmono-npgsql2.0-cil = "/usr/lib/mono/gac/Npgsql/2.0.*/ \
+	/usr/lib/mono/2.0/Npgsql.dll"
+FILES_libmono-system-runtime1.0-cil-dbg = "/usr/lib/mono/gac/System.Runtime.*/1.0.*/*.mdb \
+	/usr/lib/mono/gac/System.Runtime.*/1.0.*/*/*.mdb \
+	/usr/lib/mono/gac/System.Runtime.*/1.0.*/.debug/ \
+	/usr/lib/mono/gac/System.Runtime.*/1.0.*/../.debug/ \
+	/usr/lib/mono/1.0/System.Runtime.*.dll*.mdb \
+	/usr/lib/mono/1.0/System.Runtime.*.dll*/*.mdb"
+FILES_libmono-system-runtime1.0-cil = "/usr/lib/mono/gac/System.Runtime.*/1.0.*/ \
+	/usr/lib/mono/1.0/System.Runtime.*.dll"
+FILES_libmono-peapi2.0-cil-dbg = "/usr/lib/mono/gac/PEAPI/2.0.*/*.mdb \
+	/usr/lib/mono/gac/PEAPI/2.0.*/*/*.mdb \
+	/usr/lib/mono/gac/PEAPI/2.0.*/.debug/ \
+	/usr/lib/mono/gac/PEAPI/2.0.*/../.debug/ \
+	/usr/lib/mono/2.0/PEAPI.dll*.mdb \
+	/usr/lib/mono/2.0/PEAPI.dll*/*.mdb"
+FILES_libmono-peapi2.0-cil = "/usr/lib/mono/gac/PEAPI/2.0.*/ \
+	/usr/lib/mono/2.0/PEAPI.dll"
+FILES_libmono-c5-1.0-cil-dbg = "/usr/lib/mono/gac/Mono.C5/1.0.*/*.mdb \
+	/usr/lib/mono/gac/Mono.C5/1.0.*/*/*.mdb \
+	/usr/lib/mono/gac/Mono.C5/1.0.*/.debug/ \
+	/usr/lib/mono/gac/Mono.C5/1.0.*/../.debug/ \
+	/usr/lib/mono/2.0/Mono.C5.dll*.mdb \
+	/usr/lib/mono/2.0/Mono.C5.dll*/*.mdb"
+FILES_libmono-c5-1.0-cil = "/usr/lib/mono/gac/Mono.C5/1.0.*/ \
+	/usr/lib/mono/2.0/Mono.C5.dll"
+FILES_libmono-oracle2.0-cil-dbg = "/usr/lib/mono/gac/System.Data.OracleClient/2.0.*/*.mdb \
+	/usr/lib/mono/gac/System.Data.OracleClient/2.0.*/*/*.mdb \
+	/usr/lib/mono/gac/System.Data.OracleClient/2.0.*/.debug/ \
+	/usr/lib/mono/gac/System.Data.OracleClient/2.0.*/../.debug/ \
+	/usr/lib/mono/2.0/System.Data.OracleClient.dll*.mdb \
+	/usr/lib/mono/2.0/System.Data.OracleClient.dll*/*.mdb"
+FILES_libmono-oracle2.0-cil = "/usr/lib/mono/gac/System.Data.OracleClient/2.0.*/ \
+	/usr/lib/mono/2.0/System.Data.OracleClient.dll"
+FILES_libmono-sharpzip2.6-cil-dbg = "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.6.*/*.mdb \
+	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.6.*/*/*.mdb \
+	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.6.*/.debug/ \
+	/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.6.*/../.debug/ \
+	/usr/lib/mono/compat-2.0/ICSharpCode.SharpZipLib.dll*.mdb \
+	/usr/lib/mono/compat-2.0/ICSharpCode.SharpZipLib.dll*/*.mdb"
+FILES_libmono-sharpzip2.6-cil = "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.6.*/ \
+	/usr/lib/mono/compat-2.0/ICSharpCode.SharpZipLib.dll"
+FILES_mono-mcs-dbg = "/usr/bin/mcs*.mdb \
+	/usr/bin/mcs*/*.mdb \
+	/usr/lib/mono/1.0/mcs.exe*.mdb \
+	/usr/lib/mono/1.0/mcs.exe*/*.mdb"
+FILES_mono-mcs = "/usr/bin/mcs \
+	/usr/lib/mono/1.0/mcs.exe*"
+FILES_libmono-system1.0-cil-dbg = "/usr/lib/mono/1.0/CustomMarshalers.dll*.mdb \
+	/usr/lib/mono/1.0/CustomMarshalers.dll*/*.mdb \
+	/usr/lib/mono/1.0/System.Configuration.Install.dll*.mdb \
+	/usr/lib/mono/1.0/System.Configuration.Install.dll*/*.mdb \
+	/usr/lib/mono/1.0/System.Drawing.dll*.mdb \
+	/usr/lib/mono/1.0/System.Drawing.dll*/*.mdb \
+	/usr/lib/mono/1.0/System.EnterpriseServices.dll*.mdb \
+	/usr/lib/mono/1.0/System.EnterpriseServices.dll*/*.mdb \
+	/usr/lib/mono/1.0/System.Management.dll*.mdb \
+	/usr/lib/mono/1.0/System.Management.dll*/*.mdb \
+	/usr/lib/mono/1.0/System.Security.dll*.mdb \
+	/usr/lib/mono/1.0/System.Security.dll*/*.mdb \
+	/usr/lib/mono/1.0/System.ServiceProcess.dll*.mdb \
+	/usr/lib/mono/1.0/System.ServiceProcess.dll*/*.mdb \
+	/usr/lib/mono/1.0/System.Xml.dll*.mdb \
+	/usr/lib/mono/1.0/System.Xml.dll*/*.mdb \
+	/usr/lib/mono/1.0/System.dll*.mdb \
+	/usr/lib/mono/1.0/System.dll*/*.mdb \
+	/usr/lib/mono/gac/CustomMarshalers/1.0.5000.0__*/*.mdb \
+	/usr/lib/mono/gac/CustomMarshalers/1.0.5000.0__*/*/*.mdb \
+	/usr/lib/mono/gac/CustomMarshalers/1.0.5000.0__*/.debug/ \
+	/usr/lib/mono/gac/CustomMarshalers/1.0.5000.0__*/../.debug/ \
+	/usr/lib/mono/gac/System.Configuration.Install/1.0.5000.0__*/*.mdb \
+	/usr/lib/mono/gac/System.Configuration.Install/1.0.5000.0__*/*/*.mdb \
+	/usr/lib/mono/gac/System.Configuration.Install/1.0.5000.0__*/.debug/ \
+	/usr/lib/mono/gac/System.Configuration.Install/1.0.5000.0__*/../.debug/ \
+	/usr/lib/mono/gac/System.Drawing/1.0.5000.0__*/*.mdb \
+	/usr/lib/mono/gac/System.Drawing/1.0.5000.0__*/*/*.mdb \
+	/usr/lib/mono/gac/System.Drawing/1.0.5000.0__*/.debug/ \
+	/usr/lib/mono/gac/System.Drawing/1.0.5000.0__*/../.debug/ \
+	/usr/lib/mono/gac/System.EnterpriseServices/1.0.5000.0__*/*.mdb \
+	/usr/lib/mono/gac/System.EnterpriseServices/1.0.5000.0__*/*/*.mdb \
+	/usr/lib/mono/gac/System.EnterpriseServices/1.0.5000.0__*/.debug/ \
+	/usr/lib/mono/gac/System.EnterpriseServices/1.0.5000.0__*/../.debug/ \
+	/usr/lib/mono/gac/System.Management/1.0.5000.0__*/*.mdb \
+	/usr/lib/mono/gac/System.Management/1.0.5000.0__*/*/*.mdb \
+	/usr/lib/mono/gac/System.Management/1.0.5000.0__*/.debug/ \
+	/usr/lib/mono/gac/System.Management/1.0.5000.0__*/../.debug/ \
+	/usr/lib/mono/gac/System.Security/1.0.5000.0__*/*.mdb \
+	/usr/lib/mono/gac/System.Security/1.0.5000.0__*/*/*.mdb \
+	/usr/lib/mono/gac/System.Security/1.0.5000.0__*/.debug/ \
+	/usr/lib/mono/gac/System.Security/1.0.5000.0__*/../.debug/ \
+	/usr/lib/mono/gac/System.ServiceProcess/1.0.5000.0__*/*.mdb \
+	/usr/lib/mono/gac/System.ServiceProcess/1.0.5000.0__*/*/*.mdb \
+	/usr/lib/mono/gac/System.ServiceProcess/1.0.5000.0__*/.debug/ \
+	/usr/lib/mono/gac/System.ServiceProcess/1.0.5000.0__*/../.debug/ \
+	/usr/lib/mono/gac/System.Xml/1.0.5000.0__*/*.mdb \
+	/usr/lib/mono/gac/System.Xml/1.0.5000.0__*/*/*.mdb \
+	/usr/lib/mono/gac/System.Xml/1.0.5000.0__*/.debug/ \
+	/usr/lib/mono/gac/System.Xml/1.0.5000.0__*/../.debug/ \
+	/usr/lib/mono/gac/System/1.0.5000.0__*/*.mdb \
+	/usr/lib/mono/gac/System/1.0.5000.0__*/*/*.mdb \
+	/usr/lib/mono/gac/System/1.0.5000.0__*/.debug/ \
+	/usr/lib/mono/gac/System/1.0.5000.0__*/../.debug/"
+FILES_libmono-system1.0-cil = "/usr/lib/mono/1.0/CustomMarshalers.dll \
+	/usr/lib/mono/1.0/System.Configuration.Install.dll \
+	/usr/lib/mono/1.0/System.Drawing.dll \
+	/usr/lib/mono/1.0/System.EnterpriseServices.dll \
+	/usr/lib/mono/1.0/System.Management.dll \
+	/usr/lib/mono/1.0/System.Security.dll \
+	/usr/lib/mono/1.0/System.ServiceProcess.dll \
+	/usr/lib/mono/1.0/System.Xml.dll \
+	/usr/lib/mono/1.0/System.dll \
+	/usr/lib/mono/gac/CustomMarshalers/1.0.5000.0__*/ \
+	/usr/lib/mono/gac/System.Configuration.Install/1.0.5000.0__*/ \
+	/usr/lib/mono/gac/System.Drawing/1.0.5000.0__*/ \
+	/usr/lib/mono/gac/System.EnterpriseServices/1.0.5000.0__*/ \
+	/usr/lib/mono/gac/System.Management/1.0.5000.0__*/ \
+	/usr/lib/mono/gac/System.Security/1.0.5000.0__*/ \
+	/usr/lib/mono/gac/System.ServiceProcess/1.0.5000.0__*/ \
+	/usr/lib/mono/gac/System.Xml/1.0.5000.0__*/ \
+	/usr/lib/mono/gac/System/1.0.5000.0__*/"
+FILES_libmono-system2.0-cil-dbg = "/usr/lib/mono/2.0/CustomMarshalers.dll*.mdb \
+	/usr/lib/mono/2.0/CustomMarshalers.dll*/*.mdb \
+	/usr/lib/mono/2.0/System.Configuration.Install.dll*.mdb \
+	/usr/lib/mono/2.0/System.Configuration.Install.dll*/*.mdb \
+	/usr/lib/mono/2.0/System.Configuration.dll*.mdb \
+	/usr/lib/mono/2.0/System.Configuration.dll*/*.mdb \
+	/usr/lib/mono/2.0/System.Core.dll*.mdb \
+	/usr/lib/mono/2.0/System.Core.dll*/*.mdb \
+	/usr/lib/mono/2.0/System.Drawing.dll*.mdb \
+	/usr/lib/mono/2.0/System.Drawing.dll*/*.mdb \
+	/usr/lib/mono/2.0/System.EnterpriseServices.dll*.mdb \
+	/usr/lib/mono/2.0/System.EnterpriseServices.dll*/*.mdb \
+	/usr/lib/mono/2.0/System.Management.dll*.mdb \
+	/usr/lib/mono/2.0/System.Management.dll*/*.mdb \
+	/usr/lib/mono/2.0/System.Security.dll*.mdb \
+	/usr/lib/mono/2.0/System.Security.dll*/*.mdb \
+	/usr/lib/mono/2.0/System.ServiceProcess.dll*.mdb \
+	/usr/lib/mono/2.0/System.ServiceProcess.dll*/*.mdb \
+	/usr/lib/mono/2.0/System.Transactions.dll*.mdb \
+	/usr/lib/mono/2.0/System.Transactions.dll*/*.mdb \
+	/usr/lib/mono/2.0/System.Xml.dll*.mdb \
+	/usr/lib/mono/2.0/System.Xml.dll*/*.mdb \
+	/usr/lib/mono/2.0/System.Xml.Linq.dll*.mdb \
+	/usr/lib/mono/2.0/System.Xml.Linq.dll*/*.mdb \
+	/usr/lib/mono/2.0/System.dll*.mdb \
+	/usr/lib/mono/2.0/System.dll*/*.mdb \
+	/usr/lib/mono/gac/CustomMarshalers/2.0.0.0__*/*.mdb \
+	/usr/lib/mono/gac/CustomMarshalers/2.0.0.0__*/*/*.mdb \
+	/usr/lib/mono/gac/CustomMarshalers/2.0.0.0__*/.debug/ \
+	/usr/lib/mono/gac/CustomMarshalers/2.0.0.0__*/../.debug/ \
+	/usr/lib/mono/gac/System.Configuration.Install/2.0.0.0__*/*.mdb \
+	/usr/lib/mono/gac/System.Configuration.Install/2.0.0.0__*/*/*.mdb \
+	/usr/lib/mono/gac/System.Configuration.Install/2.0.0.0__*/.debug/ \
+	/usr/lib/mono/gac/System.Configuration.Install/2.0.0.0__*/../.debug/ \
+	/usr/lib/mono/gac/System.Configuration/2.0.0.0__*/*.mdb \
+	/usr/lib/mono/gac/System.Configuration/2.0.0.0__*/*/*.mdb \
+	/usr/lib/mono/gac/System.Configuration/2.0.0.0__*/.debug/ \
+	/usr/lib/mono/gac/System.Configuration/2.0.0.0__*/../.debug/ \
+	/usr/lib/mono/gac/System.Core/3.5.0.0__*/*.mdb \
+	/usr/lib/mono/gac/System.Core/3.5.0.0__*/*/*.mdb \
+	/usr/lib/mono/gac/System.Core/3.5.0.0__*/.debug/ \
+	/usr/lib/mono/gac/System.Core/3.5.0.0__*/../.debug/ \
+	/usr/lib/mono/gac/System.Drawing/2.0.0.0__*/*.mdb \
+	/usr/lib/mono/gac/System.Drawing/2.0.0.0__*/*/*.mdb \
+	/usr/lib/mono/gac/System.Drawing/2.0.0.0__*/.debug/ \
+	/usr/lib/mono/gac/System.Drawing/2.0.0.0__*/../.debug/ \
+	/usr/lib/mono/gac/System.EnterpriseServices/2.0.0.0__*/*.mdb \
+	/usr/lib/mono/gac/System.EnterpriseServices/2.0.0.0__*/*/*.mdb \
+	/usr/lib/mono/gac/System.EnterpriseServices/2.0.0.0__*/.debug/ \
+	/usr/lib/mono/gac/System.EnterpriseServices/2.0.0.0__*/../.debug/ \
+	/usr/lib/mono/gac/System.Management/2.0.0.0__*/*.mdb \
+	/usr/lib/mono/gac/System.Management/2.0.0.0__*/*/*.mdb \
+	/usr/lib/mono/gac/System.Management/2.0.0.0__*/.debug/ \
+	/usr/lib/mono/gac/System.Management/2.0.0.0__*/../.debug/ \
+	/usr/lib/mono/gac/System.Security/2.0.0.0__*/*.mdb \
+	/usr/lib/mono/gac/System.Security/2.0.0.0__*/*/*.mdb \
+	/usr/lib/mono/gac/System.Security/2.0.0.0__*/.debug/ \
+	/usr/lib/mono/gac/System.Security/2.0.0.0__*/../.debug/ \
+	/usr/lib/mono/gac/System.ServiceProcess/2.0.0.0__*/*.mdb \
+	/usr/lib/mono/gac/System.ServiceProcess/2.0.0.0__*/*/*.mdb \
+	/usr/lib/mono/gac/System.ServiceProcess/2.0.0.0__*/.debug/ \
+	/usr/lib/mono/gac/System.ServiceProcess/2.0.0.0__*/../.debug/ \
+	/usr/lib/mono/gac/System.Transactions/2.0.0.0__*/*.mdb \
+	/usr/lib/mono/gac/System.Transactions/2.0.0.0__*/*/*.mdb \
+	/usr/lib/mono/gac/System.Transactions/2.0.0.0__*/.debug/ \
+	/usr/lib/mono/gac/System.Transactions/2.0.0.0__*/../.debug/ \
+	/usr/lib/mono/gac/System.Xml/2.0.0.0__*/*.mdb \
+	/usr/lib/mono/gac/System.Xml/2.0.0.0__*/*/*.mdb \
+	/usr/lib/mono/gac/System.Xml/2.0.0.0__*/.debug/ \
+	/usr/lib/mono/gac/System.Xml/2.0.0.0__*/../.debug/ \
+	/usr/lib/mono/gac/System.Xml.Linq/3.5.0.0__*/*.mdb \
+	/usr/lib/mono/gac/System.Xml.Linq/3.5.0.0__*/*/*.mdb \
+	/usr/lib/mono/gac/System.Xml.Linq/3.5.0.0__*/.debug/ \
+	/usr/lib/mono/gac/System.Xml.Linq/3.5.0.0__*/../.debug/ \
+	/usr/lib/mono/gac/System/2.0.0.0__*/*.mdb \
+	/usr/lib/mono/gac/System/2.0.0.0__*/*/*.mdb \
+	/usr/lib/mono/gac/System/2.0.0.0__*/.debug/ \
+	/usr/lib/mono/gac/System/2.0.0.0__*/../.debug/"
+FILES_libmono-system2.0-cil = "/usr/lib/mono/2.0/CustomMarshalers.dll \
+	/usr/lib/mono/2.0/System.Configuration.Install.dll \
+	/usr/lib/mono/2.0/System.Configuration.dll \
+	/usr/lib/mono/2.0/System.Core.dll \
+	/usr/lib/mono/2.0/System.Drawing.dll \
+	/usr/lib/mono/2.0/System.EnterpriseServices.dll \
+	/usr/lib/mono/2.0/System.Management.dll \
+	/usr/lib/mono/2.0/System.Security.dll \
+	/usr/lib/mono/2.0/System.ServiceProcess.dll \
+	/usr/lib/mono/2.0/System.Transactions.dll \
+	/usr/lib/mono/2.0/System.Xml.dll \
+	/usr/lib/mono/2.0/System.Xml.Linq.dll \
+	/usr/lib/mono/2.0/System.dll \
+	/usr/lib/mono/gac/CustomMarshalers/2.0.0.0__*/ \
+	/usr/lib/mono/gac/System.Configuration.Install/2.0.0.0__*/ \
+	/usr/lib/mono/gac/System.Configuration/2.0.0.0__*/ \
+	/usr/lib/mono/gac/System.Core/3.5.0.0__*/ \
+	/usr/lib/mono/gac/System.Drawing/2.0.0.0__*/ \
+	/usr/lib/mono/gac/System.EnterpriseServices/2.0.0.0__*/ \
+	/usr/lib/mono/gac/System.Management/2.0.0.0__*/ \
+	/usr/lib/mono/gac/System.Security/2.0.0.0__*/ \
+	/usr/lib/mono/gac/System.ServiceProcess/2.0.0.0__*/ \
+	/usr/lib/mono/gac/System.Transactions/2.0.0.0__*/ \
+	/usr/lib/mono/gac/System.Xml/2.0.0.0__*/ \
+	/usr/lib/mono/gac/System.Xml.Linq/3.5.0.0__*/ \
+	/usr/lib/mono/gac/System/2.0.0.0__*/"
+FILES_libmono1.0-cil-dbg = "/usr/lib/mono/1.0/Mono.CompilerServices.SymbolWriter.dll*.mdb \
+	/usr/lib/mono/1.0/Mono.CompilerServices.SymbolWriter.dll*/*.mdb \
+	/usr/lib/mono/1.0/Mono.Data.SybaseClient.dll*.mdb \
+	/usr/lib/mono/1.0/Mono.Data.SybaseClient.dll*/*.mdb \
+	/usr/lib/mono/1.0/Mono.Data.TdsClient.dll*.mdb \
+	/usr/lib/mono/1.0/Mono.Data.TdsClient.dll*/*.mdb \
+	/usr/lib/mono/1.0/Mono.Data.dll*.mdb \
+	/usr/lib/mono/1.0/Mono.Data.dll*/*.mdb \
+	/usr/lib/mono/1.0/Mono.GetOptions.dll*.mdb \
+	/usr/lib/mono/1.0/Mono.GetOptions.dll*/*.mdb \
+	/usr/lib/mono/1.0/Mono.Http.dll*.mdb \
+	/usr/lib/mono/1.0/Mono.Http.dll*/*.mdb \
+	/usr/lib/mono/1.0/Mono.Posix.dll*.mdb \
+	/usr/lib/mono/1.0/Mono.Posix.dll*/*.mdb \
+	/usr/lib/mono/1.0/Mono.Security.Win32.dll*.mdb \
+	/usr/lib/mono/1.0/Mono.Security.Win32.dll*/*.mdb \
+	/usr/lib/mono/1.0/OpenSystem.C.dll*.mdb \
+	/usr/lib/mono/1.0/OpenSystem.C.dll*/*.mdb \
+	/usr/lib/mono/gac/Mono.CompilerServices.SymbolWriter/1.0.5000.0__*/*.mdb \
+	/usr/lib/mono/gac/Mono.CompilerServices.SymbolWriter/1.0.5000.0__*/*/*.mdb \
+	/usr/lib/mono/gac/Mono.CompilerServices.SymbolWriter/1.0.5000.0__*/.debug/ \
+	/usr/lib/mono/gac/Mono.CompilerServices.SymbolWriter/1.0.5000.0__*/../.debug/ \
+	/usr/lib/mono/gac/Mono.Data.SybaseClient/1.0.5000.0__*/*.mdb \
+	/usr/lib/mono/gac/Mono.Data.SybaseClient/1.0.5000.0__*/*/*.mdb \
+	/usr/lib/mono/gac/Mono.Data.SybaseClient/1.0.5000.0__*/.debug/ \
+	/usr/lib/mono/gac/Mono.Data.SybaseClient/1.0.5000.0__*/../.debug/ \
+	/usr/lib/mono/gac/Mono.Data.TdsClient/1.0.5000.0__*/*.mdb \
+	/usr/lib/mono/gac/Mono.Data.TdsClient/1.0.5000.0__*/*/*.mdb \
+	/usr/lib/mono/gac/Mono.Data.TdsClient/1.0.5000.0__*/.debug/ \
+	/usr/lib/mono/gac/Mono.Data.TdsClient/1.0.5000.0__*/../.debug/ \
+	/usr/lib/mono/gac/Mono.Data/1.0.5000.0__*/*.mdb \
+	/usr/lib/mono/gac/Mono.Data/1.0.5000.0__*/*/*.mdb \
+	/usr/lib/mono/gac/Mono.Data/1.0.5000.0__*/.debug/ \
+	/usr/lib/mono/gac/Mono.Data/1.0.5000.0__*/../.debug/ \
+	/usr/lib/mono/gac/Mono.GetOptions/1.0.5000.0__*/*.mdb \
+	/usr/lib/mono/gac/Mono.GetOptions/1.0.5000.0__*/*/*.mdb \
+	/usr/lib/mono/gac/Mono.GetOptions/1.0.5000.0__*/.debug/ \
+	/usr/lib/mono/gac/Mono.GetOptions/1.0.5000.0__*/../.debug/ \
+	/usr/lib/mono/gac/Mono.Http/1.0.5000.0__*/*.mdb \
+	/usr/lib/mono/gac/Mono.Http/1.0.5000.0__*/*/*.mdb \
+	/usr/lib/mono/gac/Mono.Http/1.0.5000.0__*/.debug/ \
+	/usr/lib/mono/gac/Mono.Http/1.0.5000.0__*/../.debug/ \
+	/usr/lib/mono/gac/Mono.Posix/1.0.5000.0__*/*.mdb \
+	/usr/lib/mono/gac/Mono.Posix/1.0.5000.0__*/*/*.mdb \
+	/usr/lib/mono/gac/Mono.Posix/1.0.5000.0__*/.debug/ \
+	/usr/lib/mono/gac/Mono.Posix/1.0.5000.0__*/../.debug/ \
+	/usr/lib/mono/gac/Mono.Security.Win32/1.0.5000.0__*/*.mdb \
+	/usr/lib/mono/gac/Mono.Security.Win32/1.0.5000.0__*/*/*.mdb \
+	/usr/lib/mono/gac/Mono.Security.Win32/1.0.5000.0__*/.debug/ \
+	/usr/lib/mono/gac/Mono.Security.Win32/1.0.5000.0__*/../.debug/ \
+	/usr/lib/mono/gac/OpenSystem.C/1.0.5000.0__*/*.mdb \
+	/usr/lib/mono/gac/OpenSystem.C/1.0.5000.0__*/*/*.mdb \
+	/usr/lib/mono/gac/OpenSystem.C/1.0.5000.0__*/.debug/ \
+	/usr/lib/mono/gac/OpenSystem.C/1.0.5000.0__*/../.debug/ \
+	/usr/lib/mono/gac/Mono.Cecil/*.mdb \
+	/usr/lib/mono/gac/Mono.Cecil/*/*.mdb \
+	/usr/lib/mono/gac/Mono.Cecil/.debug/ \
+	/usr/lib/mono/gac/Mono.Cecil/../.debug/ \
+	/usr/lib/mono/gac/Mono.Cecil.Mdb/*.mdb \
+	/usr/lib/mono/gac/Mono.Cecil.Mdb/*/*.mdb \
+	/usr/lib/mono/gac/Mono.Cecil.Mdb/.debug/ \
+	/usr/lib/mono/gac/Mono.Cecil.Mdb/../.debug/ \
+	/usr/lib/mono/gac/mono-service/1.0.5000.0__*/*.mdb \
+	/usr/lib/mono/gac/mono-service/1.0.5000.0__*/*/*.mdb \
+	/usr/lib/mono/gac/mono-service/1.0.5000.0__*/.debug/ \
+	/usr/lib/mono/gac/mono-service/1.0.5000.0__*/../.debug/ \
+	/usr/lib/pkgconfig/cecil.pc*.mdb \
+	/usr/lib/pkgconfig/cecil.pc*/*.mdb"
+FILES_libmono1.0-cil = "/usr/lib/mono/1.0/Mono.CompilerServices.SymbolWriter.dll \
+	/usr/lib/mono/1.0/Mono.Data.SybaseClient.dll \
+	/usr/lib/mono/1.0/Mono.Data.TdsClient.dll \
+	/usr/lib/mono/1.0/Mono.Data.dll \
+	/usr/lib/mono/1.0/Mono.GetOptions.dll \
+	/usr/lib/mono/1.0/Mono.Http.dll \
+	/usr/lib/mono/1.0/Mono.Posix.dll \
+	/usr/lib/mono/1.0/Mono.Security.Win32.dll \
+	/usr/lib/mono/1.0/OpenSystem.C.dll \
+	/usr/lib/mono/gac/Mono.CompilerServices.SymbolWriter/1.0.5000.0__*/ \
+	/usr/lib/mono/gac/Mono.Data.SybaseClient/1.0.5000.0__*/ \
+	/usr/lib/mono/gac/Mono.Data.TdsClient/1.0.5000.0__*/ \
+	/usr/lib/mono/gac/Mono.Data/1.0.5000.0__*/ \
+	/usr/lib/mono/gac/Mono.GetOptions/1.0.5000.0__*/ \
+	/usr/lib/mono/gac/Mono.Http/1.0.5000.0__*/ \
+	/usr/lib/mono/gac/Mono.Posix/1.0.5000.0__*/ \
+	/usr/lib/mono/gac/Mono.Security.Win32/1.0.5000.0__*/ \
+	/usr/lib/mono/gac/OpenSystem.C/1.0.5000.0__*/ \
+	/usr/lib/mono/gac/Mono.Cecil/ \
+	/usr/lib/mono/gac/Mono.Cecil.Mdb/ \
+	/usr/lib/mono/gac/mono-service/1.0.5000.0__*/ \
+	/usr/lib/pkgconfig/cecil.pc"
+FILES_libmono2.0-cil-dbg = "/usr/lib/mono/2.0/Mono.CompilerServices.SymbolWriter.dll*.mdb \
+	/usr/lib/mono/2.0/Mono.CompilerServices.SymbolWriter.dll*/*.mdb \
+	/usr/lib/mono/2.0/Mono.Data.SybaseClient.dll*.mdb \
+	/usr/lib/mono/2.0/Mono.Data.SybaseClient.dll*/*.mdb \
+	/usr/lib/mono/2.0/Mono.Data.TdsClient.dll*.mdb \
+	/usr/lib/mono/2.0/Mono.Data.TdsClient.dll*/*.mdb \
+	/usr/lib/mono/2.0/Mono.Data.dll*.mdb \
+	/usr/lib/mono/2.0/Mono.Data.dll*/*.mdb \
+	/usr/lib/mono/2.0/Mono.GetOptions.dll*.mdb \
+	/usr/lib/mono/2.0/Mono.GetOptions.dll*/*.mdb \
+	/usr/lib/mono/2.0/Mono.Http.dll*.mdb \
+	/usr/lib/mono/2.0/Mono.Http.dll*/*.mdb \
+	/usr/lib/mono/2.0/Mono.Posix.dll*.mdb \
+	/usr/lib/mono/2.0/Mono.Posix.dll*/*.mdb \
+	/usr/lib/mono/2.0/Mono.Security.Win32.dll*.mdb \
+	/usr/lib/mono/2.0/Mono.Security.Win32.dll*/*.mdb \
+	/usr/lib/mono/2.0/Mono.Web.dll*.mdb \
+	/usr/lib/mono/2.0/Mono.Web.dll*/*.mdb \
+	/usr/lib/mono/2.0/OpenSystem.C.dll*.mdb \
+	/usr/lib/mono/2.0/OpenSystem.C.dll*/*.mdb \
+	/usr/lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.0.0__*/*.mdb \
+	/usr/lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.0.0__*/*/*.mdb \
+	/usr/lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.0.0__*/.debug/ \
+	/usr/lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.0.0__*/../.debug/ \
+	/usr/lib/mono/gac/Mono.Data.SybaseClient/2.0.0.0__*/*.mdb \
+	/usr/lib/mono/gac/Mono.Data.SybaseClient/2.0.0.0__*/*/*.mdb \
+	/usr/lib/mono/gac/Mono.Data.SybaseClient/2.0.0.0__*/.debug/ \
+	/usr/lib/mono/gac/Mono.Data.SybaseClient/2.0.0.0__*/../.debug/ \
+	/usr/lib/mono/gac/Mono.Data.TdsClient/2.0.0.0__*/*.mdb \
+	/usr/lib/mono/gac/Mono.Data.TdsClient/2.0.0.0__*/*/*.mdb \
+	/usr/lib/mono/gac/Mono.Data.TdsClient/2.0.0.0__*/.debug/ \
+	/usr/lib/mono/gac/Mono.Data.TdsClient/2.0.0.0__*/../.debug/ \
+	/usr/lib/mono/gac/Mono.Data/2.0.0.0__*/*.mdb \
+	/usr/lib/mono/gac/Mono.Data/2.0.0.0__*/*/*.mdb \
+	/usr/lib/mono/gac/Mono.Data/2.0.0.0__*/.debug/ \
+	/usr/lib/mono/gac/Mono.Data/2.0.0.0__*/../.debug/ \
+	/usr/lib/mono/gac/Mono.GetOptions/2.0.0.0__*/*.mdb \
+	/usr/lib/mono/gac/Mono.GetOptions/2.0.0.0__*/*/*.mdb \
+	/usr/lib/mono/gac/Mono.GetOptions/2.0.0.0__*/.debug/ \
+	/usr/lib/mono/gac/Mono.GetOptions/2.0.0.0__*/../.debug/ \
+	/usr/lib/mono/gac/Mono.Http/2.0.0.0__*/*.mdb \
+	/usr/lib/mono/gac/Mono.Http/2.0.0.0__*/*/*.mdb \
+	/usr/lib/mono/gac/Mono.Http/2.0.0.0__*/.debug/ \
+	/usr/lib/mono/gac/Mono.Http/2.0.0.0__*/../.debug/ \
+	/usr/lib/mono/gac/Mono.Posix/2.0.0.0__*/*.mdb \
+	/usr/lib/mono/gac/Mono.Posix/2.0.0.0__*/*/*.mdb \
+	/usr/lib/mono/gac/Mono.Posix/2.0.0.0__*/.debug/ \
+	/usr/lib/mono/gac/Mono.Posix/2.0.0.0__*/../.debug/ \
+	/usr/lib/mono/gac/Mono.Security.Win32/2.0.0.0__*/*.mdb \
+	/usr/lib/mono/gac/Mono.Security.Win32/2.0.0.0__*/*/*.mdb \
+	/usr/lib/mono/gac/Mono.Security.Win32/2.0.0.0__*/.debug/ \
+	/usr/lib/mono/gac/Mono.Security.Win32/2.0.0.0__*/../.debug/ \
+	/usr/lib/mono/gac/Mono.Web/2.0.0.0__*/*.mdb \
+	/usr/lib/mono/gac/Mono.Web/2.0.0.0__*/*/*.mdb \
+	/usr/lib/mono/gac/Mono.Web/2.0.0.0__*/.debug/ \
+	/usr/lib/mono/gac/Mono.Web/2.0.0.0__*/../.debug/ \
+	/usr/lib/mono/gac/OpenSystem.C/2.0.0.0__*/*.mdb \
+	/usr/lib/mono/gac/OpenSystem.C/2.0.0.0__*/*/*.mdb \
+	/usr/lib/mono/gac/OpenSystem.C/2.0.0.0__*/.debug/ \
+	/usr/lib/mono/gac/OpenSystem.C/2.0.0.0__*/../.debug/ \
+	/usr/lib/mono/gac/mono-service/2.0.0.0__*/*.mdb \
+	/usr/lib/mono/gac/mono-service/2.0.0.0__*/*/*.mdb \
+	/usr/lib/mono/gac/mono-service/2.0.0.0__*/.debug/ \
+	/usr/lib/mono/gac/mono-service/2.0.0.0__*/../.debug/"
+FILES_libmono2.0-cil = "/usr/lib/mono/2.0/Mono.CompilerServices.SymbolWriter.dll \
+	/usr/lib/mono/2.0/Mono.Data.SybaseClient.dll \
+	/usr/lib/mono/2.0/Mono.Data.TdsClient.dll \
+	/usr/lib/mono/2.0/Mono.Data.dll \
+	/usr/lib/mono/2.0/Mono.GetOptions.dll \
+	/usr/lib/mono/2.0/Mono.Http.dll \
+	/usr/lib/mono/2.0/Mono.Posix.dll \
+	/usr/lib/mono/2.0/Mono.Security.Win32.dll \
+	/usr/lib/mono/2.0/Mono.Web.dll \
+	/usr/lib/mono/2.0/OpenSystem.C.dll \
+	/usr/lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.0.0__*/ \
+	/usr/lib/mono/gac/Mono.Data.SybaseClient/2.0.0.0__*/ \
+	/usr/lib/mono/gac/Mono.Data.TdsClient/2.0.0.0__*/ \
+	/usr/lib/mono/gac/Mono.Data/2.0.0.0__*/ \
+	/usr/lib/mono/gac/Mono.GetOptions/2.0.0.0__*/ \
+	/usr/lib/mono/gac/Mono.Http/2.0.0.0__*/ \
+	/usr/lib/mono/gac/Mono.Posix/2.0.0.0__*/ \
+	/usr/lib/mono/gac/Mono.Security.Win32/2.0.0.0__*/ \
+	/usr/lib/mono/gac/Mono.Web/2.0.0.0__*/ \
+	/usr/lib/mono/gac/OpenSystem.C/2.0.0.0__*/ \
+	/usr/lib/mono/gac/mono-service/2.0.0.0__*/"
+
+PACKAGES = "mono-jit-dbg \
+	mono-jit \
+	mono-gac-dbg \
+	mono-gac \
+	mono-mjs-dbg \
+	mono-mjs \
+	mono-gmcs-dbg \
+	mono-gmcs \
+	mono-utils-dbg \
+	mono-utils \
+	libmono-peapi1.0-cil-dbg \
+	libmono-peapi1.0-cil \
+	libmono-cairo1.0-cil-dbg \
+	libmono-cairo1.0-cil \
+	libmono-system-web2.0-cil-dbg \
+	libmono-system-web2.0-cil \
+	mono-1.0-devel-dbg \
+	mono-1.0-devel \
+	prj2make-sharp-dbg \
+	prj2make-sharp \
+	libmono-accessibility2.0-cil-dbg \
+	libmono-accessibility2.0-cil \
+	libmono-microsoft7.0-cil-dbg \
+	libmono-microsoft7.0-cil \
+	libmono-mozilla0.2-cil-dbg \
+	libmono-mozilla0.2-cil \
+	libmono-security1.0-cil-dbg \
+	libmono-security1.0-cil \
+	libmono-relaxng2.0-cil-dbg \
+	libmono-relaxng2.0-cil \
+	libmono-sharpzip2.84-cil-dbg \
+	libmono-sharpzip2.84-cil \
+	libmono-system-data2.0-cil-dbg \
+	libmono-system-data2.0-cil \
+	libmono-cairo2.0-cil-dbg \
+	libmono-cairo2.0-cil \
+	libmono-corlib2.0-cil-dbg \
+	libmono-corlib2.0-cil \
+	libmono-security2.0-cil-dbg \
+	libmono-security2.0-cil \
+	libmono-microsoft8.0-cil-dbg \
+	libmono-microsoft8.0-cil \
+	libmono-corlib1.0-cil-dbg \
+	libmono-corlib1.0-cil \
+	libmono-system-web1.0-cil-dbg \
+	libmono-system-web1.0-cil \
+	libmono-system-runtime2.0-cil-dbg \
+	libmono-system-runtime2.0-cil \
+	libmono-cscompmgd8.0-cil-dbg \
+	libmono-cscompmgd8.0-cil \
+	libmono-cscompmgd7.0-cil-dbg \
+	libmono-cscompmgd7.0-cil \
+	libmono-firebirdsql1.7-cil-dbg \
+	libmono-firebirdsql1.7-cil \
+	mono-jay-dbg \
+	mono-jay \
+	libmono-data-tds1.0-cil-dbg \
+	libmono-data-tds1.0-cil \
+	libmono-sqlite1.0-cil-dbg \
+	libmono-sqlite1.0-cil \
+	mono-2.0-devel-dbg \
+	mono-2.0-devel \
+	libmono-relaxng1.0-cil-dbg \
+	libmono-relaxng1.0-cil \
+	libmono-i18n2.0-cil-dbg \
+	libmono-i18n2.0-cil \
+	libmono-accessibility1.0-cil-dbg \
+	libmono-accessibility1.0-cil \
+	mono-common-dbg \
+	mono-common \
+	libmono-oracle1.0-cil-dbg \
+	libmono-oracle1.0-cil \
+	libmono-system-data1.0-cil-dbg \
+	libmono-system-data1.0-cil \
+	libmono-bytefx0.7.6.2-cil-dbg \
+	libmono-bytefx0.7.6.2-cil \
+	libmono0-dbg \
+	libmono0 \
+	libmono-dev-dbg \
+	libmono-dev \
+	mono-xbuild-dbg \
+	mono-xbuild \
+	libmono-sharpzip0.6-cil-dbg \
+	libmono-sharpzip0.6-cil \
+	mono-smcs-dbg \
+	mono-smcs \
+	libmono-data-tds2.0-cil-dbg \
+	libmono-data-tds2.0-cil \
+	libmono-system2.1-cil-dbg \
+	libmono-system2.1-cil \
+	mono-1.0-service-dbg \
+	mono-1.0-service \
+	libmono-system-messaging1.0-cil-dbg \
+	libmono-system-messaging1.0-cil \
+	libmono-winforms2.0-cil-dbg \
+	libmono-winforms2.0-cil \
+	libmono-npgsql1.0-cil-dbg \
+	libmono-npgsql1.0-cil \
+	libmono-winforms1.0-cil-dbg \
+	libmono-winforms1.0-cil \
+	libmono-i18n1.0-cil-dbg \
+	libmono-i18n1.0-cil \
+	libmono-bytefx0.7.6.1-cil-dbg \
+	libmono-bytefx0.7.6.1-cil \
+	libmono-db2-1.0-cil-dbg \
+	libmono-db2-1.0-cil \
+	libmono-microsoft-build2.0-cil-dbg \
+	libmono-microsoft-build2.0-cil \
+	libmono-system-ldap1.0-cil-dbg \
+	libmono-system-ldap1.0-cil \
+	libmono-ldap1.0-cil-dbg \
+	libmono-ldap1.0-cil \
+	libmono-system-ldap2.0-cil-dbg \
+	libmono-system-ldap2.0-cil \
+	libmono-system-messaging2.0-cil-dbg \
+	libmono-system-messaging2.0-cil \
+	mono-2.0-service-dbg \
+	mono-2.0-service \
+	libmono-sharpzip0.84-cil-dbg \
+	libmono-sharpzip0.84-cil \
+	libmono-corlib2.1-cil-dbg \
+	libmono-corlib2.1-cil \
+	libmono-sqlite2.0-cil-dbg \
+	libmono-sqlite2.0-cil \
+	libmono-ldap2.0-cil-dbg \
+	libmono-ldap2.0-cil \
+	libmono-npgsql2.0-cil-dbg \
+	libmono-npgsql2.0-cil \
+	libmono-system-runtime1.0-cil-dbg \
+	libmono-system-runtime1.0-cil \
+	libmono-peapi2.0-cil-dbg \
+	libmono-peapi2.0-cil \
+	libmono-c5-1.0-cil-dbg \
+	libmono-c5-1.0-cil \
+	libmono-oracle2.0-cil-dbg \
+	libmono-oracle2.0-cil \
+	libmono-sharpzip2.6-cil-dbg \
+	libmono-sharpzip2.6-cil \
+	mono-mcs-dbg \
+	mono-mcs \
+	libmono-system1.0-cil-dbg \
+	libmono-system1.0-cil \
+	libmono-system2.0-cil-dbg \
+	libmono-system2.0-cil \
+	libmono1.0-cil-dbg \
+	libmono1.0-cil \
+	libmono2.0-cil-dbg \
+	libmono2.0-cil"
diff --git a/packages/mono/mono_1.9.1.bb b/packages/mono/mono_1.9.1.bb
new file mode 100644
index 0000000000..4be75d99a7
--- /dev/null
+++ b/packages/mono/mono_1.9.1.bb
@@ -0,0 +1,80 @@
+require mono_1.9.1.inc
+
+DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native"
+
+DEFAULT_PREFERENCE = "-1"
+
+PR = "r1"
+
+SRC_URI += "file://configure.patch;patch=1"
+
+# Per http://www.mono-project.com/Mono:ARM
+EXTRA_OECONF += " --disable-mcs-build "
+# Instead, get the mcs tree from a different build (see mono-mcs-intermediate)
+
+do_install_prepend() {
+	install -d ${D}
+	pushd ${D}
+	tar -xzf ${STAGING_DATADIR_NATIVE}/mono-mcs/mono-mcs-${PV}.tar.gz
+	popd
+}
+
+do_install_append() {
+	# mono-mcs-intermediate builds and installs jay (a Yacc for Java and C#),
+	# however, jay is not being cross-compiled and thus only
+	# available for the buildhost architecture, so remove it
+	# entirely
+	pushd ${D}
+	rm -rf ./usr/share/man/man1/jay.1 ./usr/share/jay \
+	    ./usr/share/jay/README.jay \
+	    ./usr/bin/jay
+	popd
+
+	# Not packaged with the default rules and apparently
+	# not used for anything
+	rm -rf ${D}${datadir}/mono-1.0/mono/cil/cil-opcodes.xml
+}
+
+inherit mono
+
+# Import file definitions from Debian
+require mono_1.2.5.1-files.inc
+
+# Add some packages
+PACKAGES_append = " mono-doc mono mono-runtime"
+
+FILES_mono-doc_append = " /usr/share/libgc-mono/ "
+
+FILES_mono = ""
+ALLOW_EMPTY_mono = "1"
+RDEPENDS_mono = "mono-common mono-jit"
+
+FILES_mono-runtime = ""
+ALLOW_EMPTY_mono-runtime = "1"
+RDEPENDS_mono-runtime = "mono-jit mono-gac"
+
+RDEPENDS_mono-jit = "mono-common"
+
+FILES_libmono-dev =+ " /usr/lib/libmono.la /usr/lib/libmono-profiler-cov.la /usr/lib/libmono-profiler-aot.la \
+	/usr/lib/libMonoPosixHelper.la /usr/lib/libMonoSupportW.la"
+FILES_libmono-dbg =+ " /usr/lib/.debug/libmono*.so.* /usr/lib/.debug/libikvm-native.so \
+	/usr/lib/.debug/libMonoPosixHelper.so /usr/lib/.debug/libMonoSupportW.so"
+
+# Packages not included in Debian
+PACKAGES_prepend = "libnunit2.2-cil-dbg libnunit2.2-cil-dev libnunit2.2-cil \
+	libmono-cecil0.5-cil-dbg libmono-cecil0.5-cil-dev libmono-cecil0.5-cil \
+	libmono-db2-1.0-cil-dbg libmono-db2-1.0-cil-dev libmono-db2-1.0-cil"
+
+FILES_libnunit2.2-cil = "/usr/lib/mono/gac/nunit.*/2.2.* /usr/lib/mono/1.0/nunit.*.dll"
+FILES_libnunit2.2-cil-dev = "/usr/lib/pkgconfig/mono-nunit.pc"
+FILES_libnunit2.2-cil-dbg = "/usr/lib/mono/gac/nunit*/2.2.*/nunit.*.dll.mdb"
+
+FILES_libmono-cecil0.5-cil = "/usr/lib/mono/gac/Mono.Cecil/0.5.*"
+FILES_libmono-cecil0.5-cil-dbg = "/usr/lib/mono/gac/Mono.Cecil/0.5.0.1__0738eb9f132ed756/Mono.Cecil.dll.mdb"
+
+FILES_libmono-db2-1.0-cil = "/usr/lib/mono/gac/IBM.Data.DB2/1.0* /usr/lib/mono/1.0/IBM.Data.DB2.dll"
+FILES_libmono-db2-1.0-cil-dbg = "/usr/lib/mono/gac/IBM.Data.DB2/1.0*/IBM.Data.DB2.dll.mdb"
+
+# Move .pc files
+FILES_libmono-cairo1.0-cil-dev = "/usr/lib/pkgconfig/mono-cairo.pc"
+PACKAGES =+ " libmono-cairo1.0-cil-dev "
diff --git a/packages/mono/mono_1.9.1.inc b/packages/mono/mono_1.9.1.inc
new file mode 100644
index 0000000000..120ec70f4d
--- /dev/null
+++ b/packages/mono/mono_1.9.1.inc
@@ -0,0 +1,15 @@
+DESCRIPTION = "Mono Programming Language"
+SECTION = "devel/mono"
+LICENSE = "GPL LGPL X11"
+
+SRC_URI = "http://ftp.novell.com/pub/mono/sources/mono/mono-1.9.1.tar.bz2 \
+		"
+
+#	   file://mono-libgc-configure.patch;patch=1"
+
+S = "${WORKDIR}/mono-1.9.1"
+
+inherit autotools
+EXTRA_OECONF_arm = "--without-tls"
+EXTRA_OECONF_mipsel = "--without-tls"
+
diff --git a/packages/mythtv/files/armv5te/.mtn2git_empty b/packages/mythtv/files/armv5te/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mythtv/files/armv5te/.mtn2git_empty
diff --git a/packages/mythtv/files/armv5te/configh b/packages/mythtv/files/armv5te/configh
new file mode 100644
index 0000000000..46c647e2d5
--- /dev/null
+++ b/packages/mythtv/files/armv5te/configh
@@ -0,0 +1,6 @@
+#define HAVE_LLRINT 1
+#define HAVE_ROUNDF 1
+#define ARCH_ARMV4L 1
+#define ENABLE_ARMV4L 1
+#define HAVE_ARMV5TE 1
+#define ENABLE_ARMV5TE 1
diff --git a/packages/mythtv/files/armv5te/configmak b/packages/mythtv/files/armv5te/configmak
new file mode 100644
index 0000000000..aa9978515d
--- /dev/null
+++ b/packages/mythtv/files/armv5te/configmak
@@ -0,0 +1,3 @@
+ARCH_ARMV4L=yes
+HAVE_ARMV5TE=yes
+
diff --git a/packages/mythtv/files/armv6/.mtn2git_empty b/packages/mythtv/files/armv6/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mythtv/files/armv6/.mtn2git_empty
diff --git a/packages/mythtv/files/armv6/configh b/packages/mythtv/files/armv6/configh
new file mode 100644
index 0000000000..2301e723d6
--- /dev/null
+++ b/packages/mythtv/files/armv6/configh
@@ -0,0 +1,8 @@
+#define HAVE_LLRINT 1
+#define HAVE_ROUNDF 1
+#define ARCH_ARMV4L 1
+#define ENABLE_ARMV4L 1
+#define HAVE_ARMV5TE 1
+#define ENABLE_ARMV5TE 1
+#define HAVE_ARMV6 1
+#define ENABLE_ARMV6 1
diff --git a/packages/mythtv/files/armv6/configmak b/packages/mythtv/files/armv6/configmak
new file mode 100644
index 0000000000..4db5dc0dfd
--- /dev/null
+++ b/packages/mythtv/files/armv6/configmak
@@ -0,0 +1,3 @@
+ARCH_ARMV4L=yes
+HAVE_ARMV5TE=yes
+HAVE_ARMV6=yes
diff --git a/packages/mythtv/files/armv7a/.mtn2git_empty b/packages/mythtv/files/armv7a/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mythtv/files/armv7a/.mtn2git_empty
diff --git a/packages/mythtv/files/armv7a/configh b/packages/mythtv/files/armv7a/configh
new file mode 100644
index 0000000000..245e40f56a
--- /dev/null
+++ b/packages/mythtv/files/armv7a/configh
@@ -0,0 +1,14 @@
+#define HAVE_LLRINT 1
+#define HAVE_ROUNDF 1
+#define ARCH_ARMV4L 1
+#define ENABLE_ARMV4L 1
+#define HAVE_ARMV5TE 1
+#define ENABLE_ARMV5TE 1
+#define HAVE_ARMV6 1
+#define ENABLE_ARMV6 1
+#define HAVE_ARMV6T2 1
+#define ENABLE_ARMV6T2 1
+#define HAVE_ARMVFP 1
+#define ENABLE_ARMVFP 1
+#define HAVE_NEON 1
+#define ENABLE_NEON 1
diff --git a/packages/mythtv/files/armv7a/configmak b/packages/mythtv/files/armv7a/configmak
new file mode 100644
index 0000000000..50d549f794
--- /dev/null
+++ b/packages/mythtv/files/armv7a/configmak
@@ -0,0 +1,6 @@
+ARCH_ARMV4L=yes
+HAVE_ARMV5TE=yes
+HAVE_ARMV6=yes
+HAVE_ARMV6T2=yes
+HAVE_ARMVFP=yes
+HAVE_NEON=yes
diff --git a/packages/mythtv/files/configh b/packages/mythtv/files/configh
new file mode 100644
index 0000000000..2fe7658383
--- /dev/null
+++ b/packages/mythtv/files/configh
@@ -0,0 +1,2 @@
+#define HAVE_LLRINT 1
+#define HAVE_ROUNDF 1
diff --git a/packages/mythtv/files/configmak b/packages/mythtv/files/configmak
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mythtv/files/configmak
diff --git a/packages/mythtv/mythtv-0.21/.mtn2git_empty b/packages/mythtv/mythtv-0.21/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mythtv/mythtv-0.21/.mtn2git_empty
diff --git a/packages/mythtv/mythtv-0.21/configure.patch b/packages/mythtv/mythtv-0.21/configure.patch
new file mode 100644
index 0000000000..3b0b9a313a
--- /dev/null
+++ b/packages/mythtv/mythtv-0.21/configure.patch
@@ -0,0 +1,183 @@
+--- /tmp/configure	2008-06-30 08:40:35.000000000 +0200
++++ mythtv/configure	2008-07-23 09:51:41.000000000 +0200
+@@ -475,12 +475,13 @@
+ }
+ 
+ check_cmd(){
+-    log "$@"
++   	echo "Checking $@" 
++	log "$@"
+     "$@" >>$logfile 2>&1
+ }
+ 
+ check_cc(){
+-    log check_cc "$@"
++	log check_cc "$@"
+     cat >$TMPC
+     log_file $TMPC
+     check_cmd $cc $CFLAGS $ECFLAGS $OPTFLAGS "$@" -c -o $TMPO $TMPC
+@@ -1115,11 +1116,11 @@
+ fi
+ 
+ # machine
+-arch=`uname -m`
++disabled cross_compile && arch=`uname -m`
+ arch_raw="$arch"
+ cpu="generic"
+ cpu_override="no"
+-processor=`uname -p 2>/dev/null`
++disabled cross_compile && processor=`uname -p 2>/dev/null`
+ processor_flags=""
+ tune="generic"
+ 
+@@ -1183,7 +1184,7 @@
+ lamemp3="yes"
+ lirc="yes"
+ mac_bundle="no"
+-opengl="yes"
++opengl="no"
+ v4l="yes"
+ x11="yes"
+ x11_include_path="/usr/X11R6/include"
+@@ -1212,7 +1213,7 @@
+ # build settings
+ SHFLAGS='-shared -Wl,-soname,$@'
+ VHOOKSHFLAGS='$(SHFLAGS)'
+-LDLATEFLAGS='-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
++#LDLATEFLAGS='-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
+ FFSERVERLDFLAGS=-Wl,-E
+ LDCONFIG="ldconfig"
+ LIBPREF="lib"
+@@ -1707,7 +1708,7 @@
+ 
+ has_library()
+ {
+-    if test -f /etc/ld.so.conf ; then
++	if test -f /etc/ld.so.conf && disabled cross_compile ; then
+         LIBPATHS=`cat /etc/ld.so.conf | grep -v "#" | grep -v "include"`
+     else
+         LIBPATHS=''
+@@ -1718,7 +1719,7 @@
+     LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` "
+ 
+     # recurse down just one level, should be enough in most cases
+-    if test -f /etc/ld.so.conf ; then
++    if test -f /etc/ld.so.conf && disabled cross_compile ; then
+         INCL=`cat /etc/ld.so.conf | grep -v "#" | grep  "^include"`
+         SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'`
+         for x in $SRCH ; do
+@@ -1727,9 +1728,9 @@
+         done
+     fi
+ 
+-    LIBPATHS="`echo $LIBPATHS /$libdir_name /usr/$libdir_name /usr/local/$libdir_name /usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` "
++    enabled cross_compile || LIBPATHS="`echo $LIBPATHS /$libdir_name /usr/$libdir_name /usr/local/$libdir_name /usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` "
+ 
+-    HAS_IT="no"
++    HAS_IT="yes"
+     for LIBPATH in $LIBPATHS ; do
+         if test x`ls $LIBPATH/$1* 2> /dev/null | head -n 1` != x"" ; then
+             echo "$1  IS at $LIBPATH"
+@@ -1745,17 +1746,18 @@
+ 
+ has_header()
+ {
+-    HPATHS="/usr/local/include /usr/include /usr/include/g++-v3 /usr/X11R6/include"
++    enabled cross_compile || HPATHS="/usr/local/include /usr/include /usr/include/g++-v3 /usr/X11R6/include"
+     INCL=`echo $DYLD_LIBRARY_PATH $LD_LIBRARY_PATH | sed s/':'/' '/g`
+     HPATHS="$HPATHS "$(echo $INCL | sed "s/$libdir_name/include/g")
+ 
+-    HAS_IT="no"
++    HAS_IT="yes"
+     for HPATH in $HPATHS ; do
+         if test x`ls $HPATH/$1* 2> /dev/null | head -n 1` != x"" ; then
+             HAS_IT="yes"
+         fi
+     done
+-    expr $HAS_IT : "yes" > /dev/null
++    echo "$1: $HAS_IT"
++	expr $HAS_IT : "yes" > /dev/null
+ }
+ 
+ append CCONFIG "$compile_type"
+@@ -1861,13 +1863,15 @@
+ if test x"$cmov" = x"default"; then
+     disable cmov
+     if enabled cpu_override; then
+-        is_x86_cmov_cpu "$cpu" && enable cmov
++        disabled cross_compile && is_x86_cmov_cpu "$cpu" && enable cmov
+         disabled cmov || is_x86_slow_cmov_cpu "$cpu" || enable fast_cmov
+     elif expr "$processor_flags" : ".*cmov" > /dev/null ; then
+-        enable cmov
++        disabled cross_compile && enable cmov
+     fi
+ fi
+ 
++enabled cross_compile && disable cmov
++
+ # use different default ARCHFLAGS for CPU missing cmov (Via C3 ...)
+ if test x"$arch" = x"x86_32" && disabled cmov && disabled cpu_override; then
+     ARCHFLAGS="-march=i586"
+@@ -2239,7 +2243,7 @@
+ EOF
+ 
+ if $cc $CFLAGS $ECFLAGS -o $TMPE $TMPC 2>/dev/null ; then
+-$TMPE && cpuclipspositive="yes"
++enabled cross_compile || $TMPE && cpuclipspositive="yes"
+ fi
+ 
+ # test negative wrap
+@@ -2254,7 +2258,7 @@
+ EOF
+ 
+ if $cc $CFLAGS $ECFLAGS -o $TMPE $TMPC 2>/dev/null ; then
+-$TMPE && cpuclipsnegative="yes"
++enabled cross_compile || $TMPE && cpuclipsnegative="yes"
+ fi
+ 
+ # test for distcc
+@@ -2607,33 +2611,9 @@
+ check_ldflags -Wl,--warn-common
+ check_ldflags $LDLATEFLAGS
+ 
+-# GCC version
+-cat > $TMPC << EOF
+-int main(int argc, char **argv)
+-{
+-    int ret = 0;
+-    if (argc == 1)
+-    {
+-        #if defined(__GNUC__)
+-            ret = __GNUC__;
+-        #endif
+-    }
+-    else
+-    {
+-        #if defined(__GNUC_MINOR__)
+-            ret = __GNUC_MINOR__;
+-        #endif
+-    }
+-    return ret;
+-}
+-EOF
+-
+-if $cc $CFLAGS $TMPC -o $TMPE ; then
+-    $TMPE
+-    GCC_MAJOR=$?
+-    $TMPE "minor"
+-    GCC_MINOR=$?
+-fi
++gcc_version=$($cc -v 2>&1 | grep version | cut -s -d' ' -f 3) 
++GCC_MAJOR=$(echo ${gcc_version} | cut -s -d'.' -f1) 
++GCC_MINOR=$(echo ${gcc_version} | cut -s -d'.' -f2)
+ 
+ if enabled symbol_visibility; then
+     if test x"$GCC_MAJOR" = x"4" ; then
+@@ -2727,6 +2707,7 @@
+ 
+ check_header GL/gl.h
+ has_library libGL || has_library libopengl32 || disable opengl
++enabled cross_compile && disable opengl
+ 
+ VENDOR_XVMC_LIBS=""
+ check_header X11/extensions/XvMClib.h
diff --git a/packages/mythtv/mythtv-0.21/ffmpeg-arm-update.diff b/packages/mythtv/mythtv-0.21/ffmpeg-arm-update.diff
new file mode 100644
index 0000000000..d0e32eb512
--- /dev/null
+++ b/packages/mythtv/mythtv-0.21/ffmpeg-arm-update.diff
@@ -0,0 +1,1669 @@
+diff -Nurd mythtv.orig/libs/libavcodec/armv4l/dsputil_arm.c mythtv/libs/libavcodec/armv4l/dsputil_arm.c
+--- mythtv.orig/libs/libavcodec/armv4l/dsputil_arm.c	2008-07-23 12:19:05.000000000 +0200
++++ mythtv/libs/libavcodec/armv4l/dsputil_arm.c	2008-07-24 19:54:00.753198000 +0200
+@@ -19,12 +19,14 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+-#include "dsputil.h"
++#include "libavcodec/dsputil.h"
+ #ifdef HAVE_IPP
+-#include "ipp.h"
++#include <ipp.h>
+ #endif
+ 
+ extern void dsputil_init_iwmmxt(DSPContext* c, AVCodecContext *avctx);
++extern void ff_float_init_arm_vfp(DSPContext* c, AVCodecContext *avctx);
++extern void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx);
+ 
+ extern void j_rev_dct_ARM(DCTELEM *data);
+ extern void simple_idct_ARM(DCTELEM *data);
+@@ -41,6 +43,12 @@
+ extern void ff_simple_idct_add_armv6(uint8_t *dest, int line_size,
+                                      DCTELEM *data);
+ 
++extern void ff_simple_idct_neon(DCTELEM *data);
++extern void ff_simple_idct_put_neon(uint8_t *dest, int line_size,
++                                    DCTELEM *data);
++extern void ff_simple_idct_add_neon(uint8_t *dest, int line_size,
++                                    DCTELEM *data);
++
+ /* XXX: local hack */
+ static void (*ff_put_pixels_clamped)(const DCTELEM *block, uint8_t *pixels, int line_size);
+ static void (*ff_add_pixels_clamped)(const DCTELEM *block, uint8_t *pixels, int line_size);
+@@ -202,6 +210,24 @@
+ }
+ #endif
+ 
++#ifdef HAVE_ARMV5TE
++static void prefetch_arm(void *mem, int stride, int h)
++{
++    asm volatile(
++        "1:              \n\t"
++        "subs %0, %0, #1 \n\t"
++        "pld  [%1]       \n\t"
++        "add  %1, %1, %2 \n\t"
++        "bgt  1b         \n\t"
++        : "+r"(h), "+r"(mem) : "r"(stride));
++}
++#endif
++
++int mm_support(void)
++{
++    return ENABLE_IWMMXT * MM_IWMMXT;
++}
++
+ void dsputil_init_armv4l(DSPContext* c, AVCodecContext *avctx)
+ {
+     int idct_algo= avctx->idct_algo;
+@@ -209,49 +235,60 @@
+     ff_put_pixels_clamped = c->put_pixels_clamped;
+     ff_add_pixels_clamped = c->add_pixels_clamped;
+ 
+-    if(idct_algo == FF_IDCT_AUTO){
++    if (avctx->lowres == 0) {
++        if(idct_algo == FF_IDCT_AUTO){
+ #if defined(HAVE_IPP)
+-        idct_algo = FF_IDCT_IPP;
++            idct_algo = FF_IDCT_IPP;
++#elif defined(HAVE_NEON)
++            idct_algo = FF_IDCT_SIMPLENEON;
+ #elif defined(HAVE_ARMV6)
+-        idct_algo = FF_IDCT_SIMPLEARMV6;
++            idct_algo = FF_IDCT_SIMPLEARMV6;
+ #elif defined(HAVE_ARMV5TE)
+-        idct_algo = FF_IDCT_SIMPLEARMV5TE;
++            idct_algo = FF_IDCT_SIMPLEARMV5TE;
+ #else
+-        idct_algo = FF_IDCT_ARM;
++            idct_algo = FF_IDCT_ARM;
+ #endif
+-    }
++        }
+ 
+-    if(idct_algo==FF_IDCT_ARM){
+-        c->idct_put= j_rev_dct_ARM_put;
+-        c->idct_add= j_rev_dct_ARM_add;
+-        c->idct    = j_rev_dct_ARM;
+-        c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM;/* FF_NO_IDCT_PERM */
+-    } else if (idct_algo==FF_IDCT_SIMPLEARM){
+-        c->idct_put= simple_idct_ARM_put;
+-        c->idct_add= simple_idct_ARM_add;
+-        c->idct    = simple_idct_ARM;
+-        c->idct_permutation_type= FF_NO_IDCT_PERM;
++        if(idct_algo==FF_IDCT_ARM){
++            c->idct_put= j_rev_dct_ARM_put;
++            c->idct_add= j_rev_dct_ARM_add;
++            c->idct    = j_rev_dct_ARM;
++            c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM;/* FF_NO_IDCT_PERM */
++        } else if (idct_algo==FF_IDCT_SIMPLEARM){
++            c->idct_put= simple_idct_ARM_put;
++            c->idct_add= simple_idct_ARM_add;
++            c->idct    = simple_idct_ARM;
++            c->idct_permutation_type= FF_NO_IDCT_PERM;
+ #ifdef HAVE_ARMV6
+-    } else if (idct_algo==FF_IDCT_SIMPLEARMV6){
+-        c->idct_put= ff_simple_idct_put_armv6;
+-        c->idct_add= ff_simple_idct_add_armv6;
+-        c->idct    = ff_simple_idct_armv6;
+-        c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM;
++        } else if (idct_algo==FF_IDCT_SIMPLEARMV6){
++            c->idct_put= ff_simple_idct_put_armv6;
++            c->idct_add= ff_simple_idct_add_armv6;
++            c->idct    = ff_simple_idct_armv6;
++            c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM;
+ #endif
+ #ifdef HAVE_ARMV5TE
+-    } else if (idct_algo==FF_IDCT_SIMPLEARMV5TE){
+-        c->idct_put= simple_idct_put_armv5te;
+-        c->idct_add= simple_idct_add_armv5te;
+-        c->idct    = simple_idct_armv5te;
+-        c->idct_permutation_type = FF_NO_IDCT_PERM;
++        } else if (idct_algo==FF_IDCT_SIMPLEARMV5TE){
++            c->idct_put= simple_idct_put_armv5te;
++            c->idct_add= simple_idct_add_armv5te;
++            c->idct    = simple_idct_armv5te;
++            c->idct_permutation_type = FF_NO_IDCT_PERM;
+ #endif
+ #ifdef HAVE_IPP
+-    } else if (idct_algo==FF_IDCT_IPP){
+-        c->idct_put= simple_idct_ipp_put;
+-        c->idct_add= simple_idct_ipp_add;
+-        c->idct    = simple_idct_ipp;
+-        c->idct_permutation_type= FF_NO_IDCT_PERM;
++        } else if (idct_algo==FF_IDCT_IPP){
++            c->idct_put= simple_idct_ipp_put;
++            c->idct_add= simple_idct_ipp_add;
++            c->idct    = simple_idct_ipp;
++            c->idct_permutation_type= FF_NO_IDCT_PERM;
++#endif
++#ifdef HAVE_NEON
++        } else if (idct_algo==FF_IDCT_SIMPLENEON){
++            c->idct_put= ff_simple_idct_put_neon;
++            c->idct_add= ff_simple_idct_add_neon;
++            c->idct    = ff_simple_idct_neon;
++            c->idct_permutation_type = FF_NO_IDCT_PERM;
+ #endif
++        }
+     }
+ 
+     c->put_pixels_tab[0][0] = put_pixels16_arm;
+@@ -271,7 +308,17 @@
+     c->put_no_rnd_pixels_tab[1][2] = put_no_rnd_pixels8_y2_arm; //OK
+     c->put_no_rnd_pixels_tab[1][3] = put_no_rnd_pixels8_xy2_arm;
+ 
++#ifdef HAVE_ARMV5TE
++    c->prefetch = prefetch_arm;
++#endif
++
+ #ifdef HAVE_IWMMXT
+     dsputil_init_iwmmxt(c, avctx);
+ #endif
++#ifdef HAVE_ARMVFP
++    ff_float_init_arm_vfp(c, avctx);
++#endif
++#ifdef HAVE_NEON
++    ff_dsputil_init_neon(c, avctx);
++#endif
+ }
+diff -Nurd mythtv.orig/libs/libavcodec/armv4l/dsputil_arm_s.S mythtv/libs/libavcodec/armv4l/dsputil_arm_s.S
+--- mythtv.orig/libs/libavcodec/armv4l/dsputil_arm_s.S	2008-07-23 12:19:05.000000000 +0200
++++ mythtv/libs/libavcodec/armv4l/dsputil_arm_s.S	2008-07-24 19:54:00.753198000 +0200
+@@ -19,6 +19,13 @@
+ @ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ @
+ 
++#include "config.h"
++
++#ifndef HAVE_PLD
++.macro pld reg
++.endm
++#endif
++
+ .macro  ADJ_ALIGN_QUADWORD_D shift, Rd0, Rd1, Rd2, Rd3, Rn0, Rn1, Rn2, Rn3, Rn4
+         mov \Rd0, \Rn0, lsr #(\shift * 8)
+         mov \Rd1, \Rn1, lsr #(\shift * 8)
+diff -Nurd mythtv.orig/libs/libavcodec/armv4l/dsputil_iwmmxt.c mythtv/libs/libavcodec/armv4l/dsputil_iwmmxt.c
+--- mythtv.orig/libs/libavcodec/armv4l/dsputil_iwmmxt.c	2008-07-23 12:19:05.000000000 +0200
++++ mythtv/libs/libavcodec/armv4l/dsputil_iwmmxt.c	2008-07-24 19:54:00.753198000 +0200
+@@ -19,10 +19,10 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+-#include "dsputil.h"
++#include "libavcodec/dsputil.h"
+ 
+ #define DEF(x, y) x ## _no_rnd_ ## y ##_iwmmxt
+-#define SET_RND(regd)  __asm__ __volatile__ ("mov r12, #1 \n\t tbcsth " #regd ", r12":::"r12");
++#define SET_RND(regd)  asm volatile ("mov r12, #1 \n\t tbcsth " #regd ", r12":::"r12");
+ #define WAVG2B "wavg2b"
+ #include "dsputil_iwmmxt_rnd.h"
+ #undef DEF
+@@ -30,7 +30,7 @@
+ #undef WAVG2B
+ 
+ #define DEF(x, y) x ## _ ## y ##_iwmmxt
+-#define SET_RND(regd)  __asm__ __volatile__ ("mov r12, #2 \n\t tbcsth " #regd ", r12":::"r12");
++#define SET_RND(regd)  asm volatile ("mov r12, #2 \n\t tbcsth " #regd ", r12":::"r12");
+ #define WAVG2B "wavg2br"
+ #include "dsputil_iwmmxt_rnd.h"
+ #undef DEF
+@@ -89,7 +89,7 @@
+ {
+     uint8_t *pixels2 = pixels + line_size;
+ 
+-    __asm__ __volatile__ (
++    asm volatile (
+         "mov            r12, #4                 \n\t"
+         "1:                                     \n\t"
+         "pld            [%[pixels], %[line_size2]]              \n\t"
+@@ -125,7 +125,7 @@
+ 
+ static void clear_blocks_iwmmxt(DCTELEM *blocks)
+ {
+-    __asm __volatile(
++    asm volatile(
+                 "wzero wr0                      \n\t"
+                 "mov r1, #(128 * 6 / 32)        \n\t"
+                 "1:                             \n\t"
+diff -Nurd mythtv.orig/libs/libavcodec/armv4l/dsputil_iwmmxt_rnd.h mythtv/libs/libavcodec/armv4l/dsputil_iwmmxt_rnd.h
+--- mythtv.orig/libs/libavcodec/armv4l/dsputil_iwmmxt_rnd.h	2008-07-23 12:19:05.000000000 +0200
++++ mythtv/libs/libavcodec/armv4l/dsputil_iwmmxt_rnd.h	2008-07-24 19:54:01.023198000 +0200
+@@ -19,13 +19,14 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+-#ifndef FFMPEG_DSPUTIL_IWMMXT_RND_H
+-#define FFMPEG_DSPUTIL_IWMMXT_RND_H
++/* This header intentionally has no multiple inclusion guards. It is meant to
++ * be included multiple times and generates different code depending on the
++ * value of certain #defines. */
+ 
+ void DEF(put, pixels8)(uint8_t *block, const uint8_t *pixels, const int line_size, int h)
+ {
+     int stride = line_size;
+-    __asm__ __volatile__ (
++    asm volatile (
+         "and r12, %[pixels], #7 \n\t"
+         "bic %[pixels], %[pixels], #7 \n\t"
+         "tmcr wcgr1, r12 \n\t"
+@@ -59,7 +60,7 @@
+ void DEF(avg, pixels8)(uint8_t *block, const uint8_t *pixels, const int line_size, int h)
+ {
+     int stride = line_size;
+-    __asm__ __volatile__ (
++    asm volatile (
+         "and r12, %[pixels], #7 \n\t"
+         "bic %[pixels], %[pixels], #7 \n\t"
+         "tmcr wcgr1, r12 \n\t"
+@@ -101,7 +102,7 @@
+ void DEF(put, pixels16)(uint8_t *block, const uint8_t *pixels, const int line_size, int h)
+ {
+     int stride = line_size;
+-    __asm__ __volatile__ (
++    asm volatile (
+         "and r12, %[pixels], #7 \n\t"
+         "bic %[pixels], %[pixels], #7 \n\t"
+         "tmcr wcgr1, r12 \n\t"
+@@ -141,7 +142,7 @@
+ void DEF(avg, pixels16)(uint8_t *block, const uint8_t *pixels, const int line_size, int h)
+ {
+     int stride = line_size;
+-    __asm__ __volatile__ (
++    asm volatile (
+         "pld [%[pixels]]                \n\t"
+         "pld [%[pixels], #32]           \n\t"
+         "pld [%[block]]                 \n\t"
+@@ -200,7 +201,7 @@
+     // [wr0 wr1 wr2 wr3] for previous line
+     // [wr4 wr5 wr6 wr7] for current line
+     SET_RND(wr15); // =2 for rnd  and  =1 for no_rnd version
+-    __asm__ __volatile__(
++    asm volatile(
+         "pld [%[pixels]]                \n\t"
+         "pld [%[pixels], #32]           \n\t"
+         "and r12, %[pixels], #7         \n\t"
+@@ -249,7 +250,7 @@
+     // [wr0 wr1 wr2 wr3] for previous line
+     // [wr4 wr5 wr6 wr7] for current line
+     SET_RND(wr15); // =2 for rnd  and  =1 for no_rnd version
+-    __asm__ __volatile__(
++    asm volatile(
+         "pld [%[pixels]]                \n\t"
+         "pld [%[pixels], #32]           \n\t"
+         "and r12, %[pixels], #7         \n\t"
+@@ -310,7 +311,7 @@
+     // [wr0 wr1 wr2 wr3] for previous line
+     // [wr4 wr5 wr6 wr7] for current line
+     SET_RND(wr15); // =2 for rnd  and  =1 for no_rnd version
+-    __asm__ __volatile__(
++    asm volatile(
+         "pld [%[pixels]]                \n\t"
+         "pld [%[pixels], #32]           \n\t"
+         "pld [%[block]]                 \n\t"
+@@ -371,7 +372,7 @@
+     // [wr0 wr1 wr2 wr3] for previous line
+     // [wr4 wr5 wr6 wr7] for current line
+     SET_RND(wr15); // =2 for rnd  and  =1 for no_rnd version
+-    __asm__ __volatile__(
++    asm volatile(
+         "pld [%[pixels]]                \n\t"
+         "pld [%[pixels], #32]           \n\t"
+         "pld [%[block]]                 \n\t"
+@@ -447,7 +448,7 @@
+     int stride = line_size;
+     // [wr0 wr1 wr2 wr3] for previous line
+     // [wr4 wr5 wr6 wr7] for current line
+-    __asm__ __volatile__(
++    asm volatile(
+         "pld            [%[pixels]]                             \n\t"
+         "pld            [%[pixels], #32]                        \n\t"
+         "and            r12, %[pixels], #7                      \n\t"
+@@ -501,7 +502,7 @@
+     int stride = line_size;
+     // [wr0 wr1 wr2 wr3] for previous line
+     // [wr4 wr5 wr6 wr7] for current line
+-    __asm__ __volatile__(
++    asm volatile(
+         "pld [%[pixels]]                \n\t"
+         "pld [%[pixels], #32]           \n\t"
+         "and r12, %[pixels], #7         \n\t"
+@@ -558,7 +559,7 @@
+     int stride = line_size;
+     // [wr0 wr1 wr2 wr3] for previous line
+     // [wr4 wr5 wr6 wr7] for current line
+-    __asm__ __volatile__(
++    asm volatile(
+         "pld [%[pixels]]                \n\t"
+         "pld [%[pixels], #32]           \n\t"
+         "and r12, %[pixels], #7         \n\t"
+@@ -626,7 +627,7 @@
+     // [wr0 wr1 wr2 wr3] for previous line
+     // [wr4 wr5 wr6 wr7] for current line
+     SET_RND(wr15); // =2 for rnd  and  =1 for no_rnd version
+-    __asm__ __volatile__(
++    asm volatile(
+         "pld [%[pixels]]                \n\t"
+         "mov r12, #2                    \n\t"
+         "pld [%[pixels], #32]           \n\t"
+@@ -720,7 +721,7 @@
+     // [wr0 wr1 wr2 wr3] for previous line
+     // [wr4 wr5 wr6 wr7] for current line
+     SET_RND(wr15); // =2 for rnd  and  =1 for no_rnd version
+-    __asm__ __volatile__(
++    asm volatile(
+         "pld [%[pixels]]                \n\t"
+         "mov r12, #2                    \n\t"
+         "pld [%[pixels], #32]           \n\t"
+@@ -862,7 +863,7 @@
+     // [wr0 wr1 wr2 wr3] for previous line
+     // [wr4 wr5 wr6 wr7] for current line
+     SET_RND(wr15); // =2 for rnd  and  =1 for no_rnd version
+-    __asm__ __volatile__(
++    asm volatile(
+         "pld [%[block]]                 \n\t"
+         "pld [%[block], #32]            \n\t"
+         "pld [%[pixels]]                \n\t"
+@@ -966,7 +967,7 @@
+     // [wr0 wr1 wr2 wr3] for previous line
+     // [wr4 wr5 wr6 wr7] for current line
+     SET_RND(wr15); // =2 for rnd  and  =1 for no_rnd version
+-    __asm__ __volatile__(
++    asm volatile(
+         "pld [%[block]]                 \n\t"
+         "pld [%[block], #32]            \n\t"
+         "pld [%[pixels]]                \n\t"
+@@ -1115,5 +1116,3 @@
+         : [line_size]"r"(line_size)
+         : "r12", "memory");
+ }
+-
+-#endif /* FFMPEG_DSPUTIL_IWMMXT_RND_H */
+diff -Nurd mythtv.orig/libs/libavcodec/armv4l/dsputil_neon.c mythtv/libs/libavcodec/armv4l/dsputil_neon.c
+--- mythtv.orig/libs/libavcodec/armv4l/dsputil_neon.c	1970-01-01 01:00:00.000000000 +0100
++++ mythtv/libs/libavcodec/armv4l/dsputil_neon.c	2008-07-24 19:54:01.023198000 +0200
+@@ -0,0 +1,397 @@
++/*
++ * ARM NEON optimised DSP functions
++ * Copyright (c) 2008 Mans Rullgard <mans@mansr.com>
++ *
++ * This file is part of FFmpeg.
++ *
++ * FFmpeg is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * FFmpeg is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with FFmpeg; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ */
++
++#include <stdint.h>
++
++#include "libavcodec/avcodec.h"
++#include "libavcodec/dsputil.h"
++
++extern void ff_put_h264_chroma_mc8_neon(uint8_t *dst, uint8_t *src, int stride,
++                                        int h, int x, int y);
++
++#define PUT_PIXELS_16_X2(vhadd)                                 \
++        "1:                                          \n\t"      \
++        "vld1.64   {d0,d1,d2}, [%[p]], %[line_size]  \n\t"      \
++        "vld1.64   {d4,d5,d6}, [%[p]], %[line_size]  \n\t"      \
++        "pld       [%[p]]                            \n\t"      \
++        "subs      %[h], %[h], #2                    \n\t"      \
++        "vext.8    q1, q0, q1, #1                    \n\t"      \
++        "vext.8    q3, q2, q3, #1                    \n\t"      \
++         vhadd".u8 q0, q0, q1                        \n\t"      \
++         vhadd".u8 q2, q2, q3                        \n\t"      \
++        "vst1.64   {d0,d1}, [%[b],:64], %[line_size] \n\t"      \
++        "vst1.64   {d4,d5}, [%[b],:64], %[line_size] \n\t"      \
++        "bne       1b                                \n\t"
++
++#define PUT_PIXELS_16_Y2(vhadd)                                 \
++        "add       %[p1], %[p0], %[line_size]         \n\t"     \
++        "lsl       %[l2], %[line_size], #1            \n\t"     \
++        "vld1.64   {d0,d1}, [%[p0]], %[l2]            \n\t"     \
++        "vld1.64   {d2,d3}, [%[p1]], %[l2]            \n\t"     \
++        "1:                                           \n\t"     \
++        "subs      %[h], %[h], #2                     \n\t"     \
++         vhadd".u8 q2, q0, q1                         \n\t"     \
++        "vst1.64   {d4,d5}, [%[b],:128], %[line_size] \n\t"     \
++        "vld1.64   {d0,d1}, [%[p0]],     %[l2]        \n\t"     \
++         vhadd".u8 q2, q0, q1                         \n\t"     \
++        "vst1.64   {d4,d5}, [%[b],:128], %[line_size] \n\t"     \
++        "vld1.64   {d2,d3}, [%[p1]],     %[l2]        \n\t"     \
++        "bne 1b                                       \n\t"
++
++#define PUT_PIXELS_16_XY2(vshrn, no_rnd)                        \
++        "lsl        %[l2], %[line_size], #1              \n\t"  \
++        "add        %[p1], %[p0], %[line_size]           \n\t"  \
++        "vld1.64    {d0,d1,d2}, [%[p0]], %[l2]           \n\t"  \
++        "vld1.64    {d4,d5,d6}, [%[p1]], %[l2]           \n\t"  \
++        "pld        [%[p0]]                              \n\t"  \
++        "pld        [%[p1]]                              \n\t"  \
++        "vext.8     q1,  q0, q1, #1                      \n\t"  \
++        "vext.8     q3,  q2, q3, #1                      \n\t"  \
++        "vaddl.u8   q8,  d0, d2                          \n\t"  \
++        "vaddl.u8   q10, d1, d3                          \n\t"  \
++        "vaddl.u8   q9,  d4, d6                          \n\t"  \
++        "vaddl.u8   q11, d5, d7                          \n\t"  \
++        "1:                                              \n\t"  \
++        "subs       %[h], %[h], #2                       \n\t"  \
++        "vld1.64    {d0,d1,d2}, [%[p0]], %[l2]           \n\t"  \
++        "vadd.u16   q12, q8, q9                          \n\t"  \
++        "pld        [%[p0]]                              \n\t"  \
++ no_rnd "vadd.u16   q12, q12, q13                        \n\t"  \
++        "vext.8     q15, q0, q1, #1                      \n\t"  \
++        "vadd.u16   q1, q10, q11                         \n\t"  \
++         vshrn".u16 d28, q12, #2                         \n\t"  \
++ no_rnd "vadd.u16   q1, q1, q13                          \n\t"  \
++         vshrn".u16 d29, q1, #2                          \n\t"  \
++        "vaddl.u8   q8, d0, d30                          \n\t"  \
++        "vld1.64    {d2,d3,d4}, [%[p1]], %[l2]           \n\t"  \
++        "vaddl.u8   q10, d1, d31                         \n\t"  \
++        "vst1.64    {d28,d29}, [%[b],:128], %[line_size] \n\t"  \
++        "vadd.u16   q12, q8, q9                          \n\t"  \
++        "pld        [%[p1]]                              \n\t"  \
++ no_rnd "vadd.u16   q12, q12, q13                        \n\t"  \
++        "vext.8     q2, q1, q2, #1                       \n\t"  \
++        "vadd.u16   q0, q10, q11                         \n\t"  \
++         vshrn".u16 d30, q12, #2                         \n\t"  \
++ no_rnd "vadd.u16   q0, q0, q13                          \n\t"  \
++         vshrn".u16 d31, q0, #2                          \n\t"  \
++        "vaddl.u8   q9, d2, d4                           \n\t"  \
++        "vst1.64    {d30,d31}, [%[b],:128], %[line_size] \n\t"  \
++        "vaddl.u8   q11, d3, d5                          \n\t"  \
++        "bgt     1b                                      \n\t"
++
++#define PUT_PIXELS_8_X2(vhadd)                          \
++        "1:                                       \n\t" \
++        "vld1.64   {d0,d1}, [%[p]], %[line_size]  \n\t" \
++        "vld1.64   {d2,d3}, [%[p]], %[line_size]  \n\t" \
++        "pld       [%[p]]                         \n\t" \
++        "subs      %[h], %[h], #2                 \n\t" \
++        "vext.8    d1, d0, d1, #1                 \n\t" \
++        "vext.8    d3, d2, d3, #1                 \n\t" \
++        "vswp      d1, d2                         \n\t" \
++         vhadd".u8 q0, q0, q1                     \n\t" \
++        "vst1.64   {d0}, [%[b],:64], %[line_size] \n\t" \
++        "vst1.64   {d1}, [%[b],:64], %[line_size] \n\t" \
++        "bne       1b                             \n\t"
++
++#define PUT_PIXELS_8_Y2(vhadd)                          \
++        "add       %[p1], %[p0], %[line_size]     \n\t" \
++        "lsl       %[l2], %[line_size], #1        \n\t" \
++        "vld1.64   {d0}, [%[p0]], %[l2]           \n\t" \
++        "vld1.64   {d1}, [%[p1]], %[l2]           \n\t" \
++        "1:                                       \n\t" \
++        "subs      %[h], %[h], #2                 \n\t" \
++         vhadd".u8 d4, d0, d1                     \n\t" \
++        "vst1.64   {d4}, [%[b],:64], %[line_size] \n\t" \
++        "vld1.64   {d0}, [%[p0]],    %[l2]        \n\t" \
++         vhadd".u8 d4, d0, d1                     \n\t" \
++        "vst1.64   {d4}, [%[b],:64], %[line_size] \n\t" \
++        "vld1.64   {d1}, [%[p1]],     %[l2]       \n\t" \
++        "bne 1b                                   \n\t"
++
++#define PUT_PIXELS8_XY2(vshrn, no_rnd)                          \
++        "lsl        %[l2],   %[line_size], #1       \n\t"       \
++        "add        %[p1],   %[p0], %[line_size]    \n\t"       \
++        "vld1.64    {d0,d1}, [%[p0]], %[l2]         \n\t"       \
++        "vld1.64    {d2,d3}, [%[p1]], %[l2]         \n\t"       \
++        "pld        [%[p0]]                         \n\t"       \
++        "pld        [%[p1]]                         \n\t"       \
++        "vext.8     d4, d0, d1, #1                  \n\t"       \
++        "vext.8     d6, d2, d3, #1                  \n\t"       \
++        "vaddl.u8   q8, d0, d4                      \n\t"       \
++        "vaddl.u8   q9, d2, d6                      \n\t"       \
++        "1:                                         \n\t"       \
++        "subs       %[h], %[h], #2                  \n\t"       \
++        "vld1.64    {d0,d1}, [%[p0]], %[l2]         \n\t"       \
++        "pld        [%[p0]]                         \n\t"       \
++        "vadd.u16   q10, q8, q9                     \n\t"       \
++        "vext.8     d4, d0, d1, #1                  \n\t"       \
++ no_rnd "vadd.u16   q10, q10, q11                   \n\t"       \
++        "vaddl.u8   q8, d0, d4                      \n\t"       \
++         vshrn".u16 d5, q10, #2                     \n\t"       \
++        "vld1.64    {d2,d3}, [%[p1]], %[l2]         \n\t"       \
++        "vadd.u16   q10, q8, q9                     \n\t"       \
++        "pld        [%[p1]]                         \n\t"       \
++ no_rnd "vadd.u16   q10, q10, q11                   \n\t"       \
++        "vst1.64    {d5}, [%[b],:64], %[line_size]  \n\t"       \
++         vshrn".u16 d7, q10, #2                     \n\t"       \
++        "vext.8     d6, d2, d3, #1                  \n\t"       \
++        "vaddl.u8   q9, d2, d6                      \n\t"       \
++        "vst1.64    {d7}, [%[b],:64], %[line_size]  \n\t"       \
++        "bgt     1b                                 \n\t"
++
++static void put_pixels16_neon(uint8_t *block, const uint8_t *pixels,
++                              int line_size, int h)
++{
++    asm volatile(
++        "1:                                         \n\t"
++        "vld1.64 {d0,d1}, [%[pixels]], %[line_size] \n\t"
++        "vld1.64 {d2,d3}, [%[pixels]], %[line_size] \n\t"
++        "vld1.64 {d4,d5}, [%[pixels]], %[line_size] \n\t"
++        "vld1.64 {d6,d7}, [%[pixels]], %[line_size] \n\t"
++        "pld     [%[pixels]]                        \n\t"
++        "subs    %[h], %[h], #4                     \n\t"
++        "vst1.64 {d0,d1}, [%[block],:128], %[line_size]  \n\t"
++        "vst1.64 {d2,d3}, [%[block],:128], %[line_size]  \n\t"
++        "vst1.64 {d4,d5}, [%[block],:128], %[line_size]  \n\t"
++        "vst1.64 {d6,d7}, [%[block],:128], %[line_size]  \n\t"
++        "bne     1b                                 \n\t"
++        : [block]"+r"(block), [pixels]"+r"(pixels), [h]"+r"(h)
++        : [line_size]"r"(line_size)
++        : "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7", "memory");
++}
++
++static void put_pixels16_x2_neon(uint8_t *block, const uint8_t *pixels,
++                                 int line_size, int h)
++{
++    asm volatile(
++        PUT_PIXELS_16_X2("vrhadd")
++        : [b]"+r"(block), [p]"+r"(pixels), [h]"+r"(h)
++        : [line_size]"r"(line_size)
++        : "d0", "d1", "d2", "d3", "d4", "d5", "d6", "memory");
++}
++
++static void put_pixels16_y2_neon(uint8_t *block, const uint8_t *pixels,
++                                 int line_size, int h)
++{
++    const uint8_t *p1;
++    int l2;
++
++    asm volatile(
++        PUT_PIXELS_16_Y2("vrhadd")
++        : [b]"+r"(block), [p0]"+r"(pixels), [p1]"=&r"(p1), [h]"+r"(h),
++          [l2]"=&r"(l2)
++        : [line_size]"r"(line_size)
++        : "d0", "d1", "d2", "d3", "d4", "d5", "memory");
++}
++
++static void put_pixels16_xy2_neon(uint8_t *block, const uint8_t *pixels,
++                                  int line_size, int h)
++{
++    const uint8_t *p1;
++    int l2;
++
++    asm volatile(
++        PUT_PIXELS_16_XY2("vrshrn", "@")
++        : [b]"+r"(block),
++          [p0]"+r"(pixels),
++          [p1]"=&r"(p1), [h]"+r"(h),
++          [l2]"=&r"(l2)
++        : [line_size]"r"(line_size)
++        : "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7",
++          "d28", "d29", "d30", "d31",
++          "q8", "q9", "q10", "q11", "q12", "memory");
++}
++
++static void put_pixels8_neon(uint8_t *block, const uint8_t *pixels,
++                             int line_size, int h)
++{
++    asm volatile(
++        "1:                                 \n\t"
++        "vld1.64 {d0}, [%[p]], %[line_size] \n\t"
++        "vld1.64 {d1}, [%[p]], %[line_size] \n\t"
++        "vld1.64 {d2}, [%[p]], %[line_size] \n\t"
++        "vld1.64 {d3}, [%[p]], %[line_size] \n\t"
++        "subs    %[h], %[h], #4             \n\t"
++        "vst1.64 {d0}, [%[b],:64], %[line_size] \n\t"
++        "vst1.64 {d1}, [%[b],:64], %[line_size] \n\t"
++        "vst1.64 {d2}, [%[b],:64], %[line_size] \n\t"
++        "vst1.64 {d3}, [%[b],:64], %[line_size] \n\t"
++        "bne     1b                         \n\t"
++        : [b]"+r"(block), [p]"+r"(pixels), [h]"+r"(h)
++        : [line_size]"r"(line_size)
++        : "d0", "d1", "d2", "d3", "memory");
++}
++
++static void put_pixels8_x2_neon(uint8_t *block, const uint8_t *pixels,
++                                int line_size, int h)
++{
++    asm volatile(
++        PUT_PIXELS_8_X2("vrhadd")
++        : [b]"+r"(block), [p]"+r"(pixels), [h]"+r"(h)
++        : [line_size]"r"(line_size)
++        : "d0", "d1", "d2", "d3", "memory");
++}
++
++static void put_pixels8_y2_neon(uint8_t *block, const uint8_t *pixels,
++                                int line_size, int h)
++{
++    const uint8_t *p1;
++    int l2;
++
++    asm volatile(
++        PUT_PIXELS_8_Y2("vrhadd")
++        : [b]"+r"(block), [p0]"+r"(pixels), [p1]"=&r"(p1), [h]"+r"(h),
++          [l2]"=&r"(l2)
++        : [line_size]"r"(line_size)
++        : "d0", "d1", "d4", "memory");
++}
++
++static void put_pixels8_xy2_neon(uint8_t *block, const uint8_t *pixels,
++                                 int line_size, int h)
++{
++    const uint8_t *p1;
++    int l2;
++
++    asm volatile(
++        PUT_PIXELS8_XY2("vrshrn", "@")
++        : [b]"+r"(block),
++          [p0]"+r"(pixels),
++          [p1]"=&r"(p1), [h]"+r"(h),
++          [l2]"=&r"(l2)
++        : [line_size]"r"(line_size)
++        : "d0", "d1", "d2", "d3", "d4", "d6", "d7",
++          "q8", "q9", "q10", "memory");
++}
++
++static void put_no_rnd_pixels16_x2_neon(uint8_t *block, const uint8_t *pixels,
++                                        int line_size, int h)
++{
++    asm volatile(
++        PUT_PIXELS_16_X2("vhadd")
++        : [b]"+r"(block), [p]"+r"(pixels), [h]"+r"(h)
++        : [line_size]"r"(line_size)
++        : "d0", "d1", "d2", "d3", "d4", "d5", "d6", "memory");
++}
++
++static void put_no_rnd_pixels16_y2_neon(uint8_t *block, const uint8_t *pixels,
++                                        int line_size, int h)
++{
++    const uint8_t *p1;
++    int l2;
++
++    asm volatile(
++        PUT_PIXELS_16_Y2("vhadd")
++        : [b]"+r"(block), [p0]"+r"(pixels), [p1]"=&r"(p1), [h]"+r"(h),
++          [l2]"=&r"(l2)
++        : [line_size]"r"(line_size)
++        : "d0", "d1", "d2", "d3", "d4", "d5", "memory");
++}
++
++static void put_no_rnd_pixels16_xy2_neon(uint8_t *block, const uint8_t *pixels,
++                                         int line_size, int h)
++{
++    const uint8_t *p1;
++    int l2;
++
++    asm volatile(
++        "vmov.i16   q13, #1                         \n\t"
++        PUT_PIXELS_16_XY2("vshrn", "")
++        : [b]"+r"(block),
++          [p0]"+r"(pixels),
++          [p1]"=&r"(p1), [h]"+r"(h),
++          [l2]"=&r"(l2)
++        : [line_size]"r"(line_size)
++        : "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7",
++          "d28", "d29", "d30", "d31",
++          "q8", "q9", "q10", "q11", "q12", "q13", "memory");
++}
++
++static void put_no_rnd_pixels8_x2_neon(uint8_t *block, const uint8_t *pixels,
++                                       int line_size, int h)
++{
++    asm volatile(
++        PUT_PIXELS_8_X2("vhadd")
++        : [b]"+r"(block), [p]"+r"(pixels), [h]"+r"(h)
++        : [line_size]"r"(line_size)
++        : "d0", "d1", "d2", "d3", "memory");
++}
++
++static void put_no_rnd_pixels8_y2_neon(uint8_t *block, const uint8_t *pixels,
++                                       int line_size, int h)
++{
++    const uint8_t *p1;
++    int l2;
++
++    asm volatile(
++        PUT_PIXELS_8_Y2("vhadd")
++        : [b]"+r"(block), [p0]"+r"(pixels), [p1]"=&r"(p1), [h]"+r"(h),
++          [l2]"=&r"(l2)
++        : [line_size]"r"(line_size)
++        : "d0", "d1", "d4", "memory");
++}
++
++static void put_no_rnd_pixels8_xy2_neon(uint8_t *block, const uint8_t *pixels,
++                                        int line_size, int h)
++{
++    const uint8_t *p1;
++    int l2;
++
++    asm volatile(
++        "vmov.i16   q11, #1                         \n\t"
++        PUT_PIXELS8_XY2("vshrn", "")
++        : [b]"+r"(block),
++          [p0]"+r"(pixels),
++          [p1]"=&r"(p1), [h]"+r"(h),
++          [l2]"=&r"(l2)
++        : [line_size]"r"(line_size)
++        : "d0", "d1", "d2", "d3", "d4", "d6", "d7",
++          "q8", "q9", "q10", "q11", "memory");
++}
++
++static void put_h264_qpel16_mc00_neon(uint8_t *dst, uint8_t *src, int stride)
++{
++    put_pixels16_neon(dst, src, stride, 16);
++}
++
++void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx)
++{
++    c->put_pixels_tab[0][0] = put_pixels16_neon;
++    c->put_pixels_tab[0][1] = put_pixels16_x2_neon;
++    c->put_pixels_tab[0][2] = put_pixels16_y2_neon;
++    c->put_pixels_tab[0][3] = put_pixels16_xy2_neon;
++    c->put_pixels_tab[1][0] = put_pixels8_neon;
++    c->put_pixels_tab[1][1] = put_pixels8_x2_neon;
++    c->put_pixels_tab[1][2] = put_pixels8_y2_neon;
++    c->put_pixels_tab[1][3] = put_pixels8_xy2_neon;
++
++    c->put_no_rnd_pixels_tab[0][0] = put_pixels16_neon;
++    c->put_no_rnd_pixels_tab[0][1] = put_no_rnd_pixels16_x2_neon;
++    c->put_no_rnd_pixels_tab[0][2] = put_no_rnd_pixels16_y2_neon;
++    c->put_no_rnd_pixels_tab[0][3] = put_no_rnd_pixels16_xy2_neon;
++    c->put_no_rnd_pixels_tab[1][0] = put_pixels8_neon;
++    c->put_no_rnd_pixels_tab[1][1] = put_no_rnd_pixels8_x2_neon;
++    c->put_no_rnd_pixels_tab[1][2] = put_no_rnd_pixels8_y2_neon;
++    c->put_no_rnd_pixels_tab[1][3] = put_no_rnd_pixels8_xy2_neon;
++
++    c->put_h264_chroma_pixels_tab[0] = ff_put_h264_chroma_mc8_neon;
++
++    c->put_h264_qpel_pixels_tab[0][0] = put_h264_qpel16_mc00_neon;
++}
+diff -Nurd mythtv.orig/libs/libavcodec/armv4l/float_arm_vfp.c mythtv/libs/libavcodec/armv4l/float_arm_vfp.c
+--- mythtv.orig/libs/libavcodec/armv4l/float_arm_vfp.c	1970-01-01 01:00:00.000000000 +0100
++++ mythtv/libs/libavcodec/armv4l/float_arm_vfp.c	2008-07-24 19:54:01.023198000 +0200
+@@ -0,0 +1,208 @@
++/*
++ * Copyright (c) 2008 Siarhei Siamashka <ssvb@users.sourceforge.net>
++ *
++ * This file is part of FFmpeg.
++ *
++ * FFmpeg is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * FFmpeg is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with FFmpeg; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ */
++
++#include "libavcodec/dsputil.h"
++
++/*
++ * VFP is a floating point coprocessor used in some ARM cores. VFP11 has 1 cycle
++ * throughput for almost all the instructions (except for double precision
++ * arithmetics), but rather high latency. Latency is 4 cycles for loads and 8 cycles
++ * for arithmetic operations. Scheduling code to avoid pipeline stalls is very
++ * important for performance. One more interesting feature is that VFP has
++ * independent load/store and arithmetics pipelines, so it is possible to make
++ * them work simultaneously and get more than 1 operation per cycle. Load/store
++ * pipeline can process 2 single precision floating point values per cycle and
++ * supports bulk loads and stores for large sets of registers. Arithmetic operations
++ * can be done on vectors, which allows to keep the arithmetics pipeline busy,
++ * while the processor may issue and execute other instructions. Detailed
++ * optimization manuals can be found at http://www.arm.com
++ */
++
++/**
++ * ARM VFP optimized implementation of 'vector_fmul_c' function.
++ * Assume that len is a positive number and is multiple of 8
++ */
++static void vector_fmul_vfp(float *dst, const float *src, int len)
++{
++    int tmp;
++    asm volatile(
++        "fmrx       %[tmp], fpscr\n\t"
++        "orr        %[tmp], %[tmp], #(3 << 16)\n\t" /* set vector size to 4 */
++        "fmxr       fpscr, %[tmp]\n\t"
++
++        "fldmias    %[dst_r]!, {s0-s3}\n\t"
++        "fldmias    %[src]!, {s8-s11}\n\t"
++        "fldmias    %[dst_r]!, {s4-s7}\n\t"
++        "fldmias    %[src]!, {s12-s15}\n\t"
++        "fmuls      s8, s0, s8\n\t"
++    "1:\n\t"
++        "subs       %[len], %[len], #16\n\t"
++        "fmuls      s12, s4, s12\n\t"
++        "fldmiasge  %[dst_r]!, {s16-s19}\n\t"
++        "fldmiasge  %[src]!, {s24-s27}\n\t"
++        "fldmiasge  %[dst_r]!, {s20-s23}\n\t"
++        "fldmiasge  %[src]!, {s28-s31}\n\t"
++        "fmulsge    s24, s16, s24\n\t"
++        "fstmias    %[dst_w]!, {s8-s11}\n\t"
++        "fstmias    %[dst_w]!, {s12-s15}\n\t"
++        "fmulsge    s28, s20, s28\n\t"
++        "fldmiasgt  %[dst_r]!, {s0-s3}\n\t"
++        "fldmiasgt  %[src]!, {s8-s11}\n\t"
++        "fldmiasgt  %[dst_r]!, {s4-s7}\n\t"
++        "fldmiasgt  %[src]!, {s12-s15}\n\t"
++        "fmulsge    s8, s0, s8\n\t"
++        "fstmiasge  %[dst_w]!, {s24-s27}\n\t"
++        "fstmiasge  %[dst_w]!, {s28-s31}\n\t"
++        "bgt        1b\n\t"
++
++        "bic        %[tmp], %[tmp], #(7 << 16)\n\t" /* set vector size back to 1 */
++        "fmxr       fpscr, %[tmp]\n\t"
++        : [dst_w] "+&r" (dst), [dst_r] "+&r" (dst), [src] "+&r" (src), [len] "+&r" (len), [tmp] "=&r" (tmp)
++        :
++        : "s0",  "s1",  "s2",  "s3",  "s4",  "s5",  "s6",  "s7",
++          "s8",  "s9",  "s10", "s11", "s12", "s13", "s14", "s15",
++          "s16", "s17", "s18", "s19", "s20", "s21", "s22", "s23",
++          "s24", "s25", "s26", "s27", "s28", "s29", "s30", "s31",
++          "cc", "memory");
++}
++
++/**
++ * ARM VFP optimized implementation of 'vector_fmul_reverse_c' function.
++ * Assume that len is a positive number and is multiple of 8
++ */
++static void vector_fmul_reverse_vfp(float *dst, const float *src0, const float *src1, int len)
++{
++    src1 += len;
++    asm volatile(
++        "fldmdbs    %[src1]!, {s0-s3}\n\t"
++        "fldmias    %[src0]!, {s8-s11}\n\t"
++        "fldmdbs    %[src1]!, {s4-s7}\n\t"
++        "fldmias    %[src0]!, {s12-s15}\n\t"
++        "fmuls      s8, s3, s8\n\t"
++        "fmuls      s9, s2, s9\n\t"
++        "fmuls      s10, s1, s10\n\t"
++        "fmuls      s11, s0, s11\n\t"
++    "1:\n\t"
++        "subs       %[len], %[len], #16\n\t"
++        "fldmdbsge  %[src1]!, {s16-s19}\n\t"
++        "fmuls      s12, s7, s12\n\t"
++        "fldmiasge  %[src0]!, {s24-s27}\n\t"
++        "fmuls      s13, s6, s13\n\t"
++        "fldmdbsge  %[src1]!, {s20-s23}\n\t"
++        "fmuls      s14, s5, s14\n\t"
++        "fldmiasge  %[src0]!, {s28-s31}\n\t"
++        "fmuls      s15, s4, s15\n\t"
++        "fmulsge    s24, s19, s24\n\t"
++        "fldmdbsgt  %[src1]!, {s0-s3}\n\t"
++        "fmulsge    s25, s18, s25\n\t"
++        "fstmias    %[dst]!, {s8-s13}\n\t"
++        "fmulsge    s26, s17, s26\n\t"
++        "fldmiasgt  %[src0]!, {s8-s11}\n\t"
++        "fmulsge    s27, s16, s27\n\t"
++        "fmulsge    s28, s23, s28\n\t"
++        "fldmdbsgt  %[src1]!, {s4-s7}\n\t"
++        "fmulsge    s29, s22, s29\n\t"
++        "fstmias    %[dst]!, {s14-s15}\n\t"
++        "fmulsge    s30, s21, s30\n\t"
++        "fmulsge    s31, s20, s31\n\t"
++        "fmulsge    s8, s3, s8\n\t"
++        "fldmiasgt  %[src0]!, {s12-s15}\n\t"
++        "fmulsge    s9, s2, s9\n\t"
++        "fmulsge    s10, s1, s10\n\t"
++        "fstmiasge  %[dst]!, {s24-s27}\n\t"
++        "fmulsge    s11, s0, s11\n\t"
++        "fstmiasge  %[dst]!, {s28-s31}\n\t"
++        "bgt        1b\n\t"
++
++        : [dst] "+&r" (dst), [src0] "+&r" (src0), [src1] "+&r" (src1), [len] "+&r" (len)
++        :
++        : "s0",  "s1",  "s2",  "s3",  "s4",  "s5",  "s6",  "s7",
++          "s8",  "s9",  "s10", "s11", "s12", "s13", "s14", "s15",
++          "s16", "s17", "s18", "s19", "s20", "s21", "s22", "s23",
++          "s24", "s25", "s26", "s27", "s28", "s29", "s30", "s31",
++          "cc", "memory");
++}
++
++#ifdef HAVE_ARMV6
++/**
++ * ARM VFP optimized float to int16 conversion.
++ * Assume that len is a positive number and is multiple of 8, destination
++ * buffer is at least 4 bytes aligned (8 bytes alignment is better for
++ * performance), little endian byte sex
++ */
++void float_to_int16_vfp(int16_t *dst, const float *src, int len)
++{
++    asm volatile(
++        "fldmias    %[src]!, {s16-s23}\n\t"
++        "ftosis     s0, s16\n\t"
++        "ftosis     s1, s17\n\t"
++        "ftosis     s2, s18\n\t"
++        "ftosis     s3, s19\n\t"
++        "ftosis     s4, s20\n\t"
++        "ftosis     s5, s21\n\t"
++        "ftosis     s6, s22\n\t"
++        "ftosis     s7, s23\n\t"
++    "1:\n\t"
++        "subs       %[len], %[len], #8\n\t"
++        "fmrrs      r3, r4, {s0, s1}\n\t"
++        "fmrrs      r5, r6, {s2, s3}\n\t"
++        "fmrrs      r7, r8, {s4, s5}\n\t"
++        "fmrrs      ip, lr, {s6, s7}\n\t"
++        "fldmiasgt  %[src]!, {s16-s23}\n\t"
++        "ssat       r4, #16, r4\n\t"
++        "ssat       r3, #16, r3\n\t"
++        "ssat       r6, #16, r6\n\t"
++        "ssat       r5, #16, r5\n\t"
++        "pkhbt      r3, r3, r4, lsl #16\n\t"
++        "pkhbt      r4, r5, r6, lsl #16\n\t"
++        "ftosisgt   s0, s16\n\t"
++        "ftosisgt   s1, s17\n\t"
++        "ftosisgt   s2, s18\n\t"
++        "ftosisgt   s3, s19\n\t"
++        "ftosisgt   s4, s20\n\t"
++        "ftosisgt   s5, s21\n\t"
++        "ftosisgt   s6, s22\n\t"
++        "ftosisgt   s7, s23\n\t"
++        "ssat       r8, #16, r8\n\t"
++        "ssat       r7, #16, r7\n\t"
++        "ssat       lr, #16, lr\n\t"
++        "ssat       ip, #16, ip\n\t"
++        "pkhbt      r5, r7, r8, lsl #16\n\t"
++        "pkhbt      r6, ip, lr, lsl #16\n\t"
++        "stmia      %[dst]!, {r3-r6}\n\t"
++        "bgt        1b\n\t"
++
++        : [dst] "+&r" (dst), [src] "+&r" (src), [len] "+&r" (len)
++        :
++        : "s0",  "s1",  "s2",  "s3",  "s4",  "s5",  "s6",  "s7",
++          "s16", "s17", "s18", "s19", "s20", "s21", "s22", "s23",
++          "r3", "r4", "r5", "r6", "r7", "r8", "ip", "lr",
++          "cc", "memory");
++}
++#endif
++
++void ff_float_init_arm_vfp(DSPContext* c, AVCodecContext *avctx)
++{
++    c->vector_fmul = vector_fmul_vfp;
++    c->vector_fmul_reverse = vector_fmul_reverse_vfp;
++#ifdef HAVE_ARMV6
++    c->float_to_int16 = float_to_int16_vfp;
++#endif
++}
+diff -Nurd mythtv.orig/libs/libavcodec/armv4l/h264dsp_neon.S mythtv/libs/libavcodec/armv4l/h264dsp_neon.S
+--- mythtv.orig/libs/libavcodec/armv4l/h264dsp_neon.S	1970-01-01 01:00:00.000000000 +0100
++++ mythtv/libs/libavcodec/armv4l/h264dsp_neon.S	2008-07-24 19:54:01.033198000 +0200
+@@ -0,0 +1,148 @@
++/*
++ * Copyright (c) 2008 Mans Rullgard <mans@mansr.com>
++ *
++ * This file is part of FFmpeg.
++ *
++ * FFmpeg is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * FFmpeg is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with FFmpeg; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ */
++
++        .fpu neon
++
++        .text
++        .align
++        .global ff_put_h264_chroma_mc8_neon
++        .func   ff_put_h264_chroma_mc8_neon
++/* void ff_put_h264_chroma_mc8_neon(uint8_t *dst, uint8_t *src, int stride,
++                                    int h, int x, int y) */
++ff_put_h264_chroma_mc8_neon:
++        push      {r4-r7}
++        ldrd      r4, [sp, #16]
++
++        pld       [r1]
++        pld       [r1, r2]
++
++        muls      r7, r4, r5
++        rsb       r6, r7, r5, lsl #3
++        rsb       ip, r7, r4, lsl #3
++        sub       r4, r7, r4, lsl #3
++        sub       r4, r4, r5, lsl #3
++        add       r4, r4, #64
++
++        beq       2f
++
++        add       r5, r1, r2
++
++        vdup.8    d0, r4
++        lsl       r4, r2, #1
++        vdup.8    d1, ip
++        vld1.64   {d4,d5}, [r1], r4
++        vdup.8    d2, r6
++        vld1.64   {d6,d7}, [r5], r4
++        vdup.8    d3, r7
++
++        mov       r6, #32
++        vext.8    d5, d4, d5, #1
++        vdup.16   q12, r6
++        vext.8    d7, d6, d7, #1
++1:
++        pld       [r5]
++        vmull.u8  q8, d4, d0
++        vmlal.u8  q8, d5, d1
++        vld1.64   {d4,d5}, [r1], r4
++        vmlal.u8  q8, d6, d2
++        vext.8    d5, d4, d5, #1
++        vmlal.u8  q8, d7, d3
++        vmull.u8  q9, d6, d0
++        vadd.i16  q8, q8, q12
++        subs      r3, r3, #2
++        vmlal.u8  q9, d7, d1
++        vshrn.u16 d16, q8, #6
++        vld1.64   {d6,d7}, [r5], r4
++        vmlal.u8  q9, d4, d2
++        vmlal.u8  q9, d5, d3
++        pld       [r1]
++        vadd.i16  q9, q9, q12
++        vst1.64   {d16}, [r0,:64], r2
++        vshrn.u16 d17, q9, #6
++        vext.8    d7, d6, d7, #1
++        vst1.64   {d17}, [r0,:64], r2
++        bgt       1b
++
++        pop       {r4-r7}
++        bx        lr
++
++2:
++        tst       r6, r6
++        add       ip, ip, r6
++        vdup.8    d0, r4
++        vdup.8    d1, ip
++        mov       r6, #32
++        vdup.16   q12, r6
++
++        beq       4f
++
++        add       r5, r1, r2
++        lsl       r4, r2, #1
++        vld1.64   {d4}, [r1], r4
++        vld1.64   {d6}, [r5], r4
++3:
++        pld       [r5]
++        vmull.u8  q8, d4, d0
++        vmlal.u8  q8, d6, d1
++        vld1.64   {d4}, [r1], r4
++        vmull.u8  q9, d6, d0
++        vadd.i16  q8, q8, q12
++        vmlal.u8  q9, d4, d1
++        vshrn.u16 d16, q8, #6
++        vadd.i16  q9, q9, q12
++        vst1.64   {d16}, [r0,:64], r2
++        vshrn.u16 d17, q9, #6
++        subs      r3, r3, #2
++        vld1.64   {d6}, [r5], r4
++        pld       [r1]
++        vst1.64   {d17}, [r0,:64], r2
++        bgt       3b
++
++        pop       {r4-r7}
++        bx        lr
++
++4:
++        vld1.64   {d4,d5}, [r1], r2
++        vld1.64   {d6,d7}, [r1], r2
++        vext.8    d5, d4, d5, #1
++        vext.8    d7, d6, d7, #1
++5:
++        pld       [r1]
++        subs      r3, r3, #2
++        vmull.u8  q8, d4, d0
++        vmlal.u8  q8, d5, d1
++        vld1.64   {d4,d5}, [r1], r2
++        vmull.u8  q9, d6, d0
++        vmlal.u8  q9, d7, d1
++        pld       [r1]
++        vadd.i16  q8, q8, q12
++        vadd.i16  q9, q9, q12
++        vext.8    d5, d4, d5, #1
++        vshrn.u16 d16, q8, #6
++        vld1.64   {d6,d7}, [r1], r2
++        vshrn.u16 d17, q9, #6
++        vst1.64   {d16}, [r0,:64], r2
++        vext.8    d7, d6, d7, #1
++        vst1.64   {d17}, [r0,:64], r2
++        bgt       5b
++
++        pop       {r4-r7}
++        bx        lr
++        .endfunc
+diff -Nurd mythtv.orig/libs/libavcodec/armv4l/mpegvideo_arm.c mythtv/libs/libavcodec/armv4l/mpegvideo_arm.c
+--- mythtv.orig/libs/libavcodec/armv4l/mpegvideo_arm.c	2008-07-23 12:19:05.000000000 +0200
++++ mythtv/libs/libavcodec/armv4l/mpegvideo_arm.c	2008-07-24 19:54:01.263198000 +0200
+@@ -18,9 +18,9 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+-#include "dsputil.h"
+-#include "mpegvideo.h"
+-#include "avcodec.h"
++#include "libavcodec/avcodec.h"
++#include "libavcodec/dsputil.h"
++#include "libavcodec/mpegvideo.h"
+ 
+ extern void MPV_common_init_iwmmxt(MpegEncContext *s);
+ extern void MPV_common_init_armv5te(MpegEncContext *s);
+@@ -28,7 +28,7 @@
+ void MPV_common_init_armv4l(MpegEncContext *s)
+ {
+     /* IWMMXT support is a superset of armv5te, so
+-     * allow optimised functions for armv5te unless
++     * allow optimized functions for armv5te unless
+      * a better iwmmxt function exists
+      */
+ #ifdef HAVE_ARMV5TE
+diff -Nurd mythtv.orig/libs/libavcodec/armv4l/mpegvideo_armv5te.c mythtv/libs/libavcodec/armv4l/mpegvideo_armv5te.c
+--- mythtv.orig/libs/libavcodec/armv4l/mpegvideo_armv5te.c	2008-07-23 12:19:05.000000000 +0200
++++ mythtv/libs/libavcodec/armv4l/mpegvideo_armv5te.c	2008-07-24 19:54:01.263198000 +0200
+@@ -19,9 +19,9 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+-#include "dsputil.h"
+-#include "mpegvideo.h"
+-#include "avcodec.h"
++#include "libavcodec/avcodec.h"
++#include "libavcodec/dsputil.h"
++#include "libavcodec/mpegvideo.h"
+ 
+ 
+ #ifdef ENABLE_ARM_TESTS
+@@ -65,7 +65,7 @@
+ ({ DCTELEM *xblock = xxblock; \
+    int xqmul = xxqmul, xqadd = xxqadd, xcount = xxcount, xtmp; \
+    int xdata1, xdata2; \
+-__asm__ __volatile__( \
++asm volatile( \
+         "subs %[count], %[count], #2       \n\t" \
+         "ble 2f                            \n\t" \
+         "ldrd r4, [%[block], #0]           \n\t" \
+diff -Nurd mythtv.orig/libs/libavcodec/armv4l/mpegvideo_iwmmxt.c mythtv/libs/libavcodec/armv4l/mpegvideo_iwmmxt.c
+--- mythtv.orig/libs/libavcodec/armv4l/mpegvideo_iwmmxt.c	2008-07-23 12:19:05.000000000 +0200
++++ mythtv/libs/libavcodec/armv4l/mpegvideo_iwmmxt.c	2008-07-24 19:54:01.273198000 +0200
+@@ -18,9 +18,9 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+-#include "dsputil.h"
+-#include "mpegvideo.h"
+-#include "avcodec.h"
++#include "libavcodec/avcodec.h"
++#include "libavcodec/dsputil.h"
++#include "libavcodec/mpegvideo.h"
+ 
+ static void dct_unquantize_h263_intra_iwmmxt(MpegEncContext *s,
+                                              DCTELEM *block, int n, int qscale)
+@@ -48,7 +48,7 @@
+     else
+         nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ];
+ 
+-    __asm__ __volatile__ (
++    asm volatile (
+ /*      "movd %1, %%mm6                 \n\t" //qmul */
+ /*      "packssdw %%mm6, %%mm6          \n\t" */
+ /*      "packssdw %%mm6, %%mm6          \n\t" */
+diff -Nurd mythtv.orig/libs/libavcodec/armv4l/simple_idct_arm.S mythtv/libs/libavcodec/armv4l/simple_idct_arm.S
+--- mythtv.orig/libs/libavcodec/armv4l/simple_idct_arm.S	2008-07-23 12:19:05.000000000 +0200
++++ mythtv/libs/libavcodec/armv4l/simple_idct_arm.S	2008-07-24 19:54:01.503198000 +0200
+@@ -79,7 +79,7 @@
+ 
+ 
+ __row_loop:
+-        @@ read the row and check if it is null, almost null, or not, according to strongarm specs, it is not necessary to optimise ldr accesses (i.e. split 32bits in 2 16bits words), at least it gives more usable registers :)
++        @@ read the row and check if it is null, almost null, or not, according to strongarm specs, it is not necessary to optimize ldr accesses (i.e. split 32bits in 2 16bits words), at least it gives more usable registers :)
+         ldr r1, [r14, #0]        @ R1=(int32)(R12)[0]=ROWr32[0] (relative row cast to a 32b pointer)
+         ldr r2, [r14, #4]        @ R2=(int32)(R12)[1]=ROWr32[1]
+         ldr r3, [r14, #8]        @ R3=ROWr32[2]
+@@ -421,7 +421,7 @@
+         @@ col[40] = ((a2 - b2) >> COL_SHIFT);
+         @@ col[48] = ((a1 - b1) >> COL_SHIFT);
+         @@ col[56] = ((a0 - b0) >> COL_SHIFT);
+-        @@@@@ no optimisation here @@@@@
++        @@@@@ no optimization here @@@@@
+         add r8, r6, r0           @ R8=a0+b0
+         add r9, r2, r1           @ R9=a1+b1
+         mov r8, r8, asr #COL_SHIFT
+diff -Nurd mythtv.orig/libs/libavcodec/armv4l/simple_idct_neon.S mythtv/libs/libavcodec/armv4l/simple_idct_neon.S
+--- mythtv.orig/libs/libavcodec/armv4l/simple_idct_neon.S	1970-01-01 01:00:00.000000000 +0100
++++ mythtv/libs/libavcodec/armv4l/simple_idct_neon.S	2008-07-24 19:54:01.503198000 +0200
+@@ -0,0 +1,388 @@
++/*
++ * ARM NEON IDCT
++ *
++ * Copyright (c) 2008 Mans Rullgard <mans@mansr.com>
++ *
++ * Based on Simple IDCT
++ * Copyright (c) 2001 Michael Niedermayer <michaelni@gmx.at>
++ *
++ * This file is part of FFmpeg.
++ *
++ * FFmpeg is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * FFmpeg is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with FFmpeg; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ */
++
++#define W1  22725  //cos(i*M_PI/16)*sqrt(2)*(1<<14) + 0.5
++#define W2  21407  //cos(i*M_PI/16)*sqrt(2)*(1<<14) + 0.5
++#define W3  19266  //cos(i*M_PI/16)*sqrt(2)*(1<<14) + 0.5
++#define W4  16383  //cos(i*M_PI/16)*sqrt(2)*(1<<14) + 0.5
++#define W5  12873  //cos(i*M_PI/16)*sqrt(2)*(1<<14) + 0.5
++#define W6  8867   //cos(i*M_PI/16)*sqrt(2)*(1<<14) + 0.5
++#define W7  4520   //cos(i*M_PI/16)*sqrt(2)*(1<<14) + 0.5
++#define W4c ((1<<(COL_SHIFT-1))/W4)
++#define ROW_SHIFT 11
++#define COL_SHIFT 20
++
++#define w1 d0[0]
++#define w2 d0[1]
++#define w3 d0[2]
++#define w4 d0[3]
++#define w5 d1[0]
++#define w6 d1[1]
++#define w7 d1[2]
++#define w4c d1[3]
++
++        .fpu neon
++
++        .macro idct_col4_top
++        vmull.s16 q7,  d6,  w2    /* q9   = W2 * col[2] */
++        vmull.s16 q8,  d6,  w6    /* q10  = W6 * col[2] */
++        vmull.s16 q9,  d4,  w1    /* q9  = W1 * col[1] */
++        vadd.i32  q11, q15, q7
++        vmull.s16 q10, d4,  w3    /* q10 = W3 * col[1] */
++        vadd.i32  q12, q15, q8
++        vmull.s16 q5,  d4,  w5    /* q5  = W5 * col[1] */
++        vsub.i32  q13, q15, q8
++        vmull.s16 q6,  d4,  w7    /* q6  = W7 * col[1] */
++        vsub.i32  q14, q15, q7
++
++        vmlal.s16 q9,  d8, w3     /* q9  += W3 * col[3] */
++        vmlsl.s16 q10, d8, w7     /* q10 -= W7 * col[3] */
++        vmlsl.s16 q5,  d8, w1     /* q5  -= W1 * col[3] */
++        vmlsl.s16 q6,  d8, w5     /* q6  -= W5 * col[3] */
++        .endm
++
++        .macro idct_col4_mid1
++        vmull.s16 q7,  d3,  w4    /* q7 = W4 * col[4] */
++        vadd.i32  q11, q11, q7
++        vsub.i32  q12, q12, q7
++        vsub.i32  q13, q13, q7
++        vadd.i32  q14, q14, q7
++        .endm
++
++        .macro idct_col4_mid2
++        vmlal.s16 q9,  d5, w5     /* q9  += W5 * col[5] */
++        vmlsl.s16 q10, d5, w1     /* q10 -= W1 * col[5] */
++        vmlal.s16 q5,  d5, w7     /* q5  += W7 * col[5] */
++        vmlal.s16 q6,  d5, w3     /* q6  += W3 * col[5] */
++        .endm
++
++        .macro idct_col4_mid3
++        vmull.s16 q7,  d7, w6     /* q7 = W6 * col[6] */
++        vmull.s16 q8,  d7, w2     /* q8 = W2 * col[6] */
++        vadd.i32  q11, q11, q7
++        vsub.i32  q12, q12, q8
++        vadd.i32  q13, q13, q8
++        vsub.i32  q14, q14, q7
++        .endm
++
++        .macro idct_col4_mid4
++        vmlal.s16 q9,  d9, w7
++        vmlsl.s16 q10, d9, w5
++        vmlal.s16 q5,  d9, w3
++        vmlsl.s16 q6,  d9, w1
++        .endm
++
++        .macro idct_col4_mid
++        vmull.s16 q7,  d3,  w4    /* q7   = W4 * col[4] */
++        vmlal.s16 q9,  d5,  w5    /* q9  += W5 * col[5] */
++        vmlsl.s16 q10, d5,  w1    /* q10 -= W1 * col[5] */
++        vadd.i32  q11, q11, q7
++        vmull.s16 q8,  d7,  w2    /* q8   = W2 * col[6] */
++        vsub.i32  q12, q12, q7
++        vmlal.s16 q5,  d5,  w7    /* q5  += W7 * col[5] */
++        vsub.i32  q13, q13, q7
++        vmlal.s16 q6,  d5,  w3    /* q6  += W3 * col[5] */
++        vadd.i32  q14, q14, q7
++        vmull.s16 q7,  d7,  w6    /* q7   = W6 * col[6] */
++        vadd.i32  q11, q11, q7
++        vmlal.s16 q9,  d9,  w7
++        vsub.i32  q12, q12, q8
++        vmlsl.s16 q10, d9,  w5
++        vadd.i32  q13, q13, q8
++        vmlal.s16 q5,  d9,  w3
++        vsub.i32  q14, q14, q7
++        vmlsl.s16 q6,  d9,  w1
++        .endm
++
++        .macro idct_col4_end
++        vadd.i32 q3,  q11, q9
++        vadd.i32 q4,  q12, q10
++        vadd.i32 q7,  q13, q5
++        vadd.i32 q8,  q14, q6
++        vsub.i32 q11, q11, q9
++        vsub.i32 q12, q12, q10
++        vsub.i32 q13, q13, q5
++        vsub.i32 q14, q14, q6
++        .endm
++
++	.text
++        .align
++        .type idct_row4_neon, %function
++        .func idct_row4_neon
++idct_row4_neon:
++        vld1.64 {d2,d3}, [a3,:128]!
++        vld1.64 {d4,d5}, [a3,:128]!
++        vld1.64 {d6,d7}, [a3,:128]!
++        vld1.64 {d8,d9}, [a3,:128]!
++        add a3, a3, #-64
++
++        vmov.i32  q15, #(1<<(ROW_SHIFT-1))
++        vorr      d10, d3,  d5
++        vtrn.16   q1,  q2
++        vorr      d11, d7,  d9
++        vtrn.16   q3,  q4
++        vorr      d10, d10, d11
++        vtrn.32   q1,  q3
++        vmlal.s16 q15, d2,  w4    /* q15 += W4 * col[0] */
++        vtrn.32   q2,  q4
++        vmov      a4,  v1,  d10
++
++        idct_col4_top
++
++        orrs a4, a4, v1
++        beq 1f
++        idct_col4_mid
++1:
++        vadd.i32 q3,  q11, q9
++        vadd.i32 q4,  q12, q10
++        vshrn.i32 d2, q3,  #ROW_SHIFT
++        vadd.i32 q7,  q13, q5
++        vshrn.i32 d4, q4,  #ROW_SHIFT
++        vadd.i32 q8,  q14, q6
++        vshrn.i32 d6, q7,  #ROW_SHIFT
++        vsub.i32 q11, q11, q9
++        vshrn.i32 d8, q8,  #ROW_SHIFT
++        vsub.i32 q12, q12, q10
++        vshrn.i32 d9, q11, #ROW_SHIFT
++        vsub.i32 q13, q13, q5
++        vshrn.i32 d7, q12, #ROW_SHIFT
++        vsub.i32 q14, q14, q6
++        vshrn.i32 d5, q13, #ROW_SHIFT
++        vshrn.i32 d3, q14, #ROW_SHIFT
++
++        vtrn.16   q1, q2
++        vtrn.16   q3, q4
++        vtrn.32   q1, q3
++        vtrn.32   q2, q4
++
++        vst1.64 {d2,d3}, [a3,:128]!
++        vst1.64 {d4,d5}, [a3,:128]!
++        vst1.64 {d6,d7}, [a3,:128]!
++        vst1.64 {d8,d9}, [a3,:128]!
++
++        mov pc, lr
++        .endfunc
++
++        .align
++        .type idct_col4_neon, %function
++        .func idct_col4_neon
++idct_col4_neon:
++        mov ip, #16
++        vld1.64 {d2}, [a3,:64], ip /* d2 = col[0] */
++        vld1.64 {d4}, [a3,:64], ip /* d3 = col[1] */
++        vld1.64 {d6}, [a3,:64], ip /* d4 = col[2] */
++        vld1.64 {d8}, [a3,:64], ip /* d5 = col[3] */
++        vld1.64 {d3}, [a3,:64], ip /* d6 = col[4] */
++        vld1.64 {d5}, [a3,:64], ip /* d7 = col[5] */
++        vld1.64 {d7}, [a3,:64], ip /* d8 = col[6] */
++        vld1.64 {d9}, [a3,:64], ip /* d9 = col[7] */
++
++        vrev64.32 d11, d3
++        vrev64.32 d13, d5
++        vorr      d11, d3, d11
++        vrev64.32 d15, d7
++        vorr      d13, d5, d13
++        vrev64.32 d17, d9
++        vorr      d15, d7, d15
++        vmov.32   v1,  d11[0]
++        vmov.32   v2,  d13[0]
++        vorr      d17, d9, d17
++        vmov.32   v3,  d15[0]
++        vmov.32   ip,  d17[0]
++        vdup.16   d30, w4c
++        vadd.i16  d30, d30, d2
++        vmull.s16 q15, d30, w4 /* q15 = W4 * (col[0]+(1<<(COL_SHIFT-1))/W4) */
++
++        idct_col4_top
++        tst v1, v1
++        beq 1f
++        idct_col4_mid1
++1:      tst v2, v2
++        beq 2f
++        idct_col4_mid2
++2:      tst v3, v3
++        beq 3f
++        idct_col4_mid3
++3:      tst ip, ip
++        beq 4f
++        idct_col4_mid4
++4:
++        idct_col4_end
++
++        vshr.s32  q2, q3,  #COL_SHIFT
++        vshr.s32  q3, q4,  #COL_SHIFT
++        vmovn.i32 d2, q2
++        vshr.s32  q4, q7,  #COL_SHIFT
++        vmovn.i32 d3, q3
++        vshr.s32  q5, q8,  #COL_SHIFT
++        vmovn.i32 d4, q4
++        vshr.s32  q6, q14, #COL_SHIFT
++        vmovn.i32 d5, q5
++        vshr.s32  q7, q13, #COL_SHIFT
++        vmovn.i32 d6, q6
++        vshr.s32  q8, q12, #COL_SHIFT
++        vmovn.i32 d7, q7
++        vshr.s32  q9, q11, #COL_SHIFT
++        vmovn.i32 d8, q8
++        vmovn.i32 d9, q9
++
++        mov pc, lr
++        .endfunc
++
++        .macro idct_col4_st16
++        mov ip, #16
++        vst1.64 {d2}, [a3,:64], ip
++        vst1.64 {d3}, [a3,:64], ip
++        vst1.64 {d4}, [a3,:64], ip
++        vst1.64 {d5}, [a3,:64], ip
++        vst1.64 {d6}, [a3,:64], ip
++        vst1.64 {d7}, [a3,:64], ip
++        vst1.64 {d8}, [a3,:64], ip
++        vst1.64 {d9}, [a3,:64], ip
++        .endm
++
++        .align
++        .type idct_col4_add8, %function
++        .func idct_col4_add8
++idct_col4_add8:
++        vld1.32 {d10[0]}, [a1,:32], a2
++        vld1.32 {d10[1]}, [a1,:32], a2
++        vld1.32 {d11[0]}, [a1,:32], a2
++        vld1.32 {d11[1]}, [a1,:32], a2
++        vld1.32 {d12[0]}, [a1,:32], a2
++        vld1.32 {d12[1]}, [a1,:32], a2
++        vld1.32 {d13[0]}, [a1,:32], a2
++        vld1.32 {d13[1]}, [a1,:32], a2
++
++        vaddw.u8 q1, q1, d10
++        vaddw.u8 q2, q2, d11
++        vaddw.u8 q3, q3, d12
++        vaddw.u8 q4, q4, d13
++
++        sub a1, a1, a2, lsl #3
++        .endfunc
++
++        .type idct_col4_st8, %function
++        .func idct_col4_st8
++idct_col4_st8:
++        vqmovun.s16 d2, q1
++        vqmovun.s16 d3, q2
++        vqmovun.s16 d4, q3
++        vqmovun.s16 d5, q4
++
++        vst1.32 {d2[0]}, [a1,:32], a2
++        vst1.32 {d2[1]}, [a1,:32], a2
++        vst1.32 {d3[0]}, [a1,:32], a2
++        vst1.32 {d3[1]}, [a1,:32], a2
++        vst1.32 {d4[0]}, [a1,:32], a2
++        vst1.32 {d4[1]}, [a1,:32], a2
++        vst1.32 {d5[0]}, [a1,:32], a2
++        vst1.32 {d5[1]}, [a1,:32], a2
++        mov pc, lr
++        .endfunc
++
++        .align 4
++const:  .short W1, W2, W3, W4, W5, W6, W7, W4c
++
++        .macro idct_start data
++        pld [\data]
++        pld [\data, #64]
++        push {v1-v3, lr}
++        vpush {d8-d15}
++        adr a4, const
++        vld1.64 {d0,d1}, [a4,:128]
++        .endm
++
++        .macro idct_end
++        vpop {d8-d15}
++        pop {v1-v3, pc}
++        .endm
++
++        .align
++        .global ff_simple_idct_neon
++        .type ff_simple_idct_neon, %function
++        .func ff_simple_idct_neon
++/* void ff_simple_idct_neon(DCTELEM *data); */
++ff_simple_idct_neon:
++        idct_start a1
++
++        mov a3, a1
++        bl idct_row4_neon
++        bl idct_row4_neon
++        add a3, a3, #-128
++        bl idct_col4_neon
++        add a3, a3, #-128
++        idct_col4_st16
++        add a3, a3, #-120
++        bl idct_col4_neon
++        add a3, a3, #-128
++        idct_col4_st16
++
++        idct_end
++        .endfunc
++
++        .align
++        .global ff_simple_idct_put_neon
++        .type ff_simple_idct_put_neon, %function
++        .func ff_simple_idct_put_neon
++/* void ff_simple_idct_put_neon(uint8_t *dst, int line_size, DCTELEM *data); */
++ff_simple_idct_put_neon:
++        idct_start a3
++
++        bl idct_row4_neon
++        bl idct_row4_neon
++        add a3, a3, #-128
++        bl idct_col4_neon
++        bl idct_col4_st8
++        sub a1, a1, a2, lsl #3
++        add a1, a1, #4
++        add a3, a3, #-120
++        bl idct_col4_neon
++        bl idct_col4_st8
++
++        idct_end
++        .endfunc
++
++        .align
++        .global ff_simple_idct_add_neon
++        .type ff_simple_idct_add_neon, %function
++        .func ff_simple_idct_add_neon
++/* void ff_simple_idct_add_neon(uint8_t *dst, int line_size, DCTELEM *data); */
++ff_simple_idct_add_neon:
++        idct_start a3
++
++        bl idct_row4_neon
++        bl idct_row4_neon
++        add a3, a3, #-128
++        bl idct_col4_neon
++        bl idct_col4_add8
++        sub a1, a1, a2, lsl #3
++        add a1, a1, #4
++        add a3, a3, #-120
++        bl idct_col4_neon
++        bl idct_col4_add8
++
++        idct_end
++        .endfunc
+diff -Nurd mythtv.orig/libs/libavcodec/avcodec.h mythtv/libs/libavcodec/avcodec.h
+--- mythtv.orig/libs/libavcodec/avcodec.h	2008-07-23 12:19:11.000000000 +0200
++++ mythtv/libs/libavcodec/avcodec.h	2008-07-24 19:56:46.953198000 +0200
+@@ -1328,6 +1328,8 @@
+ #define FF_IDCT_SIMPLEARMV6   17
+ #define FF_IDCT_SIMPLEVIS     18
+ #define FF_IDCT_WMV2          19
++#define FF_IDCT_FAAN          20
++#define FF_IDCT_SIMPLENEON    21
+ 
+     /**
+      * slice count
+diff -Nurd mythtv.orig/libs/libavcodec/libavcodec.pro mythtv/libs/libavcodec/libavcodec.pro
+--- mythtv.orig/libs/libavcodec/libavcodec.pro	2008-07-23 12:19:10.000000000 +0200
++++ mythtv/libs/libavcodec/libavcodec.pro	2008-07-24 19:54:01.503198000 +0200
+@@ -413,6 +413,8 @@
+ 
+ contains( HAVE_ARMV6, yes )      { SOURCES += armv4l/simple_idct_armv6.S }
+ 
++contains( HAVE_NEON, yes )      { SOURCES += armv4l/float_arm_vfp.c armv4l/simple_idct_neon.S armv4l/dsputil_neon.c armv4l/h264dsp_neon.S }
++
+ contains( HAVE_VIS, yes ) {
+     SOURCES += sparc/dsputil_vis.c
+     SOURCES += sparc/simple_idct_vis.c
+diff -Nurd mythtv.orig/libs/libavcodec/utils.c mythtv/libs/libavcodec/utils.c
+--- mythtv.orig/libs/libavcodec/utils.c	2008-07-23 12:19:10.000000000 +0200
++++ mythtv/libs/libavcodec/utils.c	2008-07-24 19:58:12.403198000 +0200
+@@ -594,6 +594,7 @@
+ {"sh4", NULL, 0, FF_OPT_TYPE_CONST, FF_IDCT_SH4, INT_MIN, INT_MAX, V|E|D, "idct"},
+ {"simplearm", NULL, 0, FF_OPT_TYPE_CONST, FF_IDCT_SIMPLEARM, INT_MIN, INT_MAX, V|E|D, "idct"},
+ {"simplearmv5te", NULL, 0, FF_OPT_TYPE_CONST, FF_IDCT_SIMPLEARMV5TE, INT_MIN, INT_MAX, V|E|D, "idct"},
++{"simpleneon", NULL, 0, FF_OPT_TYPE_CONST, FF_IDCT_SIMPLENEON, INT_MIN, INT_MAX, V|E|D, "idct"},
+ {"h264", NULL, 0, FF_OPT_TYPE_CONST, FF_IDCT_H264, INT_MIN, INT_MAX, V|E|D, "idct"},
+ {"vp3", NULL, 0, FF_OPT_TYPE_CONST, FF_IDCT_VP3, INT_MIN, INT_MAX, V|E|D, "idct"},
+ {"ipp", NULL, 0, FF_OPT_TYPE_CONST, FF_IDCT_IPP, INT_MIN, INT_MAX, V|E|D, "idct"},
diff --git a/packages/mythtv/mythtv.inc b/packages/mythtv/mythtv.inc
index 9b7a0a768e..8355e0f1a1 100644
--- a/packages/mythtv/mythtv.inc
+++ b/packages/mythtv/mythtv.inc
@@ -7,8 +7,6 @@ DEPENDS = "jack alsa-lib lame libxinerama libxv libxxf86vm libxvmc lirc"
 
 SRC_URI = "http://www.mythtv.org/mc/mythtv-${PV}.tar.bz2"
 
-inherit qmake2 qt4x11
-
 
 QMAKE_PROFILES = "mythtv.pro"
 
diff --git a/packages/mythtv/mythtv/configure.patch b/packages/mythtv/mythtv/configure.patch
index 16f5076880..c95a785d6c 100644
--- a/packages/mythtv/mythtv/configure.patch
+++ b/packages/mythtv/mythtv/configure.patch
@@ -1,5 +1,5 @@
 --- /tmp/configure	2008-07-22 10:27:56.000000000 +0200
-+++ mythtv/configure	2008-07-22 12:50:43.000000000 +0200
++++ mythtv/configure	2008-07-22 17:53:20.000000000 +0200
 @@ -476,12 +476,13 @@
  }
  
@@ -30,6 +30,15 @@
  processor_flags=""
  tune="generic"
  
+@@ -1185,7 +1186,7 @@
+ lamemp3="yes"
+ lirc="yes"
+ mac_bundle="no"
+-opengl="yes"
++opengl="no"
+ v4l="yes"
+ x11="yes"
+ x11_include_path="/usr/X11R6/include"
 @@ -1214,7 +1215,7 @@
  # build settings
  SHFLAGS='-shared -Wl,-soname,$@'
@@ -129,3 +138,11 @@
  fi
  
  # test for distcc
+@@ -2718,6 +2723,7 @@
+ 
+ check_header GL/gl.h
+ has_library libGL || has_library libopengl32 || disable opengl
++enabled cross_compile && disable opengl
+ 
+ VENDOR_XVMC_LIBS=""
+ check_header X11/extensions/XvMClib.h
diff --git a/packages/mythtv/mythtv/ifdef-qt.diff b/packages/mythtv/mythtv/ifdef-qt.diff
new file mode 100644
index 0000000000..bdefee11df
--- /dev/null
+++ b/packages/mythtv/mythtv/ifdef-qt.diff
@@ -0,0 +1,13 @@
+--- /tmp/mythmainwindow.cpp	2008-07-22 18:19:06.000000000 +0200
++++ mythtv/libs/libmythui/mythmainwindow.cpp	2008-07-22 18:19:26.000000000 +0200
+@@ -4,7 +4,10 @@
+ 
+ #include <algorithm>
+ 
++#ifdef USE_OPENGL_PAINTER
+ #include <QGLWidget>
++endif
++
+ #include <QApplication>
+ #include <QTimer>
+ #include <QDesktopWidget>
diff --git a/packages/mythtv/mythtv_0.18.1.bb b/packages/mythtv/mythtv_0.18.1.bb
index 1602ce0e42..fd2c351845 100644
--- a/packages/mythtv/mythtv_0.18.1.bb
+++ b/packages/mythtv/mythtv_0.18.1.bb
@@ -1,5 +1,7 @@
 require mythtv.inc
 
+inherit qmake2 qt3x11
+
 PR = "r1"
 
 SRC_URI += "file://msmpeg-underscore-pic.patch;patch=1 \
diff --git a/packages/mythtv/mythtv_0.20.bb b/packages/mythtv/mythtv_0.20.bb
index c9e2fdc431..2ebebd3012 100644
--- a/packages/mythtv/mythtv_0.20.bb
+++ b/packages/mythtv/mythtv_0.20.bb
@@ -1,5 +1,7 @@
 require mythtv.inc
 
+inherit qmake2 qt3x11
+
 DEPENDS += "openchrome"
 PR = "r0"
 
diff --git a/packages/mythtv/mythtv_0.21.bb b/packages/mythtv/mythtv_0.21.bb
index a33c446813..eb9d98c674 100644
--- a/packages/mythtv/mythtv_0.21.bb
+++ b/packages/mythtv/mythtv_0.21.bb
@@ -1,23 +1,33 @@
 require mythtv.inc
 
-PR = "r0"
+inherit qmake qt3x11
 
-#SRC_URI += "file://configure.patch;patch=1 \
-#            file://libmyth-libdir.patch;patch=1"
+PR = "${SRCREV}+r2"
+REALPV = "0.21"
 
-# Seen on the mythtv web page:
-# http://www.mythtv.org/mc/fix-mythweb-in-0.20.diff;patch=1
+SRCREV = "17789"
+SRC_URI = "svn://svn.mythtv.org/svn/branches/release-0-21-fixes;module=mythtv;proto=http"
+
+SRC_URI += " \
+            file://ffmpeg-arm-update.diff;patch=1 \
+            file://configure.patch;patch=1 \
+            file://configh \
+	    file://configmak \
+	    "
+
+S = "${WORKDIR}/mythtv"
 
 QMAKE_PROFILES = "mythtv.pro"
 
 mythlibs = "mythavutil mythavcodec mythavformat myth mythtv mythui mythfreemheg mythupnp mythlivemedia"
 PACKAGES =+ "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-data"
 
+FILES_${PN}-dbg += "${libdir}/mythtv/filters/.debug"
 FILES_mythtv-backend = "${bindir}/mythbackend ${bindir}/mythcommflag ${bindir}/mythfilldatabase ${bindir}/mythtranscode"
 FILES_mythtv-frontend = "${bindir}/mythfrontend ${datadir}/mythtv/i18n/mythfrontend_* ${datadir}/mythtv/*.ttf"
 RDEPENDS_mythtv-frontend = "qt-x11-plugins-sqldrivers qt-x11-plugins-imageformats"
-FILES_mythtv-bin = "${bindir}"
-FILES_mythtv-filters = "${libdir}/mythtv/filters"
+FILES_mythtv-bin = "${bindir}/*"
+FILES_mythtv-filters = "${libdir}/mythtv/filters/*"
 FILES_mythtv-data = "${datadir}"
 RDEPENDS_${PN} = "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-data"
 ALLOW_EMPTY_${PN} = "1"
@@ -28,7 +38,7 @@ python __anonymous () {
     import bb
 
     mythlibs = bb.data.getVar('mythlibs', d).split()
-    pv = bb.data.expand(bb.data.getVar("PV", d), d)
+    pv = bb.data.expand(bb.data.getVar("REALPV", d), d)
 
     for m in mythlibs:
         bb.data.setVar("FILES_lib%s%s" % (m, pv), "${libdir}/lib%s-%s.so.*" % (m, pv), d)
@@ -38,22 +48,50 @@ python __anonymous () {
 
     bb.data.setVar("PACKAGES", packages, d)
 }
+
+EXTRA_OECONF_armv5te = " --enable-armv5te "
+EXTRA_OECONF_armv6 = " --enable-armv6 "
+EXTRA_OECONF_armv7a = " --enable-armv6"
+
+#build with support for the iwmmxt instruction and pxa270fb overlay support (pxa270 and up)
+#not every iwmmxt machine has the lcd connected to pxafb, but building the module doesn't hurt
+MY_ARCH := "${PACKAGE_ARCH}"
+PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'iwmmxt', 'iwmmxt', '${MY_ARCH}',d)}"
+
+MY_TARGET_CC_ARCH := "${TARGET_CC_ARCH}"
+TARGET_CC_ARCH = "${@base_contains('MACHINE_FEATURES', 'iwmmxt', '-march=iwmmxt -mtune=iwmmxt', '${MY_TARGET_CC_ARCH}',d)}"
+
+EXTRA_OECONF_append = " ${@base_contains('MACHINE_FEATURES', 'iwmmxt', '--enable-pxa --enable-iwmmxt', '',d)} "
+
 do_configure_prepend() {
 # it's not autotools anyway, so we call ./configure directly
 	find . -name "Makefile"|xargs rm -f
+
 	./configure	--prefix=/usr		\
 			--mandir=/usr/man 	\
 			--cpu=${MYTHTV_ARCH}	\
+			--arch=${MYTHTV_ARCH} \
 			--disable-altivec	\
+		 	--disable-opengl-video \
+			--disable-strip \
 			--enable-v4l		\
 			--enable-audio-oss	\
 			--enable-proc-opt	\
 			--enable-dvb		\
+			--enable-libmp3lame \
 			--cross-compile	\
-            --dvb-path=${STAGING_INCDIR}
+            --dvb-path=${STAGING_INCDIR} \
+			--with-bindings= \
+			${EXTRA_OECONF}
 
 	sed 's!PREFIX =.*!PREFIX = ${prefix}!;/INCLUDEPATH += $${PREFIX}\/include/d' < settings.pro > settings.pro.new
 	mv settings.pro.new settings.pro
+	for pro in ${S}/*/*pro ${S}/*/*/*pro ${S}/*/*/*/*pro ; do
+		sed -i -e s:opengl::g $pro
+	done
+	sed -i /.SUBDIR/d ${S}/bindings/*pro
+	cat ${WORKDIR}/configh >> ${S}/config.h
+	cat ${WORKDIR}/configmak  ${OPTSMAK} >> ${S}/config.mak
 }
 
 python populate_packages_prepend () {
diff --git a/packages/mythtv/mythtv_svn.bb b/packages/mythtv/mythtv_svn.bb
index 24a8b3d220..83ce8252fa 100644
--- a/packages/mythtv/mythtv_svn.bb
+++ b/packages/mythtv/mythtv_svn.bb
@@ -1,11 +1,14 @@
 require mythtv.inc
 
+inherit qmake2 qt4x11
+
 DEFAULT_PREFERENCE = "-1"
 
-PV = "0.21+svnr${SRCREV}"
-PR = "r0"
+PV = "0.21+0.22rc+svnr${SRCREV}"
+PR = "r2"
+REALPV = "0.22"
 
-SRCREV = "17880"
+SRCREV = "17892"
 SRC_URI = "svn://svn.mythtv.org/svn/trunk;module=mythtv;proto=http"
 
 SRC_URI += "file://configure.patch;patch=1 \
@@ -15,14 +18,14 @@ S = "${WORKDIR}/mythtv"
 
 QMAKE_PROFILES = "mythtv.pro"
 
-mythlibs = "mythavutil mythavcodec mythavformat myth mythtv mythui mythfreemheg mythupnp mythlivemedia"
+mythlibs = "mythdb mythavutil mythavcodec mythavformat myth mythtv mythui mythfreemheg mythupnp mythlivemedia"
 PACKAGES =+ "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-data"
 
+FILES_${PN}-dbg += "${libdir}/mythtv/filters/.debug"
 FILES_mythtv-backend = "${bindir}/mythbackend ${bindir}/mythcommflag ${bindir}/mythfilldatabase ${bindir}/mythtranscode"
 FILES_mythtv-frontend = "${bindir}/mythfrontend ${datadir}/mythtv/i18n/mythfrontend_* ${datadir}/mythtv/*.ttf"
-RDEPENDS_mythtv-frontend = "qt-x11-plugins-sqldrivers qt-x11-plugins-imageformats"
-FILES_mythtv-bin = "${bindir}"
-FILES_mythtv-filters = "${libdir}/mythtv/filters"
+FILES_mythtv-bin = "${bindir}/*"
+FILES_mythtv-filters = "${libdir}/mythtv/filters/*"
 FILES_mythtv-data = "${datadir}"
 RDEPENDS_${PN} = "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-data"
 ALLOW_EMPTY_${PN} = "1"
@@ -33,7 +36,7 @@ python __anonymous () {
     import bb
 
     mythlibs = bb.data.getVar('mythlibs', d).split()
-    pv = bb.data.expand(bb.data.getVar("PV", d), d)
+    pv = bb.data.expand(bb.data.getVar("REALPV", d), d)
 
     for m in mythlibs:
         bb.data.setVar("FILES_lib%s%s" % (m, pv), "${libdir}/lib%s-%s.so.*" % (m, pv), d)
@@ -46,7 +49,7 @@ python __anonymous () {
 
 EXTRA_OECONF_armv5te = " --enable-armv5te "
 EXTRA_OECONF_armv6 = " --enable-armv6 "
-EXTRA_OECONF_armv7a =  --enable-armv6"
+EXTRA_OECONF_armv7a = " --enable-armv6"
 
 #build with support for the iwmmxt instruction and pxa270fb overlay support (pxa270 and up)
 #not every iwmmxt machine has the lcd connected to pxafb, but building the module doesn't hurt
@@ -62,11 +65,13 @@ EXTRA_OECONF_append = " ${@base_contains('MACHINE_FEATURES', 'iwmmxt', '--enable
 do_configure_prepend() {
 # it's not autotools anyway, so we call ./configure directly
 	find . -name "Makefile"|xargs rm -f
+
 	./configure	--prefix=/usr		\
 			--mandir=/usr/man 	\
 			--cpu=${MYTHTV_ARCH}	\
 			--arch=${MYTHTV_ARCH} \
 			--disable-altivec	\
+		 	--disable-opengl-video \
 			--disable-strip \
 			--enable-v4l		\
 			--enable-audio-oss	\
@@ -75,10 +80,15 @@ do_configure_prepend() {
 			--enable-libmp3lame \
 			--cross-compile	\
             --dvb-path=${STAGING_INCDIR} \
+			--with-bindings= \
 			${EXTRA_OECONF}
 
 	sed 's!PREFIX =.*!PREFIX = ${prefix}!;/INCLUDEPATH += $${PREFIX}\/include/d' < settings.pro > settings.pro.new
 	mv settings.pro.new settings.pro
+    for pro in ${S}/*/*pro ${S}/*/*/*pro ${S}/*/*/*/*pro ; do
+		sed -i -e s:opengl::g $pro
+	done
+	sed -i /.SUBDIR/d ${S}/bindings/*pro
 }
 
 python populate_packages_prepend () {
diff --git a/packages/neuros-public/neuros-lib-widgets_git.bb b/packages/neuros-public/neuros-lib-widgets_git.bb
index 0e1e22e6d2..45dde3c14a 100644
--- a/packages/neuros-public/neuros-lib-widgets_git.bb
+++ b/packages/neuros-public/neuros-lib-widgets_git.bb
@@ -1,6 +1,9 @@
 DESCRIPTION = "Neuros qt-plugins"
 LICENSE = "GPL"
 
+PV = "0.0+${PR}+gitr${SRCREV}"
+PR = "r1"
+
 DEPENDS = "qt-embedded"
 
 inherit qtopia4core
@@ -14,4 +17,7 @@ do_install() {
 	install -m 0755 ${S}/build/lib* ${D}/${libdir}
 }
 
-
+do_stage() {
+	install -d ${STAGING_LIBDIR}
+	install -m 0755 ${S}/build/lib* ${STAGING_LIBDIR}	
+}
diff --git a/packages/neuros-public/neuros-mainmenu_git.bb b/packages/neuros-public/neuros-mainmenu_git.bb
new file mode 100644
index 0000000000..c16cbeb036
--- /dev/null
+++ b/packages/neuros-public/neuros-mainmenu_git.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Neuros window manager"
+LICENSE = "GPL"
+
+PV = "0.0+${PR}+gitr${SRCREV}"
+PR = "r0"
+
+DEPENDS = "qt-embedded"
+
+inherit qtopia4core
+
+SRCREV = "27fc35bd349ccbac1226ebb3d41417d8164b7dd1"
+SRC_URI = "git://git.neurostechnology.com/git/app-mainmenu;protocol=git"
+S = "${WORKDIR}/git/"
+
+do_install() {
+	install -d ${D}/${bindir}
+	install -m 0755  ${S}/build/main-menu ${D}/${bindir}
+
+	install -d ${D}/${sysconfdir}/menu
+	install -m 0644 ${S}/resources/menu/* ${D}/${sysconfdir}/menu
+}
+
+
diff --git a/packages/neuros-public/neuros-nwm_git.bb b/packages/neuros-public/neuros-nwm_git.bb
new file mode 100644
index 0000000000..6dbbd4cabd
--- /dev/null
+++ b/packages/neuros-public/neuros-nwm_git.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Neuros window manager"
+LICENSE = "GPL"
+
+PV = "0.0+${PR}+gitr${SRCREV}"
+PR = "r2"
+
+DEPENDS = "qt-embedded"
+
+inherit qtopia4core
+
+SRCREV = "d0b6789dde38d321d3c90c04512a4ea43e28e79e"
+SRC_URI = "git://git.neurostechnology.com/git/app-nwm;protocol=git"
+S = "${WORKDIR}/git/"
+
+do_configure_prepend() {
+	rm ${S}/src/Makefile || true
+}
+
+do_install() {
+    install -d ${D}/${bindir}
+    install -m 0755  ${S}/build/nwm ${D}/${bindir}
+}
diff --git a/packages/neuros-public/neuros-qt-plugins_git.bb b/packages/neuros-public/neuros-qt-plugins_git.bb
index d0de64d945..62a9d43fca 100644
--- a/packages/neuros-public/neuros-qt-plugins_git.bb
+++ b/packages/neuros-public/neuros-qt-plugins_git.bb
@@ -1,7 +1,8 @@
 DESCRIPTION = "Neuros qt-plugins"
 LICENSE = "GPL"
 
-PR = "r1"
+PV = "0.0+${PR}+gitr${SRCREV}"
+PR = "r2"
 
 DEPENDS = "qt-embedded"
 
diff --git a/packages/nfs-utils/nfs-utils_1.1.2.bb b/packages/nfs-utils/nfs-utils_1.1.2.bb
new file mode 100644
index 0000000000..67adf6e964
--- /dev/null
+++ b/packages/nfs-utils/nfs-utils_1.1.2.bb
@@ -0,0 +1,63 @@
+DESCRIPTION = "userspace utilities for kernel nfs"
+PRIORITY = "optional"
+SECTION = "console/network"
+LICENSE = "GPL"
+
+DEPENDS = "tcp-wrappers libevent"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \
+	file://nfsserver \
+   "
+
+S = "${WORKDIR}/nfs-utils-${PV}/"
+
+PARALLEL_MAKE = ""
+
+# Only kernel-module-nfsd is required here (but can be built-in)  - the nfsd module will
+# pull in the remainder of the dependencies.
+RDEPENDS = "portmap"
+RRECOMMENDS = "kernel-module-nfsd"
+
+INITSCRIPT_NAME = "nfsserver"
+# The server has no dependencies at the user run levels, so just put
+# it in at the default levels.  It must be terminated before the network
+# in the shutdown levels, but that works fine.
+INITSCRIPT_PARAMS = "defaults"
+
+inherit autotools update-rc.d
+
+EXTRA_OECONF = "--with-statduser=nobody \
+		--enable-nfsv3 \
+		--disable-nfsv4 \
+		--disable-gss \
+		--with-statedir=/var/lib/nfs"
+
+do_ccompile() {
+	# UGLY HACK ALERT
+	cat ${WORKDIR}/forgotten-defines >> ${S}/support/include/config.h
+	oe_runmake 'BUILD=1'
+}
+
+INHIBIT_AUTO_STAGE = "1"
+
+do_install() {
+	install -d ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver
+
+	install -d ${D}${sbindir}
+	install -m 0755 ${S}/utils/exportfs/exportfs ${D}${sbindir}/exportfs
+	install -m 0755 ${S}/utils/mountd/mountd ${D}${sbindir}/mountd
+	install -m 0755 ${S}/utils/mount/mount.nfs ${D}${sbindir}/mount.nfs
+	install -m 0755 ${S}/utils/nfsd/nfsd ${D}${sbindir}/nfsd
+	install -m 0755 ${S}/utils/nfsstat/nfsstat ${D}${sbindir}/nfsstat
+	install -m 0755 ${S}/utils/showmount/showmount ${D}${sbindir}/showmount
+	install -m 0755 ${S}/utils/statd/statd ${D}${sbindir}/statd
+
+	install -d ${D}${mandir}/man8
+	install -m 0644 ${S}/utils/exportfs/exportfs.man ${D}${mandir}/man8/exportfs.8
+	install -m 0644 ${S}/utils/mountd/mountd.man ${D}${mandir}/man8/mountd.8
+	install -m 0644 ${S}/utils/nfsd/nfsd.man ${D}${mandir}/man8/nfsd.8
+	install -m 0644 ${S}/utils/nfsstat/nfsstat.man ${D}${mandir}/man8/nfsstat.8
+	install -m 0644 ${S}/utils/showmount/showmount.man ${D}${mandir}/man8/showmount.8
+	install -m 0644 ${S}/utils/statd/statd.man ${D}${mandir}/man8/statd.8
+}
diff --git a/packages/openmoko-projects/illume-theme_svn.bb b/packages/openmoko-projects/illume-theme-asu_svn.bb
index 3ea672117f..5ddb61d0eb 100644
--- a/packages/openmoko-projects/illume-theme_svn.bb
+++ b/packages/openmoko-projects/illume-theme-asu_svn.bb
@@ -1,17 +1,12 @@
 DESCRIPTION = "Illume - Mobile UI module for Enlightenment"
 HOMEPAGE = "http://illume.projects.openmoko.org/"
 LICENSE = "MIT/BSD"
-
-PACKAGE_ARCH="all"
 PV = "0.0+svnr${SRCREV}"
-PR = "r5"
+PR = "r6"
 
-SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=illume;proto=https"
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=illume;proto=http"
 S = "${WORKDIR}/illume"
 
-CONFFILES_${PN} = "${sysconfdir}/enlightenment/default_profile"
-FILES_${PN} = "${sysconfdir}/enlightenment ${datadir}/enlightenment"
-
 do_install() {
     install -d ${D}${sysconfdir}/enlightenment
     install -d ${D}${datadir}/enlightenment/data/themes/
@@ -23,3 +18,10 @@ do_install() {
     install -m 0644 ${S}/misc-data/illume.edj ${D}${datadir}/enlightenment/data/themes/
     install -m 0644 ${S}/misc-data/illume_init.edj ${D}${datadir}/enlightenment/data/init/
 }
+
+RPROVIDES_${PN} = "illume-theme"
+CONFFILES_${PN} = "${sysconfdir}/enlightenment/default_profile"
+FILES_${PN} = "${sysconfdir}/enlightenment ${datadir}/enlightenment"
+
+PACKAGE_ARCH_${PN} = "all"
+
diff --git a/packages/openmoko-projects/illume_svn.bb b/packages/openmoko-projects/illume_svn.bb
index b58bc2c1d6..af101f1a01 100644
--- a/packages/openmoko-projects/illume_svn.bb
+++ b/packages/openmoko-projects/illume_svn.bb
@@ -4,7 +4,7 @@ AUTHOR = "Rasterman"
 LICENSE = "MIT/BSD"
 DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native"
 PV = "0.0+svnr${SRCREV}"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=http"
 S = "${WORKDIR}/${PN}"
@@ -21,6 +21,7 @@ EXTRA_OECONF = "\
 RRECOMMENDS_${PN} = "\
   wamerican \
   ${PN}-config \
+  ${PN}-theme \
   ${PN}-dicts-default \
   ${PN}-keyboards-default \
   ${PN}-keyboards-numbers \
diff --git a/packages/python/python-setuptools-native_0.6c8.bb b/packages/python/python-setuptools-native_0.6c8.bb
index b7716d8cac..0bbf9c32fc 100644
--- a/packages/python/python-setuptools-native_0.6c8.bb
+++ b/packages/python/python-setuptools-native_0.6c8.bb
@@ -1,9 +1,9 @@
 require python-setuptools_${PV}.bb
 inherit native
 
+FILESPATH = "${FILE_DIRNAME}/python-setuptools"
 DEPENDS = "python-native"
 
 do_stage() {
-    BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
-      ${STAGING_BINDIR_NATIVE}/python setup.py install
+	distutils_stage_all
 }
diff --git a/packages/python/python-setuptools/.mtn2git_empty b/packages/python/python-setuptools/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/python/python-setuptools/.mtn2git_empty
diff --git a/packages/python/python-setuptools/fix-log-usage.patch b/packages/python/python-setuptools/fix-log-usage.patch
new file mode 100644
index 0000000000..6363c850c2
--- /dev/null
+++ b/packages/python/python-setuptools/fix-log-usage.patch
@@ -0,0 +1,13 @@
+Index: setuptools-0.6c8/setuptools/command/sdist.py
+===================================================================
+--- setuptools-0.6c8.orig/setuptools/command/sdist.py
++++ setuptools-0.6c8/setuptools/command/sdist.py
+@@ -95,7 +95,7 @@ def entries_finder(dirname, filename):
+         for match in entries_pattern.finditer(data):
+             yield joinpath(dirname,unescape(match.group(1)))
+     else:
+-        log.warn("unrecognized .svn/entries format in %s", dirname)
++        print ("unrecognized .svn/entries format in %s", dirname)
+ 
+ 
+ finders = [
diff --git a/packages/python/python-setuptools_0.6c8.bb b/packages/python/python-setuptools_0.6c8.bb
index 19f73d3f67..5b82ecea69 100644
--- a/packages/python/python-setuptools_0.6c8.bb
+++ b/packages/python/python-setuptools_0.6c8.bb
@@ -5,9 +5,12 @@ PRIORITY = "optional"
 LICENSE = "MIT-like"
 RDEPENDS = "python-distutils python-compression"
 SRCNAME = "setuptools"
-PR = "ml0"
+PR = "ml1"
 
-SRC_URI = "http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz"
+SRC_URI = "\
+  http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz\
+  file://fix-log-usage.patch;patch=1 \
+"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/packages/qt4/qt4-x11-free-4.4.0/.mtn2git_empty b/packages/qt4/qt4-x11-free-4.4.0/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qt4/qt4-x11-free-4.4.0/.mtn2git_empty
diff --git a/packages/qt4/qt4-x11-free-4.4.0/0001-cross-compile.patch b/packages/qt4/qt4-x11-free-4.4.0/0001-cross-compile.patch
new file mode 100644
index 0000000000..310f1931bc
--- /dev/null
+++ b/packages/qt4/qt4-x11-free-4.4.0/0001-cross-compile.patch
@@ -0,0 +1,32 @@
+--- /tmp/configure	2008-07-08 10:01:36.000000000 +0200
++++ qt-embedded-linux-opensource-src-4.4.0/configure	2008-07-08 10:23:04.000000000 +0200
+@@ -762,7 +762,7 @@
+             UNKNOWN_ARG=yes
+         fi
+         ;;
+-    -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config)
++    -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-crossarch)
+         VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
+         shift
+         VAL="$1"
+@@ -1179,7 +1179,10 @@
+     xplatform)
+         XPLATFORM="$VAL"
+         ;;
+-    debug-and-release)
++	crossarch)
++		CROSSARCH="$VAL"
++		;;
++	debug-and-release)
+         if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+             CFG_DEBUG_RELEASE="$VAL"
+         else
+@@ -2417,6 +2420,8 @@
+     ARCH=$HOST_ARCH
+ fi
+ 
++ARCH="$CROSSARCH"
++
+ if [ -d "$relpath/src/corelib/arch/$ARCH" ]; then
+     if [ "$OPT_VERBOSE" = "yes" ]; then
+         echo "    '$ARCH' is supported"
diff --git a/packages/qt4/qt4-x11-free-4.4.0/0002-fix-resinit-declaration.patch b/packages/qt4/qt4-x11-free-4.4.0/0002-fix-resinit-declaration.patch
new file mode 100644
index 0000000000..e479a64a2b
--- /dev/null
+++ b/packages/qt4/qt4-x11-free-4.4.0/0002-fix-resinit-declaration.patch
@@ -0,0 +1,25 @@
+From acfeb18aa94bad6b2066e91cd15570889baaa252 Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker@klever.net>
+Date: Sat, 2 Jun 2007 16:04:01 +0200
+Subject: [PATCH] fix resinit declaration
+
+---
+ src/qt3support/network/q3dns.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/qt3support/network/q3dns.cpp b/src/qt3support/network/q3dns.cpp
+index 9bc7b16..bfc333e 100644
+--- a/src/qt3support/network/q3dns.cpp
++++ b/src/qt3support/network/q3dns.cpp
+@@ -30,7 +30,7 @@
+ # include <netinet/in.h>
+ # include <arpa/nameser.h>
+ # include <resolv.h>
+-extern "C" int res_init();
++extern "C" int res_init() throw();
+ #endif
+ 
+ // POSIX Large File Support redefines open -> open64
+-- 
+1.5.0.7
+
diff --git a/packages/qt4/qt4-x11-free-4.4.0/0003-no-tools.patch b/packages/qt4/qt4-x11-free-4.4.0/0003-no-tools.patch
new file mode 100644
index 0000000000..bb36444f80
--- /dev/null
+++ b/packages/qt4/qt4-x11-free-4.4.0/0003-no-tools.patch
@@ -0,0 +1,16 @@
+--- /tmp/src.pro	2008-07-08 10:43:30.000000000 +0200
++++ qt-embedded-linux-opensource-src-4.4.0/src/src.pro	2008-07-08 11:28:24.000000000 +0200
+@@ -6,12 +6,9 @@
+ wince*:{
+   SRC_SUBDIRS += src_corelib src_xml src_gui src_sql src_network src_script src_testlib
+ } else {
+-    SRC_SUBDIRS += src_tools_moc src_tools_rcc src_tools_uic src_corelib src_xml src_network src_gui src_sql src_script src_testlib
++    SRC_SUBDIRS += src_corelib src_xml src_network src_gui src_sql src_script src_testlib
+     contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support
+     contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus
+-    !cross_compile {
+-        contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_tools_uic3
+-    }
+ }
+ win32:!contains(QT_EDITION, OpenSource|Console): {
+     SRC_SUBDIRS += src_activeqt
diff --git a/packages/qt4/qt4-x11-free-4.4.0/0004-no-qmake.patch b/packages/qt4/qt4-x11-free-4.4.0/0004-no-qmake.patch
new file mode 100644
index 0000000000..28f8d3ad9d
--- /dev/null
+++ b/packages/qt4/qt4-x11-free-4.4.0/0004-no-qmake.patch
@@ -0,0 +1,25 @@
+From f5a73ce944240de9013cc23288c115e8213add5e Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker@klever.net>
+Date: Sat, 2 Jun 2007 16:06:59 +0200
+Subject: [PATCH] no qmake
+
+---
+ configure |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index b3c2a52..1901e57 100755
+--- a/configure
++++ b/configure
+@@ -3517,7 +3517,7 @@ END {
+ }
+ 
+ # build qmake
+-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
++if false; then ###[ '!' -f "$outpath/bin/qmake" ];
+     echo "Creating qmake. Please wait..."
+ 
+     OLD_QCONFIG_H=
+-- 
+1.5.0.7
+
diff --git a/packages/qt4/qt4-x11-free-4.4.0/0005-fix-mkspecs.patch b/packages/qt4/qt4-x11-free-4.4.0/0005-fix-mkspecs.patch
new file mode 100644
index 0000000000..c6f55906bc
--- /dev/null
+++ b/packages/qt4/qt4-x11-free-4.4.0/0005-fix-mkspecs.patch
@@ -0,0 +1,101 @@
+--- /tmp/g++.conf	2008-07-08 10:32:18.000000000 +0200
++++ qt-embedded-linux-opensource-src-4.4.0/mkspecs/common/g++.conf	2008-07-08 10:34:15.000000000 +0200
+@@ -2,12 +2,12 @@
+ # qmake configuration for common gcc
+ #
+ 
+-QMAKE_CC		= gcc
+-QMAKE_CFLAGS		+= -pipe
++QMAKE_CC       = $(OE_QMAKE_CC)
++QMAKE_CFLAGS       += -pipe $(OE_QMAKE_CFLAGS)
+ QMAKE_CFLAGS_DEPS	+= -M
+ QMAKE_CFLAGS_WARN_ON	+= -Wall -W
+ QMAKE_CFLAGS_WARN_OFF	+= -w
+-QMAKE_CFLAGS_RELEASE	+= -O2
++QMAKE_CFLAGS_RELEASE	+= 
+ QMAKE_CFLAGS_DEBUG	+= -g
+ QMAKE_CFLAGS_SHLIB	+= -fPIC
+ QMAKE_CFLAGS_STATIC_LIB	+= -fPIC
+@@ -16,8 +16,8 @@
+ QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+ QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
+ 
+-QMAKE_CXX		= g++
+-QMAKE_CXXFLAGS		+= $$QMAKE_CFLAGS
++QMAKE_CXX      = $(OE_QMAKE_CXX)
++QMAKE_CXXFLAGS     += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
+ QMAKE_CXXFLAGS_DEPS	+= $$QMAKE_CFLAGS_DEPS
+ QMAKE_CXXFLAGS_WARN_ON	+= $$QMAKE_CFLAGS_WARN_ON
+ QMAKE_CXXFLAGS_WARN_OFF	+= $$QMAKE_CFLAGS_WARN_OFF
+@@ -30,9 +30,9 @@
+ QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+ QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
+ 
+-QMAKE_LINK		= g++
+-QMAKE_LINK_SHLIB	= g++
+-QMAKE_LFLAGS		+=
++QMAKE_LINK     = $(OE_QMAKE_LINK)
++QMAKE_LINK_SHLIB   = $(OE_QMAKE_LINK)
++QMAKE_LFLAGS       += $(OE_QMAKE_LDFLAGS)
+ QMAKE_LFLAGS_RELEASE	+=
+ QMAKE_LFLAGS_DEBUG	+=
+ QMAKE_LFLAGS_APP	+=
+@@ -41,7 +41,7 @@
+ QMAKE_LFLAGS_SONAME	+= -Wl,-soname,
+ QMAKE_LFLAGS_THREAD	+=
+ QMAKE_LFLAGS_NOUNDEF	+= -Wl,--no-undefined
+-QMAKE_RPATH		= -Wl,-rpath,
++QMAKE_RPATH        = -Wl,-rpath-link,
+ 
+ QMAKE_PCH_OUTPUT_EXT    = .gch
+ 
+--- /tmp/linux.conf	2008-07-08 10:32:18.000000000 +0200
++++ qt-embedded-linux-opensource-src-4.4.0/mkspecs/common/linux.conf	2008-07-08 10:38:37.000000000 +0200
+@@ -7,26 +7,27 @@
+ 
+ QMAKE_INCDIR          =
+ QMAKE_LIBDIR          =
+-QMAKE_INCDIR_X11      = /usr/X11R6/include
+-QMAKE_LIBDIR_X11      = /usr/X11R6/lib
+-QMAKE_INCDIR_QT       = $$[QT_INSTALL_HEADERS]
+-QMAKE_LIBDIR_QT       = $$[QT_INSTALL_LIBS]
+-QMAKE_INCDIR_OPENGL   = /usr/X11R6/include
+-QMAKE_LIBDIR_OPENGL   = /usr/X11R6/lib
++QMAKE_INCDIR_X11      =
++QMAKE_LIBDIR_X11      =
++QMAKE_INCDIR_QT       = $(OE_QMAKE_INCDIR_QT)
++QMAKE_LIBDIR_QT       = $(OE_QMAKE_LIBDIR_QT)
++QMAKE_INCDIR_OPENGL   =
++QMAKE_LIBDIR_OPENGL   =
++
+ 
+ QMAKE_LIBS            =
+ QMAKE_LIBS_DYNLOAD    = -ldl
+-QMAKE_LIBS_X11        = -lXext -lX11 -lm
+-QMAKE_LIBS_X11SM      = -lSM -lICE
++QMAKE_LIBS_X11        = $(OE_QMAKE_LIBS_X11)
++QMAKE_LIBS_X11SM      = $(OE_QMAKE_LIBS_X11SM)
+ QMAKE_LIBS_NIS        = -lnsl
+ QMAKE_LIBS_OPENGL     = -lGLU -lGL
+ QMAKE_LIBS_OPENGL_QT  = -lGL
+ QMAKE_LIBS_THREAD     = -lpthread
+ 
+-QMAKE_MOC             = $$[QT_INSTALL_BINS]/moc
+-QMAKE_UIC             = $$[QT_INSTALL_BINS]/uic
++QMAKE_MOC             = $(OE_QMAKE_MOC)
++QMAKE_UIC             = $(OE_QMAKE_UIC)
+ 
+-QMAKE_AR              = ar cqs
++QMAKE_AR              = $(OE_QMAKE_AR) cqs
+ QMAKE_OBJCOPY         = objcopy
+ QMAKE_RANLIB          =
+ 
+@@ -39,7 +40,7 @@
+ QMAKE_MOVE            = mv -f
+ QMAKE_DEL_FILE        = rm -f
+ QMAKE_DEL_DIR         = rmdir
+-QMAKE_STRIP           = strip
++QMAKE_STRIP           = $(OE_QMAKE_STRIP)
+ QMAKE_STRIPFLAGS_LIB += --strip-unneeded
+ QMAKE_CHK_DIR_EXISTS  = test -d
+ QMAKE_MKDIR           = mkdir -p
diff --git a/packages/qt4/qt4-x11-free-4.4.0/0006-freetype-host-includes.patch b/packages/qt4/qt4-x11-free-4.4.0/0006-freetype-host-includes.patch
new file mode 100644
index 0000000000..cc8e115fee
--- /dev/null
+++ b/packages/qt4/qt4-x11-free-4.4.0/0006-freetype-host-includes.patch
@@ -0,0 +1,23 @@
+From c9ab62bd9a56643574b3ae6e59e0ca776d4860d2 Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker@klever.net>
+Date: Mon, 4 Jun 2007 14:48:50 +0200
+Subject: [PATCH] freetype host includes
+
+---
+ config.tests/unix/freetype/freetype.pri |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/config.tests/unix/freetype/freetype.pri b/config.tests/unix/freetype/freetype.pri
+index 84974bf..ab9a6f2 100644
+--- a/config.tests/unix/freetype/freetype.pri
++++ b/config.tests/unix/freetype/freetype.pri
+@@ -1,5 +1,5 @@
+ !cross_compile {
+-    TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
++    TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
+     for(p, TRY_INCLUDEPATHS) {
+         p = $$join(p, "", "", "/freetype2")
+         exists($$p):INCLUDEPATH *= $$p
+-- 
+1.5.0.7
+
diff --git a/packages/qt4/qt4-x11-free-4.4.0/0007-openssl-host-includes.patch b/packages/qt4/qt4-x11-free-4.4.0/0007-openssl-host-includes.patch
new file mode 100644
index 0000000000..35b71d9694
--- /dev/null
+++ b/packages/qt4/qt4-x11-free-4.4.0/0007-openssl-host-includes.patch
@@ -0,0 +1,23 @@
+From d45943adb443ad4b85ca4504952dee743c675e1e Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker@klever.net>
+Date: Mon, 4 Jun 2007 14:58:34 +0200
+Subject: [PATCH] openssl host includes
+
+---
+ config.tests/unix/openssl/openssl.pri |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/config.tests/unix/openssl/openssl.pri b/config.tests/unix/openssl/openssl.pri
+index 756e5fe..19b4061 100644
+--- a/config.tests/unix/openssl/openssl.pri
++++ b/config.tests/unix/openssl/openssl.pri
+@@ -1,5 +1,5 @@
+ !cross_compile {
+-    TRY_INCLUDEPATHS = /include /usr/include /usr/local/include $$QMAKE_INCDIR $$INCLUDEPATH
++    TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH
+     for(p, TRY_INCLUDEPATHS) {
+         pp = $$join(p, "", "", "/openssl")
+         exists($$pp):INCLUDEPATH *= $$p
+-- 
+1.5.0.7
+
diff --git a/packages/qt4/qt4-x11-free-4.4.0/allow-configure-plugins.patch b/packages/qt4/qt4-x11-free-4.4.0/allow-configure-plugins.patch
new file mode 100644
index 0000000000..601f2fc369
--- /dev/null
+++ b/packages/qt4/qt4-x11-free-4.4.0/allow-configure-plugins.patch
@@ -0,0 +1,62 @@
+Index: qtopia-core-opensource-src-4.3.3/configure
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/configure	2008-01-20 11:42:07.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/configure	2008-01-20 22:31:37.000000000 +0100
+@@ -639,10 +639,10 @@
+ 
+ CFG_SQL_AVAILABLE=
+ if [ -d "$relpath/src/plugins/sqldrivers" ]; then
+-  for a in "$relpath/src/plugins/sqldrivers/"*; do
+-     if [ -d "$a" ]; then
+-	 base_a=`basename $a`
+-  	 CFG_SQL_AVAILABLE="${CFG_SQL_AVAILABLE} ${base_a}"
++  for a in `ls $relpath/src/plugins/sqldrivers/`; do
++     dir="$relpath/src/plugins/sqldrivers/$a"
++     if [ -d "$dir" ]; then
++  	 CFG_SQL_AVAILABLE="${CFG_SQL_AVAILABLE} ${a}"
+ 	 eval "CFG_SQL_${base_a}=auto"
+      fi
+   done
+@@ -650,30 +650,30 @@
+ 
+ CFG_DECORATION_PLUGIN_AVAILABLE=
+ if [ -d "$relpath/src/plugins/decorations" ]; then
+-  for a in "$relpath/src/plugins/decorations/"*; do
+-     if [ -d "$a" ]; then
+-	 base_a=`basename $a`
+-  	 CFG_DECORATION_PLUGIN_AVAILABLE="${CFG_DECORATION_PLUGIN_AVAILABLE} ${base_a}"
++  for a in `ls $relpath/src/plugins/decorations/`; do
++     dir="$relpath/src/plugins/decorations/$a"
++     if [ -d "$dir" ]; then
++  	 CFG_DECORATION_PLUGIN_AVAILABLE="${CFG_DECORATION_PLUGIN_AVAILABLE} ${a}"
+      fi
+   done
+ fi
+ 
+ CFG_MOUSE_PLUGIN_AVAILABLE=
+ if [ -d "$relpath/src/plugins/mousedrivers" ]; then
+-  for a in "$relpath/src/plugins/mousedrivers/"*; do
+-     if [ -d "$a" ]; then
+-	 base_a=`basename $a`
+-  	 CFG_MOUSE_PLUGIN_AVAILABLE="${CFG_MOUSE_PLUGIN_AVAILABLE} ${base_a}"
++  for a in `ls $relpath/src/plugins/mousedrivers/`; do
++     dir="$relpath/src/plugins/mousedrivers/$a"
++     if [ -d "$dir" ]; then
++  	 CFG_MOUSE_PLUGIN_AVAILABLE="${CFG_MOUSE_PLUGIN_AVAILABLE} ${a}"
+      fi
+   done
+ fi
+ 
+ CFG_GFX_PLUGIN_AVAILABLE=
+ if [ -d "$relpath/src/plugins/gfxdrivers" ]; then
+-  for a in "$relpath/src/plugins/gfxdrivers/"*; do
+-     if [ -d "$a" ]; then
+-	 base_a=`basename $a`
+-  	 CFG_GFX_PLUGIN_AVAILABLE="${CFG_GFX_PLUGIN_AVAILABLE} ${base_a}"
++  for a in `ls $relpath/src/plugins/gfxdrivers/`; do
++     dir="$relpath/src/plugins/gfxdrivers/$a"
++     if [ -d "$dir" ]; then
++  	 CFG_GFX_PLUGIN_AVAILABLE="${CFG_GFX_PLUGIN_AVAILABLE} ${a}"
+      fi
+   done
+   CFG_GFX_OFF="$CFG_GFX_AVAILABLE" # assume all off
diff --git a/packages/qt4/qt4-x11-free-4.4.0/build-tools.patch b/packages/qt4/qt4-x11-free-4.4.0/build-tools.patch
new file mode 100644
index 0000000000..54ad666374
--- /dev/null
+++ b/packages/qt4/qt4-x11-free-4.4.0/build-tools.patch
@@ -0,0 +1,28 @@
+Do not disable tools, examples and demos for the QWS build. Use brute-force
+to do this.
+
+Index: qtopia-core-opensource-src-4.3.3/configure
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/configure	2007-12-27 16:30:36.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/configure	2007-12-27 16:30:52.000000000 +0100
+@@ -2265,13 +2265,13 @@
+     CFG_BUILD_PARTS="$QT_DEFAULT_BUILD_PARTS"
+ 
+     # don't build tools by default when cross-compiling
+-    if [ "$PLATFORM" != "$XPLATFORM" ]; then
+-	CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, tools,,g"`
+-    fi
+-fi
+-for nobuild in $CFG_NOBUILD_PARTS; do
+-    CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, $nobuild,,g"`
+-done
++    #if [ "$PLATFORM" != "$XPLATFORM" ]; then
++    #	CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, tools,,g"`
++    #fi
++fi
++#for nobuild in $CFG_NOBUILD_PARTS; do
++#    CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, $nobuild,,g"`
++#done
+ if echo $CFG_BUILD_PARTS | grep -v libs >/dev/null 2>&1; then
+ #    echo
+ #    echo "WARNING: libs is a required part of the build."
diff --git a/packages/qt4/qt4-x11-free-4.4.0/linux-oe-qmake.conf b/packages/qt4/qt4-x11-free-4.4.0/linux-oe-qmake.conf
new file mode 100644
index 0000000000..fc5ac6dc5c
--- /dev/null
+++ b/packages/qt4/qt4-x11-free-4.4.0/linux-oe-qmake.conf
@@ -0,0 +1,95 @@
+#
+# qmake configuration for linux-oe-g++ / OpenEmbedded Build System / http://openembedded.org
+#
+
+MAKEFILE_GENERATOR	= UNIX
+TEMPLATE		= app
+CONFIG			+= qt warn_on release link_prl
+QT                      += core gui network
+QMAKE_INCREMENTAL_STYLE = sublib
+
+QMAKE_CC		= $(OE_QMAKE_CC)
+QMAKE_LEX		= flex
+QMAKE_LEXFLAGS		=
+QMAKE_YACC		= yacc
+QMAKE_YACCFLAGS		= -d
+QMAKE_YACCFLAGS_MANGLE  = -p $base -b $base
+QMAKE_YACC_HEADER       = $base.tab.h
+QMAKE_YACC_SOURCE       = $base.tab.c
+QMAKE_CFLAGS		= -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA)
+QMAKE_CFLAGS_DEPS	= -M
+QMAKE_CFLAGS_WARN_ON	= -Wall -W
+QMAKE_CFLAGS_WARN_OFF	=
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
+QMAKE_CFLAGS_DEBUG	= -g
+QMAKE_CFLAGS_SHLIB	= -fPIC
+QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
+QMAKE_CFLAGS_THREAD	= -D_REENTRANT
+QMAKE_CFLAGS_HIDESYMS   = -fvisibility=hidden
+
+QMAKE_CXX		= $(OE_QMAKE_CXX)
+QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) $(CXXFLAGS_EXTRA)
+QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
+QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
+QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF
+QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE
+QMAKE_CXXFLAGS_DEBUG	= $$QMAKE_CFLAGS_DEBUG
+QMAKE_CXXFLAGS_SHLIB	= $$QMAKE_CFLAGS_SHLIB
+QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
+QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
+QMAKE_CXXFLAGS_HIDESYMS = $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
+
+QMAKE_INCDIR		=
+QMAKE_LIBDIR		=
+QMAKE_INCDIR_X11	= 
+QMAKE_LIBDIR_X11	= 
+QMAKE_INCDIR_QT		= $(OE_QMAKE_INCDIR_QT)
+QMAKE_LIBDIR_QT		= $(OE_QMAKE_LIBDIR_QT)
+QMAKE_INCDIR_OPENGL	=
+QMAKE_LIBDIR_OPENGL	=
+QMAKE_INCDIR_QTOPIA     = $(OE_QMAKE_INCDIR_QTOPIA)
+QMAKE_LIBDIR_QTOPIA     = $(OE_QMAKE_LIBDIR_QTOPIA)
+
+
+QMAKE_LINK		= $(OE_QMAKE_LINK)
+QMAKE_LINK_SHLIB	= $(OE_QMAKE_LINK)
+QMAKE_LFLAGS		= $(OE_QMAKE_LDFLAGS) $(LFLAGS_EXTRA)
+QMAKE_LFLAGS_RELEASE	=
+QMAKE_LFLAGS_DEBUG	=
+QMAKE_LFLAGS_SHLIB      = -shared
+QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
+QMAKE_LFLAGS_SONAME     = -Wl,-soname,
+QMAKE_LFLAGS_THREAD     =
+QMAKE_RPATH             = -Wl,-rpath-link,
+
+QMAKE_LIBS		= $(LIBS_EXTRA)
+QMAKE_LIBS_DYNLOAD      = -ldl
+QMAKE_LIBS_X11		= 
+QMAKE_LIBS_X11SM	=  
+QMAKE_LIBS_QT		= -lqte
+QMAKE_LIBS_QT_THREAD    = -lqte-mt
+QMAKE_LIBS_QT_OPENGL	= -lqgl
+QMAKE_LIBS_THREAD       = -lpthread
+QMAKE_LIBS_QTOPIA       = -lqpe -lqtopia
+QMAKE_LIBS_THREAD       = -lpthread
+
+QMAKE_MOC		= $$[QT_INSTALL_BINS]/moc
+QMAKE_UIC		= $$[QT_INSTALL_BINS]/uic
+
+QMAKE_AR		= $(OE_QMAKE_AR) cqs
+QMAKE_RANLIB		= $(OE_QMAKE_RANLIB)
+
+QMAKE_TAR		= tar -cf
+QMAKE_GZIP		= gzip -9f
+
+QMAKE_COPY		= cp -f
+QMAKE_COPY_FILE         = $(COPY)
+QMAKE_COPY_DIR          = $(COPY) -r
+QMAKE_MOVE		= mv -f
+QMAKE_DEL_FILE		= rm -f
+QMAKE_DEL_DIR		= rmdir
+QMAKE_STRIP             = $(OE_QMAKE_STRIP)
+QMAKE_STRIPFLAGS_LIB	+= --strip-unneeded
+QMAKE_CHK_DIR_EXISTS	= test -d
+QMAKE_MKDIR		= mkdir -p
+load(qt_config)
diff --git a/packages/qt4/qt4-x11-free-4.4.0/qconfig-oe.h b/packages/qt4/qt4-x11-free-4.4.0/qconfig-oe.h
new file mode 100644
index 0000000000..f820c01da8
--- /dev/null
+++ b/packages/qt4/qt4-x11-free-4.4.0/qconfig-oe.h
@@ -0,0 +1,45 @@
+/****************************************************************************
+**
+** Copyright (C) 1992-2007 Trolltech ASA. All rights reserved.
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** This file may be used under the terms of the GNU General Public
+** License version 2.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of
+** this file.  Please review the following information to ensure GNU
+** General Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/
+**
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** In addition, as a special exception, Trolltech gives you certain
+** additional rights. These rights are described in the Trolltech GPL
+** Exception version 1.0, which can be found at
+** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** GPL_EXCEPTION.txt in this package.
+**
+** In addition, as a special exception, Trolltech, as the sole copyright
+** holder for Qt Designer, grants users of the Qt/Eclipse Integration
+** plug-in the right for the Qt/Eclipse Integration to link to
+** functionality provided by Qt Designer and its related libraries.
+**
+** Trolltech reserves all rights not expressly granted herein.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+****************************************************************************/
+
+
+/*
+ Empty leaves all features enabled. See doc/html/emb-features.html for choices.
+
+ Note that disabling some features will produce a libqt that is not
+ compatible with other libqt builds. Such modifications are only
+ supported on Qtopia Core where reducing the library size is important
+ and where the application-suite is often a fixed set.
+*/
diff --git a/packages/qt4/qt4-x11-free_4.4.0.bb b/packages/qt4/qt4-x11-free_4.4.0.bb
new file mode 100644
index 0000000000..7d30503c07
--- /dev/null
+++ b/packages/qt4/qt4-x11-free_4.4.0.bb
@@ -0,0 +1,5 @@
+require qt4-x11-free.inc
+SRC_URI += " \
+           file://0002-fix-resinit-declaration.patch;patch=1 \
+           file://0006-freetype-host-includes.patch;patch=1 \
+           file://0007-openssl-host-includes.patch;patch=1 "
diff --git a/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb b/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
index e6e73da516..8870bcc799 100644
--- a/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
+++ b/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
@@ -12,6 +12,7 @@ PROVIDES_sharprom-compatible = "\
   virtual/libiconv \
   virtual/arm-linux-gcc \
   virtual/arm-linux-libc-for-gcc \
+  virtual/arm-linux-gcc-intermediate \
   virtual/arm-linux-gcc-initial "
 PR = "r2"
 
diff --git a/packages/tcp-wrappers/tcp-wrappers_7.6.bb b/packages/tcp-wrappers/tcp-wrappers_7.6.bb
index 047adc23a6..e10d3e8172 100644
--- a/packages/tcp-wrappers/tcp-wrappers_7.6.bb
+++ b/packages/tcp-wrappers/tcp-wrappers_7.6.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Tools for monitoring and filtering incoming requests for tcp \
 LICENSE = "tcp-wrappers"
 PRIORITY = "optional"
 SECTION = "console/network"
-PR="r1"
+PR="r2"
 
 
 PACKAGES = "${PN}-dbg libwrap libwrap-doc libwrap-dev tcp-wrappers tcp-wrappers-doc"
@@ -107,5 +107,6 @@ do_install () {
 
 do_stage() {
         oe_libinstall -C shared -so  libwrap ${STAGING_LIBDIR}
+		install -m 0644 tcpd.h ${STAGING_INCDIR}
 }
 
diff --git a/packages/uclibc/bfin-uclibc_svn.bb b/packages/uclibc/bfin-uclibc_svn.bb
index 5e71ddb490..cccb5d6527 100644
--- a/packages/uclibc/bfin-uclibc_svn.bb
+++ b/packages/uclibc/bfin-uclibc_svn.bb
@@ -7,7 +7,7 @@
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
 UCLIBC_BASE ?= "0.9.29"
-PR = "r1"
+PR = "r2"
 PV = "${UCLIBC_BASE}+svnr${SRCREV}"
 
 require uclibc.inc
diff --git a/packages/uclibc/uclibc-cvs/uclibc-arm-ftruncate64.patch b/packages/uclibc/files/uclibc-arm-ftruncate64.patch
index 504d37bcd2..504d37bcd2 100644
--- a/packages/uclibc/uclibc-cvs/uclibc-arm-ftruncate64.patch
+++ b/packages/uclibc/files/uclibc-arm-ftruncate64.patch
diff --git a/packages/uclibc/uclibc-0.9.27/uclibc-makevars-in-quotes.patch b/packages/uclibc/uclibc-0.9.27/uclibc-makevars-in-quotes.patch
new file mode 100644
index 0000000000..ce67e8f764
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.27/uclibc-makevars-in-quotes.patch
@@ -0,0 +1,25 @@
+---
+ Makefile |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: uClibc-0.9.27/Makefile
+===================================================================
+--- uClibc-0.9.27.orig/Makefile	2008-07-23 20:05:34.000000000 -0700
++++ uClibc-0.9.27/Makefile	2008-07-23 20:06:27.000000000 -0700
+@@ -243,14 +243,14 @@ endif
+ .PHONY: utils
+ ifeq ($(strip $(HAVE_SHARED)),y)
+ utils:
+-	$(MAKE) CROSS=$(CROSS) CC=$(CC) -C utils
++	$(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils
+ else
+ utils: dummy
+ endif
+ 
+ # Installs helper applications, such as 'ldd' and 'ldconfig'
+ install_utils: utils
+-	$(MAKE) CROSS=$(CROSS) CC=$(CC) -C utils install
++	$(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils install
+ #ifeq ($(strip $(UCLIBC_HAS_LOCALE)),y)
+ #	@$(MAKE) -C libc/misc/wchar iconv.target
+ #	$(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)/usr/bin;
diff --git a/packages/uclibc/uclibc-0.9.28/uclibc-libgcc-eh.patch b/packages/uclibc/uclibc-0.9.28/uclibc-libgcc-eh.patch
new file mode 100644
index 0000000000..0f66c1526f
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.28/uclibc-libgcc-eh.patch
@@ -0,0 +1,38 @@
+---
+ Rules.mak |    9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+Index: uClibc-0.9.28/Rules.mak
+===================================================================
+--- uClibc-0.9.28.orig/Rules.mak	2005-08-17 15:49:49.000000000 -0700
++++ uClibc-0.9.28/Rules.mak	2008-07-22 23:35:10.000000000 -0700
+@@ -37,7 +37,8 @@
+ # will build uClibc for 'arm'.
+ 
+ ifndef CROSS
+-CROSS=
++TARGET_ARCH=arm
++CROSS=arm-angstrom-linux-uclibcgnueabi-
+ endif
+ CC         = $(CROSS)gcc
+ AR         = $(CROSS)ar
+@@ -85,7 +86,8 @@ ifeq ($(filter $(noconfig_targets),$(MAK
+ endif
+ 
+ ifndef CROSS
+-CROSS=$(subst ",, $(strip $(CROSS_COMPILER_PREFIX)))
++TARGET_ARCH=arm
++CROSS=arm-angstrom-linux-uclibcgnueabi-
+ endif
+ 
+ # A nifty macro to make testing gcc features easier
+@@ -337,6 +339,9 @@ ASFLAGS += $(ASFLAGS_NOEXEC)
+ LIBGCC_CFLAGS ?= $(CFLAGS) $(CPU_CFLAGS-y)
+ LIBGCC:=$(shell $(CC) $(LIBGCC_CFLAGS) -print-libgcc-file-name)
+ LIBGCC_DIR:=$(dir $(LIBGCC))
++ifneq ($(shell $(CC) $(LIBGCC_CFLAGS) -print-file-name=libgcc_eh.a),libgcc_eh.a)
++  LIBGCC += $(shell $(CC) $(LIBGCC_CFLAGS) -print-file-name=libgcc_eh.a)
++endif
+ 
+ ########################################
+ #
diff --git a/packages/uclibc/uclibc-initial_0.9.26.bb b/packages/uclibc/uclibc-initial_0.9.26.bb
index c29a498a96..a6a83bdce9 100644
--- a/packages/uclibc/uclibc-initial_0.9.26.bb
+++ b/packages/uclibc/uclibc-initial_0.9.26.bb
@@ -3,20 +3,28 @@ require uclibc_${PV}.bb
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
-DEPENDS = "linux-libc-headers"
+DEPENDS = "linux-libc-headers virtual/${TARGET_PREFIX}gcc-initial"
 PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
 PACKAGES = ""
 
 do_stage() {
 	# Install initial headers into the cross dir
-	make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGING_PREFIX}/ \
-		RUNTIME_PREFIX=${UCLIBC_STAGING_PREFIX}/ \
+	make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+		RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
 		pregen install_dev
+	make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+		RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+                libc/sysdeps/linux/${TARGET_ARCH}/crt0.o \
+                libc/sysdeps/linux/${TARGET_ARCH}/crti.o \
+                libc/sysdeps/linux/${TARGET_ARCH}/crtn.o
 
 	ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
 
 	# This conflicts with the c++ version of this header
-	rm -f ${UCLIBC_STAGING_PREFIX}/include/bits/atomicity.h
+	rm -f ${UCLIBC_STAGE_PREFIX}/include/bits/atomicity.h
+	install -m 644 libc/sysdeps/linux/${TARGET_ARCH}/crt[0in].o ${UCLIBC_STAGE_PREFIX}/lib
+	${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
+		-o ${UCLIBC_STAGE_PREFIX}/lib/libc.so
 }
 
 do_install() {
diff --git a/packages/uclibc/uclibc-initial_0.9.27.bb b/packages/uclibc/uclibc-initial_0.9.27.bb
index c29a498a96..3aecd802af 100644
--- a/packages/uclibc/uclibc-initial_0.9.27.bb
+++ b/packages/uclibc/uclibc-initial_0.9.27.bb
@@ -3,20 +3,29 @@ require uclibc_${PV}.bb
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
-DEPENDS = "linux-libc-headers"
+DEPENDS = "linux-libc-headers virtual/${TARGET_PREFIX}gcc-initial"
 PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
 PACKAGES = ""
 
 do_stage() {
 	# Install initial headers into the cross dir
-	make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGING_PREFIX}/ \
-		RUNTIME_PREFIX=${UCLIBC_STAGING_PREFIX}/ \
+	make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+		RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
 		pregen install_dev
+	make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+		RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+                libc/sysdeps/linux/${TARGET_ARCH}/crt0.o \
+                libc/sysdeps/linux/${TARGET_ARCH}/crti.o \
+                libc/sysdeps/linux/${TARGET_ARCH}/crtn.o
 
 	ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
 
 	# This conflicts with the c++ version of this header
-	rm -f ${UCLIBC_STAGING_PREFIX}/include/bits/atomicity.h
+	rm -f ${UCLIBC_STAGE_PREFIX}/include/bits/atomicity.h
+	install -m 644 libc/sysdeps/linux/${TARGET_ARCH}/crt[0in].o ${UCLIBC_STAGE_PREFIX}/lib
+	${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
+		-o ${UCLIBC_STAGE_PREFIX}/lib/libc.so
+
 }
 
 do_install() {
diff --git a/packages/uclibc/uclibc-initial_0.9.28.bb b/packages/uclibc/uclibc-initial_0.9.28.bb
index c29a498a96..4bfbdb6d16 100644
--- a/packages/uclibc/uclibc-initial_0.9.28.bb
+++ b/packages/uclibc/uclibc-initial_0.9.28.bb
@@ -3,20 +3,29 @@ require uclibc_${PV}.bb
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
-DEPENDS = "linux-libc-headers"
+DEPENDS = "linux-libc-headers virtual/${TARGET_PREFIX}gcc-initial"
 PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
 PACKAGES = ""
 
 do_stage() {
 	# Install initial headers into the cross dir
-	make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGING_PREFIX}/ \
-		RUNTIME_PREFIX=${UCLIBC_STAGING_PREFIX}/ \
+	make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+		RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
 		pregen install_dev
+	make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+		RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+		libc/sysdeps/linux/${TARGET_ARCH}/crt1.o \
+		libc/sysdeps/linux/${TARGET_ARCH}/crti.o \
+		libc/sysdeps/linux/${TARGET_ARCH}/crtn.o
 
 	ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
 
 	# This conflicts with the c++ version of this header
-	rm -f ${UCLIBC_STAGING_PREFIX}/include/bits/atomicity.h
+	rm -f ${UCLIBC_STAGE_PREFIX}/include/bits/atomicity.h
+	install -m 644 libc/sysdeps/linux/${TARGET_ARCH}/crt[1in].o ${UCLIBC_STAGE_PREFIX}/lib
+	${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
+		-o ${UCLIBC_STAGE_PREFIX}/lib/libc.so
+
 }
 
 do_install() {
diff --git a/packages/uclibc/uclibc-initial_0.9.29.bb b/packages/uclibc/uclibc-initial_0.9.29.bb
index e75f612b88..c56e5fb2f5 100644
--- a/packages/uclibc/uclibc-initial_0.9.29.bb
+++ b/packages/uclibc/uclibc-initial_0.9.29.bb
@@ -3,7 +3,7 @@ require uclibc_${PV}.bb
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
-DEPENDS = "linux-libc-headers ncurses-native"
+DEPENDS = "linux-libc-headers ncurses-native virtual/${TARGET_PREFIX}gcc-initial"
 PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
 PACKAGES = ""
 
@@ -12,12 +12,19 @@ do_stage() {
 	make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
 		RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
 		pregen install_dev
+	make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+		RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+		lib/crt1.o lib/crti.o lib/crtn.o
 
 	install -d ${CROSS_DIR}/${TARGET_SYS}	
 	ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
 
 	# This conflicts with the c++ version of this header
 	rm -f ${UCLIBC_STAGE_PREFIX}/include/bits/atomicity.h
+	install -m 644 lib/crt[1in].o ${UCLIBC_STAGE_PREFIX}/lib
+	${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
+		-o ${UCLIBC_STAGE_PREFIX}/lib/libc.so
+
 }
 
 do_install() {
diff --git a/packages/uclibc/uclibc-initial_svn.bb b/packages/uclibc/uclibc-initial_svn.bb
index f3496839ff..e742fd55fd 100644
--- a/packages/uclibc/uclibc-initial_svn.bb
+++ b/packages/uclibc/uclibc-initial_svn.bb
@@ -1,9 +1,7 @@
 SECTION = "base"
 require uclibc_svn.bb
 
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-cvs', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
-DEPENDS = "linux-libc-headers ncurses-native"
+DEPENDS = "linux-libc-headers ncurses-native virtual/${TARGET_PREFIX}gcc-initial"
 PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
 PACKAGES = ""
 
@@ -11,12 +9,18 @@ do_stage() {
 	# Install initial headers into the cross dir
 	make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
 		RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
-		pregen install_dev
+		install_headers
+	make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+		RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+		lib/crt1.o lib/crti.o lib/crtn.o
 
 	ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
 
 	# This conflicts with the c++ version of this header
 	rm -f ${UCLIBC_STAGE_PREFIX}/include/bits/atomicity.h
+	install -m 644 lib/crt[1in].o ${UCLIBC_STAGE_PREFIX}/lib
+	${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
+		-o ${UCLIBC_STAGE_PREFIX}/lib/libc.so
 }
 
 do_install() {
diff --git a/packages/uclibc/uclibc.inc b/packages/uclibc/uclibc.inc
index 861568c06e..544d760e99 100644
--- a/packages/uclibc/uclibc.inc
+++ b/packages/uclibc/uclibc.inc
@@ -22,7 +22,7 @@ python __anonymous () {
 PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES += "${@['virtual/libiconv', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']}"
 DEPENDS = "virtual/${TARGET_PREFIX}binutils \
-	   virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers ncurses-native"
+	   virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers ncurses-native pax-utils-native"
 RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
 
 # Blackfin needs a wrapper around ld
@@ -73,7 +73,8 @@ UCLIBC_STAGE_PREFIX = "${STAGING_DIR_HOST}${layout_prefix}"
 # the CFLAGS (for when building the utils).
 OEMAKE_NO_CC = "'STRIPTOOL=true' 'LD=${LD}' \
 		'LOCALE_DATA_FILENAME=${UCLIBC_LOCALE_FILE}'"
-EXTRA_OEMAKE = "${OEMAKE_NO_CC} 'CC=${CC}' HOSTCFLAGS='-I${STAGING_INCDIR_NATIVE}'"
+EXTRA_OEMAKE = "${OEMAKE_NO_CC} 'CC=${CC}' \
+		'HOSTCFLAGS=-I${STAGING_INCDIR_NATIVE}'"
 EXTRA_OEMAKE_task_do_populate_staging = "${OEMAKE_NO_CC}"
 EXTRA_OEMAKE_task_do_package = "${OEMAKE_NO_CC}"
 
diff --git a/packages/uclibc/uclibc_0.9.26.bb b/packages/uclibc/uclibc_0.9.26.bb
index 865d373a43..1c52500ee6 100644
--- a/packages/uclibc/uclibc_0.9.26.bb
+++ b/packages/uclibc/uclibc_0.9.26.bb
@@ -1,4 +1,4 @@
-PR = "r9"
+PR = "r10"
 
 require uclibc.inc
 
diff --git a/packages/uclibc/uclibc_0.9.27.bb b/packages/uclibc/uclibc_0.9.27.bb
index d1686f5772..f730ad8a27 100644
--- a/packages/uclibc/uclibc_0.9.27.bb
+++ b/packages/uclibc/uclibc_0.9.27.bb
@@ -1,5 +1,5 @@
 DEFAULT_PREFERENCE = "1"
-PR = "r9"
+PR = "r10"
 
 require uclibc.inc
 
@@ -19,6 +19,7 @@ SRC_URI += "${PATCH_ipc_h}"
 SRC_URI += " file://thumb-swi.patch;patch=1"
 SRC_URI += " file://thumb-swp.patch;patch=1"
 SRC_URI += " file://arm-thumb-defined.patch;patch=1"
+SRC_URI += " file://uclibc-makevars-in-quotes.patch;patch=1"
 
 # ARM thumb interworking - these changes fix various bugs in the
 # uclibc implementation of thumb interwork support, but they are
diff --git a/packages/uclibc/uclibc_0.9.28.bb b/packages/uclibc/uclibc_0.9.28.bb
index eb3bb50083..1b2fc325d5 100644
--- a/packages/uclibc/uclibc_0.9.28.bb
+++ b/packages/uclibc/uclibc_0.9.28.bb
@@ -1,5 +1,5 @@
 DEFAULT_PREFERENCE = "1"
-PR = "r13"
+PR = "r14"
 
 require uclibc.inc
 
@@ -34,6 +34,7 @@ THUMBSTUFF = " \
               file://dl-startup.h.patch;patch=1 \
               file://dl-string.h.patch;patch=1 \
               file://dl-sysdep.h.patch;patch=1 \
+              file://uclibc-libgcc-eh.patch;patch=1 \
              "
 
 SRC_URI_append_arm = " ${THUMBSTUFF} "
diff --git a/packages/uclibc/uclibc_0.9.29.bb b/packages/uclibc/uclibc_0.9.29.bb
index 4565f7dbb4..8368903277 100644
--- a/packages/uclibc/uclibc_0.9.29.bb
+++ b/packages/uclibc/uclibc_0.9.29.bb
@@ -7,8 +7,8 @@
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
 UCLIBC_BASE ?= "0.9.29"
-PR = "r19"
-DEFAULT_PREFERENCE = "3"
+PR = "r20"
+DEFAULT_PREFERENCE = "1"
 
 require uclibc.inc
 
diff --git a/packages/uclibc/uclibc_svn.bb b/packages/uclibc/uclibc_svn.bb
index a357808745..b7b8960952 100644
--- a/packages/uclibc/uclibc_svn.bb
+++ b/packages/uclibc/uclibc_svn.bb
@@ -8,7 +8,7 @@
 #
 UCLIBC_BASE ?= "0.9.29"
 PV = "${UCLIBC_BASE}+svnr${SRCREV}"
-PR = "r10"
+PR = "r12"
 #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take
 # precedence.
 
@@ -28,8 +28,6 @@ SRC_URI += "svn://uclibc.org/trunk;module=uClibc \
             file://uClibc.machine \
             file://uClibc.distro \
             file://uclibc-arm-ftruncate64.patch;patch=1 \
-            file://errno_values.h.patch;patch=1 \
-	    file://build_wcs_upper_buffer.patch;patch=1 \
             file://arm_fix_alignment.patch;patch=1 \
 	    file://unistd_arm.patch;patch=1 \
             "
diff --git a/packages/vlc/vlc-davinci_0.8.6h.bb b/packages/vlc/vlc-davinci_0.8.6h.bb
index 28c4a8a38c..6f0308880c 100644
--- a/packages/vlc/vlc-davinci_0.8.6h.bb
+++ b/packages/vlc/vlc-davinci_0.8.6h.bb
@@ -4,13 +4,13 @@ LICENSE = "GPL"
 PRIORITY = "optional"
 SECTION = "multimedia"
 
-SRCREV = "fa02f65b17429432d13a108f73744f33709dd01c"
+SRCREV = "1ae3abd276bc478f7a3156c4acef1dd20f1b1899"
 
-PR = "r2"
+PR = "r3"
 
 PV = "0.8.6h+${PR}+gitr${SRCREV}"
 
-DEPENDS = "dbus libxml2 gnutls tremor faad2 ffmpeg flac liba52 libid3tag libmad mpeg2dec"
+DEPENDS = "codec-engine dbus libxml2 gnutls tremor faad2 ffmpeg flac liba52 libid3tag libmad mpeg2dec"
 
 SRC_URI = "git://git.videolan.org/vlc.git;protocol=git;branch=0.8.6-neuros"
 
@@ -35,7 +35,7 @@ EXTRA_OECONF = "\
 	--enable-live555 --enable-tremor \
     --disable-mod \
 	--enable-davinci --enable-davincifb --enable-davinciresizer \
-    --enable-v4l2 --enable-aa --enable-wma --enable-faad \
+    --enable-v4l2 --disable-aa --enable-wma --disable-faad \
     --enable-dbus \
 "