merge of '92b38b8c6e237f7df0177373a95c59b85ad01087'

     and 'd73006a33d6286f7506fbf07c816c81e2e9c215c'

66 files changed, 602 insertions, 807 deletions

diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index 3c555751da..fccf2b6d80 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -139,6 +139,13 @@ autotools_do_configure() {
 
 autotools_do_install() {
 	oe_runmake 'DESTDIR=${D}' install
+
+        for i in `find ${D} -name "*.la"` ; do \
+            sed -i -e s:${STAGING_LIBDIR}:${libdir}:g $i
+            sed -i -e s:${D}::g $i
+            sed -i -e 's:-I${WORKDIR}\S*: :g' $i
+            sed -i -e 's:-L${WORKDIR}\S*: :g' $i
+	done
 }
 
 STAGE_TEMP="${WORKDIR}/temp-staging"
diff --git a/classes/pkgconfig.bbclass b/classes/pkgconfig.bbclass
index f2054b0b07..cd6e04731e 100644
--- a/classes/pkgconfig.bbclass
+++ b/classes/pkgconfig.bbclass
@@ -17,8 +17,17 @@ def get_pkgconfig_mangle(d):
 		s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'"
 		s += " -e 's:OEPREFIX:${STAGING_LIBDIR}/..:'"
 		s += " -e 's:OEEXECPREFIX:${STAGING_LIBDIR}/..:'"
+		s += " -e 's:-L${WORKDIR}\S*: :g'"
+		s += " -e 's:-I${WORKDIR}\S*: :g'"
+
 	return s
 
+do_install_append () {
+        for pc in `find ${D} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do
+                sed -i ${@get_pkgconfig_mangle(d)} ${pc}
+        done
+}
+
 do_stage_append () {
 	for pc in `find ${S} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do
 		pcname=`basename $pc`
diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass
index d2fd4b0b04..a0da0667dd 100644
--- a/classes/sanity.bbclass
+++ b/classes/sanity.bbclass
@@ -89,7 +89,7 @@ def check_sanity(e):
 	if not check_app_exists('${BUILD_PREFIX}g++', e.data):
 		missing = missing + "C++ Compiler (${BUILD_PREFIX}g++),"
 
-	required_utilities = "patch diffstat texi2html makeinfo cvs svn git bzip2 tar gzip gawk md5sum bison"
+	required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn git bzip2 tar gzip gawk md5sum bison"
 
 	for util in required_utilities.split():
 		if not check_app_exists( util, e.data ):
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 34a02514d3..17690d8277 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -148,7 +148,7 @@ PREFERRED_VERSION_cairo            = "1.4.10"
 PREFERRED_VERSION_glib-2.0         = "2.12.12"
 PREFERRED_VERSION_pango            = "1.16.4"
 PREFERRED_VERSION_atk              = "1.10.3"
-PREFERRED_VERSION_gtk+             = "2.10.12"
+PREFERRED_VERSION_gtk+             = "2.10.14"
 
 # newer poppler cvs breaks some apps, fix until popper 6 and apps
 # catch up with api changes
diff --git a/packages/ecj/ecj-native_3.3.bb b/packages/ecj/ecj-native_3.3.bb
new file mode 100644
index 0000000000..ff2eb5f49e
--- /dev/null
+++ b/packages/ecj/ecj-native_3.3.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "JDT Core Batch Compiler"
+HOMEPAGE = "http://www.eclipse.org/"
+PRIORITY = "optional"
+SECTION = "devel"
+LICENSE = "EPL"
+PR = "r0"
+
+inherit native
+
+SRC_URI = "http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.3-200706251500/ecj.jar \
+	   file://ecj.sh"
+
+do_stage() {
+        install -d ${STAGING_BINDIR_NATIVE}
+        install -m 755 ${S}/../ecj.jar ${STAGING_BINDIR_NATIVE}
+	install -m 755 ${S}/../ecj.sh ${STAGING_BINDIR_NATIVE}/ecj
+}
diff --git a/packages/gcc/gcc-4.0.2/libstdc++-configure.patch b/packages/gcc/gcc-4.0.2/libstdc++-configure.patch
new file mode 100644
index 0000000000..8dc613104d
--- /dev/null
+++ b/packages/gcc/gcc-4.0.2/libstdc++-configure.patch
@@ -0,0 +1,10 @@
+--- /tmp/configure	2007-06-02 09:26:29.000000000 +0200
++++ gcc-4.0.2/libstdc++-v3/configure	2007-06-02 09:26:40.135215000 +0200
+@@ -101472,7 +101472,6 @@
+ _ACEOF
+ 
+ fi
+-done
+ 
+   fi
+ 
diff --git a/packages/gcc/gcc-4.2.0/.mtn2git_empty b/packages/gcc/gcc-4.2.1/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gcc/gcc-4.2.0/.mtn2git_empty
+++ b/packages/gcc/gcc-4.2.1/.mtn2git_empty
diff --git a/packages/gcc/gcc-4.2.0/100-uclibc-conf.patch b/packages/gcc/gcc-4.2.1/100-uclibc-conf.patch
index 4243ff7b91..4243ff7b91 100644
--- a/packages/gcc/gcc-4.2.0/100-uclibc-conf.patch
+++ b/packages/gcc/gcc-4.2.1/100-uclibc-conf.patch
diff --git a/packages/gcc/gcc-4.2.0/110-arm-eabi.patch b/packages/gcc/gcc-4.2.1/110-arm-eabi.patch
index acebe5308f..acebe5308f 100644
--- a/packages/gcc/gcc-4.2.0/110-arm-eabi.patch
+++ b/packages/gcc/gcc-4.2.1/110-arm-eabi.patch
diff --git a/packages/gcc/gcc-4.2.0/200-uclibc-locale.patch b/packages/gcc/gcc-4.2.1/200-uclibc-locale.patch
index c933d1c446..c933d1c446 100644
--- a/packages/gcc/gcc-4.2.0/200-uclibc-locale.patch
+++ b/packages/gcc/gcc-4.2.1/200-uclibc-locale.patch
diff --git a/packages/gcc/gcc-4.2.0/300-libstdc++-pic.patch b/packages/gcc/gcc-4.2.1/300-libstdc++-pic.patch
index 89d03a85e5..89d03a85e5 100644
--- a/packages/gcc/gcc-4.2.0/300-libstdc++-pic.patch
+++ b/packages/gcc/gcc-4.2.1/300-libstdc++-pic.patch
diff --git a/packages/gcc/gcc-4.2.0/301-missing-execinfo_h.patch b/packages/gcc/gcc-4.2.1/301-missing-execinfo_h.patch
index 0e2092f3fb..0e2092f3fb 100644
--- a/packages/gcc/gcc-4.2.0/301-missing-execinfo_h.patch
+++ b/packages/gcc/gcc-4.2.1/301-missing-execinfo_h.patch
diff --git a/packages/gcc/gcc-4.2.0/302-c99-snprintf.patch b/packages/gcc/gcc-4.2.1/302-c99-snprintf.patch
index dfb22d681b..dfb22d681b 100644
--- a/packages/gcc/gcc-4.2.0/302-c99-snprintf.patch
+++ b/packages/gcc/gcc-4.2.1/302-c99-snprintf.patch
diff --git a/packages/gcc/gcc-4.2.0/303-c99-complex-ugly-hack.patch b/packages/gcc/gcc-4.2.1/303-c99-complex-ugly-hack.patch
index 2ccc80d9bb..2ccc80d9bb 100644
--- a/packages/gcc/gcc-4.2.0/303-c99-complex-ugly-hack.patch
+++ b/packages/gcc/gcc-4.2.1/303-c99-complex-ugly-hack.patch
diff --git a/packages/gcc/gcc-4.2.0/304-index_macro.patch b/packages/gcc/gcc-4.2.1/304-index_macro.patch
index d8e476555d..d8e476555d 100644
--- a/packages/gcc/gcc-4.2.0/304-index_macro.patch
+++ b/packages/gcc/gcc-4.2.1/304-index_macro.patch
diff --git a/packages/gcc/gcc-4.2.0/602-sdk-libstdc++-includes.patch b/packages/gcc/gcc-4.2.1/602-sdk-libstdc++-includes.patch
index 23fce7544d..23fce7544d 100644
--- a/packages/gcc/gcc-4.2.0/602-sdk-libstdc++-includes.patch
+++ b/packages/gcc/gcc-4.2.1/602-sdk-libstdc++-includes.patch
diff --git a/packages/gcc/gcc-4.2.0/740-sh-pr24836.patch b/packages/gcc/gcc-4.2.1/740-sh-pr24836.patch
index 7992282cff..7992282cff 100644
--- a/packages/gcc/gcc-4.2.0/740-sh-pr24836.patch
+++ b/packages/gcc/gcc-4.2.1/740-sh-pr24836.patch
diff --git a/packages/gcc/gcc-4.2.0/800-arm-bigendian.patch b/packages/gcc/gcc-4.2.1/800-arm-bigendian.patch
index 07c6093379..07c6093379 100644
--- a/packages/gcc/gcc-4.2.0/800-arm-bigendian.patch
+++ b/packages/gcc/gcc-4.2.1/800-arm-bigendian.patch
diff --git a/packages/gcc/gcc-4.2.0/801-arm-bigendian-eabi.patch b/packages/gcc/gcc-4.2.1/801-arm-bigendian-eabi.patch
index 54490fc24f..54490fc24f 100644
--- a/packages/gcc/gcc-4.2.0/801-arm-bigendian-eabi.patch
+++ b/packages/gcc/gcc-4.2.1/801-arm-bigendian-eabi.patch
diff --git a/packages/gcc/gcc-4.2.0/README b/packages/gcc/gcc-4.2.1/README
index b85840dc20..b85840dc20 100644
--- a/packages/gcc/gcc-4.2.0/README
+++ b/packages/gcc/gcc-4.2.1/README
diff --git a/packages/gcc/gcc-4.2.0/arm-nolibfloat.patch b/packages/gcc/gcc-4.2.1/arm-nolibfloat.patch
index c4897c0330..c4897c0330 100644
--- a/packages/gcc/gcc-4.2.0/arm-nolibfloat.patch
+++ b/packages/gcc/gcc-4.2.1/arm-nolibfloat.patch
diff --git a/packages/gcc/gcc-4.2.0/arm-softfloat.patch b/packages/gcc/gcc-4.2.1/arm-softfloat.patch
index c86c83ed15..c86c83ed15 100644
--- a/packages/gcc/gcc-4.2.0/arm-softfloat.patch
+++ b/packages/gcc/gcc-4.2.1/arm-softfloat.patch
diff --git a/packages/gcc/gcc-4.2.0/arm-thumb-cache.patch b/packages/gcc/gcc-4.2.1/arm-thumb-cache.patch
index fa63846c8c..fa63846c8c 100644
--- a/packages/gcc/gcc-4.2.0/arm-thumb-cache.patch
+++ b/packages/gcc/gcc-4.2.1/arm-thumb-cache.patch
diff --git a/packages/gcc/gcc-4.2.0/arm-thumb.patch b/packages/gcc/gcc-4.2.1/arm-thumb.patch
index 69e2f68cf2..69e2f68cf2 100644
--- a/packages/gcc/gcc-4.2.0/arm-thumb.patch
+++ b/packages/gcc/gcc-4.2.1/arm-thumb.patch
diff --git a/packages/gcc/gcc-4.2.0/cache-amnesia.patch b/packages/gcc/gcc-4.2.1/cache-amnesia.patch
index ef7cd111c5..ef7cd111c5 100644
--- a/packages/gcc/gcc-4.2.0/cache-amnesia.patch
+++ b/packages/gcc/gcc-4.2.1/cache-amnesia.patch
diff --git a/packages/gcc/gcc-4.2.0/fix-ICE-in-arm_unwind_emit_set.diff b/packages/gcc/gcc-4.2.1/fix-ICE-in-arm_unwind_emit_set.diff
index 568e15abff..568e15abff 100644
--- a/packages/gcc/gcc-4.2.0/fix-ICE-in-arm_unwind_emit_set.diff
+++ b/packages/gcc/gcc-4.2.1/fix-ICE-in-arm_unwind_emit_set.diff
diff --git a/packages/gcc/gcc-4.2.0/gcc41-configure.in.patch b/packages/gcc/gcc-4.2.1/gcc41-configure.in.patch
index 3d33bcb978..3d33bcb978 100644
--- a/packages/gcc/gcc-4.2.0/gcc41-configure.in.patch
+++ b/packages/gcc/gcc-4.2.1/gcc41-configure.in.patch
diff --git a/packages/gcc/gcc-4.2.0/ldflags.patch b/packages/gcc/gcc-4.2.1/ldflags.patch
index 9576f60778..9576f60778 100644
--- a/packages/gcc/gcc-4.2.0/ldflags.patch
+++ b/packages/gcc/gcc-4.2.1/ldflags.patch
diff --git a/packages/gcc/gcc-4.2.0/sdk-libstdc++-includes.patch b/packages/gcc/gcc-4.2.1/sdk-libstdc++-includes.patch
index 4377c2143b..4377c2143b 100644
--- a/packages/gcc/gcc-4.2.0/sdk-libstdc++-includes.patch
+++ b/packages/gcc/gcc-4.2.1/sdk-libstdc++-includes.patch
diff --git a/packages/gcc/gcc-4.2.0/sh3-installfix-fixheaders.patch b/packages/gcc/gcc-4.2.1/sh3-installfix-fixheaders.patch
index a06cd2e075..a06cd2e075 100644
--- a/packages/gcc/gcc-4.2.0/sh3-installfix-fixheaders.patch
+++ b/packages/gcc/gcc-4.2.1/sh3-installfix-fixheaders.patch
diff --git a/packages/gcc/gcc-4.2.0/unbreak-armv4t.patch b/packages/gcc/gcc-4.2.1/unbreak-armv4t.patch
index b3399abfdb..b3399abfdb 100644
--- a/packages/gcc/gcc-4.2.0/unbreak-armv4t.patch
+++ b/packages/gcc/gcc-4.2.1/unbreak-armv4t.patch
diff --git a/packages/gcc/gcc-4.2.0/zecke-no-host-includes.patch b/packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch
index 6afb10d6ef..6afb10d6ef 100644
--- a/packages/gcc/gcc-4.2.0/zecke-no-host-includes.patch
+++ b/packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch
diff --git a/packages/gcc/gcc-4.2.0/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch
index 42ec190600..42ec190600 100644
--- a/packages/gcc/gcc-4.2.0/zecke-xgcc-cpp.patch
+++ b/packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch
diff --git a/packages/gcc/gcc-cross-sdk_4.2.0.bb b/packages/gcc/gcc-cross-sdk_4.2.0.bb
deleted file mode 100644
index 71c2cd08a2..0000000000
--- a/packages/gcc/gcc-cross-sdk_4.2.0.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-DESCRIPTION = "The GNU cc and gcc C compilers."
-HOMEPAGE = "http://www.gnu.org/software/gcc/"
-SECTION = "devel"
-LICENSE = "GPL"
-PR = "r0"
-
-inherit sdk
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
-
-DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
-PACKAGES = "${PN}"
-
-require gcc_${PV}.bb
-require gcc4-build-sdk.inc
-require gcc-package-sdk.inc
-
-SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
-        file://100-uclibc-conf.patch;patch=1 \
-        file://200-uclibc-locale.patch;patch=1 \
-        file://300-libstdc++-pic.patch;patch=1 \
-        file://301-missing-execinfo_h.patch;patch=1 \
-        file://302-c99-snprintf.patch;patch=1 \
-        file://303-c99-complex-ugly-hack.patch;patch=1 \
-        file://304-index_macro.patch;patch=1 \
-        file://602-sdk-libstdc++-includes.patch;patch=1 \
-        file://740-sh-pr24836.patch;patch=1 \
-        file://800-arm-bigendian.patch;patch=1 \
-        file://arm-nolibfloat.patch;patch=1 \
-        file://arm-softfloat.patch;patch=1 \
-        file://gcc41-configure.in.patch;patch=1 \
-        file://arm-thumb.patch;patch=1 \
-        file://arm-thumb-cache.patch;patch=1 \
-        file://ldflags.patch;patch=1 \
-        file://unbreak-armv4t.patch;patch=1 \
-        file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
-        "
-
-SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
-
diff --git a/packages/gcc/gcc-cross_4.2.0.bb b/packages/gcc/gcc-cross_4.2.1.bb
index 9025a98f3c..9025a98f3c 100644
--- a/packages/gcc/gcc-cross_4.2.0.bb
+++ b/packages/gcc/gcc-cross_4.2.1.bb
diff --git a/packages/gcc/gcc_4.2.0.bb b/packages/gcc/gcc_4.2.1.bb
index b5c4b3c936..dd3a9c59cc 100644
--- a/packages/gcc/gcc_4.2.0.bb
+++ b/packages/gcc/gcc_4.2.1.bb
@@ -10,7 +10,7 @@ require gcc-package.inc
 
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://100-uclibc-conf.patch;patch=1 \
-	file://200-uclibc-locale.patch;patch=1 \
+#	file://200-uclibc-locale.patch;patch=1 \
 	file://300-libstdc++-pic.patch;patch=1 \
 	file://301-missing-execinfo_h.patch;patch=1 \
 	file://302-c99-snprintf.patch;patch=1 \
diff --git a/packages/gpephone/cms92init-0.1/.mtn2git_empty b/packages/gpephone/cms92init-0.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpephone/cms92init-0.1/.mtn2git_empty
diff --git a/packages/gpephone/cms92init-0.1/oe-install.patch b/packages/gpephone/cms92init-0.1/oe-install.patch
new file mode 100644
index 0000000000..23e321c6bd
--- /dev/null
+++ b/packages/gpephone/cms92init-0.1/oe-install.patch
@@ -0,0 +1,9 @@
+--- cms92init-simple/Makefile~	2007-05-24 12:14:31.000000000 +0200
++++ cms92init-simple/Makefile	2007-05-24 12:14:31.000000000 +0200
+@@ -12,5 +12,5 @@
+ 	
+ install:
+ 	install -d $(DESTDIR)/$(PREFIX)/bin
+-	install -m755  cms92init $(DESTDIR)/$(PREFIX)/bin
++	install -m 755  cms92init $(DESTDIR)/$(PREFIX)/bin
+ 
diff --git a/packages/gpephone/cms92init_0.1.bb b/packages/gpephone/cms92init_0.1.bb
index ab0388a45d..4b943f4a6d 100644
--- a/packages/gpephone/cms92init_0.1.bb
+++ b/packages/gpephone/cms92init_0.1.bb
@@ -7,7 +7,8 @@ PR = "r0"
 
 inherit gpephone
 
-SRC_URI = "${GPEPHONE_MIRROR}/GPRS/GPRS-${PV}.tar.bz2"
+SRC_URI = "${GPEPHONE_MIRROR}/GPRS/GPRS-${PV}.tar.bz2 \
+           file://oe-install.patch;patch=1"
 
 
 S  = ${WORKDIR}/GPRS/cms92init-simple
diff --git a/packages/gpephone/gpe-applauncher_0.8.bb b/packages/gpephone/gpe-applauncher_0.8.bb
new file mode 100644
index 0000000000..641511ad5b
--- /dev/null
+++ b/packages/gpephone/gpe-applauncher_0.8.bb
@@ -0,0 +1,12 @@
+LICENSE     = "GPL"
+DESCRIPTION = "A cellphone application launcher."
+SECTION = "gpe"
+PRIORITY    = "optional"
+PR          = "r0"
+
+DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libsettings"
+
+GPE_TARBALL_SUFFIX= "bz2"
+inherit gpephone autotools
+
+FILES_${PN} += '${datadir}/themes'
diff --git a/packages/gpephone/gpe-phonepanel_0.9.bb b/packages/gpephone/gpe-phonepanel_0.9.bb
new file mode 100644
index 0000000000..f9e2f04867
--- /dev/null
+++ b/packages/gpephone/gpe-phonepanel_0.9.bb
@@ -0,0 +1,12 @@
+LICENSE     = "GPL"
+DESCRIPTION = "A cellphone status panel to be used with gpe-applauncher."
+SECTION = "gpe"
+PRIORITY    = "optional"
+PR          = "r0"
+
+DEPENDS = "gtk+ libgpephone dbus-glib libsettings"
+
+GPE_TARBALL_SUFFIX= "bz2"
+inherit gpephone autotools
+
+FILES_${PN} += "${datadir}/themes"
diff --git a/packages/gpephone/libgpephone_0.4.bb b/packages/gpephone/libgpephone_0.4.bb
new file mode 100644
index 0000000000..690b3eded6
--- /dev/null
+++ b/packages/gpephone/libgpephone_0.4.bb
@@ -0,0 +1,13 @@
+LICENSE     = "LGPL"
+DESCRIPTION = "Base library for GPE phone environment."
+SECTION = "gpe/libs"
+PRIORITY    = "optional"
+DEPENDS     = "gtk+ gtk-doc dbus-glib"
+PR          = "r0"
+
+GPE_TARBALL_SUFFIX = "bz2"
+inherit gpephone pkgconfig autotools
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/gpephone/phoneserver/phoneserver-gta01.patch b/packages/gpephone/phoneserver/phoneserver-gta01.patch
new file mode 100644
index 0000000000..fc5968ef5a
--- /dev/null
+++ b/packages/gpephone/phoneserver/phoneserver-gta01.patch
@@ -0,0 +1,391 @@
+diff -u -r phoneserver-1.0/config.h phoneserver-1.0-mine/config.h
+--- phoneserver-1.0/config.h	2007-02-02 13:20:13.000000000 +0100
++++ phoneserver-1.0-mine/config.h	2007-07-10 15:06:28.000000000 +0200
+@@ -21,8 +21,7 @@
+ 
+ /* serial port name */
+ #ifndef SERIAL_PORT
+-//#define SERIAL_PORT "/dev/pts/0"        //ttyS1"
+-#define SERIAL_PORT "/dev/ttyS1"        //ttyS1"
++#define SERIAL_PORT "/dev/ttySAC0"        /* NEO1973 */
+ #endif                          /*  */
+ 
+ /* serial port baudrate */
+@@ -30,6 +29,8 @@
+ #define SERIAL_BAUDRATE B115200
+ #endif                          /*  */
+ 
++#define CRTSCTS 1	/* NEO needs RTS/CTS flow control */
++
+ /* buffer to hold AT command response */
+ #ifndef ATCOMMAND_BUFFER_SIZE
+ #define ATCOMMAND_BUFFER_SIZE 10240
+diff -u -r phoneserver-1.0/Makefile.am phoneserver-1.0-mine/Makefile.am
+--- phoneserver-1.0/Makefile.am	2007-02-02 13:20:13.000000000 +0100
++++ phoneserver-1.0-mine/Makefile.am	2007-07-10 13:14:47.000000000 +0200
+@@ -3,7 +3,7 @@
+ 
+ INCLUDES = @DEPS_CFLAGS@ -DPREFIX=\"@prefix@\" -D_GNU_SOURCE -Wall \
+            -DDBUS_API_SUBJECT_TO_CHANGE \
+-           -DDEBUG -DXTHREADS -D_REENTRANT -DXUSE_MTSAFE_API -DCELLON_PLATFORM 
++           -DDEBUG -DXTHREADS -D_REENTRANT -DXUSE_MTSAFE_API -DT39_PLATFORM -DNEO1973 
+ LDADD = @DEPS_LIBS@
+ 
+ 
+diff -u -r phoneserver-1.0/Makefile.in phoneserver-1.0-mine/Makefile.in
+--- phoneserver-1.0/Makefile.in	2007-02-02 13:25:43.000000000 +0100
++++ phoneserver-1.0-mine/Makefile.in	2007-07-10 13:07:16.000000000 +0200
+@@ -158,7 +158,7 @@
+ target_alias = @target_alias@
+ INCLUDES = @DEPS_CFLAGS@ -DPREFIX=\"@prefix@\" -D_GNU_SOURCE -Wall \
+            -DDBUS_API_SUBJECT_TO_CHANGE \
+-           -DDEBUG -DXTHREADS -D_REENTRANT -DXUSE_MTSAFE_API -DCELLON_PLATFORM 
++           -DDEBUG -DXTHREADS -D_REENTRANT -DXUSE_MTSAFE_API -DT39_PLATFORM 
+ 
+ LDADD = @DEPS_LIBS@
+ phoneserver_SOURCES = phoneserver.c phone-server-voc.c phone-server-sms.c phone-server-mul.c phone-server-pbk.c \
+diff -u -r phoneserver-1.0/phoneserver.c phoneserver-1.0-mine/phoneserver.c
+--- phoneserver-1.0/phoneserver.c	2007-02-02 13:20:13.000000000 +0100
++++ phoneserver-1.0-mine/phoneserver.c	2007-07-10 13:43:57.000000000 +0200
+@@ -324,22 +324,31 @@
+                             phonebook_update_entry_handler);
+ #endif
+ 
++#ifdef NEO1973
++  system("echo 1 > /sys/devices/platform/gta01-pm-gsm.0/power_on");
++  sleep(1);
++#endif
++
+   // tapi begins
+   // Initialize
+   result = tapi_initialize ();
+ 
+   // Get file descripter
+-  if (result == TEL_ERR_NONE)
+-  {
++  if (result == TEL_ERR_NONE) {
+     result = tel_get_fd (sid, (UInt32 *) & g_fd);
++  } else {
++    /* without modem there is nothing we can do */
++    exit(1);
+   }
++
+   // Open session
+-  if (result == TEL_ERR_NONE)
+-  {
++  if (result == TEL_ERR_NONE) {
+     result = tel_open_session (&sid);
++  } else {
++    /* without fd we are as well useless */
++    exit(1);
+   }
+ 
+-
+   if (result == TEL_ERR_NONE)
+   {
+     /* pbk section */
+@@ -357,6 +366,9 @@
+     tel_evt_register (sid, TEL_EVENT_MTSMS, sms_incoming_cb, NULL);
+     tel_evt_register (sid, TEL_EVENT_STATUS_REPORT, sta_report_cb, NULL);
+ 
++  } else {
++    /* without session we are also lost */
++    exit(1);
+   }
+   // tapi ends
+ #if 1
+diff -u -r phoneserver-1.0/phone-server-voc.c phoneserver-1.0-mine/phone-server-voc.c
+--- phoneserver-1.0/phone-server-voc.c	2007-02-02 13:20:13.000000000 +0100
++++ phoneserver-1.0-mine/phone-server-voc.c	2007-07-10 16:38:12.000000000 +0200
+@@ -1028,6 +1028,7 @@
+     g_print ("$$$$$$$$$$$$$$$$$$$notify VOC about the %s, and call_id = %d\n",
+              pmethod, call_id);
+ 
++#if 0
+     //0803
+ 
+     guint index;
+@@ -1038,7 +1039,7 @@
+       ("###The held call which is going to be hungup is equal to: %d, index=%d,cid=%d",
+        call_id, index, cid_dbus);
+     //0803
+-
++#endif
+ 
+     if (!strcmp (pmethod, "accept"))
+     {
+diff -u -r phoneserver-1.0/serial.c phoneserver-1.0-mine/serial.c
+--- phoneserver-1.0/serial.c	2007-02-02 13:20:13.000000000 +0100
++++ phoneserver-1.0-mine/serial.c	2007-07-10 15:07:14.000000000 +0200
+@@ -124,7 +124,7 @@
+ 
+ 
+ /* Open a device with standard options.
+- *Use value (-1) for "with_hw_handshake" if its specification is required from the user.
++ * Use value (-1) for "with_hw_handshake" if its specification is required from the user.
+  */
+ int
+ serial_opendevice (const Int8 *file, Int32 with_odd_parity, Int32 with_async)
+@@ -148,8 +148,7 @@
+ 
+   /* Set port settings for canonical input processing */
+   tp.c_cflag = B0 | CS8 | CLOCAL | CREAD | HUPCL;
+-  if (with_odd_parity)
+-  {
++  if (with_odd_parity) {
+     tp.c_cflag |= (PARENB | PARODD);
+     tp.c_iflag = 0;
+   }
+@@ -157,35 +156,36 @@
+     tp.c_iflag = IGNPAR;
+ 
+ #ifdef CRTSCTS
++  tp.c_cflag |= CRTSCTS;
++#else
+   tp.c_cflag &= ~CRTSCTS;
+-
+-#endif /*  */
++#endif
+   tp.c_oflag = 0;
+   tp.c_lflag = 0;
+   tp.c_cc[VMIN] = 1;
+   tp.c_cc[VTIME] = 0;
++
+   retcode = tcflush (fd, TCIFLUSH);
+-  if (retcode == -1)
+-  {
++  if (retcode == -1) {
+     perror ("Gnokii serial_opendevice: tcflush");
+     serial_close (fd);
+     return -1;
+   }
++
+   retcode = tcsetattr (fd, TCSANOW, &tp);
+-  if (retcode == -1)
+-  {
++  if (retcode == -1) {
+     perror ("Gnokii serial_opendevice: tcsetattr");
+     serial_close (fd);
+     return -1;
+   }
++
+   serial_changespeed (fd, 115200);
+ 
+   /* We need to turn off O_NONBLOCK now (we have CLOCAL set so it is safe).
+    *When we run some device script it really doesn't expect NONBLOCK!
+    */
+   retcode = fcntl (fd, F_SETFL, 0);
+-  if (retcode == -1)
+-  {
++  if (retcode == -1) {
+     perror ("Gnokii serial_opendevice: fnctl(F_SETFL)");
+     serial_close (fd);
+     return -1;
+@@ -195,8 +195,7 @@
+ 
+ #if !(__unices__)
+   retcode = fcntl (fd, F_SETOWN, getpid ());
+-  if (retcode == -1)
+-  {
++  if (retcode == -1) {
+     perror ("Gnokii serial_opendevice: fnctl(F_SETOWN)");
+     serial_close (fd);
+     return -1;
+@@ -223,12 +222,12 @@
+ 
+ #  endif
+ #endif /*  */
+-  if (retcode == -1)
+-  {
++  if (retcode == -1) {
+     perror ("Gnokii serial_opendevice: fnctl(F_SETFL)");
+     serial_close (fd);
+     return -1;
+   }
++
+   return fd;
+ }
+ 
+@@ -240,15 +239,16 @@
+   unsigned int flags;
+ 
+   flags = TIOCM_DTR;
++
+   if (dtr)
+     ioctl (fd, TIOCMBIS, &flags);
+-
+   else
+     ioctl (fd, TIOCMBIC, &flags);
++
+   flags = TIOCM_RTS;
++
+   if (rts)
+     ioctl (fd, TIOCMBIS, &flags);
+-
+   else
+     ioctl (fd, TIOCMBIC, &flags);
+ }
+@@ -262,6 +262,7 @@
+   FD_SET (fd, &readfds);
+   return select (fd + 1, &readfds, NULL, NULL, timeout);
+ }
++
+ static int
+ serial_wselect (int fd, struct timeval *timeout)
+ {
+@@ -361,12 +362,9 @@
+   {
+     bs = n;
+     got = write (fd, buf + r, bs);
+-    if (got == 0)
+-    {
+-      g_print ("Serial write: oops, zero byte has written!\n");
+-    }
+-    else if (got < 0)
+-    {
++    if (got == 0) {
++      g_print ("Serial write: oops, zero byte written!\n");
++    } else if (got < 0) {
+       if (errno == EINTR)
+         continue;
+       if (errno != EAGAIN)
+diff -u -r phoneserver-1.0/tapi.c phoneserver-1.0-mine/tapi.c
+--- phoneserver-1.0/tapi.c	2007-02-02 13:20:13.000000000 +0100
++++ phoneserver-1.0-mine/tapi.c	2007-07-10 16:51:22.000000000 +0200
+@@ -112,6 +112,7 @@
+ /************************************************************************/
+ /* Initialization Function Block                                        */
+ /************************************************************************/
++tel_err_t tapi_Init_PowerOn ();
+ tel_err_t tapi_Init_SoftReset ();
+ tel_err_t tapi_Init_SetNoEcho ();
+ tel_err_t tapi_Init_SetCharset ();
+@@ -287,6 +288,7 @@
+   
+  ****************/
+ static init_function init_func_table[] = {
++  tapi_Init_PowerOn,
+   tapi_Init_SoftReset,
+   tapi_Init_SetNoEcho,
+   tapi_Init_SetCharset,
+@@ -477,6 +479,18 @@
+ 
+ 
+ tel_err_t
++tapi_Init_PowerOn ()
++{
++  tel_err_t result;
++  Int8 *CommandStr;
++
++  /* AT+CFUN=1 */
++  CommandStr = AT_Builder_ExeCmd ((Int8 *) CMD_CFUN, (Int8 *) "=1", (Int8 *) NULL);
++  result = tapi_init_general (CommandStr);
++  return result;
++}
++
++tel_err_t
+ tapi_Init_SoftReset ()
+ {
+   tel_err_t result;
+@@ -516,7 +530,7 @@
+   //TODO: This phone does not support "HEX", we should set it to HEX
+ #ifdef T39_PLATFORM
+   CommandStr =
+-    AT_Builder_SetCmd ((Int8 *) CMD_CSCS, (Int8 *) "\"UTF-8\"", (Int8 *) NULL);
++    AT_Builder_SetCmd ((Int8 *) CMD_CSCS, (Int8 *) "\"8859-1\"", (Int8 *) NULL);
+ #endif
+ #ifdef CELLON_PLATFORM
+   CommandStr =
+@@ -689,8 +703,8 @@
+                        (Int8 *) "0", (Int8 *) "1", (Int8 *) "0", (Int8 *) NULL);
+ #else
+   CommandStr =
+-    AT_Builder_SetCmd ((Int8 *) CMD_CNMI, (Int8 *) "3", (Int8 *) "1",
+-                       (Int8 *) "0", (Int8 *) "0", (Int8 *) "0", (Int8 *) NULL);
++    AT_Builder_SetCmd ((Int8 *) CMD_CNMI, (Int8 *) "2", (Int8 *) "1",
++                       (Int8 *) "0", (Int8 *) "1", (Int8 *) "0", (Int8 *) NULL);
+ #endif
+   result = tapi_init_general (CommandStr);
+   return result;
+@@ -1737,7 +1751,7 @@
+   (*evt)->evt_data.async_data.cb = tel_ctx.cur_async_evt.cb;
+   (*evt)->evt_data.async_data.user_data = tel_ctx.cur_async_evt.user_data;
+ #ifdef DEBUG
+-  //g_print("sms data is --> %s\n", data->user_data[0].text);
++  g_print("sms data is --> %s\n", data->user_data[0].text);
+ #endif
+   return TEL_ERR_NONE;
+ }
+@@ -1979,14 +1993,14 @@
+     sscanf (param_str, "%d", &index);
+     entry->index = index;
+ #ifdef DEBUG
+-    //g_print("index -> %d\n", index);
++    g_print("index -> %d\n", index);
+ #endif
+     /* number */
+     param_str = (Int8 *) g_ptr_array_index (param, 1);
+     //exclude the quotation
+     memcpy (entry->number.number, param_str + 1, strlen (param_str) - 2);
+ #ifdef DEBUG
+-    //g_print("number -> %s\n", entry->number.number);
++    g_print("number -> %s\n", entry->number.number);
+ #endif
+     /* type */
+     param_str = (Int8 *) g_ptr_array_index (param, 2);
+@@ -1994,7 +2008,7 @@
+     entry->number.npi = index & 0xF;
+     entry->number.ton = (index & 0x70) >> 4;
+ #ifdef DEBUG
+-    //g_print("type -> %s\n", param_str);
++    g_print("type -> %s\n", param_str);
+ #endif
+     /* text */
+     param_str = (Int8 *) g_ptr_array_index (param, 3);
+@@ -2015,7 +2029,7 @@
+     char_unicode_decode (entry->text, entry_textbuffer, len);
+ #endif
+ #ifdef DEBUG
+-    //g_print("text -> %s\n", entry->text);
++    g_print("text -> %s\n", entry->text);
+ #endif
+     AT_Parser_Free (param);
+     /* add the entry into array */
+@@ -2524,11 +2538,11 @@
+   tel_call_info_change_t *call_status = g_new0 (tel_call_info_change_t, 1);
+   at_command_buffer_t *cmd_buffer;
+ 
+-  //g_print("AT_UNSO_PPURC_Handler called\n");
+-//              cmd_buffer = tapi_get_cmd_buffer(in_buffer, CMD_PPURC, 0, NULL);
++  g_print("AT_UNSO_PPURC_Handler called\n");
++              cmd_buffer = tapi_get_cmd_buffer(in_buffer, CMD_PPURC, 0, NULL);
+ #ifdef DEBUG
+-  //g_print("====cur parser pos is ---> %d\n", tel_ctx.cur_parser_pos);
+-  //g_print("====total parser item is ---> %d\n", tel_ctx.cur_resp.cmd->len);
++  g_print("====cur parser pos is ---> %d\n", tel_ctx.cur_parser_pos);
++  g_print("====total parser item is ---> %d\n", tel_ctx.cur_resp.cmd->len);
+ #endif
+   cmd_buffer =
+     tapi_get_cmd_buffer (in_buffer, CMD_PPURC, tel_ctx.cur_parser_pos - 1,
+@@ -3749,8 +3763,10 @@
+       break;
+     case TEL_HANGUPALL:
+       /* +CHUP */
++      //CommandStr =
++      //  AT_Builder_ExeCmd ((Int8 *) CMD_CHUP, (Int8 *) NULL, (Int8 *) NULL);
+       CommandStr =
+-        AT_Builder_ExeCmd ((Int8 *) CMD_CHUP, (Int8 *) NULL, (Int8 *) NULL);
++        AT_Builder_ExeCmd ((Int8 *) "H", (Int8 *) NULL, (Int8 *) NULL);
+       break;
+     case TEL_HANGUPACTIVE_ACCEPTOTHER:
+       /* +CHLD=1 */
+@@ -3859,7 +3875,8 @@
+         break;
+       case TEL_HANGUPALL:
+         /* +CHUP */
+-        AT_Builder_AppendCmd ((Int8 *) CMD_CHUP, (Int8 *) NULL, (Int8 *) NULL);
++        //AT_Builder_AppendCmd ((Int8 *) CMD_CHUP, (Int8 *) NULL, (Int8 *) NULL);
++        AT_Builder_AppendCmd ((Int8 *) "H", (Int8 *) NULL, (Int8 *) NULL);
+         break;
+       case TEL_HANGUPACTIVE_ACCEPTOTHER:
+         /* +CHLD=1 */
diff --git a/packages/gpephone/phoneserver_1.0.bb b/packages/gpephone/phoneserver_1.0.bb
index 522d31cee1..1415951473 100644
--- a/packages/gpephone/phoneserver_1.0.bb
+++ b/packages/gpephone/phoneserver_1.0.bb
@@ -2,12 +2,15 @@ LICENSE     = "LiPS"
 DESCRIPTION = "Phone services server"
 SECTION = "gpe"
 PRIORITY    = "optional"
-PR          = "r1"
+PR          = "r3"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 DEPENDS = "dbus-glib glib-2.0  libmsgenabler libabenabler"
 
 GPE_TARBALL_SUFFIX= "bz2"
 inherit gpephone autotools
 
-SRC_URI += "file://changeport.patch;patch=1;pnum=0"
+SRC_URI_append_x86 = " file://changeport.patch;patch=1;pnum=0"
+SRC_URI_append_fic-gta01 = " file://phoneserver-gta01.patch;patch=1"
 
diff --git a/packages/gpephone/ptim-helper_svn.bb b/packages/gpephone/ptim-helper_svn.bb
index 4aa308ccbf..3461de6225 100644
--- a/packages/gpephone/ptim-helper_svn.bb
+++ b/packages/gpephone/ptim-helper_svn.bb
@@ -14,7 +14,7 @@ SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=im
 
 S = "${WORKDIR}/imhelper"
 
-FILES_${PN} += " ${libdir}/gtk-2.0/*/immodules/ptim/helper/*.so ${libdir}/gtk-2.0/*/immodules/ptim/pixmaps"
+FILES_${PN} += " ${libdir}/gtk-2.0/*/immodules/ptim/helper/*.so ${libdir}/gtk-2.0/*/immodules/ptim/pixmaps/*"
 FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/immodules/ptim/helper/.debug/*.so"
 FILES_${PN}-dev += "${libdir}/gtk-2.0/*/immodules/ptim/helper/*.la"
 
diff --git a/packages/gpephone/ptim-manager_svn.bb b/packages/gpephone/ptim-manager_svn.bb
index b1113636e9..8c86d4cfeb 100644
--- a/packages/gpephone/ptim-manager_svn.bb
+++ b/packages/gpephone/ptim-manager_svn.bb
@@ -4,6 +4,7 @@ PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ ptim-headers libiac"
 PV = "0.1+svn-${SRCDATE}"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -18,6 +19,14 @@ FILES_${PN} += "${libdir}/gtk-2.0/*/immodules/*.so ${libdir}/gtk-2.0/*/immodules
 FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/immodules/.debug/*.so"
 FILES_${PN}-dev += "${libdir}/gtk-2.0/*/immodules/*.la"
 
+
+do_install_append () {
+	# That's evil... 
+	install -m 644 ${S}/conf/imconfig ${D}/${libdir}/gtk-2.0/*/immodules/ptim
+}
+
+
+
 do_stage () {
     autotools_stage_all
 }
\ No newline at end of file
diff --git a/packages/linux/linux-gta01.inc b/packages/linux/linux-gta01.inc
index 915e5633af..098ae9d069 100644
--- a/packages/linux/linux-gta01.inc
+++ b/packages/linux/linux-gta01.inc
@@ -62,7 +62,7 @@ do_configure() {
 
 	echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
 
-	if [ "${TARGET_OS}" == "linux-gnueabi" ]; then
+	if [ "${TARGET_OS}" = "linux-gnueabi" ]; then
 		echo "CONFIG_AEABI=y"                   >> ${S}/.config
 		echo "CONFIG_OABI_COMPAT=y"             >> ${S}/.config
 	else 
diff --git a/packages/mtd/mtd-utils-native_0.0.0+cvs20060223.bb b/packages/mtd/mtd-utils-native_0.0.0+cvs20060223.bb
deleted file mode 100644
index 6f9d71e10c..0000000000
--- a/packages/mtd/mtd-utils-native_0.0.0+cvs20060223.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require mtd-utils_${PV}.bb
-require mtd-utils-native.inc
diff --git a/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-20041113.patch b/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-20041113.patch
deleted file mode 100644
index cb819e19be..0000000000
--- a/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-20041113.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- mtd/util/mkfs.jffs2.c~add-exclusion-to-mkfs-jffs2.patch
-+++ mtd/util/mkfs.jffs2.c
-@@ -89,7 +89,12 @@
- 	struct filesystem_entry *files;	/* Only relevant to directories */
- };
- 
-+struct ignorepath_entry {
-+    struct ignorepath_entry* next;  /* Points to the next ignorepath element */
-+    char name[PATH_MAX];             /* Name of the entry */
-+};
- 
-+static struct ignorepath_entry* ignorepath = 0;
- static int out_fd = -1;
- static char default_rootdir[] = ".";
- static char *rootdir = default_rootdir;
-@@ -363,6 +368,7 @@
- 	char *hpath, *tpath;
- 	struct dirent *dp, **namelist;
- 	struct filesystem_entry *entry;
-+    struct ignorepath_entry* element = ignorepath;
- 
- 
- 	if (lstat(hostpath, &sb)) {
-@@ -372,6 +378,15 @@
- 	entry = add_host_filesystem_entry(targetpath, hostpath, 
- 			sb.st_uid, sb.st_gid, sb.st_mode, 0, parent);
- 
-+	while ( element ) {
-+		if ( strcmp( element->name, hostpath ) == 0 ) {
-+			printf( "Note: ignoring directories below '%s'\n", hostpath );
-+			return entry;
-+			break;
-+		}
-+		element = element->next;
-+	}
-+
- 	n = scandir(hostpath, &namelist, 0, alphasort);
- 	if (n < 0) {
- 		perror_msg_and_die("opening directory %s", hostpath);
-@@ -1139,6 +1154,7 @@
- 	{"root", 1, NULL, 'r'},
- 	{"pagesize", 1, NULL, 's'},
- 	{"eraseblock", 1, NULL, 'e'},
-+        {"ignore", 1, NULL, 'i'},
- 	{"output", 1, NULL, 'o'},
- 	{"help", 0, NULL, 'h'},
- 	{"verbose", 0, NULL, 'v'},
-@@ -1180,6 +1196,7 @@
-         "  -L, --list-compressors  Show the list of the avaiable compressors\n"
-         "  -t, --test-compression  Call decompress and compare with the original (for test)\n"
- 	"  -n, --no-cleanmarkers   Don't add a cleanmarker to every eraseblock\n"
-+	"  -i, --ignore=PATH       Ignore sub directory and file tree below PATH when recursing over the file system\n"
- 	"  -o, --output=FILE       Output to FILE (default: stdout)\n"
- 	"  -l, --little-endian     Create a little-endian filesystem\n"
- 	"  -b, --big-endian        Create a big-endian filesystem\n"
-@@ -1202,13 +1219,14 @@
- 	struct stat sb;
- 	FILE *devtable = NULL;
- 	struct filesystem_entry *root;
--        char *compr_name = NULL;
--        int compr_prior  = -1;
-+	char *compr_name = NULL;
-+	int compr_prior  = -1;
-+	struct ignorepath_entry* element = ignorepath;
- 
--        jffs2_compressors_init();
-+	jffs2_compressors_init();
- 
- 	while ((opt = getopt_long(argc, argv, 
--					"D:d:r:s:o:qUPfh?vVe:lbp::nc:m:x:X:Lty:", long_options, &c)) >= 0) 
-+					"D:d:r:s:i:o:qUPfh?vVe:lbp::nc:m:x:X:Lty:", long_options, &c)) >= 0) 
- 	{
- 		switch (opt) {
- 			case 'D':
-@@ -1231,6 +1249,27 @@
- 				page_size = strtol(optarg, NULL, 0);
- 				break;
- 
-+			case 'i':
-+				printf( "Note: Adding '%s' to ignore Path\n", optarg );
-+				if ( !ignorepath ) {
-+					ignorepath = xmalloc( sizeof( struct ignorepath_entry ) );
-+					ignorepath->next = 0;
-+					strcpy( &ignorepath->name[0], optarg );
-+				} else {
-+					while ( element->next ) element = element->next;
-+					element->next = xmalloc( sizeof( struct ignorepath_entry ) );
-+ 					element->next->next = 0;
-+					strcpy( &element->next->name[0], optarg );
-+				}
-+				printf( "--------- Dumping ignore path list ----------------\n" );
-+				element=ignorepath;
-+				while ( element ) {
-+					printf( "  * '%s'\n", &element->name[0] );
-+					element = element->next;
-+				}
-+				printf( "---------------------------------------------------\n" );
-+				break;
-+
- 			case 'o':
- 				if (out_fd != -1) {
- 					error_msg_and_die("output filename specified more than once");
diff --git a/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-20060131.patch b/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-20060131.patch
deleted file mode 100644
index e24f395890..0000000000
--- a/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-20060131.patch
+++ /dev/null
@@ -1,100 +0,0 @@
---- mtd/util/mkfs.jffs2.c~add-exclusion-to-mkfs-jffs2.patch
-+++ mtd/util/mkfs.jffs2.c
-@@ -92,7 +92,12 @@
- 	struct filesystem_entry *files;	/* Only relevant to directories */
- };
- 
--
-+struct ignorepath_entry {
-+	struct ignorepath_entry* next;	/* Points to the next ignorepath element */
-+	char name[PATH_MAX];		/* Name of the entry */
-+};
-+ 
-+static struct ignorepath_entry* ignorepath = 0;
- static int out_fd = -1;
- static int in_fd = -1;
- static char default_rootdir[] = ".";
-@@ -367,7 +372,7 @@
- 	char *hpath, *tpath;
- 	struct dirent *dp, **namelist;
- 	struct filesystem_entry *entry;
--
-+	struct ignorepath_entry* element = ignorepath;
- 
- 	if (lstat(hostpath, &sb)) {
- 		perror_msg_and_die("%s", hostpath);
-@@ -376,6 +381,15 @@
- 	entry = add_host_filesystem_entry(targetpath, hostpath,
- 			sb.st_uid, sb.st_gid, sb.st_mode, 0, parent);
- 
-+	while ( element ) {
-+		if ( strcmp( element->name, targetpath ) == 0 ) {
-+			printf( "Note: ignoring directories below '%s'\n", targetpath );
-+			return entry;
-+			break;
-+		}
-+		element = element->next;
-+	}
-+
- 	n = scandir(hostpath, &namelist, 0, alphasort);
- 	if (n < 0) {
- 		perror_msg_and_die("opening directory %s", hostpath);
-@@ -1157,6 +1171,7 @@
- 	{"root", 1, NULL, 'r'},
- 	{"pagesize", 1, NULL, 's'},
- 	{"eraseblock", 1, NULL, 'e'},
-+	{"ignore", 1, NULL, 'I'},
- 	{"output", 1, NULL, 'o'},
- 	{"help", 0, NULL, 'h'},
- 	{"verbose", 0, NULL, 'v'},
-@@ -1199,6 +1214,7 @@
-         "  -L, --list-compressors  Show the list of the avaiable compressors\n"
-         "  -t, --test-compression  Call decompress and compare with the original (for test)\n"
- 	"  -n, --no-eraseblock-headers   Don't add a eraseblock header to every eraseblock\n"
-+	"  -I, --ignore=PATH       Ignore sub directory and file tree below PATH when recursing over the file system\n"
- 	"  -o, --output=FILE       Output to FILE (default: stdout)\n"
- 	"  -l, --little-endian     Create a little-endian filesystem\n"
- 	"  -b, --big-endian        Create a big-endian filesystem\n"
-@@ -1368,11 +1384,12 @@
- 	struct filesystem_entry *root;
-         char *compr_name = NULL;
-         int compr_prior  = -1;
-+	struct ignorepath_entry* element = ignorepath;
- 
-         jffs2_compressors_init();
- 
- 	while ((opt = getopt_long(argc, argv,
--					"D:d:r:s:o:qUPfh?vVe:lbp::nc:m:x:X:Lty:i:", long_options, &c)) >= 0)
-+					"D:d:r:s:I:o:qUPfh?vVe:lbp::nc:m:x:X:Lty:i:", long_options, &c)) >= 0)
- 	{
- 		switch (opt) {
- 			case 'D':
-@@ -1395,6 +1412,28 @@
- 				page_size = strtol(optarg, NULL, 0);
- 				break;
- 
-+			case 'I':
-+				printf( "Note: Adding '%s' to ignore Path\n", optarg );
-+				element = ignorepath;
-+				if ( !ignorepath ) {
-+					ignorepath = xmalloc( sizeof( struct ignorepath_entry ) );
-+					ignorepath->next = 0;
-+					strcpy( &ignorepath->name[0], optarg );
-+				} else {
-+					while ( element->next ) element = element->next;
-+					element->next = xmalloc( sizeof( struct ignorepath_entry ) );
-+ 					element->next->next = 0;
-+					strcpy( &element->next->name[0], optarg );
-+				}
-+				printf( "--------- Dumping ignore path list ----------------\n" );
-+				element = ignorepath;
-+				while ( element ) {
-+					printf( "  * '%s'\n", &element->name[0] );
-+					element = element->next;
-+				}
-+				printf( "---------------------------------------------------\n" );
-+				break;
-+
- 			case 'o':
- 				if (out_fd != -1) {
- 					error_msg_and_die("output filename specified more than once");
diff --git a/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2.patch b/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2.patch
deleted file mode 100644
index 3ac41280bb..0000000000
--- a/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- mtd/util/mkfs.jffs2.c~add-exclusion-to-mkfs-jffs2.patch
-+++ mtd/util/mkfs.jffs2.c
-@@ -92,7 +92,12 @@
- 	struct filesystem_entry *files;	/* Only relevant to directories */
- };
- 
-+struct ignorepath_entry {
-+    struct ignorepath_entry* next;  /* Points to the next ignorepath element */
-+    char name[PATH_MAX];             /* Name of the entry */
-+};
- 
-+static struct ignorepath_entry* ignorepath = 0;
- static int out_fd = -1;
- static int in_fd = -1;
- static char default_rootdir[] = ".";
-@@ -367,6 +372,7 @@
- 	char *hpath, *tpath;
- 	struct dirent *dp, **namelist;
- 	struct filesystem_entry *entry;
-+	struct ignorepath_entry* element = ignorepath;
- 
- 
- 	if (lstat(hostpath, &sb)) {
-@@ -376,6 +382,15 @@
- 	entry = add_host_filesystem_entry(targetpath, hostpath, 
- 			sb.st_uid, sb.st_gid, sb.st_mode, 0, parent);
- 
-+	while ( element ) {
-+		if ( strcmp( element->name, targetpath ) == 0 ) {
-+			printf( "Note: ignoring directories below '%s'\n", targetpath );
-+			return entry;
-+			break;
-+		}
-+		element = element->next;
-+	}
-+
- 	n = scandir(hostpath, &namelist, 0, alphasort);
- 	if (n < 0) {
- 		perror_msg_and_die("opening directory %s", hostpath);
-@@ -1147,6 +1162,7 @@
- 	{"root", 1, NULL, 'r'},
- 	{"pagesize", 1, NULL, 's'},
- 	{"eraseblock", 1, NULL, 'e'},
-+	{"ignore", 1, NULL, 'I'},
- 	{"output", 1, NULL, 'o'},
- 	{"help", 0, NULL, 'h'},
- 	{"verbose", 0, NULL, 'v'},
-@@ -1189,6 +1205,7 @@
-         "  -L, --list-compressors  Show the list of the avaiable compressors\n"
-         "  -t, --test-compression  Call decompress and compare with the original (for test)\n"
- 	"  -n, --no-cleanmarkers   Don't add a cleanmarker to every eraseblock\n"
-+	"  -I, --ignore=PATH       Ignore sub directory and file tree below PATH when recursing over the file system\n"
- 	"  -o, --output=FILE       Output to FILE (default: stdout)\n"
- 	"  -l, --little-endian     Create a little-endian filesystem\n"
- 	"  -b, --big-endian        Create a big-endian filesystem\n"
-@@ -1349,11 +1366,12 @@
- 	struct filesystem_entry *root;
-         char *compr_name = NULL;
-         int compr_prior  = -1;
-+	struct ignorepath_entry* element = ignorepath;
- 
-         jffs2_compressors_init();
- 
- 	while ((opt = getopt_long(argc, argv, 
--					"D:d:r:s:o:qUPfh?vVe:lbp::nc:m:x:X:Lty:i:", long_options, &c)) >= 0) 
-+					"D:d:r:s:I:o:qUPfh?vVe:lbp::nc:m:x:X:Lty:i:", long_options, &c)) >= 0) 
- 	{
- 		switch (opt) {
- 			case 'D':
-@@ -1376,6 +1394,28 @@
- 				page_size = strtol(optarg, NULL, 0);
- 				break;
- 
-+			case 'I':
-+				printf( "Note: Adding '%s' to ignore Path\n", optarg );
-+				element = ignorepath;
-+				if ( !ignorepath ) {
-+					ignorepath = xmalloc( sizeof( struct ignorepath_entry ) );
-+					ignorepath->next = 0;
-+					strcpy( &ignorepath->name[0], optarg );
-+				} else {
-+					while ( element->next ) element = element->next;
-+					element->next = xmalloc( sizeof( struct ignorepath_entry ) );
-+ 					element->next->next = 0;
-+					strcpy( &element->next->name[0], optarg );
-+				}
-+				printf( "--------- Dumping ignore path list ----------------\n" );
-+				element = ignorepath;
-+				while ( element ) {
-+					printf( "  * '%s'\n", &element->name[0] );
-+					element = element->next;
-+				}
-+				printf( "---------------------------------------------------\n" );
-+				break;
-+
- 			case 'o':
- 				if (out_fd != -1) {
- 					error_msg_and_die("output filename specified more than once");
diff --git a/packages/mtd/mtd-utils/add_lzo.patch b/packages/mtd/mtd-utils/add_lzo.patch
deleted file mode 100644
index 9afd1ca46b..0000000000
--- a/packages/mtd/mtd-utils/add_lzo.patch
+++ /dev/null
@@ -1,220 +0,0 @@
-Add LZO support to mtd-utils to generate LZO compressed jffs2 images
-
-Unlike the kernel version, the standard lzo userspace library is used
-along with lzo1x_999_compress rather than the lzo1x_1_compress version
-since better compression ratios can be obtained (at no significant cost
-to decompression time).
-
-Signed-off-by: Richard Purdie <rpurdie@openedhand.com>
-
----
- Makefile              |    3 -
- compr.c               |    6 ++
- compr.h               |    6 ++
- compr_lzo.c           |  120 ++++++++++++++++++++++++++++++++++++++++++++++++++
- include/linux/jffs2.h |    1 
- 5 files changed, 135 insertions(+), 1 deletion(-)
-
-Index: git/Makefile
-===================================================================
---- git.orig/Makefile	2007-03-01 11:57:58.000000000 +0000
-+++ git/Makefile	2007-03-01 11:58:01.000000000 +0000
-@@ -58,8 +58,9 @@ $(BUILDDIR)/mkfs.jffs2: $(BUILDDIR)/crc3
- 			$(BUILDDIR)/compr_rtime.o \
- 			$(BUILDDIR)/mkfs.jffs2.o \
- 			$(BUILDDIR)/compr_zlib.o \
-+			$(BUILDDIR)/compr_lzo.o \
- 			$(BUILDDIR)/compr.o
--	$(CC) $(LDFLAGS) -o $@ $^ -lz
-+	$(CC) $(LDFLAGS) -o $@ $^ -lz -llzo
- 
- $(BUILDDIR)/flash_eraseall: $(BUILDDIR)/crc32.o $(BUILDDIR)/flash_eraseall.o
- 	$(CC) $(LDFLAGS) -o $@ $^
-Index: git/compr.c
-===================================================================
---- git.orig/compr.c	2007-03-01 11:57:58.000000000 +0000
-+++ git/compr.c	2007-03-01 11:58:01.000000000 +0000
-@@ -474,6 +474,9 @@ int jffs2_compressors_init(void)
- #ifdef CONFIG_JFFS2_RTIME
- 	jffs2_rtime_init();
- #endif
-+#ifdef CONFIG_JFFS2_LZO
-+        jffs2_lzo_init();
-+#endif
- 	return 0;
- }
- 
-@@ -485,5 +488,8 @@ int jffs2_compressors_exit(void)
- #ifdef CONFIG_JFFS2_ZLIB
- 	jffs2_zlib_exit();
- #endif
-+#ifdef CONFIG_JFFS2_LZO
-+        jffs2_lzo_exit();
-+#endif
- 	return 0;
- }
-Index: git/compr.h
-===================================================================
---- git.orig/compr.h	2007-03-01 11:57:58.000000000 +0000
-+++ git/compr.h	2007-03-01 11:58:01.000000000 +0000
-@@ -21,11 +21,13 @@
- 
- #define CONFIG_JFFS2_ZLIB
- #define CONFIG_JFFS2_RTIME
-+#define CONFIG_JFFS2_LZO
- 
- #define JFFS2_RUBINMIPS_PRIORITY 10
- #define JFFS2_DYNRUBIN_PRIORITY  20
- #define JFFS2_RTIME_PRIORITY     50
- #define JFFS2_ZLIB_PRIORITY      60
-+#define JFFS2_LZO_PRIORITY       80
- 
- #define JFFS2_COMPR_MODE_NONE       0
- #define JFFS2_COMPR_MODE_PRIORITY   1
-@@ -111,5 +113,9 @@ void jffs2_zlib_exit(void);
- int jffs2_rtime_init(void);
- void jffs2_rtime_exit(void);
- #endif
-+#ifdef CONFIG_JFFS2_LZO
-+int jffs2_lzo_init(void);
-+void jffs2_lzo_exit(void);
-+#endif
- 
- #endif /* __JFFS2_COMPR_H__ */
-Index: git/compr_lzo.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ git/compr_lzo.c	2007-03-01 11:58:01.000000000 +0000
-@@ -0,0 +1,120 @@
-+/*
-+ * JFFS2 LZO Compression Interface.
-+ *
-+ * Copyright (C) 2007 Nokia Corporation. All rights reserved.
-+ *
-+ * Author: Richard Purdie <rpurdie@openedhand.com>
-+ *
-+ * 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.
-+ *
-+ * 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., 51 Franklin St, Fifth Floor, Boston, MA
-+ * 02110-1301 USA
-+ *
-+ */
-+
-+#include <stdint.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include <asm/types.h>
-+#include <linux/jffs2.h>
-+#include <lzo1x.h>
-+#include "compr.h"
-+
-+extern int page_size;
-+
-+static void *lzo_mem;
-+static void *lzo_compress_buf;
-+
-+/*
-+ * Note about LZO compression.
-+ *
-+ * We want to use the _999_ compression routine which gives better compression
-+ * rates at the expense of time. Decompression time is unaffected. We might as
-+ * well use the standard lzo library routines for this but they will overflow
-+ * the destination buffer since they don't check the destination size.
-+ *
-+ * We therefore compress to a temporary buffer and copy if it will fit.
-+ *
-+ */
-+static int jffs2_lzo_cmpr(unsigned char *data_in, unsigned char *cpage_out,
-+			  uint32_t *sourcelen, uint32_t *dstlen, void *model)
-+{
-+	uint32_t compress_size;
-+	int ret;
-+
-+	ret = lzo1x_999_compress(data_in, *sourcelen, lzo_compress_buf, &compress_size, lzo_mem);
-+
-+	if (ret != LZO_E_OK)
-+		return -1;
-+
-+	if (compress_size > *dstlen)
-+		return -1;
-+
-+	memcpy(cpage_out, lzo_compress_buf, compress_size);
-+	*dstlen = compress_size;
-+
-+	return 0;
-+}
-+
-+static int jffs2_lzo_decompress(unsigned char *data_in, unsigned char *cpage_out,
-+				 uint32_t srclen, uint32_t destlen, void *model)
-+{
-+	int ret;
-+	uint32_t dl;
-+
-+	ret = lzo1x_decompress_safe(data_in,srclen,cpage_out,&dl,NULL);
-+
-+	if (ret != LZO_E_OK || dl != destlen)
-+		return -1;
-+
-+	return 0;
-+}
-+
-+static struct jffs2_compressor jffs2_lzo_comp = {
-+	.priority = JFFS2_LZO_PRIORITY,
-+	.name = "lzo",
-+	.compr = JFFS2_COMPR_LZO,
-+	.compress = &jffs2_lzo_cmpr,
-+	.decompress = &jffs2_lzo_decompress,
-+	.disabled = 0,
-+};
-+
-+int jffs2_lzo_init(void)
-+{
-+	int ret;
-+
-+	lzo_mem = malloc(LZO1X_999_MEM_COMPRESS);
-+	if (!lzo_mem)
-+		return -1;
-+
-+	/* Worse case LZO compression size from their FAQ */
-+	lzo_compress_buf = malloc(page_size + (page_size / 64) + 16 + 3);
-+	if (!lzo_compress_buf) {
-+		free(lzo_mem);
-+		return -1;
-+	}
-+
-+	ret = jffs2_register_compressor(&jffs2_lzo_comp);
-+	if (ret < 0) {
-+		free(lzo_compress_buf);
-+		free(lzo_mem);
-+	}
-+
-+	return ret;
-+}
-+
-+void jffs2_lzo_exit(void)
-+{
-+	jffs2_unregister_compressor(&jffs2_lzo_comp);
-+	free(lzo_compress_buf);
-+	free(lzo_mem);
-+}
-Index: git/include/linux/jffs2.h
-===================================================================
---- git.orig/include/linux/jffs2.h	2007-03-01 11:57:58.000000000 +0000
-+++ git/include/linux/jffs2.h	2007-03-01 11:58:01.000000000 +0000
-@@ -46,6 +46,7 @@
- #define JFFS2_COMPR_COPY	0x04
- #define JFFS2_COMPR_DYNRUBIN	0x05
- #define JFFS2_COMPR_ZLIB	0x06
-+#define JFFS2_COMPR_LZO		0x07
- /* Compatibility flags. */
- #define JFFS2_COMPAT_MASK 0xc000      /* What do to if an unknown nodetype is found */
- #define JFFS2_NODE_ACCURATE 0x2000
diff --git a/packages/mtd/mtd-utils/favour_lzo.patch b/packages/mtd/mtd-utils/favour_lzo.patch
deleted file mode 100644
index 9e55d5f4b3..0000000000
--- a/packages/mtd/mtd-utils/favour_lzo.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-Add a favourlzo compression mode to mtd-utils
-
-This allows lzo compression to be used in the cases where the
-compression ratio isn't quite as good zlib. This can make sense in
-certain use cases because LZO decompression is much faster than zlib.
-
-Signed-off-by: Richard Purdie <rpurdie@openedhand.com>
-
----
- compr.c |   52 +++++++++++++++++++++++++++++++++++++++++++++++++---
- compr.h |    1 +
- 2 files changed, 50 insertions(+), 3 deletions(-)
-
-Index: git/compr.c
-===================================================================
---- git.orig/compr.c	2007-03-01 11:58:01.000000000 +0000
-+++ git/compr.c	2007-03-01 11:58:09.000000000 +0000
-@@ -16,6 +16,8 @@
- #include <stdlib.h>
- #include <linux/jffs2.h>
- 
-+#define FAVOUR_LZO_PERCENT 80
-+
- extern int page_size;
- 
- /* LIST IMPLEMENTATION (from linux/list.h) */
-@@ -166,6 +168,33 @@ static void jffs2_decompression_test(str
- 	}
- }
- 
-+/*
-+ * Return 1 to use this compression
-+ */
-+static int jffs2_is_best_compression(struct jffs2_compressor *this,
-+		struct jffs2_compressor *best, uint32_t size, uint32_t bestsize)
-+{
-+	switch (jffs2_compression_mode) {
-+		case JFFS2_COMPR_MODE_SIZE:
-+			if (bestsize > size)
-+				return 1;
-+			return 0;
-+		case JFFS2_COMPR_MODE_FAVOURLZO:
-+			if ((this->compr == JFFS2_COMPR_LZO) && (bestsize > size))
-+				return 1;
-+			if ((best->compr != JFFS2_COMPR_LZO) && (bestsize > size))
-+				return 1;
-+			if ((this->compr == JFFS2_COMPR_LZO) && (bestsize > (size * FAVOUR_LZO_PERCENT / 100)))
-+				return 1;
-+			if ((bestsize * FAVOUR_LZO_PERCENT / 100) > size)
-+				return 1;
-+
-+			return 0;
-+	}
-+	/* Shouldn't happen */
-+	return 0;
-+}
-+
- /* jffs2_compress:
-  * @data: Pointer to uncompressed data
-  * @cdata: Pointer to returned pointer to buffer for compressed data
-@@ -231,21 +260,29 @@ uint16_t jffs2_compress( unsigned char *
- 			}
- 			if (ret == JFFS2_COMPR_NONE) free(output_buf);
- 			break;
-+		case JFFS2_COMPR_MODE_FAVOURLZO:
- 		case JFFS2_COMPR_MODE_SIZE:
- 			orig_slen = *datalen;
- 			orig_dlen = *cdatalen;
- 			list_for_each_entry(this, &jffs2_compressor_list, list) {
-+				uint32_t needed_buf_size;
-+
-+				if (jffs2_compression_mode == JFFS2_COMPR_MODE_FAVOURLZO)
-+					needed_buf_size = orig_slen+jffs2_compression_check;
-+				else
-+					needed_buf_size = orig_dlen+jffs2_compression_check;
-+
- 				/* Skip decompress-only backwards-compatibility and disabled modules */
- 				if ((!this->compress)||(this->disabled))
- 					continue;
- 				/* Allocating memory for output buffer if necessary */
--				if ((this->compr_buf_size<orig_dlen+jffs2_compression_check)&&(this->compr_buf)) {
-+				if ((this->compr_buf_size < needed_buf_size) && (this->compr_buf)) {
- 					free(this->compr_buf);
- 					this->compr_buf_size=0;
- 					this->compr_buf=NULL;
- 				}
- 				if (!this->compr_buf) {
--					tmp_buf = malloc(orig_dlen+jffs2_compression_check);
-+					tmp_buf = malloc(needed_buf_size);
- 					if (!tmp_buf) {
- 						fprintf(stderr,"mkfs.jffs2: No memory for compressor allocation. (%d bytes)\n",orig_dlen);
- 						continue;
-@@ -265,7 +302,8 @@ uint16_t jffs2_compress( unsigned char *
- 				if (!compr_ret) {
- 					if (jffs2_compression_check)
- 						jffs2_decompression_test(this, data_in, this->compr_buf, *cdatalen, *datalen, this->compr_buf_size);
--					if ((!best_dlen)||(best_dlen>*cdatalen)) {
-+					if (((!best_dlen) || jffs2_is_best_compression(this, best, *cdatalen, best_dlen))
-+								&& (*cdatalen < *datalen)) {
- 						best_dlen = *cdatalen;
- 						best_slen = *datalen;
- 						best = this;
-@@ -377,6 +415,9 @@ char *jffs2_stats(void)
- 		case JFFS2_COMPR_MODE_SIZE:
- 			act_buf += sprintf(act_buf,"size");
- 			break;
-+		case JFFS2_COMPR_MODE_FAVOURLZO:
-+			act_buf += sprintf(act_buf,"favourlzo");
-+			break;
- 		default:
- 			act_buf += sprintf(act_buf,"unkown");
- 			break;
-@@ -413,6 +454,11 @@ int jffs2_set_compression_mode_name(cons
- 		jffs2_compression_mode = JFFS2_COMPR_MODE_SIZE;
- 		return 0;
- 	}
-+	if (!strcmp("favourlzo", name)) {
-+		jffs2_compression_mode = JFFS2_COMPR_MODE_FAVOURLZO;
-+		return 0;
-+	}
-+
- 	return 1;
- }
- 
-Index: git/compr.h
-===================================================================
---- git.orig/compr.h	2007-03-01 11:58:01.000000000 +0000
-+++ git/compr.h	2007-03-01 11:58:09.000000000 +0000
-@@ -32,6 +32,7 @@
- #define JFFS2_COMPR_MODE_NONE       0
- #define JFFS2_COMPR_MODE_PRIORITY   1
- #define JFFS2_COMPR_MODE_SIZE       2
-+#define JFFS2_COMPR_MODE_FAVOURLZO  3
- 
- #define kmalloc(a,b)                malloc(a)
- #define kfree(a)                    free(a)
diff --git a/packages/mtd/mtd-utils/fix-ignoreerrors-20060131.patch b/packages/mtd/mtd-utils/fix-ignoreerrors-20060131.patch
deleted file mode 100644
index 8266a37c46..0000000000
--- a/packages/mtd/mtd-utils/fix-ignoreerrors-20060131.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- mtd/util/nanddump.c.orig	2006-01-30 21:19:22.000000000 +0100
-+++ mtd/util/nanddump.c	2006-01-30 21:19:24.000000000 +0100
-@@ -224,7 +224,7 @@
- 			}
- 		}
- 
--		if (badblock) {
-+		if (badblock && !ignoreerrors) {
- 			if (omitbad)
- 				continue;
- 			memset (readbuf, 0xff, bs);
-@@ -259,7 +259,7 @@
- 		if (omitoob)
- 			continue;
- 
--		if (badblock) {
-+		if (badblock && !ignoreerrors) {
- 			memset (readbuf, 0xff, meminfo.oobsize);
- 		} else {
- 			/* Read OOB data and exit on failure */
diff --git a/packages/mtd/mtd-utils/fix-ignoreerrors.patch b/packages/mtd/mtd-utils/fix-ignoreerrors.patch
deleted file mode 100644
index b1f702a316..0000000000
--- a/packages/mtd/mtd-utils/fix-ignoreerrors.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- mtd/util/nanddump.c.orig	2005-12-30 19:07:39.000000000 +0100
-+++ mtd/util/nanddump.c	2005-12-30 19:08:53.000000000 +0100
-@@ -224,7 +224,7 @@
- 			}
- 		}
- 
--		if (badblock) {
-+		if (badblock && !ignoreerrors) {
- 			if (omitbad)
- 				continue;
- 			memset (readbuf, 0xff, bs);
-@@ -259,7 +259,7 @@
- 		if (omitoob)
- 			continue;
- 			
--		if (badblock) {
-+		if (badblock && !ignoreerrors) {
- 			memset (readbuf, 0xff, meminfo.oobsize);
- 		} else {
- 			/* Read OOB data and exit on failure */
diff --git a/packages/mtd/mtd-utils/lzo_1x.patch b/packages/mtd/mtd-utils/lzo_1x.patch
new file mode 100644
index 0000000000..b882d9f504
--- /dev/null
+++ b/packages/mtd/mtd-utils/lzo_1x.patch
@@ -0,0 +1,26 @@
+Index: git/Makefile
+===================================================================
+--- git.orig/Makefile
++++ git/Makefile
+@@ -60,7 +60,7 @@ $(BUILDDIR)/mkfs.jffs2: $(BUILDDIR)/crc3
+ 			$(BUILDDIR)/compr_zlib.o \
+ 			$(BUILDDIR)/compr_lzo.o \
+ 			$(BUILDDIR)/compr.o
+-	$(CC) $(LDFLAGS) -o $@ $^ -lz -llzo2
++	$(CC) $(LDFLAGS) -o $@ $^ -lz -llzo
+ 
+ $(BUILDDIR)/flash_eraseall: $(BUILDDIR)/crc32.o $(BUILDDIR)/flash_eraseall.o
+ 	$(CC) $(LDFLAGS) -o $@ $^
+Index: git/compr_lzo.c
+===================================================================
+--- git.orig/compr_lzo.c
++++ git/compr_lzo.c
+@@ -26,7 +26,7 @@
+ #include <string.h>
+ #include <asm/types.h>
+ #include <linux/jffs2.h>
+-#include <lzo/lzo1x.h>
++#include <lzo1x.h>
+ #include "compr.h"
+ 
+ extern int page_size;
diff --git a/packages/mtd/mtd-utils_0.0.0+cvs20060223.bb b/packages/mtd/mtd-utils_0.0.0+cvs20060223.bb
deleted file mode 100644
index 96199f1602..0000000000
--- a/packages/mtd/mtd-utils_0.0.0+cvs20060223.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-DESCRIPTION = "Tools for managing memory technology devices."
-SECTION = "base"
-DEPENDS = "zlib"
-HOMEPAGE = "http://www.linux-mtd.infradead.org/"
-LICENSE = "GPLv2"
-PR = "r0"
-SRCDATE = "20060223"
-
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.infradead.org/home/cvs;module=mtd \ 
-           file://add-exclusion-to-mkfs-jffs2-20060131.patch;patch=1 \
-	   file://fix-ignoreerrors-20060131.patch;patch=1"
-S = "${WORKDIR}/mtd/"
-
-CFLAGS_prepend = "-I${S}/include "
-
-do_compile () {
-	oe_runmake -C util ${mtd_utils}
-}
-
-do_stage () {
-	install -d ${STAGING_INCDIR}/mtd
-	for f in ${S}/include/mtd/*.h; do
-		install -m 0644 $f ${STAGING_INCDIR}/mtd/
-	done
-	for binary in ${mtd_utils}; do
-		install -m 0755 util/$binary ${STAGING_BINDIR}
-	done
-}
-
-mtd_utils = "ftl_format flash_erase flash_eraseall nanddump doc_loadbios \
-             mkfs.jffs ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info mtd_debug \
-             flashcp nandwrite jffs2dump sumtool"
-
-do_install () {
-	install -d ${D}${bindir}
-	for binary in ${mtd_utils}; do
-		install -m 0755 util/$binary ${D}${bindir}
-	done
-}
diff --git a/packages/mtd/mtd-utils_1.0.0+git.bb b/packages/mtd/mtd-utils_1.0.0+git.bb
index 62a2c0630b..cfbd38c714 100644
--- a/packages/mtd/mtd-utils_1.0.0+git.bb
+++ b/packages/mtd/mtd-utils_1.0.0+git.bb
@@ -3,13 +3,12 @@ SECTION = "base"
 DEPENDS = "zlib lzo"
 HOMEPAGE = "http://www.linux-mtd.infradead.org/"
 LICENSE = "GPLv2"
-PR = "r2"
+PR = "r4"
 
 SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=master \
-	   file://add_lzo.patch;patch=1 \
-	   file://favour_lzo.patch;patch=1 \
            file://add-exclusion-to-mkfs-jffs2-git.patch;patch=1 \
-	   file://fix-ignoreerrors-git.patch;patch=1"
+	   file://fix-ignoreerrors-git.patch;patch=1 \
+	   file://lzo_1x.patch;patch=1"
 
 S = "${WORKDIR}/git/"
 
diff --git a/packages/openmoko-apps/openmoko-rssreader_svn.bb b/packages/openmoko-apps/openmoko-rssreader_svn.bb
index 6e58b17c5b..ec52817b81 100644
--- a/packages/openmoko-apps/openmoko-rssreader_svn.bb
+++ b/packages/openmoko-apps/openmoko-rssreader_svn.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "The OpenMoko RSS Reader"
 SECTION = "openmoko/applications"
-DEPENDS += "libmrss check"
+DEPENDS += "libmrss check webkit"
 
 PV = "0.0.1+svn${SRCDATE}"
 PR = "r1"
diff --git a/packages/pkgconfig/pkgconfig-0.22/.mtn2git_empty b/packages/pkgconfig/pkgconfig-0.22/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pkgconfig/pkgconfig-0.22/.mtn2git_empty
diff --git a/packages/pkgconfig/pkgconfig-0.22/glibconfig-sysdefs.h b/packages/pkgconfig/pkgconfig-0.22/glibconfig-sysdefs.h
new file mode 100644
index 0000000000..1329e7f21c
--- /dev/null
+++ b/packages/pkgconfig/pkgconfig-0.22/glibconfig-sysdefs.h
@@ -0,0 +1,6 @@
+#define GLIB_SYSDEF_POLLIN =1
+#define GLIB_SYSDEF_POLLOUT =4
+#define GLIB_SYSDEF_POLLPRI =2
+#define GLIB_SYSDEF_POLLERR =8
+#define GLIB_SYSDEF_POLLHUP =16
+#define GLIB_SYSDEF_POLLNVAL =32
diff --git a/packages/pkgconfig/pkgconfig-native_0.22.bb b/packages/pkgconfig/pkgconfig-native_0.22.bb
new file mode 100644
index 0000000000..507a74b7d9
--- /dev/null
+++ b/packages/pkgconfig/pkgconfig-native_0.22.bb
@@ -0,0 +1,7 @@
+SECTION = "console/utils"
+require pkgconfig_${PV}.bb
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}"
+
+S = "${WORKDIR}/pkg-config-${PV}/"
+inherit native
+DEPENDS = ""
diff --git a/packages/pkgconfig/pkgconfig_0.22.bb b/packages/pkgconfig/pkgconfig_0.22.bb
new file mode 100644
index 0000000000..f634a87940
--- /dev/null
+++ b/packages/pkgconfig/pkgconfig_0.22.bb
@@ -0,0 +1,30 @@
+SECTION = "console/utils"
+DESCRIPTION = "pkg-config is a system for managing library \
+compile/link flags that works with automake and autoconf. \
+It replaces the ubiquitous *-config scripts you may have \
+seen with a single tool."
+HOMEPAGE = "http://pkg-config.freedesktop.org/wiki/"
+LICENSE = "GPL"
+PR = "r0"
+
+DEFAULT_PREFERENCE  = "-1"
+
+SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \
+           file://glibconfig-sysdefs.h"
+
+S = "${WORKDIR}/pkg-config-${PV}/"
+
+inherit autotools
+
+acpaths = "-I ."
+do_configure () {
+	install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h glib-1.2.8/
+	gnu-configize
+	libtoolize --force
+        oe_runconf
+}
+
+do_stage_prepend() {
+	install -d -m 0755 ${STAGING_DATADIR}/pkgconfig
+
+}
diff --git a/packages/ruby/ruby_1.8.5.bb b/packages/ruby/ruby_1.8.5.bb
index d06e9e0943..6260614772 100644
--- a/packages/ruby/ruby_1.8.5.bb
+++ b/packages/ruby/ruby_1.8.5.bb
@@ -1,2 +1,8 @@
 require ruby.inc
 DEPENDS = "ruby-native zlib openssl"
+
+PR = "r1"
+
+FILES_${PN}-dbg += "${libdir}/ruby/1.8/*/.debug \
+                    ${libdir}/ruby/1.8/*/*/.debug"
+
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 368e9374d2..84c3610b8f 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r40"
+PR = "r41"
 
 DEPENDS = "task-boot"
 PROVIDES = "${PACKAGES}"
@@ -223,9 +223,13 @@ task-base-pcmcia26 = "\
     ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-hostap-cs', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}"
 
+# Provide bluez-utils-compat utils for the time being, the binaries in that package will vanish soon from upstream releases, so beware! 
+
 RDEPENDS_task-base-bluetooth = "\ 
     blueprobe \
-    bluez-utils"
+    bluez-utils \
+    bluez-utils-compat \  
+    "
 
 RRECOMMENDS_task-base-bluetooth = "\
     kernel-module-bluetooth \
diff --git a/packages/webkit/webkit_svn.bb b/packages/webkit/webkit_svn.bb
index 656b2384ac..c5f5dcafa7 100644
--- a/packages/webkit/webkit_svn.bb
+++ b/packages/webkit/webkit_svn.bb
@@ -1,4 +1,4 @@
-DEPENDS = "libpcre flex-native gperf-native gperf perl-native curl icu uicmoc4-native qmake2-native libxml2 sqlite3 cairo libxslt libidn gnutls gtk+"
+DEPENDS = "flex-native gperf-native gperf perl-native curl icu uicmoc4-native qmake2-native libxml2 sqlite3 cairo libxslt libidn gnutls gtk+"
 
 # Yes, this is wrong...
 PV = "0.0+svn${SRCDATE}"
@@ -27,12 +27,14 @@ do_configure_append() {
         qmake2 -spec ${QMAKESPEC} CONFIG+=gdk-port CONFIG-=qt CONFIG-=release CONFIG+=debug
 	mkdir -p WebKitBuilds/Debug
 	cd WebKitBuilds/Debug
-	PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro
+	PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro WEBKIT_INC_DIR=${prefix}/include WEBKIT_LIB_DIR=${libdir}
 }
 
 do_compile_prepend() {
          mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
-	 cp ${STAGING_BINDIR_NATIVE}/dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
+         cd ${S}/JavaScriptCore/pcre 
+	 ${BUILD_CC} dftables.c -o dftables -I. -I../wtf
+	 cp dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
          cd ${S}/WebKitBuilds/Debug
 }
 
@@ -42,11 +44,20 @@ do_install() {
 	install -d ${D}${libdir}/pkgconfig
 
 	install -m 0755 ${S}/WebKitBuilds/Debug/WebKitTools/GdkLauncher/GdkLauncher ${D}${bindir}
-	cp -pPR WebKitBuilds/Debug/lib/*.so* ${D}${libdir} 
-	cp -pPR WebKitBuilds/Debug/lib/*.pc ${D}${libdir}/pkgconfig/ || true
+        cd ${S}/WebKitBuilds/Debug
+	PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro WEBKIT_INC_DIR=${D}${prefix}/include WEBKIT_LIB_DIR=${D}${libdir}
+        oe_runmake install
 }
 
 
+do_stage() {
+        install -d ${STAGING_LIBDIR}
+        install -d ${STAGING_INCDIR}
+        cd ${S}/WebKitBuilds/Debug
+	PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro WEBKIT_INC_DIR=${STAGING_INCDIR} WEBKIT_LIB_DIR=${STAGING_LIBDIR}
+        oe_runmake install
+}
+
 PACKAGES =+ "webkit-gdklauncher-dbg webkit-gdklauncher"
 
 FILES_webkit-gdklauncher = "${bindir}/GdkLauncher"