merge of '77df6e755fc8272db3fd5e4c3b0620b4453ca180'

and 'f0261ce1c4acd6350d91bdaaf2939442d84a222d'
author: Marcin Juszkiewicz <hrw@openembedded.org> 2007-01-22 10:04:30 +0000
committer: Marcin Juszkiewicz <hrw@openembedded.org> 2007-01-22 10:04:30 +0000
commit: c3be2a552db104291accd82b2e674d31d5527fcc (patch)
tree: 422e82bf481b26c2a0e883d60b459cbc243d436e
parent: 3a508238c49e86e0476319bfe71a24fdfdd56b66 (diff)
parent: 4693c8ab28f246ce11a0b80b27ab6127aea14c52 (diff)
230 files changed, 9117 insertions, 876 deletions
diff --git a/classes/xfce.bbclass b/classes/xfce.bbclass
index 793348597f..8124dc877c 100644
--- a/classes/xfce.bbclass
+++ b/classes/xfce.bbclass
@@ -7,7 +7,13 @@
 HOMEPAGE = "http://www.xfce.org"
 LICENSE = "LGPL-2"
 
-SRC_URI = "http://www.us.xfce.org/archive/xfce-${PV}/src/${PN}-${PV}.tar.gz"
+def xfce_extension(ver):
+	ext = "gz"
+	if ver == "4.3.99.2":
+		ext = "bz2"
+	return ext
+
+SRC_URI = "http://www.us.xfce.org/archive/xfce-${PV}/src/${PN}-${PV}.tar.${@xfce_extension("${PV}")}"
 
 inherit autotools
 
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index b1855b0ea7..b1d67e0405 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -8,7 +8,7 @@
 
 #DISTRO_VERSION = "2007.3"
 DISTRO_VERSION = "test-${DATE}"
-DISTRO_REVISION = "30"
+DISTRO_REVISION = "32"
 
 require conf/distro/include/angstrom.inc
 require conf/distro/include/sane-srcdates.inc
@@ -46,6 +46,10 @@ FEED_ARCH_poodle	= "armv5te"
 FEED_ARCH_spitz		= "armv5te"
 FEED_ARCH_tosa		= "armv5te"
 
+
+#i586 machines
+FEED_ARCH_epia		= "i586"
+
 #i686 machines
 
 FEED_ARCH_guinness	= "i686"
@@ -70,9 +74,9 @@ FEED_URIS += " \
 # We will lock down a SRCDATE when we go into release mode
 #SRCDATE = "20070303"
 
-PREFERRED_VERSION_linux-handhelds-2.6 = "2.6.16-hh9"
-PREFERRED_VERSION_linux-handhelds-2.6_h3900 = "2.6.19-hh7"
-PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal = "2.6.18-hh1"
+PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.16-hh9"
+PREFERRED_VERSION_linux-handhelds-2.6_h3900 ?= "2.6.19-hh7"
+PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal ?= "2.6.19-hh7"
 
 
 SRCDATE_gconf-dbus = "20060719"
@@ -107,7 +111,7 @@ PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
 require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
 
 PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0"
-PREFERRED_VERSION_gtk+ = "2.10.6"
+PREFERRED_VERSION_gtk+ = "2.10.7"
 
 #zap extra stuff taking place in $MACHINE.conf 
 GPE_EXTRA_INSTALL = ""
@@ -135,6 +139,7 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
 PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
 PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs"
+PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs"
 PREFERRED_PROVIDER_tslib ?= "tslib"
 PREFERRED_PROVIDER_tslib-conf ?= "tslib"
 PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget"
diff --git a/conf/distro/include/preferred-gpe-versions-2.7.inc b/conf/distro/include/preferred-gpe-versions-2.7.inc
index 662dfc386f..cbdaec0a21 100644
--- a/conf/distro/include/preferred-gpe-versions-2.7.inc
+++ b/conf/distro/include/preferred-gpe-versions-2.7.inc
@@ -7,7 +7,7 @@
 
 #set some preferred providers:
 PREFERRED_PROVIDER_gconf="gconf-dbus"
-PREFERRED_PROVIDER_gnome-vfs="gnome-vfs-dbus"
+PREFERRED_PROVIDER_gnome-vfs="gnome-vfs"
 
 #specify versions, as the header says :)
 PREFERRED_VERSION_libmatchbox ?= "1.7"
diff --git a/conf/distro/include/preferred-gpe-versions-2.8.inc b/conf/distro/include/preferred-gpe-versions-2.8.inc
index bf00aa8d01..a246633e07 100644
--- a/conf/distro/include/preferred-gpe-versions-2.8.inc
+++ b/conf/distro/include/preferred-gpe-versions-2.8.inc
@@ -4,7 +4,7 @@
 
 #set some preferred providers:
 PREFERRED_PROVIDER_gconf="gconf-dbus"
-PREFERRED_PROVIDER_gnome-vfs="gnome-vfs-dbus"
+PREFERRED_PROVIDER_gnome-vfs="gnome-vfs"
 
 PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904"
 
diff --git a/conf/distro/include/preferred-gpe-versions.inc b/conf/distro/include/preferred-gpe-versions.inc
index 7d4efea06e..5db9d7f06a 100644
--- a/conf/distro/include/preferred-gpe-versions.inc
+++ b/conf/distro/include/preferred-gpe-versions.inc
@@ -7,7 +7,7 @@
 
 #set some preferred providers:
 PREFERRED_PROVIDER_gconf="gconf-dbus"
-PREFERRED_PROVIDER_gnome-vfs="gnome-vfs-dbus"
+PREFERRED_PROVIDER_gnome-vfs="gnome-vfs"
 
 #specify versions, as the header says :)
 #PREFERRED_VERSION_libmatchbox ?= "1.6"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index f73fa22e34..27e34856fd 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -22,7 +22,7 @@ SRCDATE_xxf86vmext ?= "20060814"
 SRCDATE_contacts ?= "20060707"
 SRCDATE_dates ?= "20060707"
 SRCDATE_fstests ?= "20061122"
-SRCDATE_eds-dbus ?= "20061215"
+SRCDATE_eds-dbus ?= "20070115"
 SRCDATE_libmatchbox ?= "20060612"
 SRCDATE_libfakekey ?= "20051101"
 SRCDATE_matchbox-common ?= "20060612"
@@ -46,7 +46,7 @@ SRCDATE_gpesyncd ?= "20061128"
 
 # GNOME
 SRCDATE_gconf-dbus ?= "20060719"
-SRCDATE_gnome-vfs-dbus ?= "20060119"
+SRCDATE_gnome-vfs ?= "20060119"
 SRCDATE_gtkhtml2 ?= "20060323"
 
 #Misc apps, sorted by alphabet
diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf
index 3968bcb6f2..95be1624f0 100644
--- a/conf/machine/compulab-pxa270.conf
+++ b/conf/machine/compulab-pxa270.conf
@@ -12,7 +12,7 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
 require conf/machine/include/tune-xscale.conf
 
 # used by sysvinit_2
-SERIAL_CONSOLE = "115200 ttySA0"
+SERIAL_CONSOLE = "38400 ttySA0"
 
 # used by opie-collections.inc
 ROOT_FLASH_SIZE = "32"
diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf
index 189021747a..86e9429506 100644
--- a/conf/machine/epia.conf
+++ b/conf/machine/epia.conf
@@ -1,13 +1,12 @@
 TARGET_ARCH = "i586"
-TARGET_VENDOR = "-oe"
+PACKAGE_EXTRA_ARCHS = "i386 i486"
+
 PREFERRED_PROVIDER_virtual/kernel = "linux-epia"
-IMAGE_FSTYPES = "ext2.gz"
-BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev kernel-modules"
-udevdir = "/dev"
 OLDEST_KERNEL = "2.6.5"
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-PACKAGE_EXTRA_ARCHS = "i386"
+
+IMAGE_FSTYPES = "ext2.gz"
+
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" 
 
 require conf/machine/include/tune-c3.conf
 
diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf
index 72c2d33713..e81dbdeaa9 100644
--- a/conf/machine/h1910.conf
+++ b/conf/machine/h1910.conf
@@ -19,6 +19,7 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen"
 # Software/packages selection
 #
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.16-hh9"
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
diff --git a/conf/machine/htcblueangel.conf b/conf/machine/htcblueangel.conf
index e92aee9972..77bb0b5639 100644
--- a/conf/machine/htcblueangel.conf
+++ b/conf/machine/htcblueangel.conf
@@ -19,6 +19,7 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget
 # Software/packages selection
 #
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.19-hh8"
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index 843e26bed0..485d90df7f 100644
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -31,17 +31,24 @@ MACHINE_EXTRA_RRECOMMENDS = "  kernel-module-nls-cp437 \
                                 kernel-module-af-key \
 				kernel-module-bsd-comp \
 				kernel-module-i2c-pxa \
-				kernel-module-htcuniversal-power \
 				kernel-module-snd-htcuniversal-audio \
 				kernel-module-htcuniversal-acx \
 				kernel-module-acx \
+                                kernel-module-i2c-algo-bit \
+                                kernel-module-rtc-sa1100 \
+                                kernel-module-rtc-dev \
+                                kernel-module-rtc-proc \
+                                kernel-module-rtc-sysfs \
 				"
 
 #
 # Modules autoload and other boot properties
 #
-module_autoload_acx = "acx"
+#module_autoload_acx = "acx"
 module_autoload_htcuniversal_acx = "htcuniversal_acx"
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_snd-mixer-oss = "snd-mixer-oss"
+module_autoload_snd-htcuniversal_audio = "snd-htcuniversal_audio"
 
 #FIXME: this should be controlled by a userspace utility later.
 module_autoload_g_ether = "g_ether"
diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf
index 4e6c9a625a..3d1b602def 100644
--- a/conf/machine/magician.conf
+++ b/conf/machine/magician.conf
@@ -17,7 +17,7 @@ require conf/machine/include/tune-xscale.conf
 ROOT_FLASH_SIZE = "80"
 VOLATILE_STORAGE_SIZE = "64"
 GUI_MACHINE_CLASS = "smallscreen"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget screen"
+MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget"
 
 #
 # Software/packages selection
@@ -34,7 +34,11 @@ MACHINE_EXTRA_RRECOMMENDS = " \
 	kernel-module-pxaficp-ir \
 	kernel-module-uinput \
 	kernel-module-hci-usb \
-	"
+	kernel-module-magician-flash \
+	kernel-module-magician-ds1wm \
+	kernel-module-magician-battery \
+	kernel-module-magician-phone \
+	kernel-module-snd-soc-magician"
 
 #
 # Modules autoload and other boot properties
@@ -44,6 +48,11 @@ module_autoload_leds-magician = "leds-magician"
 module_autoload_snd-pcm-oss = "snd-pcm-oss"
 module_autoload_snd-mixer-oss = "snd-mixer-oss"
 module_autoload_pxa27x_udc = "pxa27x_udc"
+module_autoload_magician_ds1wm = "magician_ds1wm"
+module_autoload_magician-battery = "magician-battery"
+module_autoload_magician_phone = "magician_phone"
+module_autoload_snd-soc-magician = "snd-soc-magician"
+module_autoload_hci_usb = "hci_usb"
 
 #FIXME: this should be controlled by a userspace utility later.
 module_autoload_g_ether = "g_ether"
diff --git a/conf/machine/rx3000.conf b/conf/machine/rx3000.conf
index 40b13667b6..e39844d943 100644
--- a/conf/machine/rx3000.conf
+++ b/conf/machine/rx3000.conf
@@ -20,6 +20,7 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget
 # Software/packages selection
 #
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.19-hh8"
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
diff --git a/packages/abiword/abiword-2.5.inc b/packages/abiword/abiword-2.5.inc
new file mode 100644
index 0000000000..cd95777227
--- /dev/null
+++ b/packages/abiword/abiword-2.5.inc
@@ -0,0 +1,62 @@
+DESCRIPTION = "AbiWord is free word processing program similar to Microsoft(r) Word"
+SECTION = "gnome/office"
+HOMEPAGE = "http://www.abiword.org""
+LICENSE = "GPLv2"
+
+DEPENDS     = "perl-native wv libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng libxml2"
+RDEPENDS    = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \
+               glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
+
+SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz"
+
+#want 2.x from 2.x.y for the installation directory
+SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+
+FILES_${PN} += " \
+		${datadir}/icons/* \
+		${datadir}/AbiSuite-${SHRT_VER}/AbiWord/glade \
+		${datadir}/AbiSuite-${SHRT_VER}/AbiWord/scripts \
+		${datadir}/AbiSuite-${SHRT_VER}/AbiWord/system.profile-en \
+		${datadir}/AbiSuite-${SHRT_VER}/AbiWord/system.profile-en_GB \
+#		${datadir}/AbiSuite-${SHRT_VER}/templates/A4.awt \
+#		${datadir}/AbiSuite-${SHRT_VER}/templates/US-Letter.awt \
+		${datadir}/AbiSuite-${SHRT_VER}/templates/normal.awt \
+		${datadir}/AbiSuite-${SHRT_VER}/templates/normal.awt-en_GB \
+		${datadir}/AbiSuite-${SHRT_VER}/templates/Employee-Directory.awt \
+		${datadir}/AbiSuite-${SHRT_VER}/templates/Business-Report.awt \
+		${datadir}/AbiSuite-${SHRT_VER}/templates/Fax-Coversheet.awt \
+		${datadir}/AbiSuite-${SHRT_VER}/templates/Resume.awt \
+		${datadir}/AbiSuite-${SHRT_VER}/templates/Two-Columns.awt \
+		${datadir}/AbiSuite-${SHRT_VER}/templates/Memo.awt \
+		${datadir}/AbiSuite-${SHRT_VER}/templates/Press-Release.awt "
+
+inherit autotools pkgconfig
+
+PARALLEL_MAKE = ""
+
+EXTRA_OECONF = " --disable-pspell \
+                 --enable-enchant \
+		 --with-sys-wv"
+
+# AbiWord configure.ac does not play nicely with autoreconf
+# so use the autogen.sh script that comes with AbiWord
+#
+do_configure() {
+        cd ${S}
+        export NOCONFIGURE="no"; ./autogen.sh
+        oe_runconf
+}
+
+
+do_install_append() {
+        install -d ${D}${datadir}/pixmaps/
+        mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/
+}
+
+PACKAGES += " abiword-clipart abiword-icons abiword-strings abiword-systemprofiles abiword-templates "
+
+FILES_abiword-clipart 		+= "${datadir}/AbiSuite-${SHRT_VER}/clipart"
+FILES_abiword-icons 		+= "${datadir}/AbiSuite-${SHRT_VER}/icons"
+FILES_abiword-strings 		+= "${datadir}/AbiSuite-${SHRT_VER}/AbiWord/strings"
+FILES_abiword-systemprofiles 	+= "${datadir}/AbiSuite-${SHRT_VER}/AbiWord/system.profile*"
+FILES_abiword-templates 	+= "${datadir}/AbiSuite-${SHRT_VER}/templates"
diff --git a/packages/abiword/abiword_2.5.0.bb b/packages/abiword/abiword_2.5.0.bb
new file mode 100644
index 0000000000..82d4e0e944
--- /dev/null
+++ b/packages/abiword/abiword_2.5.0.bb
@@ -0,0 +1,14 @@
+require abiword-2.5.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI += " file://cdump.pl "
+
+PR = "r0"
+
+RCONFLICTS = "abiword-embedded"
+
+do_compile_prepend () {
+	cp ${WORKDIR}/cdump.pl ${S}/src/tools/cdump/xp/
+}
+
diff --git a/packages/abiword/files/cdump.pl b/packages/abiword/files/cdump.pl
new file mode 100755
index 0000000000..76f9c8841b
--- /dev/null
+++ b/packages/abiword/files/cdump.pl
@@ -0,0 +1,32 @@
+#!/usr/bin/perl
+
+# This script replace the cdump tool we used to build the ap_wp_Splash.cpp 
+# Because the cdump tool has to be run as a part of building the AW package,
+# it breaks cross-compilation. A perl script seemed like a generic solution
+
+
+if ($#ARGV != 1 )
+{
+	print "Usage: $0 datafile arrayname $#ARGV $ARGV[0] $ARGV[1]\n";
+	exit(-1);
+}
+
+open FROM, "<$ARGV[0]" or die "Could not open file $ARGV[0]";
+binmode FROM;
+
+print "unsigned char $ARGV[1] [] = {\n";
+
+while ($len = read(FROM, $buf, 16))
+{
+	foreach(split(//,$buf))
+	{
+		printf("0x%02x,", ord($_));
+	}
+
+	print "\n";
+}
+
+
+printf "};\nunsigned long $ARGV[1]_sizeof = sizeof($ARGV[1]);\n";
+
+close FROM;
+\ No newline at end of file
diff --git a/packages/libsdl/libsdl-qpe-1.2.7/.mtn2git_empty b/packages/asterisk/asterisk-1.2.14/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libsdl/libsdl-qpe-1.2.7/.mtn2git_empty
+++ b/packages/asterisk/asterisk-1.2.14/.mtn2git_empty
diff --git a/packages/asterisk/asterisk-1.2.14/asterisk.patch b/packages/asterisk/asterisk-1.2.14/asterisk.patch
new file mode 100644
index 0000000000..006b8e9291
--- /dev/null
+++ b/packages/asterisk/asterisk-1.2.14/asterisk.patch
@@ -0,0 +1,221 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- asterisk-1.2.9.1/./Makefile~asterisk
++++ asterisk-1.2.9.1/./Makefile
+@@ -331,7 +331,7 @@
+ ASTCFLAGS+= $(TRACE_FRAMES)
+ ASTCFLAGS+= $(MALLOC_DEBUG)
+ ASTCFLAGS+= $(BUSYDETECT)
+-ASTCFLAGS+= $(OPTIONS)
++#ASTCFLAGS+= $(OPTIONS)
+ ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize)
+ ASTCFLAGS+= -fomit-frame-pointer 
+ endif
+@@ -347,12 +347,12 @@
+ 	netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \
+ 	cryptostub.o
+ 
+-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/sys/poll.h),)
++ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/include/sys/poll.h),)
+   OBJS+= poll.o
+   ASTCFLAGS+=-DPOLLCOMPAT
+ endif
+ 
+-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/dlfcn.h),)
++ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/include/dlfcn.h),)
+   OBJS+= dlfcn.o
+   ASTCFLAGS+=-DDLFCNCOMPAT
+ endif
+@@ -397,7 +397,7 @@
+ endif
+ 
+ ifeq ($(MAKETOPLEVEL),$(MAKELEVEL))
+-  CFLAGS+=$(ASTCFLAGS)
++override CFLAGS+=$(ASTCFLAGS)
+ endif
+ 
+ # This is used when generating the doxygen documentation
+@@ -519,7 +519,7 @@
+ 	fi
+ 	rm -f include/asterisk/build.h.tmp
+ 	$(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c
+-	$(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS)
++	$(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LDFLAGS) $(LIBS)
+ 
+ muted: muted.o
+ 	$(CC) $(AUDIO_LIBS) -o muted muted.o
+--- asterisk-1.2.9.1/codecs/gsm/Makefile~asterisk
++++ asterisk-1.2.9.1/codecs/gsm/Makefile
+@@ -51,7 +51,7 @@
+            ifneq (${PROC},ppc)
+             ifneq (${PROC},ppc64)
+              ifneq (${PROC},s390)
+-OPTIMIZE+=-march=$(PROC)
++#OPTIMIZE+=-march=$(PROC)
+              endif
+             endif
+            endif
+@@ -243,7 +243,7 @@
+ ifneq (${PROC},arm)
+ ifneq ($(shell uname -m), parisc)
+ ifneq ($(shell uname -m),s390)
+-GSM_SOURCES+= $(SRC)/k6opt.s
++#GSM_SOURCES+= $(SRC)/k6opt.s
+ endif
+ endif
+ endif
+@@ -309,7 +309,7 @@
+ ifneq ($(shell uname -m), armv4l)
+ ifneq ($(shell uname -m), parisc)
+ ifneq ($(shell uname -m),s390)
+-GSM_OBJECTS+= $(SRC)/k6opt.o
++#GSM_OBJECTS+= $(SRC)/k6opt.o
+ endif
+ endif
+ endif
+--- asterisk-1.2.9.1/res/Makefile~asterisk
++++ asterisk-1.2.9.1/res/Makefile
+@@ -89,7 +89,7 @@
+ 	fi
+ 
+ res_crypto.so: res_crypto.o
+-	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CRYPTO_LIBS)
++	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< $(LDFLAGS) ${CYGSOLIB} $(CRYPTO_LIBS)
+ 
+ clean:
+ 	rm -f *.so *.o .depend
+--- asterisk-1.2.9.1/channels/Makefile~asterisk
++++ asterisk-1.2.9.1/channels/Makefile
+@@ -73,7 +73,7 @@
+   SOLINK+=-lrt
+ endif
+ 
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/linux/ixjuser.h),)
+   CHANNEL_LIBS+=chan_phone.so
+ endif
+ 
+@@ -88,16 +88,16 @@
+ 
+ CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
+ 
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/alsa/asoundlib.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/alsa/asoundlib.h),)
+   CHANNEL_LIBS+=chan_alsa.so
+ endif
+ 
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/lib/libpri.so.1),)
+   CFLAGS+=-DZAPATA_PRI
+   ZAPPRI=-lpri
+ endif
+ 
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/lib/libmfcr2.so.1),)
+   CFLAGS+=-DZAPATA_R2
+   ZAPR2=-lmfcr2
+ endif
+@@ -110,7 +110,7 @@
+ endif
+ 
+ ifndef WITHOUT_ZAPTEL
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/linux/zaptel.h),)
+   ifeq (${OSARCH},NetBSD)
+     SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib
+   endif
+@@ -122,7 +122,7 @@
+ endif
+ endif # WITHOUT_ZAPTEL
+ 
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vpbapi.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/vpbapi.h),)
+   CHANNEL_LIBS+=chan_vpb.so
+   CFLAGS+=-DLINUX
+ endif
+@@ -137,7 +137,7 @@
+ 
+ ZAPDIR=/usr/lib
+ 
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/nbs.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/nbs.h),)
+   CHANNEL_LIBS+=chan_nbs.so
+ endif
+ 
+@@ -158,7 +158,7 @@
+ 	rm -f busy.h ringtone.h gentone gentone-ulaw
+ 
+ %.so : %.o
+-	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} ${LIBS}
++	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< $(LDFLAGS) ${CYGSOLIB} ${LIBS}
+ 
+ ifneq ($(wildcard .depend),)
+   include .depend
+@@ -215,7 +215,7 @@
+ chan_alsa.o: $(ALSA_SRC)
+ 
+ chan_alsa.so: chan_alsa.o
+-	$(CC) $(SOLINK) -o $@ $< -lasound -lm -ldl
++	$(CC) $(SOLINK) -o $@ $< -lasound -lm -ldl $(LDFLAGS)
+ 
+ chan_nbs.so: chan_nbs.o
+ 	$(CC) $(SOLINK) -o $@ $< -lnbs
+--- asterisk-1.2.9.1/pbx/Makefile~asterisk
++++ asterisk-1.2.9.1/pbx/Makefile
+@@ -59,7 +59,7 @@
+ 	$(CC) $(SOLINK) -o $@ $(KDE_CONSOLE_OBJS) $(KDE_LIBS)
+ 
+ pbx_dundi.so: dundi-parser.o pbx_dundi.o
+-	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} pbx_dundi.o dundi-parser.o -lz ${CYGSOLIB}
++	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} pbx_dundi.o dundi-parser.o -lz ${CYGSOLIB} $(LDFLAGS)
+ 
+ %.moc : %.h
+ 	$(MOC) $< -o $@
+--- asterisk-1.2.9.1/formats/Makefile~asterisk
++++ asterisk-1.2.9.1/formats/Makefile
+@@ -25,7 +25,7 @@
+ #
+ # OGG/Vorbis format
+ #
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vorbis/codec.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/vorbis/codec.h),)
+   FORMAT_LIBS+=format_ogg_vorbis.so
+ endif
+ 
+@@ -57,7 +57,7 @@
+ 	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lm
+ 
+ format_ogg_vorbis.so : format_ogg_vorbis.o
+-	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -logg -lvorbis -lvorbisenc -lm
++	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -logg -lvorbis -lvorbisenc -lm $(LDFLAGS)
+ 
+ install: all
+ 	for x in $(FORMAT_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
+--- asterisk-1.2.9.1/utils/Makefile~asterisk
++++ asterisk-1.2.9.1/utils/Makefile
+@@ -22,11 +22,11 @@
+ 
+ TARGET=stereorize streamplayer
+ 
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/popt.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/popt.h),)
+   TARGET+=smsq
+ endif
+ 
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/newt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/newt.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/newt.h),)
+   TARGET+=astman
+ endif
+ 
+@@ -64,7 +64,7 @@
+ 	$(CC) $(CFLAGS) -o $@ $^
+ 
+ smsq: smsq.o
+-	$(CC) $(CFLAGS) -o smsq ${SOL} smsq.o -lpopt
++	$(CC) $(CFLAGS) -o smsq ${SOL} smsq.o -lpopt $(LDFLAGS)
+ 
+ streamplayer: streamplayer.o
+ 	$(CC) $(CFLAGS) -o streamplayer ${SOL} streamplayer.o ${SOLLIBS}
diff --git a/packages/asterisk/asterisk-1.2.14/uclibc-compat-getloadavg.patch b/packages/asterisk/asterisk-1.2.14/uclibc-compat-getloadavg.patch
new file mode 100644
index 0000000000..a909513b1c
--- /dev/null
+++ b/packages/asterisk/asterisk-1.2.14/uclibc-compat-getloadavg.patch
@@ -0,0 +1,13 @@
+diff -ruN asterisk-1.2.0-old/include/asterisk/compat.h asterisk-1.2.0-new/include/asterisk/compat.h
+--- asterisk-1.2.0-old/include/asterisk/compat.h	2005-11-08 05:13:19.000000000 +0100
++++ asterisk-1.2.0-new/include/asterisk/compat.h	2005-12-04 05:32:31.000000000 +0100
+@@ -75,7 +75,9 @@
+ #define HAVE_STRTOQ
+ 
+ #ifdef _BSD_SOURCE
++#ifndef __UCLIBC__
+ #define HAVE_GETLOADAVG
++#endif /* __UCLIBC__ */
+ #endif
+ 
+ #ifdef __linux__
diff --git a/packages/asterisk/asterisk-1.2.14/uclibc-dsn.patch b/packages/asterisk/asterisk-1.2.14/uclibc-dsn.patch
new file mode 100644
index 0000000000..23657bcc76
--- /dev/null
+++ b/packages/asterisk/asterisk-1.2.14/uclibc-dsn.patch
@@ -0,0 +1,18 @@
+diff -ruN asterisk-1.0.7-old/dns.c asterisk-1.0.7-new/dns.c
+--- asterisk-1.0.7-old/dns.c	2004-06-22 22:11:15.000000000 +0200
++++ asterisk-1.0.7-new/dns.c	2005-03-19 17:38:06.000000000 +0100
+@@ -153,7 +153,13 @@
+ 
+ #if defined(res_ninit)
+ #define HAS_RES_NINIT
+-#else
++#endif
++
++#ifdef __UCLIBC__
++#undef HAS_RES_NINIT
++#endif
++
++#ifndef HAS_RES_NINIT
+ AST_MUTEX_DEFINE_STATIC(res_lock);
+ #if 0
+ #warning "Warning, res_ninit is missing...  Could have reentrancy issues"
diff --git a/packages/asterisk/asterisk_1.2.14.bb b/packages/asterisk/asterisk_1.2.14.bb
new file mode 100644
index 0000000000..42a3214f0a
--- /dev/null
+++ b/packages/asterisk/asterisk_1.2.14.bb
@@ -0,0 +1,38 @@
+DESCRIPTION="The Asterisk open source software PBX"
+HOMEPAGE="www.asterisk.org"
+LICENSE="GPL"
+DEPENDS="ncurses zlib openssl curl alsa-lib libogg libvorbis popt"
+PR = "r1"
+
+SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \
+	 file://uclibc-compat-getloadavg.patch;patch=1 \
+	 file://uclibc-dsn.patch;patch=1 \
+         file://asterisk.patch;patch=1"
+
+
+export CROSS_COMPILE="${CCACHE}${HOST_PREFIX}"
+export CROSS_COMPILE_BIN="${STAGING_BINDIR_CROSS}"
+export CROSS_COMPILE_TARGET="${STAGING_DIR}/${HOST_SYS}"
+
+export CROSS_ARCH="Linux"
+export CROSS_PROC="arm"
+export SUB_PROC="xscale"
+
+export MAKECMDGOALS="dont-optimize"
+
+# We will probably have to edit the CFLAG in the Makefile
+
+do_compile() {
+        oe_runmake
+}
+
+do_install() {
+        oe_runmake DESTDIR=${D} install
+}
+
+do_stage () {
+        install -d ${STAGING_INCDIR}/asterisk
+        install -m 0644 ${S}/include/asterisk/*.h ${STAGING_INCDIR}/asterisk/
+}
+
+
diff --git a/packages/avahi/avahi_0.6.10.bb b/packages/avahi/avahi_0.6.10.bb
deleted file mode 100644
index 27dcdcffcb..0000000000
--- a/packages/avahi/avahi_0.6.10.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require avahi.inc
-
-PR = "r1"
diff --git a/packages/avahi/avahi_0.6.11.bb b/packages/avahi/avahi_0.6.11.bb
deleted file mode 100644
index 27dcdcffcb..0000000000
--- a/packages/avahi/avahi_0.6.11.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require avahi.inc
-
-PR = "r1"
diff --git a/packages/avahi/avahi_0.6.12.bb b/packages/avahi/avahi_0.6.12.bb
deleted file mode 100644
index aad7d2661c..0000000000
--- a/packages/avahi/avahi_0.6.12.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require avahi.inc
-
-PR = "r2"
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/avahi/avahi_0.6.13.bb b/packages/avahi/avahi_0.6.13.bb
deleted file mode 100644
index 076dc0d148..0000000000
--- a/packages/avahi/avahi_0.6.13.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require avahi.inc
-
-PR = "r1"
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/packages/avahi/avahi_0.6.14.bb b/packages/avahi/avahi_0.6.16.bb
index e42f4bbc13..e42f4bbc13 100644
--- a/packages/avahi/avahi_0.6.14.bb
+++ b/packages/avahi/avahi_0.6.16.bb
diff --git a/packages/avahi/avahi_0.6.5.bb b/packages/avahi/avahi_0.6.5.bb
deleted file mode 100644
index 9189734dfa..0000000000
--- a/packages/avahi/avahi_0.6.5.bb
+++ /dev/null
@@ -1 +0,0 @@
-require avahi.inc
diff --git a/packages/avahi/avahi_0.6.8.bb b/packages/avahi/avahi_0.6.8.bb
deleted file mode 100644
index 9189734dfa..0000000000
--- a/packages/avahi/avahi_0.6.8.bb
+++ /dev/null
@@ -1 +0,0 @@
-require avahi.inc
diff --git a/packages/blueprobe/blueprobe_0.18.bb b/packages/blueprobe/blueprobe_0.18.bb
new file mode 100644
index 0000000000..2c0650511a
--- /dev/null
+++ b/packages/blueprobe/blueprobe_0.18.bb
@@ -0,0 +1,3 @@
+require blueprobe.inc
+
+PR = "r0"
diff --git a/packages/bluez/bluez-hcidump_1.25.bb b/packages/bluez/bluez-hcidump_1.33.bb
index 0cbc0fd6ec..877c8db33c 100644
--- a/packages/bluez/bluez-hcidump_1.25.bb
+++ b/packages/bluez/bluez-hcidump_1.33.bb
@@ -11,5 +11,3 @@ S = "${WORKDIR}/bluez-hcidump-${PV}"
 EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}"
 
 inherit autotools
-
-
diff --git a/packages/bluez/bluez-libs_3.1.bb b/packages/bluez/bluez-libs_3.8.bb
index d740bd80a9..d740bd80a9 100644
--- a/packages/bluez/bluez-libs_3.1.bb
+++ b/packages/bluez/bluez-libs_3.8.bb
diff --git a/packages/bluez/bluez-utils_3.1.bb b/packages/bluez/bluez-utils_3.8.bb
index 40aabaab50..d549d12d30 100644
--- a/packages/bluez/bluez-utils_3.1.bb
+++ b/packages/bluez/bluez-utils_3.8.bb
@@ -2,11 +2,12 @@ DESCRIPTION = "Linux Bluetooth Stack Userland Utilities."
 SECTION = "console"
 PRIORITY = "optional"
 DEPENDS = "bluez-libs-${PV} dbus"
+PROVIDES = "bluez-utils-dbus"
 RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus"
 RREPLACES = "bluez-utils-dbus"
-RCONFLICTS = "bluez-utils-dbus bluez-utils-nodbus"
+RCONFLICTS_${PN} = "bluez-utils-nodbus"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r0"
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
 	file://hcid.conf \
diff --git a/packages/bogofilter/bogofilter_0.96.0.bb b/packages/bogofilter/bogofilter_0.96.0.bb
index dba0893b2b..72cec9be3c 100644
--- a/packages/bogofilter/bogofilter_0.96.0.bb
+++ b/packages/bogofilter/bogofilter_0.96.0.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "Bogofilter is a mail filter that classifies mail as spam or ham (
 by a statistical analysis of the message's header and content (body). \
 The program is able to learn from the user's classifications and corrections."
 LICENSE = "GPL"
-PR = "r6"
+PR = "r7"
 PRIORITY = "optional"
 
 SRC_URI = "http://download.sourceforge.net/bogofilter/bogofilter-${PV}.tar.bz2 \
diff --git a/packages/bogofilter/files/volatiles b/packages/bogofilter/files/volatiles
index 04960ff2d3..f460c91fea 100644
--- a/packages/bogofilter/files/volatiles
+++ b/packages/bogofilter/files/volatiles
@@ -1 +1 @@
-d spam filter 0770 /var/spool/filter
+d spam filter 0770 /var/spool/filter none
diff --git a/packages/busybox/busybox-1.3.1/.mtn2git_empty b/packages/busybox/busybox-1.3.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/busybox/busybox-1.3.1/.mtn2git_empty
diff --git a/packages/busybox/busybox-1.3.1/add-getkey-applet.patch b/packages/busybox/busybox-1.3.1/add-getkey-applet.patch
new file mode 100644
index 0000000000..a75cf823c7
--- /dev/null
+++ b/packages/busybox/busybox-1.3.1/add-getkey-applet.patch
@@ -0,0 +1,167 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+Index: busybox-1.1.0/console-tools/getkey.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ busybox-1.1.0/console-tools/getkey.c	2006-03-14 17:17:28.000000000 +0100
+@@ -0,0 +1,94 @@
++/* vi: set sw=4 ts=4: */
++/*
++ * getkey.c - Michael 'Mickey' Lauer
++ *
++ * Version 0.1
++ *
++ * A simple keygrapper. Displays a configurable message and waits a dedicated number
++ * of seconds for a keypress. Sets the exit code accordingly (SUCCESS on keypress).
++ */
++#include <stdio.h>
++#include <fcntl.h>
++#include <memory.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <sys/types.h>
++#include <errno.h>
++#include <sys/ioctl.h>
++#include <sys/kd.h>
++#include "busybox.h"
++
++extern int getkey_main(int argc, char **argv)
++{
++    int status = EXIT_FAILURE;
++
++    if ( argc < 2 )
++    {
++	bb_show_usage();
++    }
++
++    /*
++     * If no terminal is attached it is quite useless
++     * to treat it like one.
++     */
++    if( !isatty(STDIN_FILENO) )
++    {
++	goto error_hard;
++    }
++
++    //bb_printf( "DEBUG: time = '%s'\n", argv[1] );
++    //bb_printf( "DEBUG: mesg = '%s'\n", argv[2] );
++
++    struct termios orig;
++    struct termios attr;
++
++    if ( tcgetattr(STDIN_FILENO, &orig) == -1 )
++    {
++	goto error_hard;
++    }
++
++    attr = orig;
++    attr.c_cc[VMIN] = 0;
++    attr.c_cc[VTIME] = 0;
++    attr.c_iflag |= INLCR;
++    attr.c_oflag |= OPOST|ONLCR;
++    attr.c_cflag &= ~PARENB;
++    attr.c_lflag &= ~(ICANON/*|ECHO*/);
++    if ( tcsetattr(STDIN_FILENO,TCSANOW,&attr) == -1 )
++    {
++	goto error_hard;
++    }
++
++    fd_set rfds;
++    struct timeval tv;
++    int retval;
++
++    FD_ZERO(&rfds);
++    FD_SET(0, &rfds);
++
++    tv.tv_sec = atoi( argv[1] );
++    tv.tv_usec = 0;
++
++    if ( argc == 3 )
++    {
++	bb_printf( argv[2], tv.tv_sec );
++	bb_printf( "\n" );
++	fflush(stdout);
++    }
++    retval = select(1, &rfds, NULL, NULL, &tv);
++    if (retval > 0)
++    {
++	status = EXIT_SUCCESS;
++    }
++
++    if (tcsetattr(STDIN_FILENO,TCSANOW,&orig) == -1 )
++    {
++	goto error_hard;
++    }
++
++    return status;
++
++error_hard   :
++    return EXIT_FAILURE;
++};
++
+Index: busybox-1.1.0/console-tools/Makefile.in
+===================================================================
+--- busybox-1.1.0.orig/console-tools/Makefile.in	2006-01-11 06:43:57.000000000 +0100
++++ busybox-1.1.0/console-tools/Makefile.in	2006-03-14 17:18:18.000000000 +0100
+@@ -21,6 +21,7 @@
+ CONSOLETOOLS_DIR-$(CONFIG_OPENVT)	+= openvt.o
+ CONSOLETOOLS_DIR-$(CONFIG_RESET)	+= reset.o
+ CONSOLETOOLS_DIR-$(CONFIG_SETKEYCODES)	+= setkeycodes.o
++CONSOLETOOLS_DIR-$(CONFIG_GETKEY)	+= getkey.o
+ 
+ libraries-y+=$(CONSOLETOOLS_DIR)$(CONSOLETOOLS_AR)
+ 
+Index: busybox-1.1.0/console-tools/Config.in
+===================================================================
+--- busybox-1.1.0.orig/console-tools/Config.in	2006-01-11 06:43:57.000000000 +0100
++++ busybox-1.1.0/console-tools/Config.in	2006-03-14 17:17:28.000000000 +0100
+@@ -31,6 +31,14 @@
+ 	  This program dumps the kernel's keyboard translation table to
+ 	  stdout, in binary format. You can then use loadkmap to load it.
+ 
++config CONFIG_GETKEY
++	bool "getkey"
++	default n
++	help
++	  This program displays a configurable message and waits
++	  a dedicated number of seconds for a keypress. It sets
++	  the exit code accordingly, i.e. SUCCESS if there was a keypress.
++
+ config CONFIG_LOADFONT
+ 	bool "loadfont"
+ 	default n
+Index: busybox-1.1.0/include/applets.h
+===================================================================
+--- busybox-1.1.0.orig/include/applets.h	2006-01-11 06:44:14.000000000 +0100
++++ busybox-1.1.0/include/applets.h	2006-03-14 17:17:28.000000000 +0100
+@@ -261,6 +261,9 @@
+ #ifdef CONFIG_FUSER
+ 	APPLET(fuser, fuser_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
+ #endif
++#ifdef CONFIG_GETKEY
++	APPLET(getkey, getkey_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
++#endif
+ #ifdef CONFIG_GETOPT
+ 	APPLET(getopt, getopt_main, _BB_DIR_BIN, _BB_SUID_NEVER)
+ #endif
+Index: busybox-1.1.0/include/usage.h
+===================================================================
+--- busybox-1.1.0.orig/include/usage.h	2006-01-11 06:44:14.000000000 +0100
++++ busybox-1.1.0/include/usage.h	2006-03-14 17:19:11.000000000 +0100
+@@ -841,6 +841,13 @@
+ 	"\t-p, --password         Password to be used\n" \
+ 	"\t-P, --port             Port number to be used"
+ 
++#define getkey_trivial_usage \
++	"time [message]"
++#define getkey_full_usage \
++	"Display a message and wait for a keypress."
++#define getkey_example_usage \
++	"$ getkey 5 'Press a key within %d seconds to interrupt autoboot.'"
++
+ #define fuser_trivial_usage \
+ 	"[options] file OR port/proto"
+ #define fuser_full_usage \
diff --git a/packages/busybox/busybox-1.3.1/angstrom/.mtn2git_empty b/packages/busybox/busybox-1.3.1/angstrom/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/busybox/busybox-1.3.1/angstrom/.mtn2git_empty
diff --git a/packages/busybox/busybox-1.3.1/angstrom/defconfig b/packages/busybox/busybox-1.3.1/angstrom/defconfig
new file mode 100644
index 0000000000..7308eead76
--- /dev/null
+++ b/packages/busybox/busybox-1.3.1/angstrom/defconfig
@@ -0,0 +1,647 @@
+#
+# Automatically generated make config: don't edit
+#
+HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+# CONFIG_NITPICK is not set
+# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+CONFIG_SHOW_USAGE=y
+# CONFIG_FEATURE_VERBOSE_USAGE is not set
+# CONFIG_FEATURE_COMPRESS_USAGE is not set
+# CONFIG_FEATURE_INSTALLER is not set
+CONFIG_LOCALE_SUPPORT=y
+CONFIG_GETOPT_LONG=y
+CONFIG_FEATURE_DEVPTS=y
+# CONFIG_FEATURE_CLEAN_UP is not set
+# CONFIG_FEATURE_SUID is not set
+# CONFIG_FEATURE_SUID_CONFIG is not set
+# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
+# CONFIG_SELINUX is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+
+#
+# Build Options
+#
+# CONFIG_STATIC is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+CONFIG_LFS=y
+USING_CROSS_COMPILER=y
+CROSS_COMPILER_PREFIX="arm-angstrom-linux-gnueabi-"
+CONFIG_BUILD_AT_ONCE=y
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
+# CONFIG_NO_DEBUG_LIB is not set
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+CONFIG_DEBUG_YANK_SUSv2=y
+
+#
+# Installation Options
+#
+# CONFIG_INSTALL_NO_USR is not set
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
+PREFIX="./_install"
+
+#
+# Busybox Library Tuning
+#
+CONFIG_MD5_SIZE_VS_SPEED=2
+
+#
+# Applets
+#
+
+#
+# Archival Utilities
+#
+CONFIG_AR=y
+# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+CONFIG_BUNZIP2=y
+CONFIG_CPIO=y
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_GUNZIP=y
+# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set
+CONFIG_GZIP=y
+# CONFIG_RPM2CPIO is not set
+# CONFIG_RPM is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+CONFIG_FEATURE_TAR_BZIP2=y
+# CONFIG_FEATURE_TAR_LZMA is not set
+CONFIG_FEATURE_TAR_FROM=y
+CONFIG_FEATURE_TAR_GZIP=y
+# CONFIG_FEATURE_TAR_COMPRESS is not set
+# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
+# CONFIG_UNCOMPRESS is not set
+# CONFIG_UNLZMA is not set
+# CONFIG_FEATURE_LZMA_FAST is not set
+CONFIG_UNZIP=y
+
+#
+# Common options for cpio and tar
+#
+# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
+# CONFIG_FEATURE_DEB_TAR_GZ is not set
+# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
+# CONFIG_FEATURE_DEB_TAR_LZMA is not set
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+# CONFIG_CAL is not set
+CONFIG_CAT=y
+# CONFIG_CATV is not set
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+CONFIG_CHROOT=y
+# CONFIG_CKSUM is not set
+# CONFIG_CMP is not set
+# CONFIG_COMM is not set
+CONFIG_CP=y
+CONFIG_CUT=y
+CONFIG_DATE=y
+# CONFIG_FEATURE_DATE_ISOFMT is not set
+CONFIG_DD=y
+CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+# CONFIG_FEATURE_DD_IBS_OBS is not set
+CONFIG_DF=y
+CONFIG_DIFF=y
+CONFIG_FEATURE_DIFF_BINARY=y
+CONFIG_FEATURE_DIFF_DIR=y
+# CONFIG_FEATURE_DIFF_MINIMAL is not set
+CONFIG_DIRNAME=y
+# CONFIG_DOS2UNIX is not set
+# CONFIG_UNIX2DOS is not set
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+CONFIG_FEATURE_ENV_LONG_OPTIONS=y
+CONFIG_EXPR=y
+# CONFIG_EXPR_MATH_SUPPORT_64 is not set
+CONFIG_FALSE=y
+# CONFIG_FOLD is not set
+CONFIG_HEAD=y
+# CONFIG_FEATURE_FANCY_HEAD is not set
+# CONFIG_HOSTID is not set
+CONFIG_ID=y
+# CONFIG_INSTALL is not set
+# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
+# CONFIG_LENGTH is not set
+CONFIG_LN=y
+CONFIG_LOGNAME=y
+CONFIG_LS=y
+CONFIG_FEATURE_LS_FILETYPES=y
+CONFIG_FEATURE_LS_FOLLOWLINKS=y
+CONFIG_FEATURE_LS_RECURSIVE=y
+CONFIG_FEATURE_LS_SORTFILES=y
+CONFIG_FEATURE_LS_TIMESTAMPS=y
+CONFIG_FEATURE_LS_USERNAME=y
+CONFIG_FEATURE_LS_COLOR=y
+# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
+CONFIG_MKFIFO=y
+CONFIG_MKNOD=y
+CONFIG_MV=y
+# CONFIG_FEATURE_MV_LONG_OPTIONS is not set
+# CONFIG_NICE is not set
+CONFIG_NOHUP=y
+CONFIG_OD=y
+# CONFIG_PRINTENV is not set
+CONFIG_PRINTF=y
+CONFIG_PWD=y
+CONFIG_REALPATH=y
+CONFIG_RM=y
+CONFIG_RMDIR=y
+CONFIG_SEQ=y
+# CONFIG_SHA1SUM is not set
+CONFIG_SLEEP=y
+CONFIG_FEATURE_FANCY_SLEEP=y
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_BIG=y
+# CONFIG_STAT is not set
+# CONFIG_FEATURE_STAT_FORMAT is not set
+CONFIG_STTY=y
+# CONFIG_SUM is not set
+CONFIG_SYNC=y
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
+CONFIG_TEST=y
+# CONFIG_FEATURE_TEST_64 is not set
+CONFIG_TOUCH=y
+CONFIG_TR=y
+CONFIG_FEATURE_TR_CLASSES=y
+# CONFIG_FEATURE_TR_EQUIV is not set
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+CONFIG_UNIQ=y
+CONFIG_USLEEP=y
+# CONFIG_UUDECODE is not set
+# CONFIG_UUENCODE is not set
+CONFIG_WATCH=y
+CONFIG_WC=y
+CONFIG_WHO=y
+CONFIG_WHOAMI=y
+CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
+
+#
+# Common options for ls, more and telnet
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+#
+# Console Utilities
+#
+CONFIG_CHVT=y
+CONFIG_CLEAR=y
+CONFIG_DEALLOCVT=y
+CONFIG_DUMPKMAP=y
+CONFIG_LOADFONT=y
+CONFIG_LOADKMAP=y
+CONFIG_OPENVT=y
+CONFIG_RESET=y
+CONFIG_SETCONSOLE=y
+# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
+# CONFIG_SETKEYCODES is not set
+# CONFIG_SETLOGCONS is not set
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+# CONFIG_PIPE_PROGRESS is not set
+CONFIG_READLINK=y
+CONFIG_FEATURE_READLINK_FOLLOW=y
+CONFIG_RUN_PARTS=y
+# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
+CONFIG_START_STOP_DAEMON=y
+CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
+CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_MATH=y
+# CONFIG_ED is not set
+CONFIG_PATCH=y
+CONFIG_SED=y
+CONFIG_VI=y
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
+CONFIG_FEATURE_VI_USE_SIGNALS=y
+# CONFIG_FEATURE_VI_DOT_CMD is not set
+# CONFIG_FEATURE_VI_READONLY is not set
+# CONFIG_FEATURE_VI_SETOPTS is not set
+# CONFIG_FEATURE_VI_SET is not set
+CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_PRINT0=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_NEWER=y
+# CONFIG_FEATURE_FIND_INUM is not set
+CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+CONFIG_FEATURE_GREP_CONTEXT=y
+CONFIG_XARGS=y
+# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set
+
+#
+# Init Utilities
+#
+# CONFIG_INIT is not set
+# CONFIG_DEBUG_INIT is not set
+# CONFIG_FEATURE_USE_INITTAB is not set
+# CONFIG_FEATURE_INIT_SCTTY is not set
+# CONFIG_FEATURE_EXTRA_QUIET is not set
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+# CONFIG_FEATURE_INITRD is not set
+# CONFIG_HALT is not set
+# CONFIG_MESG is not set
+
+#
+# Login/Password Management Utilities
+#
+# CONFIG_FEATURE_SHADOWPASSWDS is not set
+# CONFIG_USE_BB_SHADOW is not set
+# CONFIG_USE_BB_PWD_GRP is not set
+# CONFIG_ADDGROUP is not set
+# CONFIG_DELGROUP is not set
+# CONFIG_ADDUSER is not set
+# CONFIG_DELUSER is not set
+# CONFIG_GETTY is not set
+CONFIG_FEATURE_UTMP=y
+# CONFIG_FEATURE_WTMP is not set
+# CONFIG_LOGIN is not set
+# CONFIG_FEATURE_SECURETTY is not set
+# CONFIG_PASSWD is not set
+# CONFIG_SU is not set
+# CONFIG_SULOGIN is not set
+# CONFIG_VLOCK is not set
+
+#
+# Linux Ext2 FS Progs
+#
+CONFIG_CHATTR=y
+CONFIG_E2FSCK=y
+CONFIG_FSCK=y
+# CONFIG_LSATTR is not set
+CONFIG_MKE2FS=y
+# CONFIG_TUNE2FS is not set
+# CONFIG_E2LABEL is not set
+# CONFIG_FINDFS is not set
+
+#
+# Linux Module Utilities
+#
+CONFIG_INSMOD=y
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
+# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
+CONFIG_MODPROBE=y
+CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
+
+#
+# Options common to multiple modutils
+#
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+# CONFIG_FEATURE_2_4_MODULES is not set
+CONFIG_FEATURE_2_6_MODULES=y
+# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
+
+#
+# Linux System Utilities
+#
+CONFIG_DMESG=y
+CONFIG_FBSET=y
+CONFIG_FEATURE_FBSET_FANCY=y
+CONFIG_FEATURE_FBSET_READMODE=y
+# CONFIG_FDFLUSH is not set
+# CONFIG_FDFORMAT is not set
+CONFIG_FDISK=y
+FDISK_SUPPORT_LARGE_DISKS=y
+CONFIG_FEATURE_FDISK_WRITABLE=y
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+# CONFIG_FEATURE_OSF_LABEL is not set
+# CONFIG_FEATURE_FDISK_ADVANCED is not set
+# CONFIG_FREERAMDISK is not set
+CONFIG_FSCK_MINIX=y
+CONFIG_MKFS_MINIX=y
+
+#
+# Minix filesystem support
+#
+CONFIG_FEATURE_MINIX2=y
+# CONFIG_GETOPT is not set
+CONFIG_HEXDUMP=y
+CONFIG_HWCLOCK=y
+CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
+CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
+# CONFIG_IPCRM is not set
+# CONFIG_IPCS is not set
+CONFIG_LOSETUP=y
+# CONFIG_MDEV is not set
+# CONFIG_FEATURE_MDEV_CONF is not set
+# CONFIG_FEATURE_MDEV_EXEC is not set
+CONFIG_MKSWAP=y
+# CONFIG_FEATURE_MKSWAP_V0 is not set
+CONFIG_MORE=y
+CONFIG_FEATURE_USE_TERMIOS=y
+CONFIG_MOUNT=y
+CONFIG_FEATURE_MOUNT_NFS=y
+CONFIG_PIVOT_ROOT=y
+CONFIG_RDATE=y
+# CONFIG_READPROFILE is not set
+# CONFIG_SETARCH is not set
+CONFIG_SWAPONOFF=y
+# CONFIG_SWITCH_ROOT is not set
+CONFIG_UMOUNT=y
+# CONFIG_FEATURE_UMOUNT_ALL is not set
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+# CONFIG_FEATURE_MTAB_SUPPORT is not set
+
+#
+# Miscellaneous Utilities
+#
+# CONFIG_ADJTIMEX is not set
+# CONFIG_BBCONFIG is not set
+# CONFIG_CROND is not set
+# CONFIG_DEBUG_CROND_OPTION is not set
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+# CONFIG_CRONTAB is not set
+CONFIG_DC=y
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
+# CONFIG_DEVFSD_VERBOSE is not set
+# CONFIG_FEATURE_DEVFS is not set
+# CONFIG_EJECT is not set
+# CONFIG_LAST is not set
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
+# CONFIG_FEATURE_LESS_FLAGCS is not set
+# CONFIG_FEATURE_LESS_MARKS is not set
+# CONFIG_FEATURE_LESS_REGEXP is not set
+# CONFIG_HDPARM is not set
+# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
+# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
+# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
+# CONFIG_MAKEDEVS is not set
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
+# CONFIG_MOUNTPOINT is not set
+# CONFIG_MT is not set
+# CONFIG_RUNLEVEL is not set
+# CONFIG_RX is not set
+CONFIG_STRINGS=y
+# CONFIG_SETSID is not set
+# CONFIG_TASKSET is not set
+CONFIG_TIME=y
+# CONFIG_WATCHDOG is not set
+
+#
+# Networking Utilities
+#
+CONFIG_FEATURE_IPV6=y
+# CONFIG_ARPING is not set
+# CONFIG_DNSD is not set
+# CONFIG_ETHER_WAKE is not set
+# CONFIG_FAKEIDENTD is not set
+# CONFIG_FTPGET is not set
+# CONFIG_FTPPUT is not set
+# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
+CONFIG_HOSTNAME=y
+# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_WITHOUT_INETD is not set
+# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+# CONFIG_FEATURE_IFCONFIG_SLIP is not set
+# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
+CONFIG_FEATURE_IFCONFIG_HW=y
+# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
+CONFIG_IFUPDOWN=y
+# CONFIG_FEATURE_IFUPDOWN_IP is not set
+CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y
+CONFIG_FEATURE_IFUPDOWN_IPV4=y
+CONFIG_FEATURE_IFUPDOWN_IPV6=y
+# CONFIG_FEATURE_IFUPDOWN_IPX is not set
+CONFIG_FEATURE_IFUPDOWN_MAPPING=y
+# CONFIG_INETD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
+# CONFIG_FEATURE_INETD_RPC is not set
+CONFIG_IP=y
+CONFIG_FEATURE_IP_ADDRESS=y
+CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_ROUTE=y
+CONFIG_FEATURE_IP_TUNNEL=y
+# CONFIG_FEATURE_IP_SHORT_FORMS is not set
+# CONFIG_IPADDR is not set
+# CONFIG_IPLINK is not set
+# CONFIG_IPROUTE is not set
+# CONFIG_IPTUNNEL is not set
+# CONFIG_IPCALC is not set
+# CONFIG_FEATURE_IPCALC_FANCY is not set
+# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+# CONFIG_NAMEIF is not set
+CONFIG_NC=y
+# CONFIG_NC_GAPING_SECURITY_HOLE is not set
+CONFIG_NETSTAT=y
+CONFIG_NSLOOKUP=y
+CONFIG_PING=y
+CONFIG_FEATURE_FANCY_PING=y
+CONFIG_PING6=y
+CONFIG_FEATURE_FANCY_PING6=y
+CONFIG_ROUTE=y
+CONFIG_TELNET=y
+# CONFIG_FEATURE_TELNET_TTYPE is not set
+CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+# CONFIG_TELNETD is not set
+# CONFIG_FEATURE_TELNETD_INETD is not set
+CONFIG_TFTP=y
+CONFIG_FEATURE_TFTP_GET=y
+CONFIG_FEATURE_TFTP_PUT=y
+# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
+# CONFIG_DEBUG_TFTP is not set
+CONFIG_TRACEROUTE=y
+# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
+# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+
+#
+# udhcp Server/Client
+#
+CONFIG_APP_UDHCPD=y
+CONFIG_APP_UDHCPC=y
+CONFIG_APP_DUMPLEASES=y
+CONFIG_FEATURE_UDHCP_SYSLOG=y
+# CONFIG_FEATURE_UDHCP_DEBUG is not set
+# CONFIG_VCONFIG is not set
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+CONFIG_FEATURE_WGET_IP6_LITERAL=y
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+# CONFIG_ZCIP is not set
+
+#
+# Process Utilities
+#
+CONFIG_FREE=y
+CONFIG_FUSER=y
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+CONFIG_PIDOF=y
+# CONFIG_FEATURE_PIDOF_SINGLE is not set
+# CONFIG_FEATURE_PIDOF_OMIT is not set
+CONFIG_PS=y
+CONFIG_FEATURE_PS_WIDE=y
+CONFIG_RENICE=y
+CONFIG_BB_SYSCTL=y
+CONFIG_TOP=y
+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+CONFIG_UPTIME=y
+
+#
+# Shells
+#
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_LASH is not set
+# CONFIG_FEATURE_SH_IS_MSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+CONFIG_ASH=y
+
+#
+# Ash Shell Options
+#
+CONFIG_ASH_JOB_CONTROL=y
+# CONFIG_ASH_READ_NCHARS is not set
+# CONFIG_ASH_READ_TIMEOUT is not set
+CONFIG_ASH_ALIAS=y
+CONFIG_ASH_MATH_SUPPORT=y
+# CONFIG_ASH_MATH_SUPPORT_64 is not set
+CONFIG_ASH_GETOPTS=y
+# CONFIG_ASH_BUILTIN_ECHO is not set
+CONFIG_ASH_BUILTIN_TEST=y
+# CONFIG_ASH_CMDCMD is not set
+# CONFIG_ASH_MAIL is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+# CONFIG_ASH_RANDOM_SUPPORT is not set
+CONFIG_ASH_EXPAND_PRMT=y
+# CONFIG_HUSH is not set
+# CONFIG_LASH is not set
+# CONFIG_MSH is not set
+
+#
+# Bourne Shell Options
+#
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
+# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
+CONFIG_FEATURE_COMMAND_EDITING=y
+# CONFIG_FEATURE_COMMAND_EDITING_VI is not set
+CONFIG_FEATURE_COMMAND_HISTORY=63
+# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set
+CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
+# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set
+CONFIG_FEATURE_SH_FANCY_PROMPT=y
+
+#
+# System Logging Utilities
+#
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+CONFIG_FEATURE_REMOTE_LOG=y
+CONFIG_FEATURE_IPC_SYSLOG=y
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
+CONFIG_LOGREAD=y
+CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
+CONFIG_KLOGD=y
+CONFIG_LOGGER=y
diff --git a/packages/busybox/busybox-1.3.1/below.patch b/packages/busybox/busybox-1.3.1/below.patch
new file mode 100644
index 0000000000..95e8376e46
--- /dev/null
+++ b/packages/busybox/busybox-1.3.1/below.patch
@@ -0,0 +1,46 @@
+Index: busybox-1.1.0/modutils/modprobe.c
+===================================================================
+--- busybox-1.1.0.orig/modutils/modprobe.c	2006-01-11 06:43:56.000000000 +0100
++++ busybox-1.1.0/modutils/modprobe.c	2006-03-14 16:36:54.000000000 +0100
+@@ -509,6 +509,41 @@
+ 					}
+ 				}
+ 			}
++			else if ((strncmp (buffer, "below", 5) == 0) && isspace (buffer[5])) {
++				char *mod, *deps;
++				if (parse_tag_value (buffer + 6, &mod, &deps)) {
++					struct dep_t *dt;
++
++					for (dt = first; dt; dt = dt->m_next) {
++						if (strcmp (dt->m_name, mod) == 0)
++							break;
++					}
++					if (dt) {
++						char *pp;
++						char *name;
++
++						pp = name = deps;
++
++						for (;;) {
++							while (*pp != 0 && !isspace (*pp))
++								pp++;
++							if (isspace (*pp))
++								*(pp++) = 0;
++							
++							dt->m_depcnt++;
++							dt->m_deparr = (char **) xrealloc (dt->m_deparr,
++											   sizeof (char *) * dt->m_depcnt);
++							dt->m_deparr[dt->m_depcnt - 1] = bb_xstrdup (name);
++
++							while (isspace (*pp))
++								pp++;
++							name = pp;
++							if (*pp == 0)
++								break;
++						}
++					}
++				}
++			}
+ 		}
+ 	}
+ 	close ( fd );
diff --git a/packages/busybox/busybox-1.3.1/busybox-mdev.sh b/packages/busybox/busybox-1.3.1/busybox-mdev.sh
new file mode 100755
index 0000000000..9744322fa9
--- /dev/null
+++ b/packages/busybox/busybox-1.3.1/busybox-mdev.sh
@@ -0,0 +1,69 @@
+#!/bin/sh
+MDEV=/sbin/mdev
+DESC="Busybox mdev setup"
+
+# Complain if thing's aren't right
+if [ ! -e /proc/filesystems ]; then
+  echo "mdev requires a mounted procfs, not started."
+  exit 1
+fi
+
+if ! grep -q '[[:space:]]tmpfs$' /proc/filesystems; then
+  echo "mdev requires tmpfs support, not started."
+  exit 1
+fi
+
+if [ ! -d /sys/class/ ]; then
+  echo "mdev requires a mounted sysfs, not started."
+  exit 1
+fi
+
+if [ ! -e /proc/sys/kernel/hotplug ]; then
+  echo "mdev requires hotplug support, not started."
+  exit 1
+fi
+
+# We need to unmount /dev/pts/ and remount it later over the tmpfs
+if mountpoint -q /dev/pts/; then
+  umount -l /dev/pts/
+fi
+
+if mountpoint -q /dev/shm/; then
+  umount -l /dev/shm/
+fi
+
+# Create tmpfs for /dev
+echo "Creating tmpfs at /dev"
+mount -t tmpfs tmpfs /dev -o size=800k
+
+# Register mdev as hotplug event helper
+echo "$MDEV" > /proc/sys/kernel/hotplug
+
+# Populate /dev from /sys info
+echo "Populating /dev using mdev"
+$MDEV -s
+
+# Touch .udev to inform scripts that /dev needs no further setup
+touch /dev/.udev
+
+# Mount devpts
+TTYGRP=5
+TTYMODE=620
+mkdir -m 755 -p /dev/pts
+if [ ! -e /dev/ptmx ]; then
+    mknod -m 666 /dev/ptmx c 5 2
+fi
+mount -t devpts devpts /dev/pts -onoexec,nosuid,gid=$TTYGRP,mode=$TTYMODE
+
+# Make shm directory
+mkdir -m 755 -p /dev/shm
+
+# Make extraneous links
+ln -sf /proc/self/fd /dev/fd
+ln -sf /proc/self/fd/0 /dev/stdin
+ln -sf /proc/self/fd/1 /dev/stdout
+ln -sf /proc/self/fd/2 /dev/stderr
+ln -sf /proc/kcore /dev/core
+ln -sf /proc/asound/oss/sndstat /dev/sndstat
+
+exit 0
diff --git a/packages/busybox/busybox-1.3.1/defconfig b/packages/busybox/busybox-1.3.1/defconfig
new file mode 100644
index 0000000000..7308eead76
--- /dev/null
+++ b/packages/busybox/busybox-1.3.1/defconfig
@@ -0,0 +1,647 @@
+#
+# Automatically generated make config: don't edit
+#
+HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+# CONFIG_NITPICK is not set
+# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+CONFIG_SHOW_USAGE=y
+# CONFIG_FEATURE_VERBOSE_USAGE is not set
+# CONFIG_FEATURE_COMPRESS_USAGE is not set
+# CONFIG_FEATURE_INSTALLER is not set
+CONFIG_LOCALE_SUPPORT=y
+CONFIG_GETOPT_LONG=y
+CONFIG_FEATURE_DEVPTS=y
+# CONFIG_FEATURE_CLEAN_UP is not set
+# CONFIG_FEATURE_SUID is not set
+# CONFIG_FEATURE_SUID_CONFIG is not set
+# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
+# CONFIG_SELINUX is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+
+#
+# Build Options
+#
+# CONFIG_STATIC is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+CONFIG_LFS=y
+USING_CROSS_COMPILER=y
+CROSS_COMPILER_PREFIX="arm-angstrom-linux-gnueabi-"
+CONFIG_BUILD_AT_ONCE=y
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
+# CONFIG_NO_DEBUG_LIB is not set
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+CONFIG_DEBUG_YANK_SUSv2=y
+
+#
+# Installation Options
+#
+# CONFIG_INSTALL_NO_USR is not set
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
+PREFIX="./_install"
+
+#
+# Busybox Library Tuning
+#
+CONFIG_MD5_SIZE_VS_SPEED=2
+
+#
+# Applets
+#
+
+#
+# Archival Utilities
+#
+CONFIG_AR=y
+# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+CONFIG_BUNZIP2=y
+CONFIG_CPIO=y
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_GUNZIP=y
+# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set
+CONFIG_GZIP=y
+# CONFIG_RPM2CPIO is not set
+# CONFIG_RPM is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+CONFIG_FEATURE_TAR_BZIP2=y
+# CONFIG_FEATURE_TAR_LZMA is not set
+CONFIG_FEATURE_TAR_FROM=y
+CONFIG_FEATURE_TAR_GZIP=y
+# CONFIG_FEATURE_TAR_COMPRESS is not set
+# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
+# CONFIG_UNCOMPRESS is not set
+# CONFIG_UNLZMA is not set
+# CONFIG_FEATURE_LZMA_FAST is not set
+CONFIG_UNZIP=y
+
+#
+# Common options for cpio and tar
+#
+# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
+# CONFIG_FEATURE_DEB_TAR_GZ is not set
+# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
+# CONFIG_FEATURE_DEB_TAR_LZMA is not set
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+# CONFIG_CAL is not set
+CONFIG_CAT=y
+# CONFIG_CATV is not set
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+CONFIG_CHROOT=y
+# CONFIG_CKSUM is not set
+# CONFIG_CMP is not set
+# CONFIG_COMM is not set
+CONFIG_CP=y
+CONFIG_CUT=y
+CONFIG_DATE=y
+# CONFIG_FEATURE_DATE_ISOFMT is not set
+CONFIG_DD=y
+CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+# CONFIG_FEATURE_DD_IBS_OBS is not set
+CONFIG_DF=y
+CONFIG_DIFF=y
+CONFIG_FEATURE_DIFF_BINARY=y
+CONFIG_FEATURE_DIFF_DIR=y
+# CONFIG_FEATURE_DIFF_MINIMAL is not set
+CONFIG_DIRNAME=y
+# CONFIG_DOS2UNIX is not set
+# CONFIG_UNIX2DOS is not set
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+CONFIG_FEATURE_ENV_LONG_OPTIONS=y
+CONFIG_EXPR=y
+# CONFIG_EXPR_MATH_SUPPORT_64 is not set
+CONFIG_FALSE=y
+# CONFIG_FOLD is not set
+CONFIG_HEAD=y
+# CONFIG_FEATURE_FANCY_HEAD is not set
+# CONFIG_HOSTID is not set
+CONFIG_ID=y
+# CONFIG_INSTALL is not set
+# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
+# CONFIG_LENGTH is not set
+CONFIG_LN=y
+CONFIG_LOGNAME=y
+CONFIG_LS=y
+CONFIG_FEATURE_LS_FILETYPES=y
+CONFIG_FEATURE_LS_FOLLOWLINKS=y
+CONFIG_FEATURE_LS_RECURSIVE=y
+CONFIG_FEATURE_LS_SORTFILES=y
+CONFIG_FEATURE_LS_TIMESTAMPS=y
+CONFIG_FEATURE_LS_USERNAME=y
+CONFIG_FEATURE_LS_COLOR=y
+# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
+CONFIG_MKFIFO=y
+CONFIG_MKNOD=y
+CONFIG_MV=y
+# CONFIG_FEATURE_MV_LONG_OPTIONS is not set
+# CONFIG_NICE is not set
+CONFIG_NOHUP=y
+CONFIG_OD=y
+# CONFIG_PRINTENV is not set
+CONFIG_PRINTF=y
+CONFIG_PWD=y
+CONFIG_REALPATH=y
+CONFIG_RM=y
+CONFIG_RMDIR=y
+CONFIG_SEQ=y
+# CONFIG_SHA1SUM is not set
+CONFIG_SLEEP=y
+CONFIG_FEATURE_FANCY_SLEEP=y
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_BIG=y
+# CONFIG_STAT is not set
+# CONFIG_FEATURE_STAT_FORMAT is not set
+CONFIG_STTY=y
+# CONFIG_SUM is not set
+CONFIG_SYNC=y
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
+CONFIG_TEST=y
+# CONFIG_FEATURE_TEST_64 is not set
+CONFIG_TOUCH=y
+CONFIG_TR=y
+CONFIG_FEATURE_TR_CLASSES=y
+# CONFIG_FEATURE_TR_EQUIV is not set
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+CONFIG_UNIQ=y
+CONFIG_USLEEP=y
+# CONFIG_UUDECODE is not set
+# CONFIG_UUENCODE is not set
+CONFIG_WATCH=y
+CONFIG_WC=y
+CONFIG_WHO=y
+CONFIG_WHOAMI=y
+CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
+
+#
+# Common options for ls, more and telnet
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+#
+# Console Utilities
+#
+CONFIG_CHVT=y
+CONFIG_CLEAR=y
+CONFIG_DEALLOCVT=y
+CONFIG_DUMPKMAP=y
+CONFIG_LOADFONT=y
+CONFIG_LOADKMAP=y
+CONFIG_OPENVT=y
+CONFIG_RESET=y
+CONFIG_SETCONSOLE=y
+# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
+# CONFIG_SETKEYCODES is not set
+# CONFIG_SETLOGCONS is not set
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+# CONFIG_PIPE_PROGRESS is not set
+CONFIG_READLINK=y
+CONFIG_FEATURE_READLINK_FOLLOW=y
+CONFIG_RUN_PARTS=y
+# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
+CONFIG_START_STOP_DAEMON=y
+CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
+CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_MATH=y
+# CONFIG_ED is not set
+CONFIG_PATCH=y
+CONFIG_SED=y
+CONFIG_VI=y
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
+CONFIG_FEATURE_VI_USE_SIGNALS=y
+# CONFIG_FEATURE_VI_DOT_CMD is not set
+# CONFIG_FEATURE_VI_READONLY is not set
+# CONFIG_FEATURE_VI_SETOPTS is not set
+# CONFIG_FEATURE_VI_SET is not set
+CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_PRINT0=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_NEWER=y
+# CONFIG_FEATURE_FIND_INUM is not set
+CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+CONFIG_FEATURE_GREP_CONTEXT=y
+CONFIG_XARGS=y
+# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set
+
+#
+# Init Utilities
+#
+# CONFIG_INIT is not set
+# CONFIG_DEBUG_INIT is not set
+# CONFIG_FEATURE_USE_INITTAB is not set
+# CONFIG_FEATURE_INIT_SCTTY is not set
+# CONFIG_FEATURE_EXTRA_QUIET is not set
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+# CONFIG_FEATURE_INITRD is not set
+# CONFIG_HALT is not set
+# CONFIG_MESG is not set
+
+#
+# Login/Password Management Utilities
+#
+# CONFIG_FEATURE_SHADOWPASSWDS is not set
+# CONFIG_USE_BB_SHADOW is not set
+# CONFIG_USE_BB_PWD_GRP is not set
+# CONFIG_ADDGROUP is not set
+# CONFIG_DELGROUP is not set
+# CONFIG_ADDUSER is not set
+# CONFIG_DELUSER is not set
+# CONFIG_GETTY is not set
+CONFIG_FEATURE_UTMP=y
+# CONFIG_FEATURE_WTMP is not set
+# CONFIG_LOGIN is not set
+# CONFIG_FEATURE_SECURETTY is not set
+# CONFIG_PASSWD is not set
+# CONFIG_SU is not set
+# CONFIG_SULOGIN is not set
+# CONFIG_VLOCK is not set
+
+#
+# Linux Ext2 FS Progs
+#
+CONFIG_CHATTR=y
+CONFIG_E2FSCK=y
+CONFIG_FSCK=y
+# CONFIG_LSATTR is not set
+CONFIG_MKE2FS=y
+# CONFIG_TUNE2FS is not set
+# CONFIG_E2LABEL is not set
+# CONFIG_FINDFS is not set
+
+#
+# Linux Module Utilities
+#
+CONFIG_INSMOD=y
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
+# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
+CONFIG_MODPROBE=y
+CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
+
+#
+# Options common to multiple modutils
+#
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+# CONFIG_FEATURE_2_4_MODULES is not set
+CONFIG_FEATURE_2_6_MODULES=y
+# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
+
+#
+# Linux System Utilities
+#
+CONFIG_DMESG=y
+CONFIG_FBSET=y
+CONFIG_FEATURE_FBSET_FANCY=y
+CONFIG_FEATURE_FBSET_READMODE=y
+# CONFIG_FDFLUSH is not set
+# CONFIG_FDFORMAT is not set
+CONFIG_FDISK=y
+FDISK_SUPPORT_LARGE_DISKS=y
+CONFIG_FEATURE_FDISK_WRITABLE=y
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+# CONFIG_FEATURE_OSF_LABEL is not set
+# CONFIG_FEATURE_FDISK_ADVANCED is not set
+# CONFIG_FREERAMDISK is not set
+CONFIG_FSCK_MINIX=y
+CONFIG_MKFS_MINIX=y
+
+#
+# Minix filesystem support
+#
+CONFIG_FEATURE_MINIX2=y
+# CONFIG_GETOPT is not set
+CONFIG_HEXDUMP=y
+CONFIG_HWCLOCK=y
+CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
+CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
+# CONFIG_IPCRM is not set
+# CONFIG_IPCS is not set
+CONFIG_LOSETUP=y
+# CONFIG_MDEV is not set
+# CONFIG_FEATURE_MDEV_CONF is not set
+# CONFIG_FEATURE_MDEV_EXEC is not set
+CONFIG_MKSWAP=y
+# CONFIG_FEATURE_MKSWAP_V0 is not set
+CONFIG_MORE=y
+CONFIG_FEATURE_USE_TERMIOS=y
+CONFIG_MOUNT=y
+CONFIG_FEATURE_MOUNT_NFS=y
+CONFIG_PIVOT_ROOT=y
+CONFIG_RDATE=y
+# CONFIG_READPROFILE is not set
+# CONFIG_SETARCH is not set
+CONFIG_SWAPONOFF=y
+# CONFIG_SWITCH_ROOT is not set
+CONFIG_UMOUNT=y
+# CONFIG_FEATURE_UMOUNT_ALL is not set
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+# CONFIG_FEATURE_MTAB_SUPPORT is not set
+
+#
+# Miscellaneous Utilities
+#
+# CONFIG_ADJTIMEX is not set
+# CONFIG_BBCONFIG is not set
+# CONFIG_CROND is not set
+# CONFIG_DEBUG_CROND_OPTION is not set
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+# CONFIG_CRONTAB is not set
+CONFIG_DC=y
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
+# CONFIG_DEVFSD_VERBOSE is not set
+# CONFIG_FEATURE_DEVFS is not set
+# CONFIG_EJECT is not set
+# CONFIG_LAST is not set
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
+# CONFIG_FEATURE_LESS_FLAGCS is not set
+# CONFIG_FEATURE_LESS_MARKS is not set
+# CONFIG_FEATURE_LESS_REGEXP is not set
+# CONFIG_HDPARM is not set
+# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
+# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
+# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
+# CONFIG_MAKEDEVS is not set
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
+# CONFIG_MOUNTPOINT is not set
+# CONFIG_MT is not set
+# CONFIG_RUNLEVEL is not set
+# CONFIG_RX is not set
+CONFIG_STRINGS=y
+# CONFIG_SETSID is not set
+# CONFIG_TASKSET is not set
+CONFIG_TIME=y
+# CONFIG_WATCHDOG is not set
+
+#
+# Networking Utilities
+#
+CONFIG_FEATURE_IPV6=y
+# CONFIG_ARPING is not set
+# CONFIG_DNSD is not set
+# CONFIG_ETHER_WAKE is not set
+# CONFIG_FAKEIDENTD is not set
+# CONFIG_FTPGET is not set
+# CONFIG_FTPPUT is not set
+# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
+CONFIG_HOSTNAME=y
+# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_WITHOUT_INETD is not set
+# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+# CONFIG_FEATURE_IFCONFIG_SLIP is not set
+# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
+CONFIG_FEATURE_IFCONFIG_HW=y
+# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
+CONFIG_IFUPDOWN=y
+# CONFIG_FEATURE_IFUPDOWN_IP is not set
+CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y
+CONFIG_FEATURE_IFUPDOWN_IPV4=y
+CONFIG_FEATURE_IFUPDOWN_IPV6=y
+# CONFIG_FEATURE_IFUPDOWN_IPX is not set
+CONFIG_FEATURE_IFUPDOWN_MAPPING=y
+# CONFIG_INETD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
+# CONFIG_FEATURE_INETD_RPC is not set
+CONFIG_IP=y
+CONFIG_FEATURE_IP_ADDRESS=y
+CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_ROUTE=y
+CONFIG_FEATURE_IP_TUNNEL=y
+# CONFIG_FEATURE_IP_SHORT_FORMS is not set
+# CONFIG_IPADDR is not set
+# CONFIG_IPLINK is not set
+# CONFIG_IPROUTE is not set
+# CONFIG_IPTUNNEL is not set
+# CONFIG_IPCALC is not set
+# CONFIG_FEATURE_IPCALC_FANCY is not set
+# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+# CONFIG_NAMEIF is not set
+CONFIG_NC=y
+# CONFIG_NC_GAPING_SECURITY_HOLE is not set
+CONFIG_NETSTAT=y
+CONFIG_NSLOOKUP=y
+CONFIG_PING=y
+CONFIG_FEATURE_FANCY_PING=y
+CONFIG_PING6=y
+CONFIG_FEATURE_FANCY_PING6=y
+CONFIG_ROUTE=y
+CONFIG_TELNET=y
+# CONFIG_FEATURE_TELNET_TTYPE is not set
+CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+# CONFIG_TELNETD is not set
+# CONFIG_FEATURE_TELNETD_INETD is not set
+CONFIG_TFTP=y
+CONFIG_FEATURE_TFTP_GET=y
+CONFIG_FEATURE_TFTP_PUT=y
+# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
+# CONFIG_DEBUG_TFTP is not set
+CONFIG_TRACEROUTE=y
+# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
+# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+
+#
+# udhcp Server/Client
+#
+CONFIG_APP_UDHCPD=y
+CONFIG_APP_UDHCPC=y
+CONFIG_APP_DUMPLEASES=y
+CONFIG_FEATURE_UDHCP_SYSLOG=y
+# CONFIG_FEATURE_UDHCP_DEBUG is not set
+# CONFIG_VCONFIG is not set
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+CONFIG_FEATURE_WGET_IP6_LITERAL=y
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+# CONFIG_ZCIP is not set
+
+#
+# Process Utilities
+#
+CONFIG_FREE=y
+CONFIG_FUSER=y
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+CONFIG_PIDOF=y
+# CONFIG_FEATURE_PIDOF_SINGLE is not set
+# CONFIG_FEATURE_PIDOF_OMIT is not set
+CONFIG_PS=y
+CONFIG_FEATURE_PS_WIDE=y
+CONFIG_RENICE=y
+CONFIG_BB_SYSCTL=y
+CONFIG_TOP=y
+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+CONFIG_UPTIME=y
+
+#
+# Shells
+#
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_LASH is not set
+# CONFIG_FEATURE_SH_IS_MSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+CONFIG_ASH=y
+
+#
+# Ash Shell Options
+#
+CONFIG_ASH_JOB_CONTROL=y
+# CONFIG_ASH_READ_NCHARS is not set
+# CONFIG_ASH_READ_TIMEOUT is not set
+CONFIG_ASH_ALIAS=y
+CONFIG_ASH_MATH_SUPPORT=y
+# CONFIG_ASH_MATH_SUPPORT_64 is not set
+CONFIG_ASH_GETOPTS=y
+# CONFIG_ASH_BUILTIN_ECHO is not set
+CONFIG_ASH_BUILTIN_TEST=y
+# CONFIG_ASH_CMDCMD is not set
+# CONFIG_ASH_MAIL is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+# CONFIG_ASH_RANDOM_SUPPORT is not set
+CONFIG_ASH_EXPAND_PRMT=y
+# CONFIG_HUSH is not set
+# CONFIG_LASH is not set
+# CONFIG_MSH is not set
+
+#
+# Bourne Shell Options
+#
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
+# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
+CONFIG_FEATURE_COMMAND_EDITING=y
+# CONFIG_FEATURE_COMMAND_EDITING_VI is not set
+CONFIG_FEATURE_COMMAND_HISTORY=63
+# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set
+CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
+# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set
+CONFIG_FEATURE_SH_FANCY_PROMPT=y
+
+#
+# System Logging Utilities
+#
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+CONFIG_FEATURE_REMOTE_LOG=y
+CONFIG_FEATURE_IPC_SYSLOG=y
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
+CONFIG_LOGREAD=y
+CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
+CONFIG_KLOGD=y
+CONFIG_LOGGER=y
diff --git a/packages/busybox/busybox-1.3.1/dhcp-hostname.patch b/packages/busybox/busybox-1.3.1/dhcp-hostname.patch
new file mode 100644
index 0000000000..e0adea662e
--- /dev/null
+++ b/packages/busybox/busybox-1.3.1/dhcp-hostname.patch
@@ -0,0 +1,30 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- busybox-1.01/networking/udhcp/dhcpc.c~dhcp-hostname
++++ busybox-1.01/networking/udhcp/dhcpc.c
+@@ -193,6 +193,7 @@
+ 	int max_fd;
+ 	int sig;
+ 	int no_clientid = 0;
++ 	char hostbuf[256];	/* SUSv2: hostnames are <= 255 bytes */
+ 
+ 	static const struct option arg_options[] = {
+ 		{"clientid",	required_argument,	0, 'c'},
+@@ -211,6 +212,14 @@
+ 		{0, 0, 0, 0}
+ 	};
+ 
++	if (gethostname (hostbuf, sizeof (hostbuf)) == 0) {
++		len = strlen (hostbuf);
++		client_config.hostname = xmalloc (len + 2);
++		client_config.hostname[OPT_CODE] = DHCP_HOST_NAME;
++		client_config.hostname[OPT_LEN] = len;
++		strncpy(client_config.hostname + 2, hostbuf, len);
++	}
++
+ 	/* get options */
+ 	while (1) {
+ 		int option_index = 0;
diff --git a/packages/busybox/busybox-1.3.1/dhcpretrytime.patch b/packages/busybox/busybox-1.3.1/dhcpretrytime.patch
new file mode 100644
index 0000000000..893e346acf
--- /dev/null
+++ b/packages/busybox/busybox-1.3.1/dhcpretrytime.patch
@@ -0,0 +1,85 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+Index: busybox-1.1.0/networking/udhcp/dhcpc.c
+===================================================================
+--- busybox-1.1.0.orig/networking/udhcp/dhcpc.c	2006-03-14 17:19:31.000000000 +0100
++++ busybox-1.1.0/networking/udhcp/dhcpc.c	2006-03-14 17:20:45.000000000 +0100
+@@ -48,6 +48,7 @@
+ static unsigned long requested_ip; /* = 0 */
+ static unsigned long server_addr;
+ static unsigned long timeout;
++static unsigned long retrytime = 60;
+ static int packet_num; /* = 0 */
+ static int fd = -1;
+ 
+@@ -95,6 +96,7 @@
+ "  -r, --request=IP                IP address to request (default: none)\n"
+ "  -s, --script=file               Run file at dhcp events (default:\n"
+ "                                  " DEFAULT_SCRIPT ")\n"
++"  -t, --retrytime                 time to retry DHCP request (default 60s)\n")
+ "  -v, --version                   Display version\n"
+ 	);
+ 	exit(0);
+@@ -214,6 +216,7 @@
+ 		{"quit",	no_argument,		0, 'q'},
+ 		{"request",	required_argument,	0, 'r'},
+ 		{"script",	required_argument,	0, 's'},
++		{"retrytime",	required_argument,	0, 't'},
+ 		{"version",	no_argument,		0, 'v'},
+ 		{0, 0, 0, 0}
+ 	};
+@@ -229,7 +232,7 @@
+ 	/* get options */
+ 	while (1) {
+ 		int option_index = 0;
+-		c = getopt_long(argc, argv, "c:CV:fbH:h:F:i:np:qr:s:v", arg_options, &option_index);
++  		c = getopt_long(argc, argv, "c:CV:fbH:h:F:i:np:qr:s:t:v", arg_options, &option_index);
+ 		if (c == -1) break;
+ 
+ 		switch (c) {
+@@ -305,6 +308,9 @@
+ 		case 's':
+ 			client_config.script = optarg;
+ 			break;
++		case 't':
++			retrytime = atol(optarg);
++			break;
+ 		case 'v':
+ 			printf("udhcpcd, version %s\n\n", VERSION);
+ 			return 0;
+@@ -394,7 +400,7 @@
+ 				  	}
+ 					/* wait to try again */
+ 					packet_num = 0;
+-					timeout = now + 60;
++					timeout = now + retrytime;
+ 				}
+ 				break;
+ 			case RENEW_REQUESTED:
+Index: busybox-1.1.0/networking/ifupdown.c
+===================================================================
+--- busybox-1.1.0.orig/networking/ifupdown.c	2006-01-11 06:43:51.000000000 +0100
++++ busybox-1.1.0/networking/ifupdown.c	2006-03-14 17:19:41.000000000 +0100
+@@ -506,7 +506,7 @@
+ static int dhcp_up(struct interface_defn_t *ifd, execfn *exec)
+ {
+ 	if (execable("/sbin/udhcpc")) {
+-		return( execute("udhcpc -n -p /var/run/udhcpc.%iface%.pid -i "
++		return( execute("udhcpc -b -p /var/run/udhcpc.%iface%.pid -i "
+ 					"%iface% [[-H %hostname%]] [[-c %clientid%]]", ifd, exec));
+ 	} else if (execable("/sbin/pump")) {
+ 		return( execute("pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]]", ifd, exec));
+@@ -526,8 +526,8 @@
+ 		/* SIGUSR2 forces udhcpc to release the current lease and go inactive,
+ 		 * and SIGTERM causes udhcpc to exit.  Signals are queued and processed
+ 		 * sequentially so we don't need to sleep */
+-		result = execute("kill -USR2 `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec);
+-		result += execute("kill -TERM `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec);
++		result = execute("kill -USR2 `cat /var/run/udhcpc.%iface%.pid 2>/dev/null` 2>/dev/null", ifd, exec);
++		result += execute("kill -TERM `cat /var/run/udhcpc.%iface%.pid 2>/dev/null` 2>/dev/null", ifd, exec);
+ 	} else if (execable("/sbin/pump")) {
+ 		result = execute("pump -i %iface% -k", ifd, exec);
+ 	} else if (execable("/sbin/dhclient")) {
diff --git a/packages/busybox/busybox-1.3.1/fbset.patch b/packages/busybox/busybox-1.3.1/fbset.patch
new file mode 100644
index 0000000000..d0609ce6f7
--- /dev/null
+++ b/packages/busybox/busybox-1.3.1/fbset.patch
@@ -0,0 +1,24 @@
+--- busybox/util-linux/fbset.c~	2004-07-03 16:24:23.000000000 +0100
++++ busybox/util-linux/fbset.c	2004-12-30 20:09:26.000000000 +0000
+@@ -337,7 +337,7 @@
+ {
+ 	struct fb_var_screeninfo var, varset;
+ 	int fh, i;
+-	char *fbdev = DEFAULTFBDEV;
++	char *fbdev = NULL;
+ 	char *modefile = DEFAULTFBMODE;
+ 	char *thisarg, *mode = NULL;
+ 
+@@ -404,7 +404,12 @@
+ 		}
+ 	}
+ 
++	if (fbdev == NULL)
++		fbdev = DEFAULTFBDEV;
+ 	if ((fh = open(fbdev, O_RDONLY)) < 0)
++#ifdef CONFIG_FEATURE_DEVFS
++		if ((fh = open("/dev/fb0", O_RDONLY)) < 0)
++#endif
+ 		bb_perror_msg_and_die("fbset(open)");
+ 	if (ioctl(fh, FBIOGET_VSCREENINFO, &var))
+ 		bb_perror_msg_and_die("fbset(ioctl)");
diff --git a/packages/busybox/busybox-1.3.1/hdparm_M.patch b/packages/busybox/busybox-1.3.1/hdparm_M.patch
new file mode 100644
index 0000000000..9adcd36f92
--- /dev/null
+++ b/packages/busybox/busybox-1.3.1/hdparm_M.patch
@@ -0,0 +1,47 @@
+Index: busybox-1.1.0/miscutils/hdparm.c
+===================================================================
+--- busybox-1.1.0.orig/miscutils/hdparm.c	2006-01-11 06:44:13.000000000 +0100
++++ busybox-1.1.0/miscutils/hdparm.c	2006-03-14 17:22:22.000000000 +0100
+@@ -1255,6 +1255,7 @@
+ static unsigned long set_sleepnow, get_sleepnow;
+ static unsigned long get_powermode;
+ static unsigned long set_apmmode, get_apmmode, apmmode;
++static unsigned long set_acoustic = 0, get_acoustic = 0, acoustic = 0;
+ #endif
+ #ifdef CONFIG_FEATURE_HDPARM_GET_IDENTITY
+ static int get_IDentity;
+@@ -2124,6 +2125,20 @@
+ 		}
+ 		bb_ioctl(fd, HDIO_DRIVE_CMD, &args,"HDIO_DRIVE_CMD");
+ 	}
++	if (set_acoustic)
++	{
++		no_scsi();
++		acoustic=check_if_min_and_set_val(acoustic,0);
++		acoustic=check_if_maj_and_set_val(acoustic,254);
++		if_printf(get_acoustic," setting AAM level to 0x%02lX (%ld)\n", acoustic, acoustic);
++		bb_ioctl(fd, HDIO_SET_ACOUSTIC, (int*)acoustic,"HDIO_SET_ACOUSTIC");
++	}
++	if (get_acoustic)
++	{
++		no_scsi();
++		bb_ioctl(fd, HDIO_GET_ACOUSTIC, (unsigned long*)&parm,"HDIO_GET_ACOUSTIC");
++		printf(" acoustic     = %2ld (128=quiet ... 254=fast)\n", parm);
++	}
+ 	if (set_wcache)
+ 	{
+ #ifdef DO_FLUSHCACHE
+@@ -2832,6 +2847,13 @@
+ 							p = *argv++, --argc;
+ 						p=GET_NUMBER(p,&set_readahead,&Xreadahead);
+ 						break;
++					case 'M':
++						get_acoustic = noisy; 
++						noisy = 1;
++						if (!*p && argc && isalnum(**argv))
++							p = *argv++, --argc;
++						p=GET_NUMBER(p,&set_acoustic,&acoustic);
++						break;
+ 					case 'B':
+ 						get_apmmode = noisy;
+ 						noisy = 1;
diff --git a/packages/busybox/busybox-1.3.1/ifupdown-spurious-environ.patch b/packages/busybox/busybox-1.3.1/ifupdown-spurious-environ.patch
new file mode 100644
index 0000000000..8753315f2c
--- /dev/null
+++ b/packages/busybox/busybox-1.3.1/ifupdown-spurious-environ.patch
@@ -0,0 +1,12 @@
+--- busybox-1.00/networking/ifupdown.c.old	2005-06-11 19:51:59.000000000 +0100
++++ busybox-1.00/networking/ifupdown.c	2005-06-11 19:52:19.000000000 +0100
+@@ -148,6 +148,9 @@
+ 	struct mapping_defn_t *mappings;
+ };
+ 
++/* XXX */
++#define environ local_environ
++
+ static char no_act = 0;
+ static char verbose = 0;
+ static char **environ = NULL;
diff --git a/packages/busybox/busybox-1.3.1/iproute-flush-cache.patch b/packages/busybox/busybox-1.3.1/iproute-flush-cache.patch
new file mode 100644
index 0000000000..f8becc3390
--- /dev/null
+++ b/packages/busybox/busybox-1.3.1/iproute-flush-cache.patch
@@ -0,0 +1,23 @@
+Index: networking/libiproute/iproute.c
+===================================================================
+RCS file: /var/cvs/busybox/networking/libiproute/iproute.c,v
+retrieving revision 1.14
+diff -u -r1.14 iproute.c
+--- networking/libiproute/iproute.c	11 Aug 2004 08:10:58 -0000	1.14
++++ networking/libiproute/iproute.c	30 Nov 2004 20:43:44 -0000
+@@ -537,6 +537,15 @@
+ 			} else if (matches(*argv, "match") == 0) {
+ 				NEXT_ARG();
+ 				get_prefix(&filter.mdst, *argv, do_ipv6);
++			} else if (matches(*argv, "table") == 0) {
++				NEXT_ARG();
++				if (matches(*argv, "cache") == 0) {
++					filter.tb = -1;
++				} else if (matches(*argv, "main") != 0) {
++					invarg("invalid \"table\"", *argv);
++				}
++			} else if (matches(*argv, "cache") == 0) {
++				filter.tb = -1;
+ 			} else {
+ 				if (matches(*argv, "exact") == 0) {
+ 					NEXT_ARG();
diff --git a/packages/busybox/busybox-1.3.1/mnci/.mtn2git_empty b/packages/busybox/busybox-1.3.1/mnci/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/busybox/busybox-1.3.1/mnci/.mtn2git_empty
diff --git a/packages/busybox/busybox-1.3.1/mnci/defconfig b/packages/busybox/busybox-1.3.1/mnci/defconfig
new file mode 100644
index 0000000000..6a04803f18
--- /dev/null
+++ b/packages/busybox/busybox-1.3.1/mnci/defconfig
@@ -0,0 +1,643 @@
+#
+# Automatically generated make config: don't edit
+#
+HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+# CONFIG_NITPICK is not set
+# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+# CONFIG_SHOW_USAGE is not set
+# CONFIG_FEATURE_VERBOSE_USAGE is not set
+# CONFIG_FEATURE_COMPRESS_USAGE is not set
+# CONFIG_FEATURE_INSTALLER is not set
+# CONFIG_LOCALE_SUPPORT is not set
+CONFIG_GETOPT_LONG=y
+CONFIG_FEATURE_DEVPTS=y
+# CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_SUID=y
+# CONFIG_FEATURE_SUID_CONFIG is not set
+# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
+# CONFIG_SELINUX is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+
+#
+# Build Options
+#
+# CONFIG_STATIC is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+# CONFIG_LFS is not set
+USING_CROSS_COMPILER=y
+CROSS_COMPILER_PREFIX="arm-linux-"
+# CONFIG_BUILD_AT_ONCE is not set
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
+# CONFIG_NO_DEBUG_LIB is not set
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+CONFIG_DEBUG_YANK_SUSv2=y
+
+#
+# Installation Options
+#
+# CONFIG_INSTALL_NO_USR is not set
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
+PREFIX="./_install"
+
+#
+# Busybox Library Tuning
+#
+CONFIG_MD5_SIZE_VS_SPEED=2
+
+#
+# Applets
+#
+
+#
+# Archival Utilities
+#
+CONFIG_AR=y
+# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+CONFIG_BUNZIP2=y
+CONFIG_CPIO=y
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_GUNZIP=y
+# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set
+CONFIG_GZIP=y
+# CONFIG_RPM2CPIO is not set
+# CONFIG_RPM is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+CONFIG_FEATURE_TAR_BZIP2=y
+# CONFIG_FEATURE_TAR_LZMA is not set
+CONFIG_FEATURE_TAR_FROM=y
+CONFIG_FEATURE_TAR_GZIP=y
+# CONFIG_FEATURE_TAR_COMPRESS is not set
+# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
+# CONFIG_UNCOMPRESS is not set
+# CONFIG_UNLZMA is not set
+# CONFIG_FEATURE_LZMA_FAST is not set
+CONFIG_UNZIP=y
+
+#
+# Common options for cpio and tar
+#
+# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
+# CONFIG_FEATURE_DEB_TAR_GZ is not set
+# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
+# CONFIG_FEATURE_DEB_TAR_LZMA is not set
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+# CONFIG_CAL is not set
+CONFIG_CAT=y
+# CONFIG_CATV is not set
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+CONFIG_CHROOT=y
+# CONFIG_CKSUM is not set
+CONFIG_CMP=y
+# CONFIG_COMM is not set
+CONFIG_CP=y
+CONFIG_CUT=y
+CONFIG_DATE=y
+CONFIG_FEATURE_DATE_ISOFMT=y
+CONFIG_DD=y
+# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set
+# CONFIG_FEATURE_DD_IBS_OBS is not set
+CONFIG_DF=y
+# CONFIG_DIFF is not set
+# CONFIG_FEATURE_DIFF_BINARY is not set
+# CONFIG_FEATURE_DIFF_DIR is not set
+# CONFIG_FEATURE_DIFF_MINIMAL is not set
+CONFIG_DIRNAME=y
+# CONFIG_DOS2UNIX is not set
+# CONFIG_UNIX2DOS is not set
+CONFIG_DU=y
+# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set
+CONFIG_EXPR=y
+# CONFIG_EXPR_MATH_SUPPORT_64 is not set
+CONFIG_FALSE=y
+# CONFIG_FOLD is not set
+CONFIG_HEAD=y
+# CONFIG_FEATURE_FANCY_HEAD is not set
+# CONFIG_HOSTID is not set
+CONFIG_ID=y
+# CONFIG_INSTALL is not set
+# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
+# CONFIG_LENGTH is not set
+CONFIG_LN=y
+# CONFIG_LOGNAME is not set
+CONFIG_LS=y
+# CONFIG_FEATURE_LS_FILETYPES is not set
+# CONFIG_FEATURE_LS_FOLLOWLINKS is not set
+CONFIG_FEATURE_LS_RECURSIVE=y
+CONFIG_FEATURE_LS_SORTFILES=y
+CONFIG_FEATURE_LS_TIMESTAMPS=y
+CONFIG_FEATURE_LS_USERNAME=y
+# CONFIG_FEATURE_LS_COLOR is not set
+# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set
+CONFIG_MKFIFO=y
+CONFIG_MKNOD=y
+CONFIG_MV=y
+# CONFIG_FEATURE_MV_LONG_OPTIONS is not set
+CONFIG_NICE=y
+CONFIG_NOHUP=y
+CONFIG_OD=y
+# CONFIG_PRINTENV is not set
+CONFIG_PRINTF=y
+CONFIG_PWD=y
+CONFIG_REALPATH=y
+CONFIG_RM=y
+CONFIG_RMDIR=y
+CONFIG_SEQ=y
+# CONFIG_SHA1SUM is not set
+CONFIG_SLEEP=y
+# CONFIG_FEATURE_FANCY_SLEEP is not set
+CONFIG_SORT=y
+# CONFIG_FEATURE_SORT_BIG is not set
+CONFIG_STAT=y
+# CONFIG_FEATURE_STAT_FORMAT is not set
+CONFIG_STTY=y
+# CONFIG_SUM is not set
+CONFIG_SYNC=y
+CONFIG_TAIL=y
+# CONFIG_FEATURE_FANCY_TAIL is not set
+CONFIG_TEE=y
+# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
+CONFIG_TEST=y
+# CONFIG_FEATURE_TEST_64 is not set
+CONFIG_TOUCH=y
+CONFIG_TR=y
+# CONFIG_FEATURE_TR_CLASSES is not set
+# CONFIG_FEATURE_TR_EQUIV is not set
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+CONFIG_UNIQ=y
+CONFIG_USLEEP=y
+# CONFIG_UUDECODE is not set
+# CONFIG_UUENCODE is not set
+# CONFIG_WATCH is not set
+CONFIG_WC=y
+# CONFIG_WHO is not set
+# CONFIG_WHOAMI is not set
+CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
+
+#
+# Common options for ls, more and telnet
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum
+#
+# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set
+
+#
+# Console Utilities
+#
+CONFIG_CHVT=y
+CONFIG_CLEAR=y
+CONFIG_DEALLOCVT=y
+CONFIG_DUMPKMAP=y
+CONFIG_LOADFONT=y
+CONFIG_LOADKMAP=y
+CONFIG_OPENVT=y
+CONFIG_RESET=y
+CONFIG_SETCONSOLE=y
+# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
+CONFIG_SETKEYCODES=y
+CONFIG_SETLOGCONS=y
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+# CONFIG_PIPE_PROGRESS is not set
+CONFIG_READLINK=y
+CONFIG_FEATURE_READLINK_FOLLOW=y
+CONFIG_RUN_PARTS=y
+# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
+CONFIG_START_STOP_DAEMON=y
+CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
+# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_MATH=y
+# CONFIG_ED is not set
+# CONFIG_PATCH is not set
+CONFIG_SED=y
+CONFIG_VI=y
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
+CONFIG_FEATURE_VI_USE_SIGNALS=y
+# CONFIG_FEATURE_VI_DOT_CMD is not set
+# CONFIG_FEATURE_VI_READONLY is not set
+# CONFIG_FEATURE_VI_SETOPTS is not set
+# CONFIG_FEATURE_VI_SET is not set
+CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_PRINT0=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_NEWER=y
+# CONFIG_FEATURE_FIND_INUM is not set
+CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+# CONFIG_FEATURE_GREP_FGREP_ALIAS is not set
+# CONFIG_FEATURE_GREP_CONTEXT is not set
+CONFIG_XARGS=y
+# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set
+# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set
+CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
+
+#
+# Init Utilities
+#
+# CONFIG_INIT is not set
+# CONFIG_DEBUG_INIT is not set
+# CONFIG_FEATURE_USE_INITTAB is not set
+# CONFIG_FEATURE_INIT_SCTTY is not set
+# CONFIG_FEATURE_EXTRA_QUIET is not set
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+# CONFIG_FEATURE_INITRD is not set
+# CONFIG_HALT is not set
+# CONFIG_MESG is not set
+
+#
+# Login/Password Management Utilities
+#
+CONFIG_FEATURE_SHADOWPASSWDS=y
+# CONFIG_USE_BB_SHADOW is not set
+# CONFIG_USE_BB_PWD_GRP is not set
+CONFIG_ADDGROUP=y
+CONFIG_DELGROUP=y
+CONFIG_ADDUSER=y
+CONFIG_DELUSER=y
+CONFIG_GETTY=y
+# CONFIG_FEATURE_UTMP is not set
+# CONFIG_FEATURE_WTMP is not set
+CONFIG_LOGIN=y
+# CONFIG_FEATURE_SECURETTY is not set
+CONFIG_PASSWD=y
+CONFIG_SU=y
+# CONFIG_SULOGIN is not set
+# CONFIG_VLOCK is not set
+
+#
+# Linux Ext2 FS Progs
+#
+# CONFIG_CHATTR is not set
+# CONFIG_E2FSCK is not set
+# CONFIG_FSCK is not set
+# CONFIG_LSATTR is not set
+# CONFIG_MKE2FS is not set
+# CONFIG_TUNE2FS is not set
+# CONFIG_E2LABEL is not set
+# CONFIG_FINDFS is not set
+
+#
+# Linux Module Utilities
+#
+CONFIG_INSMOD=y
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
+CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
+CONFIG_MODPROBE=y
+CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
+
+#
+# Options common to multiple modutils
+#
+# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
+# CONFIG_FEATURE_2_4_MODULES is not set
+CONFIG_FEATURE_2_6_MODULES=y
+# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
+
+#
+# Linux System Utilities
+#
+CONFIG_DMESG=y
+# CONFIG_FBSET is not set
+# CONFIG_FEATURE_FBSET_FANCY is not set
+# CONFIG_FEATURE_FBSET_READMODE is not set
+# CONFIG_FDFLUSH is not set
+# CONFIG_FDFORMAT is not set
+# CONFIG_FDISK is not set
+# FDISK_SUPPORT_LARGE_DISKS is not set
+# CONFIG_FEATURE_FDISK_WRITABLE is not set
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+# CONFIG_FEATURE_OSF_LABEL is not set
+# CONFIG_FEATURE_FDISK_ADVANCED is not set
+# CONFIG_FREERAMDISK is not set
+# CONFIG_FSCK_MINIX is not set
+# CONFIG_MKFS_MINIX is not set
+# CONFIG_FEATURE_MINIX2 is not set
+CONFIG_GETOPT=y
+CONFIG_HEXDUMP=y
+CONFIG_HWCLOCK=y
+# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set
+# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
+# CONFIG_IPCRM is not set
+CONFIG_IPCS=y
+# CONFIG_LOSETUP is not set
+CONFIG_MDEV=y
+CONFIG_FEATURE_MDEV_CONF=y
+# CONFIG_FEATURE_MDEV_EXEC is not set
+# CONFIG_MKSWAP is not set
+# CONFIG_FEATURE_MKSWAP_V0 is not set
+CONFIG_MORE=y
+CONFIG_FEATURE_USE_TERMIOS=y
+CONFIG_MOUNT=y
+CONFIG_FEATURE_MOUNT_NFS=y
+CONFIG_PIVOT_ROOT=y
+# CONFIG_RDATE is not set
+# CONFIG_READPROFILE is not set
+# CONFIG_SETARCH is not set
+# CONFIG_SWAPONOFF is not set
+# CONFIG_SWITCH_ROOT is not set
+CONFIG_UMOUNT=y
+# CONFIG_FEATURE_UMOUNT_ALL is not set
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+# CONFIG_FEATURE_MTAB_SUPPORT is not set
+
+#
+# Miscellaneous Utilities
+#
+CONFIG_ADJTIMEX=y
+# CONFIG_BBCONFIG is not set
+# CONFIG_CROND is not set
+# CONFIG_DEBUG_CROND_OPTION is not set
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+# CONFIG_CRONTAB is not set
+CONFIG_DC=y
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
+# CONFIG_DEVFSD_VERBOSE is not set
+CONFIG_FEATURE_DEVFS=y
+# CONFIG_EJECT is not set
+# CONFIG_LAST is not set
+CONFIG_LESS=y
+# CONFIG_FEATURE_LESS_BRACKETS is not set
+# CONFIG_FEATURE_LESS_FLAGS is not set
+# CONFIG_FEATURE_LESS_FLAGCS is not set
+# CONFIG_FEATURE_LESS_MARKS is not set
+# CONFIG_FEATURE_LESS_REGEXP is not set
+# CONFIG_HDPARM is not set
+# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
+# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
+# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
+# CONFIG_MAKEDEVS is not set
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
+# CONFIG_MOUNTPOINT is not set
+# CONFIG_MT is not set
+# CONFIG_RUNLEVEL is not set
+# CONFIG_RX is not set
+CONFIG_STRINGS=y
+# CONFIG_SETSID is not set
+# CONFIG_TASKSET is not set
+CONFIG_TIME=y
+# CONFIG_WATCHDOG is not set
+
+#
+# Networking Utilities
+#
+# CONFIG_FEATURE_IPV6 is not set
+CONFIG_ARPING=y
+# CONFIG_DNSD is not set
+# CONFIG_ETHER_WAKE is not set
+# CONFIG_FAKEIDENTD is not set
+# CONFIG_FTPGET is not set
+# CONFIG_FTPPUT is not set
+# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
+CONFIG_HOSTNAME=y
+# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_WITHOUT_INETD is not set
+# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+# CONFIG_FEATURE_IFCONFIG_SLIP is not set
+# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
+CONFIG_FEATURE_IFCONFIG_HW=y
+# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
+CONFIG_IFUPDOWN=y
+# CONFIG_FEATURE_IFUPDOWN_IP is not set
+CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y
+CONFIG_FEATURE_IFUPDOWN_IPV4=y
+# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
+# CONFIG_FEATURE_IFUPDOWN_IPX is not set
+# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
+# CONFIG_INETD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
+# CONFIG_FEATURE_INETD_RPC is not set
+# CONFIG_IP is not set
+# CONFIG_FEATURE_IP_ADDRESS is not set
+# CONFIG_FEATURE_IP_LINK is not set
+# CONFIG_FEATURE_IP_ROUTE is not set
+# CONFIG_FEATURE_IP_TUNNEL is not set
+# CONFIG_FEATURE_IP_SHORT_FORMS is not set
+# CONFIG_IPADDR is not set
+# CONFIG_IPLINK is not set
+# CONFIG_IPROUTE is not set
+# CONFIG_IPTUNNEL is not set
+# CONFIG_IPCALC is not set
+# CONFIG_FEATURE_IPCALC_FANCY is not set
+# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+# CONFIG_NAMEIF is not set
+CONFIG_NC=y
+# CONFIG_NC_GAPING_SECURITY_HOLE is not set
+CONFIG_NETSTAT=y
+CONFIG_NSLOOKUP=y
+CONFIG_PING=y
+CONFIG_FEATURE_FANCY_PING=y
+# CONFIG_PING6 is not set
+# CONFIG_FEATURE_FANCY_PING6 is not set
+CONFIG_ROUTE=y
+CONFIG_TELNET=y
+CONFIG_FEATURE_TELNET_TTYPE=y
+CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+# CONFIG_TELNETD is not set
+# CONFIG_FEATURE_TELNETD_INETD is not set
+# CONFIG_TFTP is not set
+# CONFIG_FEATURE_TFTP_GET is not set
+# CONFIG_FEATURE_TFTP_PUT is not set
+# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
+# CONFIG_DEBUG_TFTP is not set
+CONFIG_TRACEROUTE=y
+CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
+# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+
+#
+# udhcp Server/Client
+#
+# CONFIG_APP_UDHCPD is not set
+CONFIG_APP_UDHCPC=y
+# CONFIG_APP_DUMPLEASES is not set
+CONFIG_FEATURE_UDHCP_SYSLOG=y
+# CONFIG_FEATURE_UDHCP_DEBUG is not set
+# CONFIG_VCONFIG is not set
+CONFIG_WGET=y
+# CONFIG_FEATURE_WGET_STATUSBAR is not set
+# CONFIG_FEATURE_WGET_AUTHENTICATION is not set
+# CONFIG_FEATURE_WGET_IP6_LITERAL is not set
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+CONFIG_ZCIP=y
+
+#
+# Process Utilities
+#
+CONFIG_FREE=y
+# CONFIG_FUSER is not set
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+# CONFIG_PIDOF is not set
+# CONFIG_FEATURE_PIDOF_SINGLE is not set
+# CONFIG_FEATURE_PIDOF_OMIT is not set
+CONFIG_PS=y
+CONFIG_FEATURE_PS_WIDE=y
+CONFIG_RENICE=y
+CONFIG_BB_SYSCTL=y
+CONFIG_TOP=y
+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+# CONFIG_UPTIME is not set
+
+#
+# Shells
+#
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_LASH is not set
+# CONFIG_FEATURE_SH_IS_MSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+CONFIG_ASH=y
+
+#
+# Ash Shell Options
+#
+CONFIG_ASH_JOB_CONTROL=y
+# CONFIG_ASH_READ_NCHARS is not set
+# CONFIG_ASH_READ_TIMEOUT is not set
+CONFIG_ASH_ALIAS=y
+CONFIG_ASH_MATH_SUPPORT=y
+# CONFIG_ASH_MATH_SUPPORT_64 is not set
+CONFIG_ASH_GETOPTS=y
+CONFIG_ASH_BUILTIN_ECHO=y
+CONFIG_ASH_BUILTIN_TEST=y
+# CONFIG_ASH_CMDCMD is not set
+# CONFIG_ASH_MAIL is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+# CONFIG_ASH_RANDOM_SUPPORT is not set
+# CONFIG_ASH_EXPAND_PRMT is not set
+# CONFIG_HUSH is not set
+# CONFIG_LASH is not set
+# CONFIG_MSH is not set
+
+#
+# Bourne Shell Options
+#
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
+# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
+CONFIG_FEATURE_COMMAND_EDITING=y
+# CONFIG_FEATURE_COMMAND_EDITING_VI is not set
+CONFIG_FEATURE_COMMAND_HISTORY=15
+# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set
+CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
+# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set
+CONFIG_FEATURE_SH_FANCY_PROMPT=y
+
+#
+# System Logging Utilities
+#
+CONFIG_SYSLOGD=y
+# CONFIG_FEATURE_ROTATE_LOGFILE is not set
+# CONFIG_FEATURE_REMOTE_LOG is not set
+CONFIG_FEATURE_IPC_SYSLOG=y
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
+CONFIG_LOGREAD=y
+# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
+CONFIG_KLOGD=y
+CONFIG_LOGGER=y
diff --git a/packages/busybox/busybox-1.3.1/mount-all-type.patch b/packages/busybox/busybox-1.3.1/mount-all-type.patch
new file mode 100644
index 0000000000..476094a804
--- /dev/null
+++ b/packages/busybox/busybox-1.3.1/mount-all-type.patch
@@ -0,0 +1,84 @@
+--- busybox-1.00/.pc/mount-all-type.patch/util-linux/mount.c	2004-08-02 17:14:02.000000000 -0700
++++ busybox-1.00/util-linux/mount.c	2005-05-13 00:17:19.054232796 -0700
+@@ -364,6 +364,56 @@
+ 	exit(EXIT_SUCCESS);
+ }
+ 
++/* Does this file system type, from /etc/fstab, match the given
++ * -t option value?
++ */
++static int match_fs(const char *option, const char *type)
++{
++	const int len = strlen(type);
++	const int no = option[0] == 'n' && option[1] == 'o';
++	const char *optp = option;
++
++	if (len > 0) do {
++		const char *match = strstr(optp, type);
++
++		if (match == NULL) {
++			/* No match, but if the option string starts 'no' no match
++			 * means yes.
++			 */
++			return no;
++		}
++
++		/* Match, may be partial, check for end-of-type in option string. */
++		if (match[len] == 0 || match[len] == ',') {
++			/* Ok, check for type or notype. */
++			if (match == option) {
++				/* Exact match at start (can't be 'no') */
++				return 1;
++			}
++			if (match > option+1) {
++				if (match[-1] == ',') {
++					/* Exact match in middle, might be 'no' */
++					return !no;
++				}
++				if (match == option+2 && no) {
++					/* Exact match to 'notype' at start. */
++					return 0;
++				}
++				if (match > option+2 && match[-3] == ',' &&
++						match[-2] == 'n' && match[-1] == 'o') {
++					return 0;
++				}
++			}
++		}
++
++		/* Look for another match. */
++		optp = match+1;
++	} while (1);
++
++	/* zero length type in fstab (impossible?), don't match it. */
++	return 0;
++}
++
+ extern int mount_main(int argc, char **argv)
+ {
+ 	struct stat statbuf;
+@@ -371,6 +421,7 @@
+ 	char *extra_opts;
+ 	int flags = 0;
+ 	char *filesystemType = "auto";
++	char *filesystemOption = 0;
+ 	int got_filesystemType = 0;
+ 	char *device = xmalloc(PATH_MAX);
+ 	char *directory = xmalloc(PATH_MAX);
+@@ -393,6 +444,7 @@
+ 			break;
+ 		case 't':
+ 			filesystemType = optarg;
++			filesystemOption = optarg;
+ 			got_filesystemType = 1;
+ 			break;
+ 		case 'w':
+@@ -460,6 +512,8 @@
+ 
+ 			strcpy(device, m->mnt_fsname);
+ 			strcpy(directory, m->mnt_dir);
++			if (all && filesystemOption != 0 && !match_fs(filesystemOption, m->mnt_type))
++				continue;
+ 			filesystemType = bb_xstrdup(m->mnt_type);
+ 		  singlemount:
+ 			extra_opts = string_flags;
diff --git a/packages/busybox/busybox-1.3.1/nylon/.mtn2git_empty b/packages/busybox/busybox-1.3.1/nylon/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/busybox/busybox-1.3.1/nylon/.mtn2git_empty
diff --git a/packages/busybox/busybox-1.3.1/nylon/defconfig b/packages/busybox/busybox-1.3.1/nylon/defconfig
new file mode 100644
index 0000000000..67c5408ada
--- /dev/null
+++ b/packages/busybox/busybox-1.3.1/nylon/defconfig
@@ -0,0 +1,568 @@
+#
+# Automatically generated make config: don't edit
+#
+HAVE_DOT_CONFIG=y
+
+#
+# General Configuration
+#
+# CONFIG_NITPICK is not set
+CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+CONFIG_FEATURE_VERBOSE_USAGE=y
+# CONFIG_FEATURE_INSTALLER is not set
+# CONFIG_LOCALE_SUPPORT is not set
+CONFIG_FEATURE_DEVFS=y
+# CONFIG_EJECT is not set
+CONFIG_FEATURE_DEVPTS=y
+# CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_SUID=y
+CONFIG_FEATURE_SUID_CONFIG=y
+CONFIG_FEATURE_SUID_CONFIG_QUIET=y
+# CONFIG_SELINUX is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+
+#
+# Build Options
+#
+# CONFIG_STATIC is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_LFS is not set
+# USING_CROSS_COMPILER is not set
+EXTRA_CFLAGS_OPTIONS=""
+# CONFIG_BUILD_AT_ONCE is not set
+
+#
+# Installation Options
+#
+# CONFIG_INSTALL_NO_USR is not set
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
+PREFIX="./_install"
+
+#
+# Busybox Library Tuning
+#
+CONFIG_MD5_SIZE_VS_SPEED=2
+
+#
+# Archival Utilities
+#
+CONFIG_AR=y
+CONFIG_FEATURE_AR_LONG_FILENAMES=y
+CONFIG_BUNZIP2=y
+CONFIG_CPIO=y
+CONFIG_DPKG=y
+CONFIG_DPKG_DEB=y
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_GUNZIP=y
+CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y
+CONFIG_GZIP=y
+# CONFIG_RPM2CPIO is not set
+# CONFIG_RPM is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+# CONFIG_FEATURE_TAR_BZIP2 is not set
+CONFIG_FEATURE_TAR_FROM=y
+CONFIG_FEATURE_TAR_GZIP=y
+CONFIG_FEATURE_TAR_COMPRESS=y
+# CONFIG_FEATURE_TAR_LZMA is not set
+CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+CONFIG_FEATURE_TAR_LONG_OPTIONS=y
+CONFIG_UNCOMPRESS=y
+# CONFIG_UNLZMA is not set
+CONFIG_UNZIP=y
+
+#
+# Common options for cpio and tar
+#
+# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
+# CONFIG_FEATURE_DEB_TAR_LZMA is not set
+
+#
+# Common options for dpkg and dpkg_deb
+#
+CONFIG_FEATURE_DEB_TAR_GZ=y
+CONFIG_FEATURE_DEB_TAR_BZ2=y
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+CONFIG_CAL=y
+CONFIG_CAT=y
+# CONFIG_CATV is not set
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+CONFIG_CHROOT=y
+CONFIG_DIFF=y
+# CONFIG_FEATURE_DIFF_BINARY is not set
+CONFIG_FEATURE_DIFF_DIR=y
+# CONFIG_FEATURE_DIFF_MINIMAL is not set
+# CONFIG_COMM is not set
+# CONFIG_CKSUM is not set
+# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set
+# CONFIG_FEATURE_DD_IBS_OBS is not set
+CONFIG_CMP=y
+CONFIG_CP=y
+CONFIG_CUT=y
+CONFIG_DATE=y
+
+#
+# date (forced enabled for use with watch)
+#
+CONFIG_FEATURE_DATE_ISOFMT=y
+CONFIG_DD=y
+CONFIG_DF=y
+CONFIG_DIRNAME=y
+CONFIG_DOS2UNIX=y
+CONFIG_UNIX2DOS=y
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set
+CONFIG_EXPR=y
+# CONFIG_EXPR_MATH_SUPPORT_64 is not set
+CONFIG_FALSE=y
+CONFIG_FOLD=y
+CONFIG_HEAD=y
+CONFIG_FEATURE_FANCY_HEAD=y
+CONFIG_HOSTID=y
+CONFIG_ID=y
+CONFIG_INSTALL=y
+# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
+CONFIG_LENGTH=y
+CONFIG_LN=y
+CONFIG_LOGNAME=y
+CONFIG_LS=y
+CONFIG_FEATURE_LS_FILETYPES=y
+CONFIG_FEATURE_LS_FOLLOWLINKS=y
+CONFIG_FEATURE_LS_RECURSIVE=y
+CONFIG_FEATURE_LS_SORTFILES=y
+CONFIG_FEATURE_LS_TIMESTAMPS=y
+CONFIG_FEATURE_LS_USERNAME=y
+CONFIG_FEATURE_LS_COLOR=y
+CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set
+CONFIG_MKFIFO=y
+CONFIG_MKNOD=y
+CONFIG_MV=y
+# CONFIG_FEATURE_MV_LONG_OPTIONS is not set
+CONFIG_NICE=y
+CONFIG_NOHUP=y
+CONFIG_OD=y
+# CONFIG_PRINTENV is not set
+CONFIG_PRINTF=y
+CONFIG_PWD=y
+CONFIG_REALPATH=y
+CONFIG_RM=y
+CONFIG_RMDIR=y
+CONFIG_SEQ=y
+CONFIG_SHA1SUM=y
+CONFIG_SLEEP=y
+CONFIG_FEATURE_FANCY_SLEEP=y
+CONFIG_SORT=y
+# CONFIG_FEATURE_SORT_BIG is not set
+CONFIG_STAT=y
+# CONFIG_FEATURE_STAT_FORMAT is not set
+CONFIG_STTY=y
+# CONFIG_SUM is not set
+CONFIG_SYNC=y
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
+# CONFIG_TEST is not set
+CONFIG_TOUCH=y
+CONFIG_TR=y
+# CONFIG_FEATURE_TR_CLASSES is not set
+# CONFIG_FEATURE_TR_EQUIV is not set
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+CONFIG_UNIQ=y
+CONFIG_USLEEP=y
+CONFIG_UUDECODE=y
+CONFIG_UUENCODE=y
+CONFIG_WATCH=y
+CONFIG_WC=y
+CONFIG_WHO=y
+CONFIG_WHOAMI=y
+CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
+
+#
+# Common options for ls and more
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+#
+# Console Utilities
+#
+# CONFIG_CHVT is not set
+CONFIG_CLEAR=y
+# CONFIG_DEALLOCVT is not set
+CONFIG_DUMPKMAP=y
+CONFIG_GETKEY=y
+# CONFIG_LOADFONT is not set
+CONFIG_LOADKMAP=y
+# CONFIG_OPENVT is not set
+CONFIG_RESET=y
+CONFIG_SETCONSOLE=y
+# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
+CONFIG_SETKEYCODES=y
+CONFIG_SETLOGCONS=n
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+CONFIG_PIPE_PROGRESS=y
+CONFIG_READLINK=y
+CONFIG_FEATURE_READLINK_FOLLOW=y
+CONFIG_RUN_PARTS=y
+# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
+CONFIG_START_STOP_DAEMON=y
+CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
+# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_MATH=y
+# CONFIG_ED is not set
+CONFIG_PATCH=y
+CONFIG_SED=y
+# CONFIG_VI is not set
+#CONFIG_FEATURE_VI_COLON=y
+#CONFIG_FEATURE_VI_YANKMARK=y
+#CONFIG_FEATURE_VI_SEARCH=y
+#CONFIG_FEATURE_VI_USE_SIGNALS=y
+#CONFIG_FEATURE_VI_DOT_CMD=y
+#CONFIG_FEATURE_VI_READONLY=y
+#CONFIG_FEATURE_VI_SETOPTS=y
+#CONFIG_FEATURE_VI_SET=y
+#CONFIG_FEATURE_VI_WIN_RESIZE=y
+#CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_PRINT0=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_NEWER=y
+CONFIG_FEATURE_FIND_INUM=y
+CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+CONFIG_FEATURE_GREP_CONTEXT=y
+CONFIG_XARGS=y
+CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y
+CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
+CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
+CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
+
+#
+# Init Utilities
+#
+# CONFIG_INIT is not set
+# CONFIG_HALT is not set
+# CONFIG_POWEROFF is not set
+# CONFIG_REBOOT is not set
+# CONFIG_MESG is not set
+
+#
+# Login/Password Management Utilities
+#
+# CONFIG_FEATURE_SHADOWPASSWDS is not set
+# CONFIG_USE_BB_SHADOW is not set
+# CONFIG_USE_BB_PWD_GRP is not set
+# CONFIG_USE_BB_PWD_GRP is not set
+# CONFIG_ADDGROUP is not set
+# CONFIG_DELGROUP is not set
+# CONFIG_ADDUSER is not set
+# CONFIG_DELUSER is not set
+# CONFIG_GETTY is not set
+CONFIG_FEATURE_U_W_TMP=y
+# CONFIG_LOGIN is not set
+# CONFIG_PASSWD is not set
+# CONFIG_SU is not set
+# CONFIG_SULOGIN is not set
+# CONFIG_VLOCK is not set
+
+#
+# Linux Ext2 FS Progs
+#
+# CONFIG_CHATTR is not set
+# CONFIG_E2FSCK is not set
+# CONFIG_FSCK is not set
+# CONFIG_LSATTR is not set
+# CONFIG_MKE2FS is not set
+# CONFIG_TUNE2FS is not set
+# CONFIG_E2LABEL is not set
+# CONFIG_FINDFS is not set
+
+#
+# Miscellaneous Utilities
+#
+# CONFIG_ADJTIMEX is not set
+# CONFIG_BBCONFIG is not set
+CONFIG_CROND=y
+# CONFIG_DEBUG_CROND_OPTION is not set
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+CONFIG_CRONTAB=y
+CONFIG_DC=y
+# CONFIG_DEVFSD is not set
+# CONFIG_LAST is not set
+CONFIG_LESS=y
+# CONFIG_FEATURE_LESS_BRACKETS is not set
+# CONFIG_FEATURE_LESS_FLAGS is not set
+# CONFIG_FEATURE_LESS_FLAGCS is not set
+# CONFIG_FEATURE_LESS_MARKS is not set
+# CONFIG_FEATURE_LESS_REGEXP is not set
+# CONFIG_HDPARM is not set
+# CONFIG_MAKEDEVS is not set
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
+# CONFIG_MOUNTPOINT is not set
+# CONFIG_MT is not set
+# CONFIG_RUNLEVEL is not set
+# CONFIG_RX is not set
+CONFIG_STRINGS=y
+# CONFIG_SETSID is not set
+# CONFIG_TASKSET is not set
+CONFIG_TIME=y
+CONFIG_WATCHDOG=y
+
+#
+# Linux Module Utilities
+#
+# CONFIG_INSMOD is not set
+# CONFIG_LSMOD is not set
+# CONFIG_MODPROBE is not set
+# CONFIG_RMMOD is not set
+
+#
+# Networking Utilities
+#
+CONFIG_FEATURE_IPV6=y
+CONFIG_ARPING=y
+# CONFIG_DNSD is not set
+# CONFIG_ETHER_WAKE is not set
+# CONFIG_FAKEIDENTD is not set
+# CONFIG_FTPGET is not set
+# CONFIG_FTPPUT is not set
+CONFIG_HOSTNAME=y
+CONFIG_HTTPD=y
+CONFIG_FEATURE_HTTPD_WITHOUT_INETD=y
+CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP=y
+# CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY is not set
+CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
+CONFIG_FEATURE_HTTPD_AUTH_MD5=y
+CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP=y
+CONFIG_FEATURE_HTTPD_SETUID=y
+CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES=y
+CONFIG_FEATURE_HTTPD_CGI=y
+CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
+CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
+CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y
+CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+# CONFIG_FEATURE_IFCONFIG_SLIP is not set
+CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
+CONFIG_FEATURE_IFCONFIG_HW=y
+CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
+CONFIG_IFUPDOWN=y
+# CONFIG_FEATURE_IFUPDOWN_IP is not set
+CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y
+CONFIG_FEATURE_IFUPDOWN_IPV4=y
+CONFIG_FEATURE_IFUPDOWN_IPV6=y
+# CONFIG_FEATURE_IFUPDOWN_IPX is not set
+CONFIG_FEATURE_IFUPDOWN_MAPPING=y
+CONFIG_INETD=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y
+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y
+# CONFIG_FEATURE_INETD_RPC is not set
+# CONFIG_IP is not set
+CONFIG_IPCALC=y
+CONFIG_FEATURE_IPCALC_FANCY=y
+# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+# CONFIG_IPADDR is not set
+# CONFIG_IPLINK is not set
+# CONFIG_IPROUTE is not set
+# CONFIG_IPTUNNEL is not set
+CONFIG_NAMEIF=y
+CONFIG_NC=y
+# CONFIG_NC_GAPING_SECURITY_HOLE is not set
+CONFIG_NETSTAT=y
+CONFIG_NSLOOKUP=y
+CONFIG_PING=y
+CONFIG_FEATURE_FANCY_PING=y
+CONFIG_PING6=y
+CONFIG_FEATURE_FANCY_PING6=y
+CONFIG_ROUTE=y
+CONFIG_TELNET=y
+CONFIG_FEATURE_TELNET_TTYPE=y
+CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+# CONFIG_TELNETD is not set
+CONFIG_TFTP=y
+CONFIG_FEATURE_TFTP_GET=y
+CONFIG_FEATURE_TFTP_PUT=y
+CONFIG_FEATURE_TFTP_BLOCKSIZE=y
+# CONFIG_DEBUG_TFTP is not set
+CONFIG_TRACEROUTE=y
+CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
+CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y
+# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+CONFIG_VCONFIG=y
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+CONFIG_FEATURE_WGET_IP6_LITERAL=y
+# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
+CONFIG_ZCIP=y
+
+#
+# udhcp Server/Client
+#
+CONFIG_APP_UDHCPD=y
+CONFIG_APP_UDHCPC=y
+CONFIG_APP_DUMPLEASES=y
+CONFIG_FEATURE_UDHCP_SYSLOG=y
+# CONFIG_FEATURE_UDHCP_DEBUG is not set
+
+#
+# Process Utilities
+#
+CONFIG_FREE=y
+# CONFIG_FUSER is not set
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+CONFIG_PIDOF=y
+# CONFIG_FEATURE_PIDOF_SINGLE is not set
+# CONFIG_FEATURE_PIDOF_OMIT is not set
+CONFIG_PS=y
+# CONFIG_FEATURE_PS_WIDE is not set
+CONFIG_RENICE=y
+CONFIG_BB_SYSCTL=y
+CONFIG_TOP=y
+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+FEATURE_CPU_USAGE_PERCENTAGE=y
+CONFIG_UPTIME=y
+CONFIG_SYSCTL=y
+
+#
+# Another Bourne-like Shell
+#
+# CONFIG_FEATURE_SH_IS_ASH is not set
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_LASH is not set
+# CONFIG_FEATURE_SH_IS_MSH is not set
+CONFIG_FEATURE_SH_IS_NONE=y
+# CONFIG_ASH is not set
+# CONFIG_HUSH is not set
+# CONFIG_LASH is not set
+# CONFIG_MSH is not set
+
+#
+# System Logging Utilities
+#
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+CONFIG_FEATURE_REMOTE_LOG=y
+CONFIG_FEATURE_IPC_SYSLOG=y
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
+CONFIG_LOGREAD=y
+# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
+CONFIG_KLOGD=y
+CONFIG_LOGGER=y
+
+#
+# Linux System Utilities
+#
+CONFIG_DMESG=y
+CONFIG_FBSET=y
+CONFIG_FEATURE_FBSET_FANCY=y
+CONFIG_FEATURE_FBSET_READMODE=y
+# CONFIG_FDFLUSH is not set
+# CONFIG_FDFORMAT is not set
+CONFIG_FDISK=y
+FDISK_SUPPORT_LARGE_DISKS=y
+CONFIG_FEATURE_FDISK_WRITABLE=y
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+# CONFIG_FEATURE_OSF_LABEL is not set
+# CONFIG_FEATURE_FDISK_ADVANCED is not set
+CONFIG_FREERAMDISK=y
+# CONFIG_FSCK_MINIX is not set
+# CONFIG_MKFS_MINIX is not set
+# CONFIG_GETOPT is not set
+CONFIG_HEXDUMP=y
+# CONFIG_HWCLOCK is not set
+# CONFIG_IPCRM is not set
+CONFIG_IPCS=y
+CONFIG_LOSETUP=y
+CONFIG_MDEV=y
+CONFIG_FEATURE_MDEV_CONF=y
+# CONFIG_FEATURE_MDEV_EXEC is not set
+CONFIG_MKSWAP=y
+# CONFIG_FEATURE_MKSWAP_V0 is not set
+# CONFIG_MORE is not set
+CONFIG_PIVOT_ROOT=y
+CONFIG_FEATURE_MOUNT_NFS=y
+# CONFIG_RDATE is not set
+# CONFIG_READPROFILE is not set
+# CONFIG_SETARCH is not set
+CONFIG_SWAPONOFF=y
+# CONFIG_SWITCH_ROOT is not set
+CONFIG_MOUNT=y
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_MOUNT_FORCE=y
+# CONFIG_FEATURE_UMOUNT_ALL is not set
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+# CONFIG_FEATURE_MTAB_SUPPORT is not set
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+CONFIG_DEBUG_YANK_SUSv2=y
diff --git a/packages/busybox/busybox-1.3.1/openmn/.mtn2git_empty b/packages/busybox/busybox-1.3.1/openmn/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/busybox/busybox-1.3.1/openmn/.mtn2git_empty
diff --git a/packages/busybox/busybox-1.3.1/readlink.patch b/packages/busybox/busybox-1.3.1/readlink.patch
new file mode 100644
index 0000000000..0c5431085a
--- /dev/null
+++ b/packages/busybox/busybox-1.3.1/readlink.patch
@@ -0,0 +1,85 @@
+diff -p -u -r1.7 Config.in
+--- busybox-1.00/debianutils/Config.in	15 Mar 2004 08:28:24 -0000	1.7
++++ busybox-1.00-patched/debianutils/Config.in	16 Nov 2004 11:46:41 -0000
+@@ -24,6 +24,13 @@ config CONFIG_READLINK
+ 	  This program reads a symbolic link and returns the name
+ 	  of the file it points to
+ 
++config CONFIG_FEATURE_READLINK_FOLLOW
++	bool "  Enable canonicalization by following all symlinks (-f)"
++	default n
++	depends on CONFIG_READLINK
++	help
++	  Enable the readlink option (-f).
++
+ config CONFIG_RUN_PARTS
+ 	bool "run-parts"
+ 	default n
+diff -p -u -r1.2 readlink.c
+--- busybox-1.00/debianutils/readlink.c	19 Mar 2003 09:11:41 -0000	1.2
++++ busybox-1.00-patched/debianutils/readlink.c	16 Nov 2004 11:46:41 -0000
+@@ -23,18 +23,38 @@
+ #include <errno.h>
+ #include <unistd.h>
+ #include <stdlib.h>
++#include <getopt.h>
+ #include "busybox.h"
+ 
++#ifdef CONFIG_FEATURE_READLINK_FOLLOW
++# define READLINK_FOLLOW	"f"
++# define READLINK_FLAG_f	(1 << 0)
++#else
++# define READLINK_FOLLOW	""
++#endif
++
++static const char readlink_options[] = READLINK_FOLLOW;
++
+ int readlink_main(int argc, char **argv)
+ {
+ 	char *buf = NULL;
++	unsigned long opt = bb_getopt_ulflags(argc, argv, readlink_options);
++#ifdef CONFIG_FEATURE_READLINK_FOLLOW
++	RESERVE_CONFIG_BUFFER(resolved_path, PATH_MAX);
++#endif
+ 
+ 	/* no options, no getopt */
+ 
+-	if (argc != 2)
++	if (optind + 1 != argc)
+ 		bb_show_usage();
+ 
+-	buf = xreadlink(argv[1]);
++#ifdef CONFIG_FEATURE_READLINK_FOLLOW
++	if (opt & READLINK_FLAG_f) {
++		buf = realpath(argv[optind], resolved_path);
++	} else
++#endif
++		buf = xreadlink(argv[optind]);
++
+ 	if (!buf)
+ 		return EXIT_FAILURE;
+ 	puts(buf);
+diff -p -u -r1.222 usage.h
+--- busybox-1.00/include/usage.h	14 Sep 2004 16:23:56 -0000	1.222
++++ busybox-1.00-patched/include/usage.h	16 Nov 2004 11:46:42 -0000
+@@ -1985,10 +1985,18 @@
+ 	"\t-s\tSet the system date and time (default).\n" \
+ 	"\t-p\tPrint the date and time."
+ 
++#ifdef CONFIG_FEATURE_READLINK_FOLLOW
++#define USAGE_READLINK_FOLLOW(a) a
++#else
++#define USAGE_READLINK_FOLLOW(a)
++#endif
++
+ #define readlink_trivial_usage \
+-	""
++	USAGE_READLINK_FOLLOW("[-f] ") "FILE"
+ #define readlink_full_usage \
+-	"Displays the value of a symbolic link."
++	"Displays the value of a symbolic link." \
++	USAGE_READLINK_FOLLOW("\n\nOptions:\n" \
++	"\t-f\tcanonicalize by following all symlinks")
+ 
+ #define realpath_trivial_usage \
+ 	"pathname  ..."
diff --git a/packages/busybox/busybox-1.3.1/rmmod.patch b/packages/busybox/busybox-1.3.1/rmmod.patch
new file mode 100644
index 0000000000..20770e0dc4
--- /dev/null
+++ b/packages/busybox/busybox-1.3.1/rmmod.patch
@@ -0,0 +1,40 @@
+Index: busybox-1.1.0/modutils/rmmod.c
+===================================================================
+--- busybox-1.1.0.orig/modutils/rmmod.c	2006-01-11 06:43:56.000000000 +0100
++++ busybox-1.1.0/modutils/rmmod.c	2006-03-14 16:42:14.000000000 +0100
+@@ -29,6 +29,7 @@
+ #include <string.h>
+ #include <sys/utsname.h>
+ #include <sys/syscall.h>
++#include <sys/utsname.h>
+ #include "busybox.h"
+ 
+ #ifdef CONFIG_FEATURE_2_6_MODULES
+@@ -64,6 +65,16 @@
+ 	   but must get */
+ 	size_t bufsize = sizeof(bb_common_bufsiz1);
+ #endif
++#ifdef CONFIG_FEATURE_2_6_MODULES
++	int k_version = 0;
++	struct utsname myuname;	
++
++	if (uname(&myuname) == 0) {
++		if (myuname.release[0] == '2') {
++			k_version = myuname.release[2] - '0';
++		}
++	}
++#endif
+ 
+ 	/* Parse command line. */
+ 	n = bb_getopt_ulflags(argc, argv, "wfa");
+@@ -109,6 +120,10 @@
+ 			afterslash++;
+ 		module_name = alloca(strlen(afterslash) + 1);
+ 		filename2modname(module_name, afterslash);
++		if (k_version != 4)
++ 			filename2modname(module_name, afterslash);
++		else
++			strcpy(module_name, afterslash);
+ #else
+ #define module_name		argv[n]
+ #endif
diff --git a/packages/busybox/busybox-1.3.1/slugos/.mtn2git_empty b/packages/busybox/busybox-1.3.1/slugos/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/busybox/busybox-1.3.1/slugos/.mtn2git_empty
diff --git a/packages/busybox/busybox-1.3.1/slugos/defconfig b/packages/busybox/busybox-1.3.1/slugos/defconfig
new file mode 100644
index 0000000000..c35b4f7f70
--- /dev/null
+++ b/packages/busybox/busybox-1.3.1/slugos/defconfig
@@ -0,0 +1,610 @@
+#
+# Automatically generated make config: don't edit
+#
+HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+# CONFIG_NITPICK is not set
+# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
+CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+CONFIG_SHOW_USAGE=y
+CONFIG_FEATURE_VERBOSE_USAGE=y
+# CONFIG_FEATURE_COMPRESS_USAGE is not set
+# CONFIG_FEATURE_INSTALLER is not set
+CONFIG_LOCALE_SUPPORT=y
+CONFIG_GETOPT_LONG=y
+CONFIG_FEATURE_DEVPTS=y
+# CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_SUID=y
+# CONFIG_FEATURE_SUID_CONFIG is not set
+# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
+# CONFIG_SELINUX is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+
+#
+# Build Options
+#
+# CONFIG_STATIC is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+CONFIG_LFS=y
+USING_CROSS_COMPILER=y
+CROSS_COMPILER_PREFIX="arm-angstrom-linux-gnueabi-"
+CONFIG_BUILD_AT_ONCE=y
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
+# CONFIG_NO_DEBUG_LIB is not set
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+CONFIG_DEBUG_YANK_SUSv2=y
+
+#
+# Installation Options
+#
+# CONFIG_INSTALL_NO_USR is not set
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
+PREFIX="./_install"
+
+#
+# Busybox Library Tuning
+#
+CONFIG_MD5_SIZE_VS_SPEED=2
+
+#
+# Applets
+#
+
+#
+# Archival Utilities
+#
+CONFIG_AR=y
+# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+CONFIG_BUNZIP2=y
+# CONFIG_CPIO is not set
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_GUNZIP=y
+# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set
+CONFIG_GZIP=y
+# CONFIG_RPM2CPIO is not set
+# CONFIG_RPM is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+CONFIG_FEATURE_TAR_BZIP2=y
+# CONFIG_FEATURE_TAR_LZMA is not set
+CONFIG_FEATURE_TAR_FROM=y
+CONFIG_FEATURE_TAR_GZIP=y
+# CONFIG_FEATURE_TAR_COMPRESS is not set
+# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
+# CONFIG_UNCOMPRESS is not set
+# CONFIG_UNLZMA is not set
+# CONFIG_FEATURE_LZMA_FAST is not set
+CONFIG_UNZIP=y
+
+#
+# Common options for cpio and tar
+#
+# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
+# CONFIG_FEATURE_DEB_TAR_GZ is not set
+# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
+# CONFIG_FEATURE_DEB_TAR_LZMA is not set
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+# CONFIG_CAL is not set
+CONFIG_CAT=y
+# CONFIG_CATV is not set
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+CONFIG_CHROOT=y
+# CONFIG_CKSUM is not set
+# CONFIG_CMP is not set
+# CONFIG_COMM is not set
+CONFIG_CP=y
+CONFIG_CUT=y
+CONFIG_DATE=y
+# CONFIG_FEATURE_DATE_ISOFMT is not set
+CONFIG_DD=y
+CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+# CONFIG_FEATURE_DD_IBS_OBS is not set
+CONFIG_DF=y
+CONFIG_DIFF=y
+CONFIG_FEATURE_DIFF_BINARY=y
+CONFIG_FEATURE_DIFF_DIR=y
+# CONFIG_FEATURE_DIFF_MINIMAL is not set
+CONFIG_DIRNAME=y
+# CONFIG_DOS2UNIX is not set
+# CONFIG_UNIX2DOS is not set
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+CONFIG_FEATURE_ENV_LONG_OPTIONS=y
+CONFIG_EXPR=y
+# CONFIG_EXPR_MATH_SUPPORT_64 is not set
+CONFIG_FALSE=y
+# CONFIG_FOLD is not set
+CONFIG_HEAD=y
+CONFIG_FEATURE_FANCY_HEAD=y
+# CONFIG_HOSTID is not set
+CONFIG_ID=y
+# CONFIG_INSTALL is not set
+# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
+# CONFIG_LENGTH is not set
+CONFIG_LN=y
+CONFIG_LOGNAME=y
+CONFIG_LS=y
+CONFIG_FEATURE_LS_FILETYPES=y
+CONFIG_FEATURE_LS_FOLLOWLINKS=y
+CONFIG_FEATURE_LS_RECURSIVE=y
+CONFIG_FEATURE_LS_SORTFILES=y
+CONFIG_FEATURE_LS_TIMESTAMPS=y
+CONFIG_FEATURE_LS_USERNAME=y
+CONFIG_FEATURE_LS_COLOR=y
+# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
+CONFIG_MKFIFO=y
+CONFIG_MKNOD=y
+CONFIG_MV=y
+# CONFIG_FEATURE_MV_LONG_OPTIONS is not set
+# CONFIG_NICE is not set
+# CONFIG_NOHUP is not set
+CONFIG_OD=y
+# CONFIG_PRINTENV is not set
+CONFIG_PRINTF=y
+CONFIG_PWD=y
+CONFIG_REALPATH=y
+CONFIG_RM=y
+CONFIG_RMDIR=y
+CONFIG_SEQ=y
+# CONFIG_SHA1SUM is not set
+CONFIG_SLEEP=y
+CONFIG_FEATURE_FANCY_SLEEP=y
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_BIG=y
+# CONFIG_STAT is not set
+# CONFIG_FEATURE_STAT_FORMAT is not set
+CONFIG_STTY=y
+# CONFIG_SUM is not set
+CONFIG_SYNC=y
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
+CONFIG_TEST=y
+# CONFIG_FEATURE_TEST_64 is not set
+CONFIG_TOUCH=y
+CONFIG_TR=y
+CONFIG_FEATURE_TR_CLASSES=y
+# CONFIG_FEATURE_TR_EQUIV is not set
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+CONFIG_UNIQ=y
+CONFIG_USLEEP=y
+# CONFIG_UUDECODE is not set
+# CONFIG_UUENCODE is not set
+CONFIG_WATCH=y
+CONFIG_WC=y
+CONFIG_WHO=y
+CONFIG_WHOAMI=y
+CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
+
+#
+# Common options for ls, more and telnet
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+#
+# Console Utilities
+#
+# CONFIG_CHVT is not set
+CONFIG_CLEAR=y
+# CONFIG_DEALLOCVT is not set
+# CONFIG_DUMPKMAP is not set
+# CONFIG_LOADFONT is not set
+# CONFIG_LOADKMAP is not set
+# CONFIG_OPENVT is not set
+CONFIG_RESET=y
+CONFIG_SETCONSOLE=y
+# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
+# CONFIG_SETKEYCODES is not set
+# CONFIG_SETLOGCONS is not set
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+# CONFIG_PIPE_PROGRESS is not set
+CONFIG_READLINK=y
+CONFIG_FEATURE_READLINK_FOLLOW=y
+CONFIG_RUN_PARTS=y
+# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
+CONFIG_START_STOP_DAEMON=y
+CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
+CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_MATH=y
+# CONFIG_ED is not set
+CONFIG_PATCH=y
+CONFIG_SED=y
+CONFIG_VI=y
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
+CONFIG_FEATURE_VI_USE_SIGNALS=y
+CONFIG_FEATURE_VI_DOT_CMD=y
+CONFIG_FEATURE_VI_READONLY=y
+CONFIG_FEATURE_VI_SETOPTS=y
+CONFIG_FEATURE_VI_SET=y
+CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+
+#
+# Finding Utilities
+#
+# CONFIG_FIND is not set
+CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+CONFIG_FEATURE_GREP_CONTEXT=y
+# CONFIG_XARGS is not set
+
+#
+# Init Utilities
+#
+# CONFIG_INIT is not set
+# CONFIG_DEBUG_INIT is not set
+# CONFIG_FEATURE_USE_INITTAB is not set
+# CONFIG_FEATURE_INIT_SCTTY is not set
+# CONFIG_FEATURE_EXTRA_QUIET is not set
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+# CONFIG_FEATURE_INITRD is not set
+# CONFIG_HALT is not set
+# CONFIG_MESG is not set
+
+#
+# Login/Password Management Utilities
+#
+# CONFIG_FEATURE_SHADOWPASSWDS is not set
+# CONFIG_USE_BB_SHADOW is not set
+# CONFIG_USE_BB_PWD_GRP is not set
+# CONFIG_ADDGROUP is not set
+# CONFIG_DELGROUP is not set
+# CONFIG_ADDUSER is not set
+# CONFIG_DELUSER is not set
+# CONFIG_GETTY is not set
+CONFIG_FEATURE_UTMP=y
+# CONFIG_FEATURE_WTMP is not set
+# CONFIG_LOGIN is not set
+# CONFIG_FEATURE_SECURETTY is not set
+# CONFIG_PASSWD is not set
+# CONFIG_SU is not set
+# CONFIG_SULOGIN is not set
+# CONFIG_VLOCK is not set
+
+#
+# Linux Ext2 FS Progs
+#
+CONFIG_CHATTR=y
+CONFIG_E2FSCK=y
+CONFIG_FSCK=y
+# CONFIG_LSATTR is not set
+CONFIG_MKE2FS=y
+# CONFIG_TUNE2FS is not set
+# CONFIG_E2LABEL is not set
+# CONFIG_FINDFS is not set
+
+#
+# Linux Module Utilities
+#
+# CONFIG_INSMOD is not set
+# CONFIG_RMMOD is not set
+# CONFIG_LSMOD is not set
+# CONFIG_MODPROBE is not set
+
+#
+# Options common to multiple modutils
+#
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+# CONFIG_FEATURE_2_4_MODULES is not set
+CONFIG_FEATURE_2_6_MODULES=y
+# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
+
+#
+# Linux System Utilities
+#
+CONFIG_DMESG=y
+# CONFIG_FBSET is not set
+# CONFIG_FDFLUSH is not set
+# CONFIG_FDFORMAT is not set
+CONFIG_FDISK=y
+FDISK_SUPPORT_LARGE_DISKS=y
+CONFIG_FEATURE_FDISK_WRITABLE=y
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+CONFIG_FEATURE_OSF_LABEL=y
+# CONFIG_FEATURE_FDISK_ADVANCED is not set
+# CONFIG_FREERAMDISK is not set
+# CONFIG_FSCK_MINIX is not set
+# CONFIG_MKFS_MINIX is not set
+# CONFIG_GETOPT is not set
+CONFIG_HEXDUMP=y
+CONFIG_HWCLOCK=y
+CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
+CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
+# CONFIG_IPCRM is not set
+# CONFIG_IPCS is not set
+# CONFIG_LOSETUP is not set
+# CONFIG_MDEV is not set
+# CONFIG_FEATURE_MDEV_CONF is not set
+# CONFIG_FEATURE_MDEV_EXEC is not set
+CONFIG_MKSWAP=y
+# CONFIG_FEATURE_MKSWAP_V0 is not set
+CONFIG_MORE=y
+CONFIG_FEATURE_USE_TERMIOS=y
+# CONFIG_MOUNT is not set
+# CONFIG_FEATURE_MOUNT_NFS is not set
+CONFIG_PIVOT_ROOT=y
+CONFIG_RDATE=y
+# CONFIG_READPROFILE is not set
+# CONFIG_SETARCH is not set
+# CONFIG_SWAPONOFF is not set
+# CONFIG_SWITCH_ROOT is not set
+# CONFIG_UMOUNT is not set
+# CONFIG_FEATURE_UMOUNT_ALL is not set
+
+#
+# Miscellaneous Utilities
+#
+# CONFIG_ADJTIMEX is not set
+# CONFIG_BBCONFIG is not set
+# CONFIG_CROND is not set
+# CONFIG_DEBUG_CROND_OPTION is not set
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+# CONFIG_CRONTAB is not set
+# CONFIG_DC is not set
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
+# CONFIG_DEVFSD_VERBOSE is not set
+# CONFIG_FEATURE_DEVFS is not set
+# CONFIG_EJECT is not set
+# CONFIG_LAST is not set
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
+# CONFIG_FEATURE_LESS_FLAGCS is not set
+# CONFIG_FEATURE_LESS_MARKS is not set
+# CONFIG_FEATURE_LESS_REGEXP is not set
+# CONFIG_HDPARM is not set
+# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
+# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
+# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
+# CONFIG_MAKEDEVS is not set
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
+# CONFIG_MOUNTPOINT is not set
+# CONFIG_MT is not set
+# CONFIG_RUNLEVEL is not set
+# CONFIG_RX is not set
+CONFIG_STRINGS=y
+# CONFIG_SETSID is not set
+# CONFIG_TASKSET is not set
+CONFIG_TIME=y
+# CONFIG_WATCHDOG is not set
+
+#
+# Networking Utilities
+#
+CONFIG_FEATURE_IPV6=y
+# CONFIG_ARPING is not set
+# CONFIG_DNSD is not set
+# CONFIG_ETHER_WAKE is not set
+# CONFIG_FAKEIDENTD is not set
+# CONFIG_FTPGET is not set
+# CONFIG_FTPPUT is not set
+# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
+CONFIG_HOSTNAME=y
+# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_WITHOUT_INETD is not set
+# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+# CONFIG_FEATURE_IFCONFIG_SLIP is not set
+# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
+CONFIG_FEATURE_IFCONFIG_HW=y
+# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
+CONFIG_IFUPDOWN=y
+# CONFIG_FEATURE_IFUPDOWN_IP is not set
+CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y
+CONFIG_FEATURE_IFUPDOWN_IPV4=y
+CONFIG_FEATURE_IFUPDOWN_IPV6=y
+# CONFIG_FEATURE_IFUPDOWN_IPX is not set
+# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
+# CONFIG_INETD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
+# CONFIG_FEATURE_INETD_RPC is not set
+# CONFIG_IP is not set
+# CONFIG_IPADDR is not set
+# CONFIG_IPLINK is not set
+# CONFIG_IPROUTE is not set
+# CONFIG_IPTUNNEL is not set
+# CONFIG_IPCALC is not set
+# CONFIG_FEATURE_IPCALC_FANCY is not set
+# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+# CONFIG_NAMEIF is not set
+CONFIG_NC=y
+# CONFIG_NC_GAPING_SECURITY_HOLE is not set
+CONFIG_NETSTAT=y
+CONFIG_NSLOOKUP=y
+CONFIG_PING=y
+CONFIG_FEATURE_FANCY_PING=y
+CONFIG_PING6=y
+CONFIG_FEATURE_FANCY_PING6=y
+CONFIG_ROUTE=y
+CONFIG_TELNET=y
+CONFIG_FEATURE_TELNET_TTYPE=y
+CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+# CONFIG_TELNETD is not set
+# CONFIG_FEATURE_TELNETD_INETD is not set
+CONFIG_TFTP=y
+CONFIG_FEATURE_TFTP_GET=y
+CONFIG_FEATURE_TFTP_PUT=y
+# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
+# CONFIG_DEBUG_TFTP is not set
+CONFIG_TRACEROUTE=y
+# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
+# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
+# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+
+#
+# udhcp Server/Client
+#
+# CONFIG_APP_UDHCPD is not set
+CONFIG_APP_UDHCPC=y
+CONFIG_APP_DUMPLEASES=y
+CONFIG_FEATURE_UDHCP_SYSLOG=y
+# CONFIG_FEATURE_UDHCP_DEBUG is not set
+# CONFIG_VCONFIG is not set
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+CONFIG_FEATURE_WGET_IP6_LITERAL=y
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+# CONFIG_ZCIP is not set
+
+#
+# Process Utilities
+#
+CONFIG_FREE=y
+CONFIG_FUSER=y
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+CONFIG_PIDOF=y
+# CONFIG_FEATURE_PIDOF_SINGLE is not set
+# CONFIG_FEATURE_PIDOF_OMIT is not set
+CONFIG_PS=y
+CONFIG_FEATURE_PS_WIDE=y
+CONFIG_RENICE=y
+CONFIG_BB_SYSCTL=y
+CONFIG_TOP=y
+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+CONFIG_UPTIME=y
+
+#
+# Shells
+#
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_LASH is not set
+# CONFIG_FEATURE_SH_IS_MSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+CONFIG_ASH=y
+
+#
+# Ash Shell Options
+#
+CONFIG_ASH_JOB_CONTROL=y
+# CONFIG_ASH_READ_NCHARS is not set
+# CONFIG_ASH_READ_TIMEOUT is not set
+CONFIG_ASH_ALIAS=y
+CONFIG_ASH_MATH_SUPPORT=y
+# CONFIG_ASH_MATH_SUPPORT_64 is not set
+CONFIG_ASH_GETOPTS=y
+# CONFIG_ASH_BUILTIN_ECHO is not set
+CONFIG_ASH_BUILTIN_TEST=y
+# CONFIG_ASH_CMDCMD is not set
+# CONFIG_ASH_MAIL is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+# CONFIG_ASH_RANDOM_SUPPORT is not set
+CONFIG_ASH_EXPAND_PRMT=y
+# CONFIG_HUSH is not set
+# CONFIG_LASH is not set
+# CONFIG_MSH is not set
+
+#
+# Bourne Shell Options
+#
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
+# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
+CONFIG_FEATURE_COMMAND_EDITING=y
+# CONFIG_FEATURE_COMMAND_EDITING_VI is not set
+CONFIG_FEATURE_COMMAND_HISTORY=63
+# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set
+CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
+# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set
+CONFIG_FEATURE_SH_FANCY_PROMPT=y
+
+#
+# System Logging Utilities
+#
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+CONFIG_FEATURE_REMOTE_LOG=y
+CONFIG_FEATURE_IPC_SYSLOG=y
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
+CONFIG_LOGREAD=y
+CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
+CONFIG_KLOGD=y
+CONFIG_LOGGER=y
diff --git a/packages/busybox/busybox-1.3.1/slugos/udhcpscript.patch b/packages/busybox/busybox-1.3.1/slugos/udhcpscript.patch
new file mode 100644
index 0000000000..dec6c18994
--- /dev/null
+++ b/packages/busybox/busybox-1.3.1/slugos/udhcpscript.patch
@@ -0,0 +1,133 @@
+--- busybox-1.00/.pc/udhcpscript.patch/examples/udhcp/simple.script	2004-10-13 00:18:05.000000000 -0700
++++ busybox-1.00/examples/udhcp/simple.script	2005-06-05 15:08:28.432605118 -0700
+@@ -1,40 +1,101 @@
+ #!/bin/sh
++# openslug UDHCP client script
++# this must set the HW address (MAC) on the interface
++#
++. /etc/default/functions
+ 
+-# udhcpc script edited by Tim Riker <Tim@Rikers.org>
+ 
+-[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1
++echodns(){
++	local dns
++	if test $# -gt 0
++	then
++		for dns in "$@"
++		do
++			echo "nameserver $dns"
++		done
++	fi
++}
++
++# Output the correct contents for resolv.conf
++mkresolv() {
++	test -n "$domain" && echo "search $domain"
++	echodns $dns
++}
++
++# checksum of a file (or stdin if -)
++md5strm() {
++	md5sum $1 2>/dev/null | sed -n 's/^\([0-9A-Za-z]*\).*$/\1/p'
++}
++
++bind() {
++	local B N metric i olddomain
++	B=
++	test -n "$broadcast" && B="broadcast $broadcast"
++	N=
++	test -n "$subnet" && N="netmask $subnet"
++	ifconfig "$interface" "$ip" $B $N up
++
++	# If given router information delete the old information and
++	# enter new stuff, routers get metrics incremented by 1
++	# between each (this is somewhat arbitrary)
++	if test -n "$router"
++	then
++		while route del default gw 0.0.0.0 dev $interface 2>/dev/null
++		do
++			:
++		done
+ 
+-RESOLV_CONF="/etc/resolv.conf"
+-[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
+-[ -n "$subnet" ] && NETMASK="netmask $subnet"
++		metric=0
++		for i in $router
++		do
++			route add default gw "$i" dev "$interface" metric $((metric++))
++		done
++	fi
++
++	olddomain=
++	test -r /etc/defaultdomain && olddomain="$(cat /etc/defaultdomain)"
++	if test -n "$domain" -a "$domain" != "$olddomain"
++	then
++		echo "$domain" >/etc/defaultdomain
++		# and update the kernel view too
++		echo "$domain" >/proc/sys/kernel/domainname
++	fi
++
++	# Update /etc/resolv.conf to reflect domain and dns information,
++	# this always clears resolv.conf if none is given
++	md5old="$(md5strm /etc/resolv.conf)"
++	md5new="$(mkresolv | md5strm -)"
++	test "$md5old" != "$md5new" && mkresolv >/etc/resolv.conf
++}
+ 
+ case "$1" in
+-	deconfig)
+-		/sbin/ifconfig $interface 0.0.0.0
+-		;;
+-
+-	renew|bound)
+-		/sbin/ifconfig $interface $ip $BROADCAST $NETMASK
+-
+-		if [ -n "$router" ] ; then
+-			echo "deleting routers"
+-			while route del default gw 0.0.0.0 dev $interface ; do
+-				:
+-			done
+-
+-			metric=0
+-			for i in $router ; do
+-				route add default gw $i dev $interface metric $((metric++))
+-			done
++deconfig)
++	# Bring the interface up (without inet at this point)
++	ifconfig "$interface" 0.0.0.0;;
++
++renew|bound)
++	bind;;
++
++leasefail)
++	# Pull the values from the config data if (only only if) this
++	# is the config interface
++	if test "$interface" = "$(config iface)"
++	then
++		ip="$(config ip)"
++		if test -n "$ip"
++		then
++			router="$(config gateway)"
++			subnet="$(config netmask)"
++			broadcast="$(config broadcast)"
++			domain="$(config domain)"
++			dns="$(config dns)"
++
++			bind
+ 		fi
++	fi;;
+ 
+-		echo -n > $RESOLV_CONF
+-		[ -n "$domain" ] && echo search $domain >> $RESOLV_CONF
+-		for i in $dns ; do
+-			echo adding dns $i
+-			echo nameserver $i >> $RESOLV_CONF
+-		done
+-		;;
++*)	echo "udhcpc: $*: unknown command" >&2
++	exit 1;;
+ esac
+ 
+ exit 0
diff --git a/packages/busybox/busybox-1.3.1/sparc/.mtn2git_empty b/packages/busybox/busybox-1.3.1/sparc/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/busybox/busybox-1.3.1/sparc/.mtn2git_empty
diff --git a/packages/busybox/busybox-1.3.1/udhcppidfile-breakage.patch b/packages/busybox/busybox-1.3.1/udhcppidfile-breakage.patch
new file mode 100644
index 0000000000..031274908b
--- /dev/null
+++ b/packages/busybox/busybox-1.3.1/udhcppidfile-breakage.patch
@@ -0,0 +1,57 @@
+--- busybox-1.00/networking/udhcp/common.c~udhcppidfile2
++++ busybox-1.00/networking/udhcp/common.c
+@@ -74,7 +74,7 @@
+ 
+ 	if (pid > 0) {
+ 		/* parent */
+-		if (pidfile_reassign(pidfile, pid) < 0) {
++		if (pidfile != NULL && pidfile_reassign(pidfile, pid) < 0) {
+ 			(void)kill(pid, SIGKILL);
+ 			exit(1);
+ 		} else
+@@ -119,7 +119,7 @@
+ 	sanitize_fds();
+ 
+ 	/* do some other misc startup stuff while we are here to save bytes */
+-	if (pidfile_acquire(pidfile) < 0)
++	if (pidfile != NULL && pidfile_acquire(pidfile) < 0)
+ 		exit(1);
+ 
+ 	/* equivelent of doing a fflush after every \n */
+@@ -166,7 +166,7 @@
+ 	sanitize_fds();
+ 
+ 	/* do some other misc startup stuff while we are here to save bytes */
+-	if (pidfile_acquire(pidfile) < 0)
++	if (pidfile != NULL && pidfile_acquire(pidfile) < 0)
+ 		exit(1);
+ 
+ 	/* equivelent of doing a fflush after every \n */
+--- busybox-1.00/networking/udhcp/pidfile.c~udhcppidfile2
++++ busybox-1.00/networking/udhcp/pidfile.c
+@@ -141,7 +141,11 @@
+ int pidfile_acquire(const char *pidfile)
+ {
+ 	int fd, result;
+-	if (!pidfile) return (-1);
++
++	if (pidfile == NULL) {
++		LOG(LOG_ERR, "pidfile_acquire: filename is NULL\n");
++		return (-1);
++	}
+ 
+ 	if ((fd = pidfile_open(pidfile)) < 0)
+ 		return (-1);
+@@ -170,7 +174,11 @@
+ int pidfile_reassign(const char *pidfile, int pid)
+ {
+ 	int fd, result;
+-	if (!pidfile) return (-1);
++
++	if (pidfile == NULL) {
++		LOG(LOG_ERR, "pidfile_reassign: filename is NULL\n");
++		return (-1);
++	}
+ 
+ 	if ((fd = pidfile_open(pidfile)) < 0)
+ 		return (-1);
diff --git a/packages/busybox/busybox-1.3.1/udhcppidfile.patch b/packages/busybox/busybox-1.3.1/udhcppidfile.patch
new file mode 100644
index 0000000000..b4b86b8775
--- /dev/null
+++ b/packages/busybox/busybox-1.3.1/udhcppidfile.patch
@@ -0,0 +1,274 @@
+Index: busybox-1.1.0/networking/udhcp/pidfile.h
+===================================================================
+--- busybox-1.1.0.orig/networking/udhcp/pidfile.h	2006-01-11 06:43:50.000000000 +0100
++++ busybox-1.1.0/networking/udhcp/pidfile.h	2006-03-14 17:15:45.000000000 +0100
+@@ -21,5 +21,5 @@
+ 
+ 
+ int pidfile_acquire(const char *pidfile);
+-void pidfile_write_release(int pid_fd);
++int pidfile_reassign(const char *pidfile, int newpid);
+ 
+Index: busybox-1.1.0/networking/udhcp/pidfile.c
+===================================================================
+--- busybox-1.1.0.orig/networking/udhcp/pidfile.c	2006-01-11 06:43:50.000000000 +0100
++++ busybox-1.1.0/networking/udhcp/pidfile.c	2006-03-14 17:15:45.000000000 +0100
+@@ -25,6 +25,7 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <errno.h>
+ 
+ #include "pidfile.h"
+ #include "common.h"
+@@ -37,39 +38,146 @@
+ }
+ 
+ 
+-int pidfile_acquire(const char *pidfile)
++static int pidfile_open(const char *pidfile)
+ {
+-	int pid_fd;
+-	if (!pidfile) return -1;
++	int fd;
+ 
+-	pid_fd = open(pidfile, O_CREAT | O_WRONLY, 0644);
+-	if (pid_fd < 0) {
+-		LOG(LOG_ERR, "Unable to open pidfile %s: %m\n", pidfile);
+-	} else {
+-		lockf(pid_fd, F_LOCK, 0);
+-		if (!saved_pidfile)
+-			atexit(pidfile_delete);
+-		saved_pidfile = (char *) pidfile;
++	if ((fd = open(pidfile, O_CREAT | O_RDWR, 0644)) < 0) {
++		LOG(LOG_ERR, "pidfile_open: open %s failed: %m\n", pidfile);
++		return (-1);
++	}
++
++	/* NOTE: lockf is not inherited by child after fork */
++	if (lockf(fd, F_LOCK, 0) < 0) {
++		LOG(LOG_ERR, "pidfile_open: lock %s failed: %m\n", pidfile);
++		close(fd);
++		return (-1);
++	}
++
++	return (fd);
++}
++
++
++static int pidfile_check(int fd, const char *pidfile)
++{
++	int len, pid;
++	char buf[20];
++
++	if (lseek(fd, 0L, SEEK_SET) < 0) {
++		LOG(LOG_ERR, "pidfile_check: lseek %s failed: %m\n", pidfile);
++		return (-1);
++	}
++
++	if ((len = read(fd, buf, sizeof buf - 1)) < 0) {
++		LOG(LOG_ERR, "pidfile_check: read %s failed: %m\n", pidfile);
++		return (-1);
++	}
++
++	if (len == 0)
++		return (0);
++
++	buf[len] = '\0';
++
++	if ((pid = atoi(buf)) <= 1) {
++		LOG(LOG_WARNING,
++			"pidfile_check: ignoring bogus pid (%s) in %s\n",
++			buf, pidfile);
++		return (0);
++	}
++
++	if (kill((pid_t)pid, 0) == 0) {
++		LOG(LOG_ERR, "pidfile_check: process %d exists (%s)\n",
++			pid, pidfile);
++		return (-1);
++	}
++
++	if (errno != ESRCH) {
++		LOG(LOG_ERR, "pidfile_check: kill %d failed (%s): %m\n",
++			pid, pidfile);
++		return (-1);
++	}
++
++	return (0);
++}
++
++
++static int pidfile_store(int fd, const char *pidfile, int pid)
++{
++	int len;
++	char buf[20];
++
++	if (lseek(fd, 0L, SEEK_SET) < 0) {
++		LOG(LOG_ERR, "pidfile_store: lseek %s failed: %m\n", pidfile);
++		return (-1);
++	}
++
++	len = snprintf(buf, sizeof buf - 1, "%d\n", pid);
++	buf[len] = '\0';
++
++	if (write(fd, buf, len) < 0) {
++		LOG(LOG_ERR, "pidfile_store: write %s failed: %m\n",
++			pidfile);
++		return (-1);
++	}
++
++	if (ftruncate(fd, len) < 0) {
++		LOG(LOG_ERR, "pidfile_store: ftruncate %d failed (%s): %m\n",
++			len, pidfile);
++		return (-1);
+ 	}
+ 
+-	return pid_fd;
++	return (0);
+ }
+ 
+ 
+-void pidfile_write_release(int pid_fd)
++static void pidfile_close(int fd)
+ {
+-	FILE *out;
++	(void)lseek(fd, 0L, SEEK_SET);
++	(void)lockf(fd, F_ULOCK, 0);
++	(void)close(fd);
++}
+ 
+-	if (pid_fd < 0) return;
+ 
+-	if ((out = fdopen(pid_fd, "w")) != NULL) {
+-		fprintf(out, "%d\n", getpid());
+-		fclose(out);
++int pidfile_acquire(const char *pidfile)
++{
++	int fd, result;
++	if (!pidfile) return (-1);
++
++	if ((fd = pidfile_open(pidfile)) < 0)
++		return (-1);
++
++	if ((result = pidfile_check(fd, pidfile)) == 0)
++		result = pidfile_store(fd, pidfile, getpid());
++
++	pidfile_close(fd);
++
++	if (result == 0) {
++		saved_pidfile = (char *) pidfile;
++		atexit(pidfile_delete);
+ 	}
+-	lockf(pid_fd, F_UNLCK, 0);
+-	close(pid_fd);
++
++	return (result);
+ }
+ 
+ 
++/*
++ * reassign the pid in a pidfile - used just after a fork so a parent
++ * can store the pid of its child into the file without any window
++ * where the pid in the file is a dead process (which might let another
++ * instance of the program start). Note the parent must use _exit() to
++ * avoid triggering the unlink scheduled above in pidfile_acquire()
++ */
++int pidfile_reassign(const char *pidfile, int pid)
++{
++	int fd, result;
++	if (!pidfile) return (-1);
++
++	if ((fd = pidfile_open(pidfile)) < 0)
++		return (-1);
+ 
++	result = pidfile_store(fd, pidfile, pid);
+ 
++	pidfile_close(fd);
++
++	return (result);
++}
+Index: busybox-1.1.0/networking/udhcp/common.c
+===================================================================
+--- busybox-1.1.0.orig/networking/udhcp/common.c	2006-01-11 06:43:50.000000000 +0100
++++ busybox-1.1.0/networking/udhcp/common.c	2006-03-14 17:15:45.000000000 +0100
+@@ -64,16 +64,34 @@
+ #ifdef __uClinux__
+ 	LOG(LOG_ERR, "Cannot background in uclinux (yet)");
+ #else /* __uClinux__ */
+-	int pid_fd;
++	int pid, fd;
+ 
+-	/* hold lock during fork. */
+-	pid_fd = pidfile_acquire(pidfile);
+-	if (daemon(0, 0) == -1) {
++	/* NOTE: lockf is not inherited by the child after fork */
++	if ((pid = fork()) < 0) {
+ 		perror("fork");
+ 		exit(1);
+ 	}
++
++	if (pid > 0) {
++		/* parent */
++		if (pidfile_reassign(pidfile, pid) < 0) {
++			(void)kill(pid, SIGKILL);
++			exit(1);
++		} else
++			_exit(0);
++	}
++
++	/* child */
++	(void)chdir("/");
++	if ((fd = open("/dev/null", O_RDWR)) >= 0) {
++		(void)dup2(fd, 0);
++		(void)dup2(fd, 1);
++		(void)dup2(fd, 2);
++		(void)close(fd);
++	}
++	(void)setsid();
++
+ 	daemonized++;
+-	pidfile_write_release(pid_fd);
+ #endif /* __uClinux__ */
+ }
+ 
+@@ -97,14 +115,12 @@
+ 
+ void start_log_and_pid(const char *client_server, const char *pidfile)
+ {
+-	int pid_fd;
+-
+ 	/* Make sure our syslog fd isn't overwritten */
+ 	sanitize_fds();
+ 
+ 	/* do some other misc startup stuff while we are here to save bytes */
+-	pid_fd = pidfile_acquire(pidfile);
+-	pidfile_write_release(pid_fd);
++	if (pidfile_acquire(pidfile) < 0)
++		exit(1);
+ 
+ 	/* equivelent of doing a fflush after every \n */
+ 	setlinebuf(stdout);
+@@ -150,8 +166,8 @@
+ 	sanitize_fds();
+ 
+ 	/* do some other misc startup stuff while we are here to save bytes */
+-	pid_fd = pidfile_acquire(pidfile);
+-	pidfile_write_release(pid_fd);
++	if (pidfile_acquire(pidfile) < 0)
++		exit(1);
+ 
+ 	/* equivelent of doing a fflush after every \n */
+ 	setlinebuf(stdout);
+Index: busybox-1.1.0/networking/udhcp/script.c
+===================================================================
+--- busybox-1.1.0.orig/networking/udhcp/script.c	2006-01-11 06:43:50.000000000 +0100
++++ busybox-1.1.0/networking/udhcp/script.c	2006-03-14 17:15:45.000000000 +0100
+@@ -229,6 +229,6 @@
+ 		execle(client_config.script, client_config.script,
+ 		       name, NULL, envp);
+ 		LOG(LOG_ERR, "script %s failed: %m", client_config.script);
+-		exit(1);
++		_exit(1);
+ 	}
+ }
diff --git a/packages/busybox/busybox-1.3.1/udhcpscript.patch b/packages/busybox/busybox-1.3.1/udhcpscript.patch
new file mode 100644
index 0000000000..fc21d440cd
--- /dev/null
+++ b/packages/busybox/busybox-1.3.1/udhcpscript.patch
@@ -0,0 +1,17 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- busybox-1.00-rc3/examples/udhcp/simple.script~udhcpscript
++++ busybox-1.00-rc3/examples/udhcp/simple.script
+@@ -17,8 +17,7 @@
+ 		/sbin/ifconfig $interface $ip $BROADCAST $NETMASK
+ 
+ 		if [ -n "$router" ] ; then
+-			echo "deleting routers"
+-			while route del default gw 0.0.0.0 dev $interface ; do
++			while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do
+ 				:
+ 			done
+ 
diff --git a/packages/busybox/busybox-1.3.1/wrt54/.mtn2git_empty b/packages/busybox/busybox-1.3.1/wrt54/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/busybox/busybox-1.3.1/wrt54/.mtn2git_empty
diff --git a/packages/busybox/busybox-1.3.1/xargs-double-size.patch b/packages/busybox/busybox-1.3.1/xargs-double-size.patch
new file mode 100644
index 0000000000..df64554ffc
--- /dev/null
+++ b/packages/busybox/busybox-1.3.1/xargs-double-size.patch
@@ -0,0 +1,13 @@
+--- busybox-1.2.1/findutils/xargs.c.org	2006-09-19 18:18:17.084592997 +0200
++++ busybox-1.2.1/findutils/xargs.c	2006-09-19 18:18:09.820275793 +0200
+@@ -466,8 +466,8 @@
+ 		   have it at 1 meg).  Things will work fine with a large ARG_MAX but it
+ 		   will probably hurt the system more than it needs to; an array of this
+ 		   size is allocated.  */
+-		if (orig_arg_max > 20 * 1024)
+-			orig_arg_max = 20 * 1024;
++		if (orig_arg_max > 40 * 1024)
++			orig_arg_max = 40 * 1024;
+ 		n_max_chars = orig_arg_max;
+ 	}
+ 	max_chars = xmalloc(n_max_chars);
diff --git a/packages/busybox/busybox_1.3.1.bb b/packages/busybox/busybox_1.3.1.bb
new file mode 100644
index 0000000000..b04cd86677
--- /dev/null
+++ b/packages/busybox/busybox_1.3.1.bb
@@ -0,0 +1,100 @@
+require busybox.inc
+
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_slugos = "1"
+
+SRC_URI = "file://defconfig"
+
+do_configure () {
+	install -m 0644 ${WORKDIR}/defconfig ${S}/.config.oe
+
+	echo "CROSS_COMPILER_PREFIX=\"${TARGET_PREFIX}\"" > ${S}/.config
+	echo "USING_CROSS_COMPILER=y" >> ${S}/.config
+
+	sed -e 	'/CROSS_COMPILER_PREFIX/d' \
+	    -e 	'/USING_CROSS_COMPILER/d' \
+		'${S}/.config.oe' >>'${S}/.config'
+	cml1_do_configure
+}
+
+do_install () {
+	install -d ${D}${sysconfdir}/init.d
+	oe_runmake "PREFIX=${D}" install
+	cp -pPR ${S}/_install/* ${D}/
+
+	# Move everything to /busybox (not supposed to end up in any package)
+	install -d ${D}/busybox
+	ls ${D} -R
+
+	cp -dPr ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ${D}/busybox/
+	# Move the busybox binary back to /bin
+	install -d ${D}${base_bindir}
+	mv ${D}/busybox${base_bindir}/busybox ${D}${base_bindir}/
+	# Move back the sh symlink
+	test -h ${D}/busybox${base_bindir}/sh && mv ${D}/busybox${base_bindir}/sh ${D}${base_bindir}/
+
+	install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/
+	install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/
+	if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then
+		# Move crond back to /usr/sbin/crond
+		install -d ${D}${sbindir}
+		mv ${D}/busybox${sbindir}/crond ${D}${sbindir}/
+
+		install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/
+	fi
+	if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then
+		# Move httpd back to /usr/sbin/httpd
+		install -d ${D}${sbindir}
+		mv ${D}/busybox${sbindir}/httpd ${D}${sbindir}/
+
+		install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/
+		install -d ${D}/srv/www
+	fi
+	if grep "CONFIG_APP_UDHCPD=y" ${WORKDIR}/defconfig; then
+		# Move udhcpd back to /usr/sbin/udhcpd
+		install -d ${D}${sbindir}
+		mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/
+
+		install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/
+	fi
+	if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then
+		# Move hwclock back to /sbin/hwclock
+		install -d ${D}${base_sbindir}
+		mv ${D}/busybox${base_sbindir}/hwclock ${D}${base_sbindir}/
+
+		install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
+	fi
+	if grep "CONFIG_APP_UDHCPC=y" ${WORKDIR}/defconfig; then
+		# Move dhcpc back to /usr/sbin/udhcpc
+		install -d ${D}${base_sbindir}
+		mv ${D}/busybox${base_sbindir}/udhcpc ${D}${base_sbindir}/
+
+		install -d ${D}${sysconfdir}/udhcpc.d
+		install -d ${D}${datadir}/udhcpc
+		install -m 0755 ${S}/examples/udhcp/simple.script ${D}${sysconfdir}/udhcpc.d/50default
+		install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script
+	fi
+
+	install -m 0644 ${S}/busybox.links ${D}${sysconfdir}
+}
+
+pkg_prerm_${PN} () {
+	# This is so you can make busybox commit suicide - removing busybox with no other packages
+	# providing its files, this will make update-alternatives work, but the update-rc.d part
+	# for syslog, httpd and/or udhcpd will fail if there is no other package providing sh
+	tmpdir=`mktemp -d /tmp/busyboxrm-XXXXXX`
+	ln -s /bin/busybox $tmpdir/[
+	ln -s /bin/busybox $tmpdir/test
+	ln -s /bin/busybox $tmpdir/head
+	ln -s /bin/busybox $tmpdir/sh
+	ln -s /bin/busybox $tmpdir/basename
+	ln -s /bin/busybox $tmpdir/echo
+	ln -s /bin/busybox $tmpdir/mv
+	ln -s /bin/busybox $tmpdir/ln
+	ln -s /bin/busybox $tmpdir/dirname
+	ln -s /bin/busybox $tmpdir/rm
+	ln -s /bin/busybox $tmpdir/sed
+	ln -s /bin/busybox $tmpdir/sort
+	export PATH=$PATH:$tmpdir
+	while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; bn=`basename $link`; sh /usr/bin/update-alternatives --remove $bn $to; done </etc/busybox.links
+}
diff --git a/packages/cppunit/cppunit_1.10.2.bb b/packages/cppunit/cppunit_1.10.2.bb
index def3c9d1f3..9949f020e2 100644
--- a/packages/cppunit/cppunit_1.10.2.bb
+++ b/packages/cppunit/cppunit_1.10.2.bb
@@ -11,6 +11,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/cppunit/cppunit-${PV}.tar.gz"
 
 inherit autotools
 
+CXXFLAGS_powerpc += "-lstdc++"
+
 do_stage () {
 	autotools_stage_includes
 	cd ./src/cppunit/.libs/
diff --git a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
index 14fb728304..e72253d4eb 100644
--- a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
+++ b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
@@ -1,7 +1,7 @@
 SECTION = "console/network"
 DEPENDS = "cyrus-sasl virtual/db"
 LICENSE = "BSD"
-PR = "r9"
+PR = "r10"
 DEPENDS += "install-native"
 
 SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-${PV}.tar.gz \
diff --git a/packages/cyrus-imapd/files/volatiles b/packages/cyrus-imapd/files/volatiles
index e0a55493b3..a95841c53c 100644
--- a/packages/cyrus-imapd/files/volatiles
+++ b/packages/cyrus-imapd/files/volatiles
@@ -1,63 +1,63 @@
-d cyrus mail 0755 /var/lib/cyrus
-d cyrus root 0755 /var/lib/cyrus/db
-d cyrus mail 0755 /var/lib/cyrus/proc
-d cyrus mail 0755 /var/lib/cyrus/sieve
+d cyrus mail 0755 /var/lib/cyrus none
+d cyrus root 0755 /var/lib/cyrus/db none
+d cyrus mail 0755 /var/lib/cyrus/proc none
+d cyrus mail 0755 /var/lib/cyrus/sieve none
 # if only i could: d cyrus mail 0755 /var/lib/cyrus/sieve/{a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z}
-d cyrus mail 0755 /var/lib/cyrus/sieve/a
-d cyrus mail 0755 /var/lib/cyrus/sieve/b
-d cyrus mail 0755 /var/lib/cyrus/sieve/c
-d cyrus mail 0755 /var/lib/cyrus/sieve/d
-d cyrus mail 0755 /var/lib/cyrus/sieve/e
-d cyrus mail 0755 /var/lib/cyrus/sieve/f
-d cyrus mail 0755 /var/lib/cyrus/sieve/g
-d cyrus mail 0755 /var/lib/cyrus/sieve/h
-d cyrus mail 0755 /var/lib/cyrus/sieve/i
-d cyrus mail 0755 /var/lib/cyrus/sieve/j
-d cyrus mail 0755 /var/lib/cyrus/sieve/k
-d cyrus mail 0755 /var/lib/cyrus/sieve/l
-d cyrus mail 0755 /var/lib/cyrus/sieve/m
-d cyrus mail 0755 /var/lib/cyrus/sieve/n
-d cyrus mail 0755 /var/lib/cyrus/sieve/o
-d cyrus mail 0755 /var/lib/cyrus/sieve/p
-d cyrus mail 0755 /var/lib/cyrus/sieve/q
-d cyrus mail 0755 /var/lib/cyrus/sieve/r
-d cyrus mail 0755 /var/lib/cyrus/sieve/s
-d cyrus mail 0755 /var/lib/cyrus/sieve/t
-d cyrus mail 0755 /var/lib/cyrus/sieve/u
-d cyrus mail 0755 /var/lib/cyrus/sieve/v
-d cyrus mail 0755 /var/lib/cyrus/sieve/w
-d cyrus mail 0755 /var/lib/cyrus/sieve/x
-d cyrus mail 0755 /var/lib/cyrus/sieve/y
-d cyrus mail 0755 /var/lib/cyrus/sieve/z
-d cyrus root 0755 /var/lib/cyrus/socket
-d cyrus mail 0755 /var/lib/cyrus/user
+d cyrus mail 0755 /var/lib/cyrus/sieve/a none
+d cyrus mail 0755 /var/lib/cyrus/sieve/b none
+d cyrus mail 0755 /var/lib/cyrus/sieve/c none
+d cyrus mail 0755 /var/lib/cyrus/sieve/d none
+d cyrus mail 0755 /var/lib/cyrus/sieve/e none
+d cyrus mail 0755 /var/lib/cyrus/sieve/f none
+d cyrus mail 0755 /var/lib/cyrus/sieve/g none
+d cyrus mail 0755 /var/lib/cyrus/sieve/h none
+d cyrus mail 0755 /var/lib/cyrus/sieve/i none
+d cyrus mail 0755 /var/lib/cyrus/sieve/j none
+d cyrus mail 0755 /var/lib/cyrus/sieve/k none
+d cyrus mail 0755 /var/lib/cyrus/sieve/l none
+d cyrus mail 0755 /var/lib/cyrus/sieve/m none
+d cyrus mail 0755 /var/lib/cyrus/sieve/n none
+d cyrus mail 0755 /var/lib/cyrus/sieve/o none
+d cyrus mail 0755 /var/lib/cyrus/sieve/p none
+d cyrus mail 0755 /var/lib/cyrus/sieve/q none
+d cyrus mail 0755 /var/lib/cyrus/sieve/r none
+d cyrus mail 0755 /var/lib/cyrus/sieve/s none
+d cyrus mail 0755 /var/lib/cyrus/sieve/t none
+d cyrus mail 0755 /var/lib/cyrus/sieve/u none
+d cyrus mail 0755 /var/lib/cyrus/sieve/v none
+d cyrus mail 0755 /var/lib/cyrus/sieve/w none
+d cyrus mail 0755 /var/lib/cyrus/sieve/x none
+d cyrus mail 0755 /var/lib/cyrus/sieve/y none
+d cyrus mail 0755 /var/lib/cyrus/sieve/z none
+d cyrus root 0755 /var/lib/cyrus/socket none
+d cyrus mail 0755 /var/lib/cyrus/user none
 # if only i could: d cyrus mail 0755 /var/lib/cyrus/user/{a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z}
-d cyrus mail 0755 /var/lib/cyrus/user/a
-d cyrus mail 0755 /var/lib/cyrus/user/b
-d cyrus mail 0755 /var/lib/cyrus/user/c
-d cyrus mail 0755 /var/lib/cyrus/user/d
-d cyrus mail 0755 /var/lib/cyrus/user/e
-d cyrus mail 0755 /var/lib/cyrus/user/f
-d cyrus mail 0755 /var/lib/cyrus/user/g
-d cyrus mail 0755 /var/lib/cyrus/user/h
-d cyrus mail 0755 /var/lib/cyrus/user/i
-d cyrus mail 0755 /var/lib/cyrus/user/j
-d cyrus mail 0755 /var/lib/cyrus/user/k
-d cyrus mail 0755 /var/lib/cyrus/user/l
-d cyrus mail 0755 /var/lib/cyrus/user/m
-d cyrus mail 0755 /var/lib/cyrus/user/n
-d cyrus mail 0755 /var/lib/cyrus/user/o
-d cyrus mail 0755 /var/lib/cyrus/user/p
-d cyrus mail 0755 /var/lib/cyrus/user/q
-d cyrus mail 0755 /var/lib/cyrus/user/r
-d cyrus mail 0755 /var/lib/cyrus/user/s
-d cyrus mail 0755 /var/lib/cyrus/user/t
-d cyrus mail 0755 /var/lib/cyrus/user/u
-d cyrus mail 0755 /var/lib/cyrus/user/v
-d cyrus mail 0755 /var/lib/cyrus/user/w
-d cyrus mail 0755 /var/lib/cyrus/user/x
-d cyrus mail 0755 /var/lib/cyrus/user/y
-d cyrus mail 0755 /var/lib/cyrus/user/z
-d root root 0755 /var/spool/cyrus
-d cyrus mail 0750 /var/spool/cyrus/mail
-d cyrus mail 0750 /var/spool/cyrus/news
+d cyrus mail 0755 /var/lib/cyrus/user/a none
+d cyrus mail 0755 /var/lib/cyrus/user/b none
+d cyrus mail 0755 /var/lib/cyrus/user/c none
+d cyrus mail 0755 /var/lib/cyrus/user/d none
+d cyrus mail 0755 /var/lib/cyrus/user/e none
+d cyrus mail 0755 /var/lib/cyrus/user/f none
+d cyrus mail 0755 /var/lib/cyrus/user/g none
+d cyrus mail 0755 /var/lib/cyrus/user/h none
+d cyrus mail 0755 /var/lib/cyrus/user/i none
+d cyrus mail 0755 /var/lib/cyrus/user/j none
+d cyrus mail 0755 /var/lib/cyrus/user/k none
+d cyrus mail 0755 /var/lib/cyrus/user/l none
+d cyrus mail 0755 /var/lib/cyrus/user/m none
+d cyrus mail 0755 /var/lib/cyrus/user/n none
+d cyrus mail 0755 /var/lib/cyrus/user/o none
+d cyrus mail 0755 /var/lib/cyrus/user/p none
+d cyrus mail 0755 /var/lib/cyrus/user/q none
+d cyrus mail 0755 /var/lib/cyrus/user/r none
+d cyrus mail 0755 /var/lib/cyrus/user/s none
+d cyrus mail 0755 /var/lib/cyrus/user/t none
+d cyrus mail 0755 /var/lib/cyrus/user/u none
+d cyrus mail 0755 /var/lib/cyrus/user/v none
+d cyrus mail 0755 /var/lib/cyrus/user/w none
+d cyrus mail 0755 /var/lib/cyrus/user/x none
+d cyrus mail 0755 /var/lib/cyrus/user/y none
+d cyrus mail 0755 /var/lib/cyrus/user/z none
+d root root 0755 /var/spool/cyrus none
+d cyrus mail 0750 /var/spool/cyrus/mail none
+d cyrus mail 0750 /var/spool/cyrus/news none
diff --git a/packages/dates/dates_0.2.bb b/packages/dates/dates_0.2.bb
new file mode 100755
index 0000000000..0870313df1
--- /dev/null
+++ b/packages/dates/dates_0.2.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Dates is a calendar application."
+SECTION = "x11"
+LICENSE = "LGPL"
+
+DEPENDS = "glib-2.0 gtk+ libglade eds-dbus"
+
+SRC_URI = "http://projects.o-hand.com/sources/dates/${P}.tar.gz"
+
+inherit autotools pkgconfig gtk-icon-cache
+
+FILES_${PN} += "${datadir}/pixmaps/dates.png"
+
diff --git a/packages/davfs2/davfs2_0.2.8.bb b/packages/davfs2/davfs2_0.2.8.bb
index ecb7034042..e49c4af424 100644
--- a/packages/davfs2/davfs2_0.2.8.bb
+++ b/packages/davfs2/davfs2_0.2.8.bb
@@ -6,7 +6,7 @@ DEPENDS = "neon-0.25.5"
 RDEPENDS_${PN} = "kernel-module-coda"
 LICENSE = "GPL"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/dav/${P}.tar.gz \
            file://Makefile.in.patch;patch=1 \
diff --git a/packages/davfs2/files/volatiles b/packages/davfs2/files/volatiles
index 51405429d1..169fda7c3d 100644
--- a/packages/davfs2/files/volatiles
+++ b/packages/davfs2/files/volatiles
@@ -1 +1 @@
-d root users 0775 /var/run/mount.davfs
+d root users 0775 /var/run/mount.davfs none
diff --git a/packages/eds/eds-dbus/fix-bindig-tool.patch b/packages/eds/eds-dbus/fix-bindig-tool.patch
new file mode 100644
index 0000000000..704df84f69
--- /dev/null
+++ b/packages/eds/eds-dbus/fix-bindig-tool.patch
@@ -0,0 +1,22 @@
+--- /tmp/Makefile.am	2007-01-16 13:56:57.000000000 +0100
++++ trunk/calendar/libecal-dbus/Makefile.am	2007-01-16 13:57:40.045251000 +0100
+@@ -64,7 +64,7 @@
+ 	dbus-binding-tool --mode=glib-server --output=$@ --prefix=$(subst -,_,$*) $^
+ 
+ %-bindings.h: ../libedata-cal-dbus/%.xml
+-	dbus-binding-tool --mode=glib-client --output=$@ $^
++	dbus-binding-tool --mode=glib-client --prefix= --output=$@ $^
+ 
+ BUILT_SOURCES = $(DBUS_GENERATED_H) $(MARSHAL_GENERATED)
+ CLEANFILES = $(BUILT_SOURCES)
+--- /tmp/Makefile.am	2007-01-16 14:05:49.000000000 +0100
++++ trunk/calendar/libedata-cal-dbus/Makefile.am	2007-01-16 14:06:15.865251000 +0100
+@@ -90,7 +90,7 @@
+ 	dbus-binding-tool --mode=glib-server --output=$@ --prefix=$(subst -,_,$*) $^
+ 
+ %-bindings.h: %.xml
+-	dbus-binding-tool --mode=glib-client --output=$@ $^
++	dbus-binding-tool --mode=glib-client --prefix= --output=$@ $^
+ 
+ 
+ DBUS_BINDINGS = e-data-cal-factory-bindings.h e-data-cal-bindings.h e-data-cal-view-bindings.h
diff --git a/packages/eds/eds-dbus_svn.bb b/packages/eds/eds-dbus_svn.bb
index b97ed984bc..79af6ae10d 100644
--- a/packages/eds/eds-dbus_svn.bb
+++ b/packages/eds/eds-dbus_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Evolution database backend server"
 HOMEPAGE = "http://projects.o-hand.com/eds"
 LICENSE = "LGPL"
-DEPENDS = "glib-2.0 gtk+ gconf dbus db gnome-common libglade virtual/libiconv zlib intltool"
+DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common libglade virtual/libiconv zlib intltool"
 
 PV = "1.4.0+svn${SRCDATE}"
 
@@ -11,7 +11,9 @@ SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \
            file://no_libedataserverui-20060126.patch;patch=1;maxdate=20061214 \
            file://no_libedataserverui.patch;patch=1;mindate=20061215 \
            file://disable_orbit.patch;patch=1;maxdate=20061214 \
+           file://fix-bindig-tool.patch;patch=1;maxdate=20061223 \
            file://iconv-detect.h"
+
 S = "${WORKDIR}/trunk"
 
 inherit autotools pkgconfig
diff --git a/packages/esound/esound-gpe_20070109.bb b/packages/esound/esound-gpe_20070109.bb
index e48108d530..0cf1e5bc23 100644
--- a/packages/esound/esound-gpe_20070109.bb
+++ b/packages/esound/esound-gpe_20070109.bb
@@ -7,7 +7,7 @@ PROVIDES += "esound"
 RPROVIDES += "esound"
 
 SRCDATE = "${PV}"
-SRC_URI = "svn://projects.linuxtogo.org/svn/gpe/trunk/extra/;module=esound;date=20070109 \
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpe/trunk/extra;module=esound;rev=8935 \
 	   file://audiofile-please.patch;patch=1 \
 	   file://configure.patch;patch=1"
 
diff --git a/packages/fftw/.mtn2git_empty b/packages/fftw/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/fftw/.mtn2git_empty
diff --git a/packages/fftw/fftw_3.1.2.bb b/packages/fftw/fftw_3.1.2.bb
new file mode 100644
index 0000000000..e6bc885b77
--- /dev/null
+++ b/packages/fftw/fftw_3.1.2.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "FFTW"
+SECTION =  "libs"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://www.fftw.org/fftw-${PV}.tar.gz"
+
+EXTRA_OECONF = "--disable-fortran --enable-single --enable-shared"
+
+inherit autotools pkgconfig
+
+do_stage () {
+        autotools_stage_all
+}
+
diff --git a/packages/flac/flac_1.1.2.bb b/packages/flac/flac_1.1.2.bb
index cdd96bbf2d..85ffc9beb9 100644
--- a/packages/flac/flac_1.1.2.bb
+++ b/packages/flac/flac_1.1.2.bb
@@ -31,6 +31,9 @@ do_configure () {
 	install -d ${S}/m4
 	install -m 0644 ${WORKDIR}/xmms.m4 ${S}/m4/
 	autotools_do_configure
+	# removes '-read-only-relocs' which is enabled for PowerPC builds.
+	# It makes the build fail, other archs are not affected. Fixes #1775.
+	sed -i 's/-Wl,-read_only_relocs,warning//g' src/libFLAC/Makefile
 }
 
 do_stage () {
diff --git a/packages/g15daemon/.mtn2git_empty b/packages/g15daemon/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/g15daemon/.mtn2git_empty
diff --git a/packages/g15daemon/g15daemon_1.2.6a.bb b/packages/g15daemon/g15daemon_1.2.6a.bb
new file mode 100644
index 0000000000..872d61d848
--- /dev/null
+++ b/packages/g15daemon/g15daemon_1.2.6a.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "G15daemon  takes control of the G15 keyboard, \
+allowing the use of all keys through the linux kernel uinput \
+device driver.  It  also controls  the use of the keyboard's \
+LCD display, allows multiple, simultaneous client applications \
+to connect, and gives  the  user the  ability to switch between \
+client apps at the press of a button."
+HOMEPAGE = "http://g15tools.sourceforge.net"
+LICENSE = "GPLv2"
+SECTION = "console/utils"
+PRIORITY = "optional"
+DEPENDS = "libdaemon libg15"
+RDEPENDS = "libg15"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/g15daemon/g15daemon-${PV}.tar.bz2"
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-build-docs"
+
diff --git a/packages/gnome/libgnomeui_2.16.0.bb b/packages/gnome/libgnomeui_2.16.1.bb
index 8f3e0a725c..8f3e0a725c 100644
--- a/packages/gnome/libgnomeui_2.16.0.bb
+++ b/packages/gnome/libgnomeui_2.16.1.bb
diff --git a/packages/gpe-beam/gpe-beam.inc b/packages/gpe-beam/gpe-beam.inc
new file mode 100644
index 0000000000..5ca6df0b03
--- /dev/null
+++ b/packages/gpe-beam/gpe-beam.inc
@@ -0,0 +1,5 @@
+DESCRIPTION = "GPE infrared communication applet"
+SECTION = "gpe"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib"
diff --git a/packages/gpe-beam/gpe-beam_0.2.3.bb b/packages/gpe-beam/gpe-beam_0.2.3.bb
index b009b10372..e5861f069a 100644
--- a/packages/gpe-beam/gpe-beam_0.2.3.bb
+++ b/packages/gpe-beam/gpe-beam_0.2.3.bb
@@ -1,7 +1,5 @@
-inherit gpe pkgconfig
-LICENSE = "GPL"
-DESCRIPTION = "GPE infrared communication applet"
-DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex"
+require ${PN}.inc
+
 RDEPENDS = "libopenobex-1.0-1"
-SECTION = "gpe"
-PRIORITY = "optional"
+
+inherit gpe pkgconfig
diff --git a/packages/gpe-beam/gpe-beam_0.2.6.bb b/packages/gpe-beam/gpe-beam_0.2.6.bb
index 71af4db7e6..89f8e8230a 100644
--- a/packages/gpe-beam/gpe-beam_0.2.6.bb
+++ b/packages/gpe-beam/gpe-beam_0.2.6.bb
@@ -1,12 +1,8 @@
-PR = "r1"
-
-inherit gpe
+require ${PN}.inc
 
-DESCRIPTION = "GPE infrared communication applet"
-DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib"
 RDEPENDS = "libopenobex-1.0-1 irda-utils"
-SECTION = "gpe"
-PRIORITY = "optional"
-LICENSE = "GPL"
+PR = "r1"
 
 SRC_URI += "file://vcard-send.patch;patch=1;pnum=0"
+
+inherit gpe
diff --git a/packages/gpe-beam/gpe-beam_0.2.7.bb b/packages/gpe-beam/gpe-beam_0.2.7.bb
index 51b99fcfc6..f19b64d933 100644
--- a/packages/gpe-beam/gpe-beam_0.2.7.bb
+++ b/packages/gpe-beam/gpe-beam_0.2.7.bb
@@ -1,12 +1,8 @@
-PR = "r1"
-
-inherit gpe
+require ${PN}.inc
 
-DESCRIPTION = "GPE infrared communication applet"
-DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib"
 RDEPENDS = "libopenobex-1.0-1 irda-utils"
-SECTION = "gpe"
-PRIORITY = "optional"
-LICENSE = "GPL"
+PR = "r1"
 
 SRC_URI += "file://decl.patch;patch=1;pnum=0"
+
+inherit gpe
diff --git a/packages/gpe-beam/gpe-beam_0.2.8.bb b/packages/gpe-beam/gpe-beam_0.2.8.bb
index f68b50341a..9795827aa8 100644
--- a/packages/gpe-beam/gpe-beam_0.2.8.bb
+++ b/packages/gpe-beam/gpe-beam_0.2.8.bb
@@ -1,12 +1,7 @@
-PR = "r0"
+require ${PN}.inc
 
-inherit gpe
-
-DESCRIPTION = "GPE infrared communication applet"
-DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib"
 RDEPENDS = "irda-utils"
-SECTION = "gpe"
-PRIORITY = "optional"
-LICENSE = "GPL"
 
 SRC_URI += "file://dbus-new-api.patch;patch=1"
+
+inherit gpe
diff --git a/packages/gpe-beam/gpe-beam_0.2.9.bb b/packages/gpe-beam/gpe-beam_0.2.9.bb
index 8275cf6c3a..b96bed4a2f 100644
--- a/packages/gpe-beam/gpe-beam_0.2.9.bb
+++ b/packages/gpe-beam/gpe-beam_0.2.9.bb
@@ -1,9 +1,6 @@
-DESCRIPTION = "GPE infrared communication applet"
-DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib"
+require ${PN}.inc
+
 RDEPENDS = "irda-utils"
-SECTION = "gpe"
-PRIORITY = "optional"
-LICENSE = "GPL"
 
 inherit gpe
 
diff --git a/packages/gpe-bootsplash/files/angstrom/splash-l.svg b/packages/gpe-bootsplash/files/angstrom/splash-l.svg
index 9aad9bbf6e..5af0402cb9 100644
--- a/packages/gpe-bootsplash/files/angstrom/splash-l.svg
+++ b/packages/gpe-bootsplash/files/angstrom/splash-l.svg
@@ -7,16 +7,16 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="841.88977pt"
    height="595.27557pt"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.43"
+   inkscape:version="0.43+0.44pre4"
    version="1.0"
-   sodipodi:docbase="/Users/koen/Projects/Ångström"
-   sodipodi:docname="angstrom-background.svg"
+   sodipodi:docbase="J:\"
+   sodipodi:docname="foo.svg"
    inkscape:export-filename="/Users/koen/Projects/Ångström/angstrom-background.png"
    inkscape:export-xdpi="55.049999"
    inkscape:export-ydpi="55.049999">
@@ -150,7 +150,7 @@
        fx="202.1609"
        fy="581.95923"
        r="161.44482"
-       gradientTransform="matrix(0.404735,2.39512e-7,-2.549551e-7,0.430831,83.00297,330.5175)"
+       gradientTransform="matrix(0.404735,2.39512e-7,-2.549551e-7,0.430831,83.00297,226.5175)"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -162,13 +162,13 @@
      inkscape:pageshadow="2"
      inkscape:zoom="0.57230612"
      inkscape:cx="596.83002"
-     inkscape:cy="32.789024"
+     inkscape:cy="104.03094"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      inkscape:window-width="989"
      inkscape:window-height="622"
-     inkscape:window-x="0"
-     inkscape:window-y="22" />
+     inkscape:window-x="121"
+     inkscape:window-y="262" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -205,24 +205,24 @@
        xml:space="preserve"
        style="font-size:66.54315948px;font-style:normal;font-weight:normal;fill:#3d74c0;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
        id="text2249"
-       y="813.42664"
+       y="709.42664"
        x="555.96344"><tspan
          id="tspan2251"
-         y="813.42664"
+         y="709.42664"
          x="555.96344"
          sodipodi:role="line">Embedded power</tspan></text>
     <path
        style="fill:url(#radialGradient3311);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 166.00737,492.46796 L 7.4907863,757.45093 L 322.15804,757.45093 L 166.00737,492.46796 z "
+       d="M 166.00737,388.46796 L 7.4907863,653.45093 L 322.15804,653.45093 L 166.00737,388.46796 z "
        id="path1449"
        sodipodi:nodetypes="cccc" />
     <path
        style="font-size:114.39354706px;font-style:normal;font-weight:normal;fill:#fb8900;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       d="M 331.08665,757.03785 L 316.38285,757.03785 L 316.38285,707.29524 C 316.38279,703.28042 316.14814,699.52625 315.67894,696.03274 C 315.2096,692.48722 314.34928,689.72373 313.09796,687.74229 C 311.79435,685.55245 309.91728,683.93606 307.46673,682.89317 C 305.01602,681.79829 301.83541,681.25082 297.92489,681.25073 C 293.90997,681.25082 289.71261,682.24148 285.3328,684.22278 C 280.95291,686.2042 276.75556,688.73305 272.74072,691.80931 L 272.74072,757.03785 L 258.03691,757.03785 L 258.03691,669.67541 L 272.74072,669.67541 L 272.74072,679.37364 C 277.3291,675.56742 282.07395,672.59538 286.97526,670.45752 C 291.87647,668.31982 296.90809,667.25092 302.07012,667.25083 C 311.50758,667.25092 318.70306,670.09262 323.65655,675.77592 C 328.60986,681.45938 331.08656,689.64552 331.08665,700.33438 L 331.08665,757.03785 M 430.57191,747.10497 C 430.57182,761.91304 427.20873,772.78446 420.48261,779.71925 C 413.75633,786.65399 403.40632,790.12136 389.43256,790.1214 C 384.79197,790.12136 380.25569,789.78245 375.82374,789.10466 C 371.44386,788.47892 367.11614,787.56647 362.84058,786.36725 L 362.84058,771.35058 L 363.62272,771.35058 C 366.02118,772.28912 369.82748,773.43622 375.04161,774.7919 C 380.25569,776.19969 385.46979,776.90361 390.68394,776.90362 C 395.68945,776.90361 399.83467,776.30399 403.11962,775.10475 C 406.40443,773.9055 408.95935,772.23698 410.78435,770.09921 C 412.60922,768.06569 413.91276,765.61506 414.69494,762.74732 C 415.47697,759.87954 415.86804,756.67288 415.86811,753.12726 L 415.86811,745.14969 C 411.43605,748.69529 407.18656,751.35448 403.11962,753.12726 C 399.10468,754.84792 393.9688,755.70825 387.71191,755.70825 C 377.28364,755.70825 368.99322,751.9541 362.84058,744.44577 C 356.74005,736.88532 353.68981,726.24855 353.68983,712.53541 C 353.68981,705.02713 354.73264,698.56165 356.81828,693.1389 C 358.95606,687.66414 361.84989,682.94539 365.4998,678.98259 C 368.88893,675.28065 373.00807,672.4129 377.85723,670.3793 C 382.70632,668.29374 387.52937,667.25092 392.3264,667.25083 C 397.38404,667.25092 401.60746,667.77235 404.99669,668.81508 C 408.43794,669.80585 412.06174,671.344 415.86811,673.42955 L 416.80667,669.67541 L 430.57191,669.67541 L 430.57191,747.10497 M 415.86811,733.02687 L 415.86811,685.39594 C 411.95746,683.62323 408.30757,682.37184 404.91847,681.64178 C 401.58139,680.85975 398.24437,680.46869 394.90739,680.46862 C 386.82548,680.46869 380.46426,683.18002 375.82374,688.60263 C 371.18314,694.02537 368.86288,701.89866 368.86289,712.22255 C 368.86288,722.02513 370.58353,729.45523 374.02485,734.51289 C 377.46613,739.5706 383.17559,742.09945 391.15322,742.09942 C 395.42873,742.09945 399.70432,741.29127 403.97994,739.67486 C 408.30757,738.00637 412.27031,735.79036 415.86811,733.02687 M 522.236,731.85368 C 522.23595,739.8313 518.92498,746.37502 512.30312,751.48481 C 505.7333,756.59466 496.73895,759.14957 485.3201,759.14957 C 478.85456,759.14957 472.91049,758.39354 467.48784,756.88143 C 462.11728,755.3172 457.60708,753.62261 453.95721,751.79768 L 453.95721,735.295 L 454.73932,735.295 C 459.37988,738.78848 464.54185,741.57803 470.22524,743.66366 C 475.90859,745.69718 481.35733,746.71392 486.57149,746.71391 C 493.03694,746.71392 498.09462,745.6711 501.74454,743.58544 C 505.39436,741.49982 507.2193,738.21493 507.21937,733.73077 C 507.2193,730.28948 506.22863,727.68243 504.24733,725.9096 C 502.26591,724.13684 498.4596,722.62475 492.82843,721.37333 C 490.74274,720.90409 488.00534,720.35662 484.6162,719.73088 C 481.27914,719.10522 478.22887,718.42741 475.46543,717.69737 C 467.80066,715.66392 462.35192,712.69187 459.11917,708.78124 C 455.93857,704.81856 454.34826,699.96946 454.34827,694.23387 C 454.34826,690.6362 455.07824,687.24702 456.5382,684.06636 C 458.05026,680.88582 460.31841,678.04412 463.34262,675.54128 C 466.26249,673.09073 469.96451,671.16151 474.44867,669.75361 C 478.98492,668.29374 484.04259,667.56378 489.62175,667.56368 C 494.8358,667.56378 500.10204,668.21554 505.42052,669.51898 C 510.79098,670.77044 515.24903,672.30861 518.79471,674.13348 L 518.79471,689.85402 L 518.01258,689.85402 C 514.25836,687.09061 509.69601,684.77031 504.32554,682.89317 C 498.95495,680.96403 493.6887,679.99942 488.52678,679.99934 C 483.15621,679.99942 478.61993,681.04225 474.91795,683.12781 C 471.21591,685.16137 469.3649,688.21164 469.36492,692.27857 C 469.3649,695.87638 470.48594,698.58772 472.72801,700.41259 C 474.91793,702.23759 478.4635,703.7236 483.3648,704.87065 C 486.07611,705.4964 489.10029,706.1221 492.43736,706.74773 C 495.82649,707.37349 498.6421,707.94702 500.88422,708.46839 C 507.71465,710.03269 512.98089,712.71794 516.68299,716.5242 C 520.38493,720.3827 522.23595,725.4925 522.236,731.85368 M 588.71596,756.25573 C 585.95242,756.98572 582.92825,757.58534 579.64339,758.0546 C 576.41061,758.52389 573.51678,758.75851 570.9619,758.75851 C 562.04573,758.75851 555.2674,756.36003 550.62686,751.56304 C 545.98629,746.76607 543.66601,739.07525 543.66602,728.49058 L 543.66602,682.03284 L 533.73313,682.03284 L 533.73313,669.67541 L 543.66602,669.67541 L 543.66602,644.56945 L 558.36982,644.56945 L 558.36982,669.67541 L 588.71596,669.67541 L 588.71596,682.03284 L 558.36982,682.03284 L 558.36982,721.84259 C 558.36979,726.43105 558.47406,730.02878 558.68269,732.6358 C 558.8912,735.19074 559.62118,737.58924 560.87259,739.83128 C 562.01966,741.91694 563.5839,743.4551 565.56529,744.44577 C 567.59877,745.38432 570.6751,745.85359 574.79428,745.85358 C 577.19271,745.85359 579.6955,745.51469 582.30261,744.83684 C 584.9096,744.10688 586.78669,743.50726 587.93384,743.03796 L 588.71596,743.03796 L 588.71596,756.25573 M 661.06174,685.7088 L 660.27962,685.7088 C 658.08963,685.18745 655.95184,684.82248 653.86627,684.61383 C 651.8327,684.35319 649.40813,684.22284 646.59257,684.22278 C 642.05625,684.22284 637.67641,685.2396 633.45301,687.27303 C 629.22954,689.25445 625.16254,691.83545 621.25198,695.01599 L 621.25198,757.03785 L 606.54819,757.03785 L 606.54819,669.67541 L 621.25198,669.67541 L 621.25198,682.58033 C 627.09175,677.88771 632.22766,674.57674 636.65969,672.64744 C 641.14379,670.66618 645.70611,669.67549 650.34674,669.67541 C 652.90159,669.67549 654.7526,669.75369 655.89977,669.91004 C 657.04681,670.0144 658.76746,670.24904 661.06174,670.61394 L 661.06174,685.7088 M 749.51916,713.39574 C 749.51908,727.63028 745.8692,738.86669 738.56953,747.10497 C 731.26969,755.34327 721.49325,759.46241 709.24014,759.46243 C 696.88266,759.46241 687.05407,755.34327 679.75433,747.10497 C 672.50671,738.86669 668.8829,727.63028 668.8829,713.39574 C 668.8829,699.16126 672.50671,687.92486 679.75433,679.68648 C 687.05407,671.39615 696.88266,667.25092 709.24014,667.25083 C 721.49325,667.25092 731.26969,671.39615 738.56953,679.68648 C 745.8692,687.92486 749.51908,699.16126 749.51916,713.39574 M 734.34608,713.39574 C 734.34601,702.08116 732.13002,693.68646 727.69809,688.21158 C 723.26603,682.68469 717.11339,679.92121 709.24014,679.92113 C 701.26251,679.92121 695.05773,682.68469 690.62576,688.21158 C 686.24589,693.68646 684.05594,702.08116 684.05597,713.39574 C 684.05594,724.34541 686.27196,732.6619 690.70397,738.34527 C 695.13594,743.97652 701.31465,746.79215 709.24014,746.79214 C 717.06125,746.79215 723.18783,744.00258 727.6199,738.42347 C 732.10396,732.79225 734.34601,724.44968 734.34608,713.39574 M 733.17291,655.04982 L 717.60879,655.04982 L 717.60879,639.79852 L 733.17291,639.79852 L 733.17291,655.04982 M 700.87149,655.04982 L 685.30736,655.04982 L 685.30736,639.79852 L 700.87149,639.79852 L 700.87149,655.04982 M 899.84206,757.03785 L 885.13827,757.03785 L 885.13827,707.29524 C 885.13814,703.5411 884.95566,699.91729 884.59078,696.4238 C 884.27781,692.9304 883.5739,690.14087 882.47907,688.05514 C 881.2797,685.81313 879.55903,684.11856 877.3171,682.97139 C 875.07491,681.82436 871.84216,681.25082 867.61885,681.25073 C 863.49959,681.25082 859.38045,682.29363 855.2614,684.37919 C 851.14215,686.41277 847.02301,689.01983 842.90396,692.20035 C 843.0603,693.39968 843.19063,694.80748 843.29501,696.4238 C 843.39919,697.9881 843.45134,699.55232 843.45143,701.11649 L 843.45143,757.03785 L 828.74763,757.03785 L 828.74763,707.29524 C 828.74757,703.43684 828.56507,699.78697 828.20015,696.34559 C 827.88724,692.85221 827.18334,690.06264 826.08843,687.97693 C 824.88912,685.73495 823.16846,684.06642 820.92647,682.97139 C 818.68433,681.82436 815.45159,681.25082 811.22823,681.25073 C 807.21332,681.25082 803.17236,682.24148 799.10541,684.22278 C 795.0905,686.2042 791.07564,688.73305 787.0608,691.80931 L 787.0608,757.03785 L 772.357,757.03785 L 772.357,669.67541 L 787.0608,669.67541 L 787.0608,679.37364 C 791.64918,675.56742 796.21153,672.59538 800.74784,670.45752 C 805.33623,668.31982 810.21143,667.25092 815.37344,667.25083 C 821.31745,667.25092 826.34907,668.50231 830.46829,671.00501 C 834.6395,673.50785 837.74191,676.97524 839.77548,681.40713 C 845.71948,676.40168 851.14215,672.80396 856.04351,670.61394 C 860.94467,668.37196 866.18487,667.25092 871.76407,667.25083 C 881.3579,667.25092 888.42303,670.17083 892.95943,676.01055 C 897.54771,681.79829 899.84193,689.90623 899.84206,700.33438 L 899.84206,757.03785"
+       d="M 331.08665,653.03785 L 316.38285,653.03785 L 316.38285,603.29524 C 316.38279,599.28042 316.14814,595.52625 315.67894,592.03274 C 315.2096,588.48722 314.34928,585.72373 313.09796,583.74229 C 311.79435,581.55245 309.91728,579.93606 307.46673,578.89317 C 305.01602,577.79829 301.83541,577.25082 297.92489,577.25073 C 293.90997,577.25082 289.71261,578.24148 285.3328,580.22278 C 280.95291,582.2042 276.75556,584.73305 272.74072,587.80931 L 272.74072,653.03785 L 258.03691,653.03785 L 258.03691,565.67541 L 272.74072,565.67541 L 272.74072,575.37364 C 277.3291,571.56742 282.07395,568.59538 286.97526,566.45752 C 291.87647,564.31982 296.90809,563.25092 302.07012,563.25083 C 311.50758,563.25092 318.70306,566.09262 323.65655,571.77592 C 328.60986,577.45938 331.08656,585.64552 331.08665,596.33438 L 331.08665,653.03785 M 430.57191,643.10497 C 430.57182,657.91304 427.20873,668.78446 420.48261,675.71925 C 413.75633,682.65399 403.40632,686.12136 389.43256,686.1214 C 384.79197,686.12136 380.25569,685.78245 375.82374,685.10466 C 371.44386,684.47892 367.11614,683.56647 362.84058,682.36725 L 362.84058,667.35058 L 363.62272,667.35058 C 366.02118,668.28912 369.82748,669.43622 375.04161,670.7919 C 380.25569,672.19969 385.46979,672.90361 390.68394,672.90362 C 395.68945,672.90361 399.83467,672.30399 403.11962,671.10475 C 406.40443,669.9055 408.95935,668.23698 410.78435,666.09921 C 412.60922,664.06569 413.91276,661.61506 414.69494,658.74732 C 415.47697,655.87954 415.86804,652.67288 415.86811,649.12726 L 415.86811,641.14969 C 411.43605,644.69529 407.18656,647.35448 403.11962,649.12726 C 399.10468,650.84792 393.9688,651.70825 387.71191,651.70825 C 377.28364,651.70825 368.99322,647.9541 362.84058,640.44577 C 356.74005,632.88532 353.68981,622.24855 353.68983,608.53541 C 353.68981,601.02713 354.73264,594.56165 356.81828,589.1389 C 358.95606,583.66414 361.84989,578.94539 365.4998,574.98259 C 368.88893,571.28065 373.00807,568.4129 377.85723,566.3793 C 382.70632,564.29374 387.52937,563.25092 392.3264,563.25083 C 397.38404,563.25092 401.60746,563.77235 404.99669,564.81508 C 408.43794,565.80585 412.06174,567.344 415.86811,569.42955 L 416.80667,565.67541 L 430.57191,565.67541 L 430.57191,643.10497 M 415.86811,629.02687 L 415.86811,581.39594 C 411.95746,579.62323 408.30757,578.37184 404.91847,577.64178 C 401.58139,576.85975 398.24437,576.46869 394.90739,576.46862 C 386.82548,576.46869 380.46426,579.18002 375.82374,584.60263 C 371.18314,590.02537 368.86288,597.89866 368.86289,608.22255 C 368.86288,618.02513 370.58353,625.45523 374.02485,630.51289 C 377.46613,635.5706 383.17559,638.09945 391.15322,638.09942 C 395.42873,638.09945 399.70432,637.29127 403.97994,635.67486 C 408.30757,634.00637 412.27031,631.79036 415.86811,629.02687 M 522.236,627.85368 C 522.23595,635.8313 518.92498,642.37502 512.30312,647.48481 C 505.7333,652.59466 496.73895,655.14957 485.3201,655.14957 C 478.85456,655.14957 472.91049,654.39354 467.48784,652.88143 C 462.11728,651.3172 457.60708,649.62261 453.95721,647.79768 L 453.95721,631.295 L 454.73932,631.295 C 459.37988,634.78848 464.54185,637.57803 470.22524,639.66366 C 475.90859,641.69718 481.35733,642.71392 486.57149,642.71391 C 493.03694,642.71392 498.09462,641.6711 501.74454,639.58544 C 505.39436,637.49982 507.2193,634.21493 507.21937,629.73077 C 507.2193,626.28948 506.22863,623.68243 504.24733,621.9096 C 502.26591,620.13684 498.4596,618.62475 492.82843,617.37333 C 490.74274,616.90409 488.00534,616.35662 484.6162,615.73088 C 481.27914,615.10522 478.22887,614.42741 475.46543,613.69737 C 467.80066,611.66392 462.35192,608.69187 459.11917,604.78124 C 455.93857,600.81856 454.34826,595.96946 454.34827,590.23387 C 454.34826,586.6362 455.07824,583.24702 456.5382,580.06636 C 458.05026,576.88582 460.31841,574.04412 463.34262,571.54128 C 466.26249,569.09073 469.96451,567.16151 474.44867,565.75361 C 478.98492,564.29374 484.04259,563.56378 489.62175,563.56368 C 494.8358,563.56378 500.10204,564.21554 505.42052,565.51898 C 510.79098,566.77044 515.24903,568.30861 518.79471,570.13348 L 518.79471,585.85402 L 518.01258,585.85402 C 514.25836,583.09061 509.69601,580.77031 504.32554,578.89317 C 498.95495,576.96403 493.6887,575.99942 488.52678,575.99934 C 483.15621,575.99942 478.61993,577.04225 474.91795,579.12781 C 471.21591,581.16137 469.3649,584.21164 469.36492,588.27857 C 469.3649,591.87638 470.48594,594.58772 472.72801,596.41259 C 474.91793,598.23759 478.4635,599.7236 483.3648,600.87065 C 486.07611,601.4964 489.10029,602.1221 492.43736,602.74773 C 495.82649,603.37349 498.6421,603.94702 500.88422,604.46839 C 507.71465,606.03269 512.98089,608.71794 516.68299,612.5242 C 520.38493,616.3827 522.23595,621.4925 522.236,627.85368 M 588.71596,652.25573 C 585.95242,652.98572 582.92825,653.58534 579.64339,654.0546 C 576.41061,654.52389 573.51678,654.75851 570.9619,654.75851 C 562.04573,654.75851 555.2674,652.36003 550.62686,647.56304 C 545.98629,642.76607 543.66601,635.07525 543.66602,624.49058 L 543.66602,578.03284 L 533.73313,578.03284 L 533.73313,565.67541 L 543.66602,565.67541 L 543.66602,540.56945 L 558.36982,540.56945 L 558.36982,565.67541 L 588.71596,565.67541 L 588.71596,578.03284 L 558.36982,578.03284 L 558.36982,617.84259 C 558.36979,622.43105 558.47406,626.02878 558.68269,628.6358 C 558.8912,631.19074 559.62118,633.58924 560.87259,635.83128 C 562.01966,637.91694 563.5839,639.4551 565.56529,640.44577 C 567.59877,641.38432 570.6751,641.85359 574.79428,641.85358 C 577.19271,641.85359 579.6955,641.51469 582.30261,640.83684 C 584.9096,640.10688 586.78669,639.50726 587.93384,639.03796 L 588.71596,639.03796 L 588.71596,652.25573 M 661.06174,581.7088 L 660.27962,581.7088 C 658.08963,581.18745 655.95184,580.82248 653.86627,580.61383 C 651.8327,580.35319 649.40813,580.22284 646.59257,580.22278 C 642.05625,580.22284 637.67641,581.2396 633.45301,583.27303 C 629.22954,585.25445 625.16254,587.83545 621.25198,591.01599 L 621.25198,653.03785 L 606.54819,653.03785 L 606.54819,565.67541 L 621.25198,565.67541 L 621.25198,578.58033 C 627.09175,573.88771 632.22766,570.57674 636.65969,568.64744 C 641.14379,566.66618 645.70611,565.67549 650.34674,565.67541 C 652.90159,565.67549 654.7526,565.75369 655.89977,565.91004 C 657.04681,566.0144 658.76746,566.24904 661.06174,566.61394 L 661.06174,581.7088 M 749.51916,609.39574 C 749.51908,623.63028 745.8692,634.86669 738.56953,643.10497 C 731.26969,651.34327 721.49325,655.46241 709.24014,655.46243 C 696.88266,655.46241 687.05407,651.34327 679.75433,643.10497 C 672.50671,634.86669 668.8829,623.63028 668.8829,609.39574 C 668.8829,595.16126 672.50671,583.92486 679.75433,575.68648 C 687.05407,567.39615 696.88266,563.25092 709.24014,563.25083 C 721.49325,563.25092 731.26969,567.39615 738.56953,575.68648 C 745.8692,583.92486 749.51908,595.16126 749.51916,609.39574 M 734.34608,609.39574 C 734.34601,598.08116 732.13002,589.68646 727.69809,584.21158 C 723.26603,578.68469 717.11339,575.92121 709.24014,575.92113 C 701.26251,575.92121 695.05773,578.68469 690.62576,584.21158 C 686.24589,589.68646 684.05594,598.08116 684.05597,609.39574 C 684.05594,620.34541 686.27196,628.6619 690.70397,634.34527 C 695.13594,639.97652 701.31465,642.79215 709.24014,642.79214 C 717.06125,642.79215 723.18783,640.00258 727.6199,634.42347 C 732.10396,628.79225 734.34601,620.44968 734.34608,609.39574 M 733.17291,551.04982 L 717.60879,551.04982 L 717.60879,535.79852 L 733.17291,535.79852 L 733.17291,551.04982 M 700.87149,551.04982 L 685.30736,551.04982 L 685.30736,535.79852 L 700.87149,535.79852 L 700.87149,551.04982 M 899.84206,653.03785 L 885.13827,653.03785 L 885.13827,603.29524 C 885.13814,599.5411 884.95566,595.91729 884.59078,592.4238 C 884.27781,588.9304 883.5739,586.14087 882.47907,584.05514 C 881.2797,581.81313 879.55903,580.11856 877.3171,578.97139 C 875.07491,577.82436 871.84216,577.25082 867.61885,577.25073 C 863.49959,577.25082 859.38045,578.29363 855.2614,580.37919 C 851.14215,582.41277 847.02301,585.01983 842.90396,588.20035 C 843.0603,589.39968 843.19063,590.80748 843.29501,592.4238 C 843.39919,593.9881 843.45134,595.55232 843.45143,597.11649 L 843.45143,653.03785 L 828.74763,653.03785 L 828.74763,603.29524 C 828.74757,599.43684 828.56507,595.78697 828.20015,592.34559 C 827.88724,588.85221 827.18334,586.06264 826.08843,583.97693 C 824.88912,581.73495 823.16846,580.06642 820.92647,578.97139 C 818.68433,577.82436 815.45159,577.25082 811.22823,577.25073 C 807.21332,577.25082 803.17236,578.24148 799.10541,580.22278 C 795.0905,582.2042 791.07564,584.73305 787.0608,587.80931 L 787.0608,653.03785 L 772.357,653.03785 L 772.357,565.67541 L 787.0608,565.67541 L 787.0608,575.37364 C 791.64918,571.56742 796.21153,568.59538 800.74784,566.45752 C 805.33623,564.31982 810.21143,563.25092 815.37344,563.25083 C 821.31745,563.25092 826.34907,564.50231 830.46829,567.00501 C 834.6395,569.50785 837.74191,572.97524 839.77548,577.40713 C 845.71948,572.40168 851.14215,568.80396 856.04351,566.61394 C 860.94467,564.37196 866.18487,563.25092 871.76407,563.25083 C 881.3579,563.25092 888.42303,566.17083 892.95943,572.01055 C 897.54771,577.79829 899.84193,585.90623 899.84206,596.33438 L 899.84206,653.03785"
        id="text1367" />
     <path
        style="font-size:191.88253784px;font-style:normal;font-weight:normal;fill:#fb8900;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       d="M 235.46782,757.54586 L 213.81376,757.54586 L 198.62512,714.95612 L 132.94458,714.95612 L 117.75596,757.54586 L 97.128158,757.54586 L 150.39096,613.15128 C 144.30178,610.14107 139.40997,605.9334 135.71549,600.52828 C 132.08933,595.05507 130.27628,588.82912 130.27632,581.85038 C 130.27628,572.0669 133.76555,563.85683 140.74414,557.22018 C 147.72266,550.58391 156.20638,547.26568 166.19536,547.26546 C 176.25261,547.26568 184.73633,550.58391 191.64658,557.22018 C 198.62502,563.85683 202.11431,572.0669 202.11442,581.85038 C 202.11431,588.69227 200.30124,594.91824 196.67524,600.52828 C 193.11745,606.07024 188.29404,610.2779 182.20499,613.15128 L 235.46782,757.54586 M 186.72052,582.05564 C 186.72044,576.17193 184.77056,571.28011 180.87085,567.38014 C 176.97098,563.41213 172.07916,561.42804 166.19536,561.42783 C 160.31141,561.42804 155.41958,563.41213 151.51985,567.38014 C 147.62002,571.34852 145.67014,576.24035 145.67018,582.05564 C 145.67014,587.93968 147.62002,592.86573 151.51985,596.83376 C 155.48799,600.73369 160.37982,602.68359 166.19536,602.68344 C 172.07916,602.68359 176.97098,600.73369 180.87085,596.83376 C 184.77056,592.86573 186.72044,587.93968 186.72052,582.05564 M 192.26233,697.50973 L 165.78485,624.13223 L 139.20476,697.50973 L 192.26233,697.50973"
+       d="M 235.46782,653.54586 L 213.81376,653.54586 L 198.62512,610.95612 L 132.94458,610.95612 L 117.75596,653.54586 L 97.128158,653.54586 L 150.39096,509.15128 C 144.30178,506.14107 139.40997,501.9334 135.71549,496.52828 C 132.08933,491.05507 130.27628,484.82912 130.27632,477.85038 C 130.27628,468.0669 133.76555,459.85683 140.74414,453.22018 C 147.72266,446.58391 156.20638,443.26568 166.19536,443.26546 C 176.25261,443.26568 184.73633,446.58391 191.64658,453.22018 C 198.62502,459.85683 202.11431,468.0669 202.11442,477.85038 C 202.11431,484.69227 200.30124,490.91824 196.67524,496.52828 C 193.11745,502.07024 188.29404,506.2779 182.20499,509.15128 L 235.46782,653.54586 M 186.72052,478.05564 C 186.72044,472.17193 184.77056,467.28011 180.87085,463.38014 C 176.97098,459.41213 172.07916,457.42804 166.19536,457.42783 C 160.31141,457.42804 155.41958,459.41213 151.51985,463.38014 C 147.62002,467.34852 145.67014,472.24035 145.67018,478.05564 C 145.67014,483.93968 147.62002,488.86573 151.51985,492.83376 C 155.48799,496.73369 160.37982,498.68359 166.19536,498.68344 C 172.07916,498.68359 176.97098,496.73369 180.87085,492.83376 C 184.77056,488.86573 186.72044,483.93968 186.72052,478.05564 M 192.26233,593.50973 L 165.78485,520.13223 L 139.20476,593.50973 L 192.26233,593.50973"
        id="text1330" />
   </g>
 </svg>
diff --git a/packages/gpe-bootsplash/files/angstrom/splash-p.svg b/packages/gpe-bootsplash/files/angstrom/splash-p.svg
new file mode 100644
index 0000000000..45383e2072
--- /dev/null
+++ b/packages/gpe-bootsplash/files/angstrom/splash-p.svg
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448"
+   height="1052.3622"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.43+0.44pre4"
+   version="1.0"
+   sodipodi:docbase="j:\"
+   sodipodi:docname="foo.svg"
+   inkscape:export-filename="/Users/koen/Projects/Ångström/angstrom-background.png"
+   inkscape:export-xdpi="55.049999"
+   inkscape:export-ydpi="55.049999">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3283">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3285" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop3287" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2374">
+      <stop
+         style="stop-color:#fbda93;stop-opacity:1;"
+         offset="0"
+         id="stop2376" />
+      <stop
+         style="stop-color:#bb7b25;stop-opacity:0.93814433;"
+         offset="1"
+         id="stop2378" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2366">
+      <stop
+         style="stop-color:#d4950e;stop-opacity:1;"
+         offset="0"
+         id="stop2368" />
+      <stop
+         style="stop-color:#f2ce3a;stop-opacity:1;"
+         offset="1"
+         id="stop2370" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2344">
+      <stop
+         style="stop-color:#616161;stop-opacity:1;"
+         offset="0"
+         id="stop2346" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.6082474;"
+         offset="1"
+         id="stop2348" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2324">
+      <stop
+         style="stop-color:#a16c25;stop-opacity:0;"
+         offset="0"
+         id="stop2326" />
+      <stop
+         style="stop-color:#a16c25;stop-opacity:0.7525773;"
+         offset="1"
+         id="stop2328" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4005">
+      <stop
+         style="stop-color:#faff8b;stop-opacity:1;"
+         offset="0"
+         id="stop4007" />
+      <stop
+         style="stop-color:#ffda89;stop-opacity:0;"
+         offset="1"
+         id="stop4009" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8471">
+      <stop
+         id="stop8479"
+         offset="0"
+         style="stop-color:#cbd0e5;stop-opacity:0.98039216;" />
+      <stop
+         style="stop-color:#2b469d;stop-opacity:0.96078432;"
+         offset="1"
+         id="stop8475" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8447">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop8449" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop8451" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6662">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop6664" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop6666" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6662"
+       id="linearGradient6668"
+       x1="69.1875"
+       y1="721.51025"
+       x2="1115.5"
+       y2="721.51025"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(9.437349e-7,-8.924495e-6)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4005"
+       id="linearGradient4015"
+       x1="73.751465"
+       y1="619.28882"
+       x2="205.8764"
+       y2="619.28882"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2374"
+       id="radialGradient3311"
+       cx="202.1609"
+       cy="581.95923"
+       fx="202.1609"
+       fy="581.95923"
+       r="161.44482"
+       gradientTransform="matrix(0.281574,1.666278e-7,-1.773716e-7,0.299729,-4.54534,519.7451)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.57230612"
+     inkscape:cx="596.83002"
+     inkscape:cy="549.6484"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="1280"
+     inkscape:window-height="968"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     id="layer1"
+     inkscape:groupmode="layer">
+    <text
+       xml:space="preserve"
+       style="font-size:46.29391098px;font-style:normal;font-weight:normal;fill:#3d74c0;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       id="text2249"
+       y="855.70374"
+       x="324.49207"><tspan
+         id="tspan2251"
+         y="855.70374"
+         x="324.49207"
+         sodipodi:role="line">Embedded power</tspan></text>
+    <path
+       style="fill:url(#radialGradient3311);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 53.20061,632.41367 L -57.078981,816.76166 L 161.83424,816.76166 L 53.20061,632.41367 z "
+       id="path1449"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="font-size:114.39354706px;font-style:normal;font-weight:normal;fill:#fb8900;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       d="M 168.04585,816.47428 L 157.81645,816.47428 L 157.81645,781.86847 C 157.81641,779.07537 157.65318,776.4636 157.32676,774.03318 C 157.00023,771.56658 156.40171,769.64402 155.53116,768.26553 C 154.62426,766.74206 153.31838,765.61755 151.61353,764.89201 C 149.90859,764.13031 147.69584,763.74944 144.9753,763.74937 C 142.18213,763.74944 139.26203,764.43865 136.21502,765.81703 C 133.16794,767.19549 130.24785,768.9548 127.45474,771.09495 L 127.45474,816.47428 L 117.22533,816.47428 L 117.22533,755.69645 L 127.45474,755.69645 L 127.45474,762.44348 C 130.64687,759.79551 133.94785,757.72787 137.35768,756.24056 C 140.76743,754.75337 144.26791,754.00975 147.85913,754.00969 C 154.42475,754.00975 159.43062,755.98671 162.87675,759.94056 C 166.32276,763.89453 168.04579,769.58962 168.04585,777.02582 L 168.04585,816.47428 M 237.25751,809.56401 C 237.25745,819.86595 234.91776,827.42917 230.23841,832.25369 C 225.55894,837.07816 218.35847,839.49041 208.63696,839.49044 C 205.4085,839.49041 202.25264,839.25461 199.16933,838.78308 C 196.12226,838.34776 193.11148,837.71297 190.13698,836.87868 L 190.13698,826.43162 L 190.68112,826.43162 C 192.34973,827.08456 194.99776,827.8826 198.6252,828.82574 C 202.25264,829.80513 205.88007,830.29486 209.50755,830.29487 C 212.98986,830.29486 215.87368,829.8777 218.15902,829.04338 C 220.44424,828.20907 222.22171,827.04829 223.49134,825.56104 C 224.76091,824.14633 225.66778,822.44143 226.21194,820.44635 C 226.75599,818.45124 227.02805,816.22039 227.0281,813.7537 L 227.0281,808.20373 C 223.94474,810.67039 220.98837,812.52037 218.15902,813.7537 C 215.36584,814.95075 211.79281,815.54928 207.43991,815.54928 C 200.18498,815.54928 194.41736,812.93753 190.13698,807.71402 C 185.89287,802.45422 183.77082,795.05424 183.77083,785.51405 C 183.77082,780.29055 184.49631,775.79253 185.94729,772.01994 C 187.43453,768.21117 189.44776,764.92834 191.987,762.17144 C 194.34481,759.59601 197.21049,757.60092 200.58404,756.18614 C 203.95753,754.73523 207.31291,754.00975 210.65019,754.00969 C 214.16878,754.00975 217.10702,754.3725 219.46489,755.09793 C 221.85896,755.78719 224.38003,756.85729 227.0281,758.3082 L 227.68106,755.69645 L 237.25751,755.69645 L 237.25751,809.56401 M 227.0281,799.76991 L 227.0281,766.63319 C 224.30748,765.39992 221.76826,764.52933 219.41046,764.02142 C 217.08888,763.47738 214.76732,763.20531 212.44578,763.20527 C 206.82322,763.20531 202.39774,765.09157 199.16933,768.86408 C 195.94088,772.63666 194.32669,778.11408 194.3267,785.29638 C 194.32669,792.11602 195.52373,797.28513 197.91786,800.80372 C 200.31195,804.32236 204.284,806.08168 209.83403,806.08166 C 212.80849,806.08168 215.783,805.51944 218.75754,804.39489 C 221.76826,803.23413 224.52512,801.69246 227.0281,799.76991 M 301.02799,798.95373 C 301.02795,804.50374 298.72452,809.05618 294.11771,812.61105 C 289.5471,816.16596 283.28975,817.94341 275.34569,817.94341 C 270.84762,817.94341 266.71235,817.41744 262.93982,816.36547 C 259.20353,815.27723 256.0658,814.09832 253.5266,812.82872 L 253.5266,801.34784 L 254.07071,801.34784 C 257.29913,803.77825 260.89031,805.71894 264.84422,807.1699 C 268.79812,808.58462 272.58879,809.29195 276.21628,809.29194 C 280.71428,809.29195 284.23288,808.56647 286.77213,807.11548 C 289.31129,805.66452 290.58091,803.37922 290.58095,800.25961 C 290.58091,797.86551 289.8917,796.0518 288.51331,794.81844 C 287.13484,793.58513 284.4868,792.53318 280.56921,791.66256 C 279.1182,791.33612 277.2138,790.95525 274.85598,790.51992 C 272.53439,790.08465 270.41233,789.61309 268.48983,789.10521 C 263.15746,787.69054 259.36677,785.6229 257.11776,782.90228 C 254.90503,780.14545 253.79865,776.77196 253.79866,772.78172 C 253.79865,770.27883 254.3065,767.92098 255.32218,765.7082 C 256.37412,763.49551 257.95208,761.51855 260.05601,759.77732 C 262.08735,758.07248 264.66283,756.73033 267.78246,755.75086 C 270.93831,754.73523 274.45692,754.22739 278.33833,754.22733 C 281.96573,754.22739 285.62944,754.68082 289.3295,755.58763 C 293.06571,756.45827 296.16717,757.52836 298.63389,758.79791 L 298.63389,769.73467 L 298.08977,769.73467 C 295.47797,767.81217 292.30394,766.19793 288.56772,764.89201 C 284.83141,763.54992 281.16769,762.87884 277.57655,762.87878 C 273.84027,762.87884 270.6844,763.60433 268.10893,765.05525 C 265.53343,766.46999 264.24568,768.59206 264.2457,771.42141 C 264.24568,773.9244 265.0256,775.81068 266.58539,777.08023 C 268.10892,778.34988 270.57556,779.38369 273.98538,780.18169 C 275.87164,780.61703 277.97555,781.05233 280.29715,781.48757 C 282.65495,781.92292 284.61376,782.32192 286.1736,782.68463 C 290.92552,783.77291 294.58923,785.64104 297.16477,788.28903 C 299.7402,790.97338 301.02795,794.52827 301.02799,798.95373 M 347.27793,815.93017 C 345.35534,816.43802 343.25142,816.85517 340.96616,817.18165 C 338.71712,817.50812 336.70389,817.67135 334.92647,817.67135 C 328.72352,817.67135 324.00785,816.00273 320.77944,812.66548 C 317.551,809.32823 315.93678,803.97775 315.9368,796.61402 L 315.9368,764.29349 L 309.02651,764.29349 L 309.02651,755.69645 L 315.9368,755.69645 L 315.9368,738.23029 L 326.1662,738.23029 L 326.1662,755.69645 L 347.27793,755.69645 L 347.27793,764.29349 L 326.1662,764.29349 L 326.1662,791.98903 C 326.16618,795.18121 326.23872,797.68414 326.38385,799.49785 C 326.52892,801.2753 327.03677,802.94394 327.90736,804.50372 C 328.70538,805.9547 329.79362,807.0248 331.17207,807.71402 C 332.58675,808.36695 334.72694,808.69343 337.59265,808.69342 C 339.26123,808.69343 341.00242,808.45764 342.81618,807.98607 C 344.62985,807.47823 345.93574,807.06109 346.73381,806.7346 L 347.27793,806.7346 L 347.27793,815.93017 M 397.60872,766.85085 L 397.06459,766.85085 C 395.54102,766.48815 394.05376,766.23423 392.60283,766.08909 C 391.18809,765.90774 389.50133,765.81706 387.54254,765.81703 C 384.38663,765.81706 381.3396,766.52443 378.40139,767.93907 C 375.46312,769.31755 372.63372,771.11315 369.91316,773.32584 L 369.91316,816.47428 L 359.68376,816.47428 L 359.68376,755.69645 L 369.91316,755.69645 L 369.91316,764.67438 C 373.97586,761.40974 377.54891,759.1063 380.63226,757.76408 C 383.75184,756.38573 386.92584,755.6965 390.15431,755.69645 C 391.93172,755.6965 393.21946,755.75091 394.01754,755.85968 C 394.81552,755.9323 396.01259,756.09553 397.60872,756.34939 L 397.60872,766.85085 M 459.14832,786.11258 C 459.14826,796.01551 456.60904,803.83265 451.53069,809.56401 C 446.4522,815.29537 439.65075,818.16105 431.1263,818.16106 C 422.52923,818.16105 415.6915,815.29537 410.6131,809.56401 C 405.57095,803.83265 403.04987,796.01551 403.04987,786.11258 C 403.04987,776.20968 405.57095,768.39254 410.6131,762.66113 C 415.6915,756.89358 422.52923,754.00975 431.1263,754.00969 C 439.65075,754.00975 446.4522,756.89358 451.53069,762.66113 C 456.60904,768.39254 459.14826,776.20968 459.14832,786.11258 M 448.59245,786.11258 C 448.59239,778.24106 447.05074,772.40087 443.96746,768.59203 C 440.88407,764.74697 436.6037,762.82443 431.1263,762.82438 C 425.57629,762.82443 421.25963,764.74697 418.17632,768.59203 C 415.12926,772.40087 413.60571,778.24106 413.60573,786.11258 C 413.60571,793.73024 415.14741,799.516 418.23073,803.46989 C 421.31405,807.38755 425.61255,809.34638 431.1263,809.34637 C 436.56743,809.34638 440.82967,807.40568 443.91306,803.52432 C 447.0326,799.60668 448.59239,793.80277 448.59245,786.11258 M 447.77627,745.52147 L 436.94835,745.52147 L 436.94835,734.91117 L 447.77627,734.91117 L 447.77627,745.52147 M 425.30426,745.52147 L 414.47632,745.52147 L 414.47632,734.91117 L 425.30426,734.91117 L 425.30426,745.52147 M 563.72758,816.47428 L 553.4982,816.47428 L 553.4982,781.86847 C 553.4981,779.25674 553.37115,776.73566 553.11731,774.30525 C 552.89957,771.87489 552.40987,769.93423 551.64819,768.48318 C 550.8138,766.92342 549.61673,765.74452 548.05702,764.94643 C 546.49714,764.14845 544.24813,763.74944 541.30998,763.74937 C 538.44422,763.74944 535.57854,764.47491 532.71293,765.92583 C 529.84717,767.34059 526.9815,769.15432 524.11589,771.367 C 524.22465,772.20136 524.31531,773.18078 524.38795,774.30525 C 524.46042,775.39353 524.4967,776.48174 524.49676,777.56993 L 524.49676,816.47428 L 514.26737,816.47428 L 514.26737,781.86847 C 514.26733,779.18419 514.14035,776.64499 513.88647,774.25084 C 513.6688,771.8205 513.17909,769.8798 512.41736,768.42878 C 511.58301,766.86903 510.38596,765.70824 508.8262,764.94643 C 507.26635,764.14845 505.01734,763.74944 502.07916,763.74937 C 499.28599,763.74944 496.47472,764.43865 493.64534,765.81703 C 490.85218,767.19549 488.05906,768.9548 485.26595,771.09495 L 485.26595,816.47428 L 475.03655,816.47428 L 475.03655,755.69645 L 485.26595,755.69645 L 485.26595,762.44348 C 488.45807,759.79551 491.63208,757.72787 494.78798,756.24056 C 497.98011,754.75337 501.37177,754.00975 504.96296,754.00969 C 509.0982,754.00975 512.59869,754.88034 515.46441,756.62146 C 518.36633,758.36268 520.52467,760.77493 521.93941,763.85818 C 526.07464,760.3759 529.84717,757.87298 533.25704,756.34939 C 536.66677,754.78964 540.31236,754.00975 544.19379,754.00969 C 550.8682,754.00975 555.7834,756.04112 558.93935,760.10379 C 562.13141,764.13031 563.72748,769.77098 563.72758,777.02582 L 563.72758,816.47428"
+       id="text1367" />
+    <path
+       style="font-size:191.88253784px;font-style:normal;font-weight:normal;fill:#fb8900;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       d="M 101.52407,816.82771 L 86.4594,816.82771 L 75.89269,787.19813 L 30.198912,787.19813 L 19.632227,816.82771 L 5.281514,816.82771 L 42.33631,716.37276 C 38.100083,714.27857 34.696867,711.3513 32.126627,707.59097 C 29.603911,703.78327 28.342578,699.45189 28.34261,694.59679 C 28.342578,687.79046 30.770061,682.07872 35.625051,677.46163 C 40.479985,672.84478 46.382087,670.5363 53.3314,670.53615 C 60.328195,670.5363 66.230301,672.84478 71.037754,677.46163 C 75.89263,682.07872 78.32012,687.79046 78.3202,694.59679 C 78.32012,699.35669 77.05877,703.68807 74.53617,707.59097 C 72.06102,711.4465 68.705395,714.37376 64.469261,716.37276 L 101.52407,816.82771 M 67.610701,694.73959 C 67.61065,690.6463 66.254109,687.24309 63.541099,684.52988 C 60.827967,681.76935 57.424742,680.38902 53.3314,680.38887 C 49.23794,680.38902 45.834713,681.76935 43.121682,684.52988 C 40.408585,687.29067 39.052053,690.69391 39.052076,694.73959 C 39.052053,698.83311 40.408585,702.26014 43.121682,705.02069 C 45.882305,707.73387 49.285532,709.09041 53.3314,709.0903 C 57.424742,709.09041 60.827967,707.73387 63.541099,705.02069 C 66.254109,702.26014 67.61065,698.83311 67.610701,694.73959 M 71.466113,775.06072 L 53.045808,724.01218 L 34.554099,775.06072 L 71.466113,775.06072"
+       id="text1330" />
+    <g
+       id="g625"
+       transform="matrix(1.57221,0,0,1.783879,117.3601,-832.5448)">
+      <path
+         style="font-size:12px;fill:#3673b9;fill-rule:evenodd;stroke:black;stroke-width:5;stroke-linecap:round;stroke-linejoin:round"
+         d="M 94.0243,653.144 C 92.9148,643.848 92.7925,633.53 100.937,626.205 C 110.403,617.654 128.339,609.24 161.179,608.437 C 198.937,607.895 218.386,616.406 225.076,630.58 C 228.365,637.914 224.721,648.089 221.448,650.927 C 213.78,658.207 201.683,661.711 188.673,661.848 C 186.641,661.928 175.967,663.211 169.531,664.713 C 164.673,665.763 155.85,669.834 156.459,677.063 C 156.844,681.447 161.193,684.034 165.183,684.871 C 170.445,686.339 176.027,688.99 178.258,694.859 C 181.546,704.105 177.959,710.957 168.8,715.903 C 161.709,719.634 154.415,719.213 147.278,719.071 C 140.141,718.929 133.162,719.066 126.7,716.626 C 117.33,713.315 110.463,707.247 105.645,695.933 C 97.8806,678.555 95.4338,662.383 94.0243,653.144 z "
+         id="path616"
+         sodipodi:nodetypes="cssssssssssssss" />
+      <path
+         style="font-size:12px;fill:#3673b9;fill-rule:evenodd;stroke:black;stroke-width:5;stroke-linecap:round;stroke-linejoin:round"
+         d="M 194.062,704.69 C 193.14,694.185 196.652,689.208 200.953,687.124 C 209.472,682.649 222.59,684.248 225.987,684.099 C 229.385,683.951 240.209,683.735 243.865,684.205 C 249.754,684.601 256.049,688.543 258.82,692.571 C 265.332,701.232 261.469,710.7 256.411,712.489 C 249.962,715.244 244.289,715.677 227.774,716.564 C 204.065,718.344 195.456,716.622 194.062,704.69 z "
+         id="path617"
+         sodipodi:nodetypes="csssssss" />
+      <path
+         style="font-size:12px;fill:#3673b9;fill-rule:evenodd;stroke:black;stroke-width:5;stroke-linecap:round;stroke-linejoin:round"
+         d="M 223.572,534.437 C 234.346,534.712 236.996,549.599 235.829,563.596 C 235.421,567.174 233.429,584.092 233.002,587.692 C 231.882,597.71 226.094,605.34 215.928,601.764 C 208.095,599.279 204.245,594.862 204.961,585.102 C 205.236,571.731 206.463,562.435 206.901,558.881 C 208.572,545.91 212.509,533.783 223.572,534.437 z "
+         id="path618"
+         sodipodi:nodetypes="cssssss" />
+      <path
+         style="font-size:12px;fill:#3673b9;fill-rule:evenodd;stroke:black;stroke-width:5;stroke-linecap:round;stroke-linejoin:round"
+         d="M 190.996,543.844 C 191.248,547.435 190.83,570.43 190.842,574.055 C 190.523,588.357 184.241,590.165 176.737,590.029 C 168.365,589.868 163.49,586.734 162.868,574.191 C 162.796,570.779 162.302,547.265 162.343,543.724 C 162.467,532.535 165.296,520.122 176.461,519.777 C 188.953,519.799 190.569,532.18 190.996,543.844 z "
+         id="path619"
+         sodipodi:nodetypes="cssssss" />
+      <path
+         style="font-size:12px;fill:#3673b9;fill-rule:evenodd;stroke:black;stroke-width:5;stroke-linecap:round;stroke-linejoin:round"
+         d="M 130.758,527.278 C 119.981,527.402 117.124,542.25 118.094,556.262 C 118.452,559.846 120.207,576.79 120.584,580.395 C 121.563,590.428 126.706,597.399 135.905,595.198 C 144.244,593.308 148.701,589.506 148.659,578.198 C 148.244,564.831 147.473,555.513 147.086,551.953 C 145.597,538.96 141.829,526.779 130.758,527.278 z "
+         id="path620"
+         sodipodi:nodetypes="cssssss" />
+      <path
+         style="font-size:12px;fill:#3673b9;fill-rule:evenodd;stroke:black;stroke-width:5;stroke-linecap:round;stroke-linejoin:round"
+         d="M 85.9856,547.512 C 75.8101,548.42 74.2169,562.557 76.1787,575.631 C 76.7843,578.964 79.706,594.216 81.3616,598.086 C 84.0428,607.187 88.7859,615.406 97.9757,610.333 C 107.283,605.467 110.045,600.467 108.762,592.936 C 106.17,580.739 104.92,575.864 103.257,569.463 C 99.9087,557.613 96.4103,546.232 85.9856,547.512 z "
+         id="path621"
+         sodipodi:nodetypes="cssssss" />
+    </g>
+    <path
+       style="font-size:24px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       d="M 245.74955,585.39436 L 245.74955,563.04013 L 229.53613,563.04013 L 229.53613,553.78626 L 255.57587,553.78626 L 255.57587,589.5196 C 251.74354,592.60423 247.51823,594.94559 242.89991,596.54362 C 238.28153,598.10453 233.35199,598.88497 228.11133,598.88497 C 216.64728,598.88497 207.67256,595.09426 201.18722,587.51275 C 194.7346,579.89412 191.50831,569.30236 191.50831,555.73741 C 191.50831,542.13535 194.7346,531.54357 201.18722,523.96205 C 207.67256,516.34345 216.64728,512.53413 228.11133,512.53409 C 232.89341,512.53413 237.42988,513.2031 241.72077,514.54092 C 246.04429,515.87893 250.02392,517.84862 253.65974,520.45003 L 253.65974,532.43548 C 249.99117,528.90496 246.09344,526.24769 241.96641,524.46377 C 237.83933,522.67994 233.49936,521.788 228.94657,521.78795 C 219.97182,521.788 213.22443,524.63108 208.70434,530.31713 C 204.21697,536.00327 201.97331,544.47669 201.97331,555.73741 C 201.97331,566.96099 204.21697,575.41583 208.70434,581.10192 C 213.22443,586.78803 219.97182,589.63111 228.94657,589.63111 C 232.45124,589.63111 235.57928,589.29665 238.3307,588.62766 C 241.08198,587.92154 243.55497,586.84379 245.74955,585.39436 M 283.67911,523.2931 L 283.67911,554.5667 L 296.15855,554.5667 C 300.77687,554.56674 304.34708,553.21029 306.86922,550.49727 C 309.39128,547.7843 310.65233,543.91922 310.65237,538.90206 C 310.65233,533.92208 309.39128,530.0756 306.86922,527.36255 C 304.34708,524.64967 300.77687,523.29317 296.15855,523.2931 L 283.67911,523.2931 M 273.75456,514.0392 L 296.15855,514.0392 C 304.37982,514.0393 310.5868,516.15765 314.77941,520.39429 C 319.00466,524.59392 321.11732,530.76314 321.11738,538.90206 C 321.11732,547.11537 319.00466,553.32174 314.77941,557.52129 C 310.5868,561.72088 304.37982,563.8206 296.15855,563.8206 L 283.67911,563.8206 L 283.67911,597.26835 L 273.75456,597.26835 L 273.75456,514.0392 M 334.48116,514.0392 L 380.86136,514.0392 L 380.86136,523.51607 L 344.40574,523.51607 L 344.40574,548.15592 L 379.33828,548.15592 L 379.33828,557.6328 L 344.40574,557.6328 L 344.40574,587.79148 L 381.74574,587.79148 L 381.74574,597.26835 L 334.48116,597.26835 L 334.48116,514.0392 M 439.62269,587.79148 L 474.26044,587.79148 L 474.26044,597.26835 L 427.68376,597.26835 L 427.68376,587.79148 C 431.45047,583.36893 436.57654,577.44127 443.06193,570.00844 C 449.58002,562.53845 453.6743,557.72568 455.34478,555.57013 C 458.52195,551.5193 460.73286,548.10022 461.97759,545.31284 C 463.25492,542.48842 463.89366,539.71969 463.89371,537.00668 C 463.89366,532.58416 462.51797,528.97927 459.76663,526.19189 C 457.04802,523.40465 453.49414,522.01099 449.10509,522.01091 C 445.99341,522.01099 442.70157,522.62423 439.22963,523.85054 C 435.79044,525.07703 432.10555,526.93521 428.17507,529.42518 L 428.17507,518.05293 C 432.17107,516.23201 435.90505,514.85693 439.37705,513.92775 C 442.84898,512.99869 446.02614,512.53413 448.90857,512.53409 C 456.50756,512.53413 462.56709,514.68968 467.08726,519.00062 C 471.60732,523.31175 473.86735,529.07217 473.8674,536.28195 C 473.86735,539.70114 473.29415,542.95298 472.14783,546.03756 C 471.03411,549.08504 468.98695,552.68997 466.00634,556.8523 C 465.18746,557.9301 462.5835,561.05189 458.19443,566.21767 C 453.80533,571.34634 447.61475,578.53761 439.62269,587.79148 M 495.14137,583.10876 L 505.50815,583.10876 L 505.50815,597.26835 L 495.14137,597.26835 L 495.14137,583.10876 M 524.66944,514.0392 L 571.83575,514.0392 L 571.83575,518.83342 L 545.20645,597.26835 L 534.83968,597.26835 L 559.89676,523.51607 L 524.66944,523.51607 L 524.66944,514.0392"
+       id="text1326" />
+  </g>
+</svg>
diff --git a/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb b/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb
index d9b4141204..fdb73492db 100644
--- a/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb
+++ b/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb
@@ -4,7 +4,7 @@ DEPENDS = "gtk+ libsvg-cairo"
 SECTION = "gpe"
 PRIORITY = "optional"
 LICENSE = "GPL"
-PR = "r6"
+PR = "r7"
 
 SRC_URI += "file://splash-p.svg \
 	    file://splash-l.svg \
diff --git a/packages/gpe-conf/gpe-conf_0.2.3.bb b/packages/gpe-conf/gpe-conf_0.2.3.bb
new file mode 100644
index 0000000000..3f8ae1e9d5
--- /dev/null
+++ b/packages/gpe-conf/gpe-conf_0.2.3.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Configuration applets for GPE"
+SECTION = "gpe"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client"
+RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons timezones"
+RDEPENDS_gpe-conf-panel = "gpe-conf"
+
+PR = "r0"
+
+GPE_TARBALL_SUFFIX = "bz2"
+
+inherit gpe autotools pkgconfig
+
+PACKAGES += "gpe-conf-panel"
+
+FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \
+                ${datadir}/applications/gpe-conf-* ${datadir}/gpe/pixmaps \
+                ${datadir}/gpe-conf"
+FILES_gpe-conf-panel = "${datadir}/applications/gpe-conf.desktop"
diff --git a/packages/gpm/gpm_1.20.1.bb b/packages/gpm/gpm_1.20.1.bb
index 5623ebbf16..c017cafc9a 100644
--- a/packages/gpm/gpm_1.20.1.bb
+++ b/packages/gpm/gpm_1.20.1.bb
@@ -1,21 +1,25 @@
-SECTION = "console/utils"
-LICENSE = "GPL"
-DEPENDS = "ncurses"
 DESCRIPTION = "GPM (General Purpose Mouse) is a mouse server \
 for the console and xterm, with sample clients included \
 (emacs, etc)."
+SECTION = "console/utils"
+LICENSE = "GPL"
+DEPENDS = "ncurses"
 
-PR="r1"
-PARALLEL_MAKE=""
+PR = "r2"
+PARALLEL_MAKE = ""
 
 SRC_URI = "ftp://arcana.linux.it/pub/gpm/gpm-${PV}.tar.bz2 \
 	   file://configure.patch;patch=1 \
 	   file://no-docs.patch;patch=1 \
 	   file://init"
 
-inherit autotools
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "gpm"
+INITSCRIPT_PARAMS = "defaults"
 
 export LIBS = "-lm"
+
 do_configure_prepend () {
 	cp aclocal.m4 acinclude.m4
 }
@@ -29,18 +33,5 @@ do_install () {
 	oe_runmake 'ROOT=${D}' install
 	install -d ${D}/${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/gpm
-}
-
-pkg_postinst () {
-	if test -n "${D}"; then
-		D="-r $D"
-	fi
-	update-rc.d $D gpm defaults
-}
-
-pkg_prerm () {
-	if test -n "${D}"; then
-		D="-r $D"
-	fi
-	update-rc.d $D gpm remove
+	cd ${D}${libdir} && ln -sf libgpm.so.1.19.0 libgpm.so.1
 }
diff --git a/packages/gtk-theme-torturer/.mtn2git_empty b/packages/gtk-theme-torturer/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gtk-theme-torturer/.mtn2git_empty
diff --git a/packages/gtk-theme-torturer/gtk-theme-torturer_git.bb b/packages/gtk-theme-torturer/gtk-theme-torturer_git.bb
new file mode 100644
index 0000000000..adcdf2ed2e
--- /dev/null
+++ b/packages/gtk-theme-torturer/gtk-theme-torturer_git.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Gtk+ Theme Benchmark Program"
+DEPENDS = "gtk+"
+HOMEPAGE = "http://wiki.laptop.org/go/GTK_for_OLPC"
+SECTION = "devel"
+LICENSE = "GPL"
+
+PV = "0.0.0+git${SRCDATE}"
+
+SRC_URI = "git://dev.laptop.org/projects/soc-gtk/;protocol=git"
+S = "${WORKDIR}/git/gtk-theme-torturer"
+
+CFLAGS += "-Wl,-rpath-link,${STAGING_LIBDIR}"
+
+do_install() {
+	install -d ${D}${bindir}
+	install -m 0755 torturer ${D}${bindir}
+}
+
+
diff --git a/packages/initscripts/initscripts-1.0/populate-volatile.sh b/packages/initscripts/initscripts-1.0/populate-volatile.sh
index a60cc0d420..3bb3d94de6 100755
--- a/packages/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/packages/initscripts/initscripts-1.0/populate-volatile.sh
@@ -11,7 +11,7 @@ COREDEF="00_core"
 create_file() {
 	EXEC=" 
 	touch \"$1\"; 
-	chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1 
+	chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1; 
 	chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 " 
 
 	test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache
@@ -26,7 +26,7 @@ create_file() {
 mk_dir() {
 	EXEC=" 
 	mkdir -p \"$1\"; 
-	chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1 
+	chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1; 
 	chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 "
 
 	test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache
@@ -114,7 +114,6 @@ apply_cfgfile() {
   cat ${CFGFILE} | grep -v "^#" | \
   while read LINE; do
 
-    # This is a hell of a lot faster than using cut or awk 5 times
     eval `echo "$LINE" | sed -n "s/\(.*\)\ \(.*\) \(.*\)\ \(.*\)\ \(.*\)\ \(.*\)/TTYPE=\1 ; TUSER=\2; TGROUP=\3; TMODE=\4; TNAME=\5 TLTARGET=\6/p"`
 
     [ "${VERBOSE}" != "no" ] && echo "Checking for -${TNAME}-."
diff --git a/packages/initscripts/initscripts-1.0/volatiles b/packages/initscripts/initscripts-1.0/volatiles
index 2bc7d82fbd..4320485663 100644
--- a/packages/initscripts/initscripts-1.0/volatiles
+++ b/packages/initscripts/initscripts-1.0/volatiles
@@ -3,14 +3,14 @@
 #
 # Every line must either be a comment starting with #
 # or a definition of format:
-# <type> <owner> <group> <mode> <path> [<linksource>]
+# <type> <owner> <group> <mode> <path> <linksource>
 # where the items are separated by whitespace !
 #
 # <type> : d|f|l : (d)irectory|(f)ile|(l)ink
 #
 # A linking example:
 # l root root 0777 /var/test /tmp/testfile
-# f root root 0644 /var/test
+# f root root 0644 /var/test none
 #
 # Understanding links:
 # When populate-volatile is to verify/create a directory or file, it will first
diff --git a/packages/jpeg/jpeg_6b.bb b/packages/jpeg/jpeg_6b.bb
index d725284694..8573789230 100644
--- a/packages/jpeg/jpeg_6b.bb
+++ b/packages/jpeg/jpeg_6b.bb
@@ -4,8 +4,10 @@ SECTION = "libs"
 PRIORITY = "required"
 
 DEPENDS = "libtool-cross"
+RPROVIDES_${PN} = "jpeg"
 
-PR = "r5"
+
+PR = "r6"
 
 SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \
 	   file://debian.patch;patch=1 \
diff --git a/packages/libdaemon/libdaemon_0.10.bb b/packages/libdaemon/libdaemon_0.10.bb
index a166414e61..ba7140ffdb 100644
--- a/packages/libdaemon/libdaemon_0.10.bb
+++ b/packages/libdaemon/libdaemon_0.10.bb
@@ -3,6 +3,7 @@ SECTION = "libs"
 AUTHOR = "Lennart Poettering <lennart@poettering.net>"
 HOMEPAGE = "http://0pointer.de/lennart/projects/libdaemon/"
 LICENSE = "LGPL"
+PR = "r1"
 
 SRC_URI = "http://0pointer.de/lennart/projects/libdaemon/libdaemon-${PV}.tar.gz"
 
@@ -13,7 +14,7 @@ EXTRA_OECONF = "--disable-lynx --disable-doxygen"
 do_stage () {
 	oe_libinstall -a -so -C libdaemon libdaemon ${STAGING_LIBDIR}
 	install -d ${STAGING_INCDIR}/libdaemon
-	for i in dlog.h dexec.h dfork.h dsignal.h dnonblock.h dpid.h; do
+	for i in daemon.h dlog.h dexec.h dfork.h dsignal.h dnonblock.h dpid.h; do
 		install -m 0644 ${S}/libdaemon/$i ${STAGING_INCDIR}/libdaemon/
 	done
 }
diff --git a/packages/libg15/.mtn2git_empty b/packages/libg15/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libg15/.mtn2git_empty
diff --git a/packages/libg15/libg15_1.2.1.bb b/packages/libg15/libg15_1.2.1.bb
new file mode 100644
index 0000000000..746e5f2e98
--- /dev/null
+++ b/packages/libg15/libg15_1.2.1.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "This is a library to handle the LCD and extra keys on the Logitech G15 Gaming Keyboard."
+HOMEPAGE = "http://g15tools.sourceforge.net"
+LICENSE = "GPLv2"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "libusb"
+PR = "r2"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/g15tools/libg15-${PV}.tar.bz2"
+
+inherit autotools
+
+do_stage () {
+        oe_libinstall -a -so libg15 ${STAGING_LIBDIR}
+        for i in libg15.h; do
+                install -m 0644 ${S}/$i ${STAGING_INCDIR}/
+        done
+}
+
diff --git a/packages/libmimedir/files/libmimedir-0.4.0-duration-wkst.patch b/packages/libmimedir/files/libmimedir-0.4.0-duration-wkst.patch
new file mode 100644
index 0000000000..10843182e9
--- /dev/null
+++ b/packages/libmimedir/files/libmimedir-0.4.0-duration-wkst.patch
@@ -0,0 +1,258 @@
+diff -uNr libmimedir-0.4.0/bin/ical-dump.c libmimedir-0.4.0cvs20061111/bin/ical-dump.c
+--- libmimedir-0.4.0/bin/ical-dump.c	2005-09-01 17:36:27.000000000 +0200
++++ libmimedir-0.4.0cvs20061111/bin/ical-dump.c	2006-11-11 19:14:19.000000000 +0100
+@@ -144,7 +144,7 @@
+ print_component (MIMEDirVComponent *component)
+ {
+ 	gchar *s, *summary, *categories, *uid;
+-	guint priority, seq;
++	guint priority, seq, duration;
+ 	MIMEDirDateTime *dtstart, *dtend, *due;
+ 	MIMEDirRecurrence *recur;
+ 
+@@ -161,6 +161,7 @@
+ 
+ 		      "dtstart",    &dtstart,
+ 		      "dtend",      &dtend,
++		      "duration",   &duration,
+ 		      "due",        &due,
+ 		      "recurrence", &recur,
+ 
+@@ -207,6 +208,9 @@
+ 
+ 		}
+ 	}
++	if (duration) {
++		printf (_("  Duration: %ds\n"), duration);
++	}
+ 	if (due && mimedir_datetime_is_valid (due)) {
+ 		s = mimedir_datetime_to_string (due);
+ 		if (s) {
+diff -uNr libmimedir-0.4.0/mimedir/mimedir-recurrence.c libmimedir-0.4.0cvs20061111/mimedir/mimedir-recurrence.c
+--- libmimedir-0.4.0/mimedir/mimedir-recurrence.c	2005-10-08 08:46:36.000000000 +0200
++++ libmimedir-0.4.0cvs20061111/mimedir/mimedir-recurrence.c	2006-11-11 15:47:28.000000000 +0100
+@@ -56,7 +56,8 @@
+ 	PROP_COUNT,
+ 	PROP_INTERVAL,
+ 	PROP_UNIT,
+-	PROP_UNITLIST
++	PROP_UNITLIST,
++	PROP_WKST
+ };
+ 
+ struct _MIMEDirRecurrencePriv {
+@@ -67,6 +68,7 @@
+ 
+ 	MIMEDirRecurrenceUnit	unit;
+ 	gchar			*units;
++	guint8			wkst;
+ };
+ 
+ static GObjectClass *parent_class = NULL;
+@@ -167,6 +169,50 @@
+ 		return -1;
+ }
+ 
++static const gchar *
++weekday_to_string (GDateWeekday weekday)
++{
++	switch (weekday) {
++	case G_DATE_MONDAY:
++		return "MO";
++	case G_DATE_TUESDAY:
++		return "TU";
++	case G_DATE_WEDNESDAY:
++		return "WE";
++	case G_DATE_THURSDAY:
++		return "TH";
++	case G_DATE_FRIDAY:
++		return "FR";
++	case G_DATE_SATURDAY:
++		return "SA";
++	case G_DATE_SUNDAY:
++		return "SU";
++	default:
++		g_return_val_if_reached (NULL);
++	}
++}
++
++static GDateWeekday
++string_to_weekday (const gchar *s)
++{
++	if (strcmp (s, "MO") == 0)
++		return G_DATE_MONDAY;
++	else if (strcmp (s, "TU") == 0)
++		return G_DATE_TUESDAY;
++	else if (strcmp (s, "WE") == 0)
++		return G_DATE_WEDNESDAY;
++	else if (strcmp (s, "TH") == 0)
++		return G_DATE_THURSDAY;
++	else if (strcmp (s, "FR") == 0)
++		return G_DATE_FRIDAY;
++	else if (strcmp (s, "SA") == 0)
++		return G_DATE_SATURDAY;
++	else if (strcmp (s, "SU") == 0)
++		return G_DATE_SUNDAY;
++	else
++		return G_DATE_BAD_WEEKDAY;
++}
++
+ /*
+  * Class and Object Management
+  */
+@@ -261,6 +307,14 @@
+ 				     NULL,
+ 				     G_PARAM_READWRITE);
+ 	g_object_class_install_property (gobject_class, PROP_UNITLIST, pspec);
++	pspec = g_param_spec_uint ("wkst",
++				   _("Workweek start"),
++				   _("The day on which the workweek starts"),
++				   G_DATE_BAD_WEEKDAY,
++				   G_DATE_SUNDAY,
++				   G_DATE_BAD_WEEKDAY,
++				   G_PARAM_READWRITE);
++	g_object_class_install_property (gobject_class, PROP_WKST, pspec);
+ }
+ 
+ 
+@@ -273,6 +327,7 @@
+ 	recurrence->priv = g_new0 (MIMEDirRecurrencePriv, 1);
+ 	recurrence->priv->freq = RECURRENCE_DAILY;
+ 	recurrence->priv->unit = RECURRENCE_UNIT_NONE;
++	recurrence->priv->wkst = G_DATE_BAD_WEEKDAY;
+ }
+ 
+ 
+@@ -335,6 +390,9 @@
+ 	case PROP_UNITLIST:
+ 		mimedir_utils_set_property_string (&priv->units, value);
+ 		break;
++	case PROP_WKST:
++		priv->wkst = g_value_get_uint (value);
++		break;
+ 	default:
+ 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ 		break;
+@@ -375,6 +433,9 @@
+ 	case PROP_UNITLIST:
+ 		g_value_set_string (value, priv->units);
+ 		break;
++	case PROP_WKST:
++		g_value_set_uint (value, priv->wkst);
++		break;
+ 	default:
+ 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ 		return;
+@@ -512,6 +573,17 @@
+ 			g_object_set (G_OBJECT (recurrence), "unit", unit, NULL);
+ 			g_object_set (G_OBJECT (recurrence), "units", value, NULL);
+ 		}
++		else if (!strcasecmp (name, "WKST")) {
++			GDateWeekday weekday;
++
++			weekday = string_to_weekday (value);
++			if (!g_date_valid_weekday (weekday)) {
++				ret = FALSE;
++				break;
++			}
++
++			g_object_set (G_OBJECT (recurrence), "wkst", weekday, NULL);
++		}
+ 		else {
+ 			ret = FALSE;
+ 			break;
+@@ -571,5 +643,11 @@
+ 		g_string_append_printf (string, ";%s=%s", unit, priv->units);
+ 	}
+ 
++	if (g_date_valid_weekday (priv->wkst)) {
++		const gchar *weekday;
++		weekday = weekday_to_string (priv->wkst);
++		g_string_append_printf (string, ";WKST=%s", weekday);
++	}
++
+ 	return g_string_free (string, FALSE);
+ }
+
+--- libmimedir-0.4.0/mimedir/mimedir-vcomponent.c	2006-12-01 12:53:26.000000000 +0100
++++ libmimedir-0.4.0cvs20061111/mimedir/mimedir-vcomponent.c	2006-11-11 19:08:26.000000000 +0100
+@@ -908,6 +905,7 @@
+ 	const gchar *s;
+ 	gint duration = 0;
+ 	gboolean neg = FALSE;
++	gboolean dur_week = FALSE;
+ 
+ 	g_return_val_if_fail (error == NULL || *error == NULL, 0);
+ 
+@@ -939,48 +937,52 @@
+ 
+ 		if (s[0] == 'D' || s[0] == 'd')
+ 			duration = num * SECS_PER_DAY;
+-		else if (s[0] == 'W' || s[0] == 'w')
++		else if (s[0] == 'W' || s[0] == 'w') {
+ 			duration = num * SECS_PER_WEEK;
+-		else {
++			dur_week = TRUE;
++		} else {
+ 			g_set_error (error, MIMEDIR_ATTRIBUTE_ERROR, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT_STR, "DURATION", name);
+ 			return 0;
+ 		}
+ 		s++;
+ 	}
+ 
+-	if (s[0] == 'T' || s[0] == 't') {
+-		GError *err = NULL;
+-		guint num;
++	if ((s[0] == 'T' || s[0] == 't') && !dur_week) {
++		guint state = 0;
+ 
+ 		s++;
+ 
+-		while (s[0] != '\0') {
++		while (state < 3) {
++			GError *err = NULL;
++			guint num;
++
+ 			num = mimedir_vcomponent_parse_number (name, "DURATION", &s, &err);
+ 			if (err) {
+ 				g_propagate_error (error, err);
+ 				return 0;
+ 			}
+-
+-			switch (s[0]) {
+-			case 'H':
+-				s++;
++			if (s[0] == 'H' && state < 1) {
+ 				duration += num * SECS_PER_HOUR;
+-				break;
+-			case 'M':
+-				s++;
++				state = 1;
++			} else if (s[0] == 'M' && state < 2) {
+ 				duration += num * SECS_PER_MINUTE;
+-				break;
+-			case 'S':
+-				s++;
+-				duration += num;
+-				break;
+-			default:
++				state = 2;
++			} else if (s[0] == 'S' && state < 3) {
++				duration += num ;
++				state = 3;
++			} else {
+ 				g_set_error (error, MIMEDIR_ATTRIBUTE_ERROR, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT_STR, "DURATION", name);
+ 				return 0;
+ 			}
++			s++;
+ 		}
+ 	}
+ 
++	if (s[0] != '\0') {
++		g_set_error (error, MIMEDIR_ATTRIBUTE_ERROR, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT_STR, "DURATION", name);
++		return 0;
++	}
++
+ 	return neg ? -duration : duration;
+ }
+ 
diff --git a/packages/libmimedir/libmimedir_0.4.0-20060804.bb b/packages/libmimedir/libmimedir_0.4.0-20060804.bb
index 5249157590..f2d29d4fc0 100644
--- a/packages/libmimedir/libmimedir_0.4.0-20060804.bb
+++ b/packages/libmimedir/libmimedir_0.4.0-20060804.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "intltool-native glib-2.0"
-PR = "r3"
+PR = "r4"
 DEFAULT_PREFERENCE = "5"
 SRCDATE = "20060804"
 PV = "0.4.0+cvs${SRCDATE}"
@@ -11,7 +11,8 @@ PV = "0.4.0+cvs${SRCDATE}"
 SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=libmimedir \
            file://mimedir-update.patch;patch=1 \
            file://mimedir-write-sequence.patch;patch=1;pnum=0 \
-	   file://gslist-fix.patch;patch=1;maxdate=20060814"
+	   file://gslist-fix.patch;patch=1;maxdate=20060814 \
+	   file://libmimedir-0.4.0-duration-wkst.patch"
 
 S = "${WORKDIR}/libmimedir"
 
diff --git a/packages/libnotify/libnotify_0.3.2.bb b/packages/libnotify/libnotify_0.4.3.bb
index f3f3aff334..f3f3aff334 100644
--- a/packages/libnotify/libnotify_0.3.2.bb
+++ b/packages/libnotify/libnotify_0.4.3.bb
diff --git a/packages/libnss-mdns/libnss-mdns_0.8.bb b/packages/libnss-mdns/libnss-mdns_0.9.bb
index a4a9cd00d1..171ff5113b 100644
--- a/packages/libnss-mdns/libnss-mdns_0.8.bb
+++ b/packages/libnss-mdns/libnss-mdns_0.9.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 
 RRECOMMENDS_${PN} = "zeroconf"
-PR = "r1"
+PR = "r0"
 
 EXTRA_OECONF = "--libdir=/lib"
 S = "${WORKDIR}/nss-mdns-${PV}"
diff --git a/packages/libopie/libopie2.inc b/packages/libopie/libopie2.inc
index 17ac4e2605..1e0d4f1b9a 100644
--- a/packages/libopie/libopie2.inc
+++ b/packages/libopie/libopie2.inc
@@ -19,8 +19,12 @@ EXTRA_QMAKEVARS_POST += 'DEFINES+=OPIE_NEW_MALLOC \
 			DEFINES+=OPIE_NO_ERASE_RECT_HACKFIX \
 			LIBS+=-L${S} LIBS+="-Wl,-rpath-link,${S}"'
 
-#NOTE: We no longer enable the sqlite PIM backend here, since a) using it means no sync and b) it's too large for 16MB images
-EXTRA_QMAKEVARS_PRE += 'ENABLE_SQL_PIM_BACKEND=n'
+ENABLE_SQL_PIM_BACKEND = "y"
+# NOTE: Machines with too little amount of flash may want to disable SQL backend support
+# (known not to fit in 16MB). Also, XML backend is still used by default, as SQL doesn't
+# support sync yet.
+#ENABLE_SQL_PIM_BACKEND_smallmachine = "n"
+EXTRA_QMAKEVARS_PRE += 'ENABLE_SQL_PIM_BACKEND=${ENABLE_SQL_PIM_BACKEND}'
 
 MODULES = "opiecore opiedb opiemm opienet opiepim opiesecurity opieui opiebluez"
 LIBS    = "core2    db2    mm2    net2    pim2    security2    ui2 bluez2"
diff --git a/packages/libopie/libopie2_1.2.2.bb b/packages/libopie/libopie2_1.2.2.bb
index 8fcc2fba0a..1bef43c329 100644
--- a/packages/libopie/libopie2_1.2.2.bb
+++ b/packages/libopie/libopie2_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
            file://include.pro \
diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb
index 78cc00e619..1635a5b1a3 100644
--- a/packages/libopie/libopie2_cvs.bb
+++ b/packages/libopie/libopie2_cvs.bb
@@ -1,13 +1,12 @@
 require ${PN}.inc
 
 PV = "1.2.2+cvs${SRCDATE}"
-PR = "r1"
+PR = "r3"
 
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/libopie2 \
            file://ipaq-2.6-sys-class-backlight-support.patch;patch=1 \
-           file://keyboardless-buttonmap.patch;patch=1 \
            file://include.pro"
 
 SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1"
diff --git a/packages/libsexy/libsexy_0.1.4.bb b/packages/libsexy/libsexy.inc
index b3e7e7ad7d..522b7e0d63 100644
--- a/packages/libsexy/libsexy_0.1.4.bb
+++ b/packages/libsexy/libsexy.inc
@@ -1,11 +1,11 @@
 DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel"
 HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy"
 AUTHOR = "Christian Hammond <chipx86@chipx86.com>"
-PR = "r1"
+SECTION = "x11/libs"
 
 DEPENDS = "gtk+ enchant libxml2"
 
-SRC_URI = "http://osiris.chipx86.com/projects/libsexy/releases/${P}.tar.gz"
+SRC_URI = "http://releases.chipx86.com/libsexy/${PN}/${PN}-${PV}.tar.gz"
 
 inherit autotools pkgconfig
 
diff --git a/packages/libsexy/libsexy_0.1.10.bb b/packages/libsexy/libsexy_0.1.10.bb
new file mode 100644
index 0000000000..042ea757e9
--- /dev/null
+++ b/packages/libsexy/libsexy_0.1.10.bb
@@ -0,0 +1,2 @@
+require libsexy.inc
+PR = "r0"
diff --git a/packages/libsexy/libsexy_0.1.5.bb b/packages/libsexy/libsexy_0.1.5.bb
deleted file mode 100644
index 964c381c7d..0000000000
--- a/packages/libsexy/libsexy_0.1.5.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel"
-HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy"
-AUTHOR = "Christian Hammond <chipx86@chipx86.com>"
-PR = "r0"
-
-DEPENDS = "gtk+ enchant libxml2"
-
-SRC_URI = "http://osiris.chipx86.com/projects/libsexy/releases/${P}.tar.gz"
-
-inherit autotools pkgconfig
-
-do_stage() {
-autotools_stage_all
-}
-
-
diff --git a/packages/libsexy/libsexy_0.1.6.bb b/packages/libsexy/libsexy_0.1.6.bb
index 964c381c7d..042ea757e9 100644
--- a/packages/libsexy/libsexy_0.1.6.bb
+++ b/packages/libsexy/libsexy_0.1.6.bb
@@ -1,16 +1,2 @@
-DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel"
-HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy"
-AUTHOR = "Christian Hammond <chipx86@chipx86.com>"
+require libsexy.inc
 PR = "r0"
-
-DEPENDS = "gtk+ enchant libxml2"
-
-SRC_URI = "http://osiris.chipx86.com/projects/libsexy/releases/${P}.tar.gz"
-
-inherit autotools pkgconfig
-
-do_stage() {
-autotools_stage_all
-}
-
-
diff --git a/packages/libsexy/libsexy_0.1.8.bb b/packages/libsexy/libsexy_0.1.8.bb
index 1de4a9175a..91784ffb49 100644
--- a/packages/libsexy/libsexy_0.1.8.bb
+++ b/packages/libsexy/libsexy_0.1.8.bb
@@ -1,17 +1,2 @@
-DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel"
-HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy"
-AUTHOR = "Christian Hammond <chipx86@chipx86.com>"
-SECTION = "x11/libs"
+require libsexy.inc
 PR = "r1"
-
-DEPENDS = "gtk+ enchant libxml2"
-
-SRC_URI = "http://releases.chipx86.com/libsexy/${PN}/${PN}-${PV}.tar.gz"
-
-inherit autotools pkgconfig
-
-do_stage() {
-autotools_stage_all
-}
-
-
diff --git a/packages/libxfce4mcs/libxfce4mcs_4.3.99.2.bb b/packages/libxfce4mcs/libxfce4mcs_4.3.99.2.bb
new file mode 100644
index 0000000000..07d7a95ae1
--- /dev/null
+++ b/packages/libxfce4mcs/libxfce4mcs_4.3.99.2.bb
@@ -0,0 +1,5 @@
+# libxfce4mcs OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+require ${PN}.inc
diff --git a/packages/libxfce4util/libxfce4util_4.3.99.2.bb b/packages/libxfce4util/libxfce4util_4.3.99.2.bb
new file mode 100644
index 0000000000..d1c29197d6
--- /dev/null
+++ b/packages/libxfce4util/libxfce4util_4.3.99.2.bb
@@ -0,0 +1,22 @@
+require ${PN}.inc
+
+SRC_URI += "\
+http://svn.xfce.org/svn/xfce/xfce4-dev-tools/trunk/m4macros/xdt-depends.m4 \
+http://svn.xfce.org/svn/xfce/xfce4-dev-tools/trunk/m4macros/xdt-features.m4 \
+http://svn.xfce.org/svn/xfce/xfce4-dev-tools/trunk/m4macros/xdt-i18n.m4 \
+http://svn.xfce.org/svn/xfce/xfce4-dev-tools/trunk/m4macros/xdt-python.m4 \
+http://svn.xfce.org/svn/xfce/xfce4-dev-tools/trunk/m4macros/xdt-xfce.m4"
+
+
+MACROS="m4/xdt*.m4"
+
+XFCE_HEADERS="debug.h utf8.h xfce-generics.h   xfce-resource.h \
+              i18n.h util.h xfce-kiosk.h libxfce4util-config.h  \
+              xfce-desktopentry.h xfce-miscutils.h libxfce4util.h \
+              xfce-fileutils.h xfce-rc.h xfce-utf8.h \
+              xfce-license.h xfce-i18n.h libxfce4util-enum-types.h"
+
+do_configure_prepend() {
+    install -m 0755 -d ${S}/m4/
+    install -m 0644 ${WORKDIR}/xdt-*.m4 ${S}/m4/
+}
diff --git a/packages/libxfcegui4/libxfcegui4_4.3.99.2.bb b/packages/libxfcegui4/libxfcegui4_4.3.99.2.bb
new file mode 100644
index 0000000000..2def53685a
--- /dev/null
+++ b/packages/libxfcegui4/libxfcegui4_4.3.99.2.bb
@@ -0,0 +1,5 @@
+# libxfcegui4 OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+require ${PN}.inc
diff --git a/packages/linux/linux-efika/0001-sound-Add-support-for-the-MPC52xx-PSC-AC97-Link.txt b/packages/linux/linux-efika/0001-sound-Add-support-for-the-MPC52xx-PSC-AC97-Link.txt
new file mode 100644
index 0000000000..a352f0e2f5
--- /dev/null
+++ b/packages/linux/linux-efika/0001-sound-Add-support-for-the-MPC52xx-PSC-AC97-Link.txt
@@ -0,0 +1,834 @@
+I cleaned up the setting of the port_config register on the MPC5200B.
+This driver now touches only the two relevant bits without overriding
+the others.
+
+Signed-off-by: Leon Woestenberg <leonw@mailcan.com>
+
+From 144658ad3d23bb426e29562235e40f0f9797a9c7 Mon Sep 17 00:00:00 2001
+From: Sylvain Munaut <tnt@246tNt.com>
+Date: Mon, 18 Dec 2006 22:51:38 +0100
+Subject: [PATCH] sound: Add support for the MPC52xx PSC AC97 Link
+
+Messy driver, to be cleaned ... a lot ...
+
+Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
+---
+ include/asm-ppc/mpc52xx_psc.h |   10 -
+ sound/ppc/Kconfig             |   16 +
+ sound/ppc/Makefile            |    3 
+ sound/ppc/mpc52xx_ac97.c      |  738 +++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 765 insertions(+), 2 deletions(-)
+
+Index: linux-2.6.19-rc6_efika/include/asm-ppc/mpc52xx_psc.h
+===================================================================
+--- linux-2.6.19-rc6_efika.orig/include/asm-ppc/mpc52xx_psc.h	2007-01-14 19:45:07.000000000 +0100
++++ linux-2.6.19-rc6_efika/include/asm-ppc/mpc52xx_psc.h	2007-01-14 19:45:07.000000000 +0100
+@@ -28,6 +28,10 @@
+ #define MPC52xx_PSC_MAXNUM	6
+ 
+ /* Programmable Serial Controller (PSC) status register bits */
++#define MPC52xx_PSC_SR_UNEX_RX	0x0001
++#define MPC52xx_PSC_SR_DATA_VAL	0x0002
++#define MPC52xx_PSC_SR_DATA_OVR	0x0004
++#define MPC52xx_PSC_SR_CMDSEND	0x0008
+ #define MPC52xx_PSC_SR_CDE	0x0080
+ #define MPC52xx_PSC_SR_RXRDY	0x0100
+ #define MPC52xx_PSC_SR_RXFULL	0x0200
+@@ -132,8 +136,10 @@
+ 	u8		reserved5[3];
+ 	u8		ctlr;		/* PSC + 0x1c */
+ 	u8		reserved6[3];
+-	u16		ccr;		/* PSC + 0x20 */
+-	u8		reserved7[14];
++	u32		ccr;		/* PSC + 0x20 */
++	u32		ac97_slots;	/* PSC + 0x24 */
++	u32		ac97_cmd;	/* PSC + 0x28 */
++	u32		ac97_data;	/* PSC + 0x2c */
+ 	u8		ivr;		/* PSC + 0x30 */
+ 	u8		reserved8[3];
+ 	u8		ip;		/* PSC + 0x34 */
+Index: linux-2.6.19-rc6_efika/sound/ppc/Kconfig
+===================================================================
+--- linux-2.6.19-rc6_efika.orig/sound/ppc/Kconfig	2007-01-14 19:45:07.000000000 +0100
++++ linux-2.6.19-rc6_efika/sound/ppc/Kconfig	2007-01-14 19:45:07.000000000 +0100
+@@ -33,3 +33,19 @@
+ 	  option.
+ 
+ endmenu
++
++
++# ALSA ppc drivers
++
++menu "ALSA PPC devices"
++	depends on SND!=n && PPC
++
++config SND_PPC_MPC52xx_AC97
++	tristate "Freescale MPC52xx AC97 interface support"
++	depends on SND && PPC_MPC52xx
++	select SND_AC97_CODEC
++	help
++	  Say Y or M if you want to support any AC97 codec attached to
++	  the Freescqle MPC52xx AC97 interface.
++
++endmenu
+Index: linux-2.6.19-rc6_efika/sound/ppc/Makefile
+===================================================================
+--- linux-2.6.19-rc6_efika.orig/sound/ppc/Makefile	2007-01-14 19:45:07.000000000 +0100
++++ linux-2.6.19-rc6_efika/sound/ppc/Makefile	2007-01-14 19:45:07.000000000 +0100
+@@ -4,6 +4,9 @@
+ #
+ 
+ snd-powermac-objs := powermac.o pmac.o awacs.o burgundy.o daca.o tumbler.o keywest.o beep.o
++snd-mpc52xx-ac97-objs := mpc52xx_ac97.o
+ 
+ # Toplevel Module Dependency
+ obj-$(CONFIG_SND_POWERMAC) += snd-powermac.o
++
++obj-$(CONFIG_SND_PPC_MPC52xx_AC97)	+= snd-mpc52xx-ac97.o
+Index: linux-2.6.19-rc6_efika/sound/ppc/mpc52xx_ac97.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.19-rc6_efika/sound/ppc/mpc52xx_ac97.c	2007-01-14 22:45:55.000000000 +0100
+@@ -0,0 +1,742 @@
++/*
++ * Driver for the PSC of the Freescale MPC52xx configured as AC97 interface
++ *
++ *
++ * Copyright (C) 2006 Sylvain Munaut <tnt@246tNt.com>
++ *
++ * This file is licensed under the terms of the GNU General Public License
++ * version 2. This program is licensed "as is" without any warranty of any
++ * kind, whether express or implied.
++ */
++
++#define DEBUG
++
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/interrupt.h>
++
++#include <sound/driver.h>
++#include <sound/core.h>
++#include <sound/initval.h>
++#include <sound/pcm.h>
++#include <sound/pcm_params.h>
++#include <sound/ac97_codec.h>
++
++#include <asm/of_platform.h>
++#include <asm/mpc52xx_psc.h>
++
++
++#define DRV_NAME "mpc52xx-psc-ac97"
++
++
++/* ======================================================================== */
++/* Structs / Defines                                                        */
++/* ======================================================================== */
++
++/* Private structure */
++struct mpc52xx_ac97_priv {
++	struct device *dev;
++	resource_size_t	mem_start;
++	resource_size_t mem_len;
++	int irq;
++	struct mpc52xx_psc __iomem *psc;
++	struct snd_card *card;
++	struct snd_pcm *pcm;
++	struct snd_ac97 *ac97;
++
++	struct snd_pcm_substream *substream_playback;
++	unsigned int buf_pos;
++};
++
++/* Register bit definition (AC97 mode specific) */
++#define PSC_AC97_SLOT_BIT(n)		(1<<(12-n))
++#define PSC_AC97_SLOTS_XMIT_SHIFT	16
++#define PSC_AC97_SLOTS_RECV_SHIFT	 0
++
++
++
++/* ======================================================================== */
++/* ISR routine                                                              */
++/* ======================================================================== */
++
++static irqreturn_t
++mpc52xx_ac97_irq(int irq, void *dev_id)
++{
++	struct mpc52xx_ac97_priv *priv = dev_id;
++
++	static int icnt = 0;
++	#if 0
++	{
++	unsigned int val;
++//	val = in_be32(&priv->psc->ac97_data);
++	printk(KERN_INFO "mpc52xx_ac97_irq fired (isr=%04x, status=%04x) %08x\n", in_be16(&priv->psc->mpc52xx_psc_imr), in_be16(&priv->psc->mpc52xx_psc_status), val);
++	out_8(&priv->psc->command,MPC52xx_PSC_RST_ERR_STAT);
++	}
++	#endif
++
++	/* Anti Crash during dev ;) */
++	#if 0
++	if ((icnt++) > 50000)
++		out_be16(&priv->psc->mpc52xx_psc_imr, 0);
++	#endif
++
++	/* Copy 64 data into the buffer */
++	if (in_be16(&priv->psc->mpc52xx_psc_imr) & 0x0100) {
++		if (priv->substream_playback) {
++			struct snd_pcm_runtime *rt;
++
++			rt = priv->substream_playback->runtime;
++
++			if (snd_pcm_playback_hw_avail(rt) < bytes_to_frames(rt,128)) {
++				int i;
++				/* Push silence */
++				for (i=0; i<64; i++)
++					out_be32(&priv->psc->mpc52xx_psc_buffer_32, 0x00000800);
++				printk(KERN_DEBUG "pushed silence ...\n");
++			} else {
++				int i;
++				unsigned short *data;
++
++				data = (unsigned short *)
++					(&rt->dma_area[frames_to_bytes(rt, priv->buf_pos)]);
++
++				for (i=0; i<64; i++)
++					out_be32(&priv->psc->mpc52xx_psc_buffer_32,
++						(((unsigned int)data[i]) << 16) | 0x00000000);
++							/* Setting the sof bit looks useless */
++
++				priv->buf_pos += bytes_to_frames(rt,128);;
++				if (priv->buf_pos >= rt->buffer_size)
++					priv->buf_pos = 0;
++
++				snd_pcm_period_elapsed(priv->substream_playback);
++			}
++		} else {
++			out_be16(&priv->psc->mpc52xx_psc_imr, 0);
++			printk(KERN_DEBUG "Interrupt with no stream ...\n");
++		}
++	} else {
++		printk(KERN_ERR "Spurious int\n");
++	}
++
++	return IRQ_HANDLED;
++}
++
++
++/* ======================================================================== */
++/* PCM interface                                                            */
++/* ======================================================================== */
++
++/* HW desc */
++
++static struct snd_pcm_hardware mpc52xx_ac97_hw = {
++	.info			= SNDRV_PCM_INFO_INTERLEAVED		|
++					SNDRV_PCM_INFO_MMAP		|
++					SNDRV_PCM_INFO_MMAP_VALID,
++	.formats		= SNDRV_PCM_FMTBIT_S16_BE,
++	.rates			= SNDRV_PCM_RATE_8000_48000,
++	.rate_min		= 8000,
++	.rate_max		= 48000,
++	.channels_min		= 1,
++	.channels_max		= 2,	/* Support for more ? */
++	.buffer_bytes_max	= 128*1024,
++	.period_bytes_min	= 128, /* 32, */
++	.period_bytes_max	= 128, /* 16*1024, */
++	.periods_min		= 8,
++	.periods_max		= 256,
++	.fifo_size		= 512,
++};
++
++
++/* Playback */
++
++static int
++mpc52xx_ac97_playback_open(struct snd_pcm_substream *substream)
++{
++	struct mpc52xx_ac97_priv *priv = substream->pcm->private_data;
++
++	dev_dbg(priv->dev, "mpc52xx_ac97_playback_open(%p)\n", substream);
++
++	substream->runtime->hw = mpc52xx_ac97_hw;
++
++	priv->substream_playback = substream;
++	priv->buf_pos = 0;	/* FIXME Do that where ? */
++
++	return 0;	/* FIXME */
++}
++
++static int
++mpc52xx_ac97_playback_close(struct snd_pcm_substream *substream)
++{
++	struct mpc52xx_ac97_priv *priv = substream->pcm->private_data;
++	dev_dbg(priv->dev, "mpc52xx_ac97_playback_close(%p)\n", substream);
++	priv->substream_playback = NULL;
++	return 0;	/* FIXME */
++}
++
++static int
++mpc52xx_ac97_playback_prepare(struct snd_pcm_substream *substream)
++{
++	struct mpc52xx_ac97_priv *priv = substream->pcm->private_data;
++
++	dev_dbg(priv->dev, "mpc52xx_ac97_playback_prepare(%p)\n", substream);
++
++	/* FIXME, need a spinlock to protect access */
++	if (substream->runtime->channels == 1)
++		out_be32(&priv->psc->ac97_slots, 0x01000000);
++	else
++		out_be32(&priv->psc->ac97_slots, 0x03000000);
++
++	snd_ac97_set_rate(priv->ac97, AC97_PCM_FRONT_DAC_RATE, substream->runtime->rate);
++
++	return 0;	/* FIXME */
++}
++
++
++/* Capture */
++
++static int
++mpc52xx_ac97_capture_open(struct snd_pcm_substream *substream)
++{
++	struct mpc52xx_ac97_priv *priv = substream->pcm->private_data;
++	return 0;	/* FIXME */
++}
++
++static int
++mpc52xx_ac97_capture_close(struct snd_pcm_substream *substream)
++{
++	struct mpc52xx_ac97_priv *priv = substream->pcm->private_data;
++	return 0;	/* FIXME */
++}
++
++static int
++mpc52xx_ac97_capture_prepare(struct snd_pcm_substream *substream)
++{
++	struct mpc52xx_ac97_priv *priv = substream->pcm->private_data;
++	return 0;	/* FIXME */
++}
++
++
++/* Common */
++
++static int
++mpc52xx_ac97_hw_params(struct snd_pcm_substream *substream,
++			struct snd_pcm_hw_params *params)
++{
++	struct mpc52xx_ac97_priv *priv = substream->pcm->private_data;
++	int rv;
++
++	dev_dbg(priv->dev, "mpc52xx_ac97_hw_params(%p)\n", substream);
++
++	rv = snd_pcm_lib_malloc_pages(substream,
++					params_buffer_bytes(params));
++	if (rv < 0) {
++		printk(KERN_ERR "hw params failes\n");	/* FIXME */
++		return rv;
++	}
++
++	printk(KERN_DEBUG "%d %d %d\n", params_buffer_bytes(params), params_period_bytes(params), params_periods(params));
++
++
++	return 0;
++}
++
++static int
++mpc52xx_ac97_hw_free(struct snd_pcm_substream *substream)
++{
++	struct mpc52xx_ac97_priv *priv = substream->pcm->private_data;
++
++	dev_dbg(priv->dev, "mpc52xx_ac97_hw_free(%p)\n", substream);
++
++	return snd_pcm_lib_free_pages(substream);
++}
++
++static int
++mpc52xx_ac97_trigger(struct snd_pcm_substream *substream, int cmd)
++{
++	struct mpc52xx_ac97_priv *priv = substream->pcm->private_data;
++	int rv = 0;
++
++	dev_dbg(priv->dev, "mpc52xx_ac97_trigger(%p,%d)\n", substream, cmd);
++
++	switch (cmd) {
++		case SNDRV_PCM_TRIGGER_START:
++			/* Enable TX interrupt */
++			out_be16(&priv->psc->mpc52xx_psc_imr, 0x0100); // 0x0100
++
++			break;
++
++		case SNDRV_PCM_TRIGGER_STOP:
++			/* Disable TX interrupt */
++			out_be16(&priv->psc->mpc52xx_psc_imr, 0x0000);
++
++			break;
++
++		default:
++			rv = -EINVAL;
++	}
++
++	/* FIXME */
++	return rv;
++}
++
++static snd_pcm_uframes_t
++mpc52xx_ac97_pointer(struct snd_pcm_substream *substream)
++{
++	struct mpc52xx_ac97_priv *priv = substream->pcm->private_data;
++
++//	dev_dbg(priv->dev, "mpc52xx_ac97_pointer(%p)\n", substream);
++
++	if (substream->runtime->channels == 1)
++		return priv->buf_pos;	/* FIXME */
++	else
++		return priv->buf_pos >> 1;	/* FIXME */
++}
++
++
++/* Ops */
++
++static struct snd_pcm_ops mpc52xx_ac97_playback_ops = {
++	.open		= mpc52xx_ac97_playback_open,
++	.close		= mpc52xx_ac97_playback_close,
++	.ioctl		= snd_pcm_lib_ioctl,
++	.hw_params	= mpc52xx_ac97_hw_params,
++	.hw_free	= mpc52xx_ac97_hw_free,
++	.prepare	= mpc52xx_ac97_playback_prepare,
++	.trigger	= mpc52xx_ac97_trigger,
++	.pointer	= mpc52xx_ac97_pointer,
++};
++
++static struct snd_pcm_ops mpc52xx_ac97_capture_ops = {
++	.open		= mpc52xx_ac97_capture_open,
++	.close		= mpc52xx_ac97_capture_close,
++	.ioctl		= snd_pcm_lib_ioctl,
++	.hw_params	= mpc52xx_ac97_hw_params,
++	.hw_free	= mpc52xx_ac97_hw_free,
++	.prepare	= mpc52xx_ac97_capture_prepare,
++	.trigger	= mpc52xx_ac97_trigger,
++	.pointer	= mpc52xx_ac97_pointer,
++};
++
++
++/* ======================================================================== */
++/* AC97 Bus interface                                                       */
++/* ======================================================================== */
++
++static unsigned short
++mpc52xx_ac97_bus_read(struct snd_ac97 *ac97, unsigned short reg)
++{
++	struct mpc52xx_ac97_priv *priv = ac97->private_data;
++	int timeout;
++	unsigned int val;
++
++	dev_dbg(priv->dev, "ac97 read: reg %04x\n", reg);
++
++	/* Wait for it to be ready */
++	timeout = 1000;
++	while ((--timeout) && (in_be16(&priv->psc->mpc52xx_psc_status) &
++						MPC52xx_PSC_SR_CMDSEND) )
++		udelay(10);
++
++	if (!timeout) {
++		printk(KERN_ERR DRV_NAME ": timeout on ac97 bus (rdy)\n");
++		return 0xffff;
++	}
++
++	/* Do the read */
++	out_be32(&priv->psc->ac97_cmd, (1<<31) | ((reg & 0x7f) << 24));
++
++	/* Wait for the answer */
++	timeout = 1000;
++	while ((--timeout) && !(in_be16(&priv->psc->mpc52xx_psc_status) &
++						MPC52xx_PSC_SR_DATA_VAL) )
++		udelay(10);
++
++	if (!timeout) {
++		printk(KERN_ERR DRV_NAME ": timeout on ac97 read (val)\n");
++		return 0xffff;
++	}
++
++	/* Get the data */
++	val = in_be32(&priv->psc->ac97_data);
++	if ( ((val>>24) & 0x7f) != reg ) {
++		printk(KERN_ERR DRV_NAME ": reg echo error on ac97 read\n");
++		return 0xffff;
++	}
++	val = (val >> 8) & 0xffff;
++
++	dev_dbg(priv->dev, "ac97 read ok: reg %04x  val %04x\n",
++				reg, val);
++
++	return (unsigned short) val;
++}
++
++static void
++mpc52xx_ac97_bus_write(struct snd_ac97 *ac97,
++			unsigned short reg, unsigned short val)
++{
++	struct mpc52xx_ac97_priv *priv = ac97->private_data;
++	int timeout;
++
++	dev_dbg(priv->dev, "ac97 write: reg %04x  val %04x\n",
++				reg, val);
++
++	/* Wait for it to be ready */
++	timeout = 1000;
++	while ((--timeout) && (in_be16(&priv->psc->mpc52xx_psc_status) &
++						MPC52xx_PSC_SR_CMDSEND) )
++		udelay(10);
++
++	if (!timeout) {
++		printk(KERN_ERR DRV_NAME ": timeout on ac97 write\n");
++		return;
++	}
++
++	/* Write data */
++	out_be32(&priv->psc->ac97_cmd, ((reg & 0x7f) << 24) | (val << 8));
++}
++
++static void
++mpc52xx_ac97_bus_reset(struct snd_ac97 *ac97)
++{
++	struct mpc52xx_ac97_priv *priv = ac97->private_data;
++
++	dev_dbg(priv->dev, "ac97 codec reset\n");
++
++	/* Do a cold reset */
++	out_8(&priv->psc->op1, 0x03);
++	udelay(10);
++	out_8(&priv->psc->op0, 0x02);
++	udelay(50);
++
++	/* PSC recover from cold reset (cfr user manual, not sure if useful) */
++	out_be32(&priv->psc->sicr, in_be32(&priv->psc->sicr));
++}
++
++
++static struct snd_ac97_bus_ops mpc52xx_ac97_bus_ops = {
++	.read	= mpc52xx_ac97_bus_read,
++	.write	= mpc52xx_ac97_bus_write,
++	.reset	= mpc52xx_ac97_bus_reset,
++};
++
++
++/* ======================================================================== */
++/* Sound driver setup                                                       */
++/* ======================================================================== */
++
++static int
++mpc52xx_ac97_setup_pcm(struct mpc52xx_ac97_priv *priv)
++{
++	int rv;
++
++	rv = snd_pcm_new(priv->card, DRV_NAME "-pcm", 0, 1, 1, &priv->pcm);
++	if (rv) {
++		printk(KERN_ERR DRV_NAME ": snd_pcm_new failed\n");
++		return rv;
++	}
++
++	rv = snd_pcm_lib_preallocate_pages_for_all(priv->pcm,
++		SNDRV_DMA_TYPE_CONTINUOUS, snd_dma_continuous_data(GFP_KERNEL),
++		128*1024, 128*1024);
++	if (rv) {
++		printk(KERN_ERR DRV_NAME
++			": snd_pcm_lib_preallocate_pages_for_all  failed\n");
++		return rv;
++	}
++
++	snd_pcm_set_ops(priv->pcm, SNDRV_PCM_STREAM_PLAYBACK,
++			&mpc52xx_ac97_playback_ops);
++	snd_pcm_set_ops(priv->pcm, SNDRV_PCM_STREAM_CAPTURE,
++			&mpc52xx_ac97_capture_ops);
++
++	priv->pcm->private_data = priv;
++	priv->pcm->info_flags = 0;
++
++	strcpy(priv->pcm->name, "Freescale MPC52xx PSC-AC97 PCM");
++
++	return 0;
++}
++
++static int
++mpc52xx_ac97_setup_mixer(struct mpc52xx_ac97_priv *priv)
++{
++	struct snd_ac97_bus *ac97_bus;
++	struct snd_ac97_template ac97_template;
++	int rv;
++
++	rv = snd_ac97_bus(priv->card, 0, &mpc52xx_ac97_bus_ops, NULL, &ac97_bus);
++	if (rv) {
++		printk(KERN_ERR DRV_NAME ": snd_ac97_bus failed\n");
++		return rv;
++	}
++
++	memset(&ac97_template, 0, sizeof(struct snd_ac97_template));
++	ac97_template.private_data = priv;
++
++	rv = snd_ac97_mixer(ac97_bus, &ac97_template, &priv->ac97);
++	if (rv) {
++		printk(KERN_ERR DRV_NAME ": snd_ac97_mixer failed\n");
++		return rv;
++	}
++
++	return 0;
++}
++
++
++static int
++mpc52xx_ac97_hwinit(struct mpc52xx_ac97_priv *priv)
++{
++	/* Reset everything first by safety */
++	out_8(&priv->psc->command,MPC52xx_PSC_RST_RX);
++	out_8(&priv->psc->command,MPC52xx_PSC_RST_TX);
++	out_8(&priv->psc->command,MPC52xx_PSC_RST_ERR_STAT);
++
++	/* Do a cold reset of codec */
++	out_8(&priv->psc->op1, 0x03);
++	udelay(10);
++	out_8(&priv->psc->op0, 0x02);
++	udelay(50);
++
++	/* Configure AC97 enhanced mode */
++	out_be32(&priv->psc->sicr, 0x03010000);
++
++	/* No slots active */
++	out_be32(&priv->psc->ac97_slots, 0x00000000);
++
++	/* No IRQ */
++	out_be16(&priv->psc->mpc52xx_psc_imr, 0x0000);
++
++	/* FIFO levels */
++	out_8(&priv->psc->rfcntl, 0x07);
++	out_8(&priv->psc->tfcntl, 0x07);
++	out_be16(&priv->psc->rfalarm, 0x80);
++	out_be16(&priv->psc->tfalarm, 0x80);
++
++	/* Go */
++	out_8(&priv->psc->command,MPC52xx_PSC_TX_ENABLE);
++	out_8(&priv->psc->command,MPC52xx_PSC_RX_ENABLE);
++
++	return 0;
++}
++
++static int
++mpc52xx_ac97_hwshutdown(struct mpc52xx_ac97_priv *priv)
++{
++	/* No IRQ */
++	out_be16(&priv->psc->mpc52xx_psc_imr, 0x0000);
++
++	/* Disable TB & RX */
++	out_8(&priv->psc->command,MPC52xx_PSC_RST_RX);
++	out_8(&priv->psc->command,MPC52xx_PSC_RST_TX);
++
++	/* FIXME : Reset or put codec in low power ? */
++
++	return 0;
++}
++
++
++/* ======================================================================== */
++/* OF Platform Driver                                                       */
++/* ======================================================================== */
++
++static int __devinit
++mpc52xx_ac97_probe(struct of_device *op, const struct of_device_id *match)
++{
++	struct device_node *dn = op->node;
++	struct mpc52xx_ac97_priv *priv;
++	struct snd_card *card;
++	struct resource res;
++	int rv;
++
++	dev_dbg(&op->dev, "probing MPC52xx PSC AC97 driver\n");
++
++	/* Get card structure */
++	rv = -ENOMEM;
++	card = snd_card_new(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,
++				THIS_MODULE, sizeof(struct mpc52xx_ac97_priv));
++	if (!card)
++		goto err_early;
++
++	priv = card->private_data;
++
++	/* Init our private structure */
++	priv->card = card;
++	priv->dev = &op->dev;
++
++	/* Get resources (mem,irq,...) */
++	rv = of_address_to_resource(dn, 0, &res);
++	if (rv)
++		goto err_early;
++
++	priv->mem_start = res.start;
++	priv->mem_len = res.end - res.start + 1;
++
++	if (!request_mem_region(priv->mem_start, priv->mem_len, DRV_NAME)) {
++		printk(KERN_ERR DRV_NAME ": request_mem_region failed\n");
++		rv = -EBUSY;
++		goto err_early;
++	}
++
++	priv->psc = ioremap(priv->mem_start, priv->mem_len);
++	if (!priv->psc) {
++		printk(KERN_ERR DRV_NAME ": ioremap failed\n");
++		rv = -ENOMEM;
++		goto err_iomap;
++	}
++
++	priv->irq = irq_of_parse_and_map(dn, 0);
++	if (priv->irq == NO_IRQ) {
++		printk(KERN_ERR DRV_NAME ": irq_of_parse_and_map failed\n");
++		rv = -EBUSY;
++		goto err_irqmap;
++	}
++
++	/* Low level HW Init */
++	mpc52xx_ac97_hwinit(priv);
++
++	/* Request IRQ now that we're 'stable' */
++	rv = request_irq(priv->irq, mpc52xx_ac97_irq, 0, DRV_NAME, priv);
++	if (rv < 0) {
++		printk(KERN_ERR DRV_NAME ": request_irq failed\n");
++		goto err_irqreq;
++	}
++
++	/* Prepare sound stuff */
++	rv = mpc52xx_ac97_setup_mixer(priv);
++	if (rv)
++		goto err_late;
++
++	rv = mpc52xx_ac97_setup_pcm(priv);
++	if (rv)
++		goto err_late;
++
++	/* Finally register the card */
++	snprintf(card->shortname, sizeof(card->shortname), DRV_NAME);
++	snprintf(card->longname, sizeof(card->longname),
++		"Freescale MPC52xx PSC-AC97 (%s)", card->mixername);
++
++	rv = snd_card_register(card);
++	if (rv) {
++		printk(KERN_ERR DRV_NAME ": snd_card_register failed\n");
++		goto err_late;
++	}
++
++	dev_set_drvdata(&op->dev, priv);
++
++	return 0;
++
++err_late:
++	free_irq(priv->irq, priv);
++err_irqreq:
++	mpc52xx_ac97_hwshutdown(priv);
++	irq_dispose_mapping(priv->irq);
++err_irqmap:
++	iounmap(priv->psc);
++err_iomap:
++	release_mem_region(priv->mem_start, priv->mem_len);
++err_early:
++	if (card)
++		snd_card_free(card);
++	return rv;
++}
++
++static int
++mpc52xx_ac97_remove(struct of_device *op)
++{
++	struct mpc52xx_ac97_priv *priv;
++
++	dev_dbg(&op->dev, "removing MPC52xx PSC AC97 driver\n");
++
++	priv = dev_get_drvdata(&op->dev);
++	if (priv) {
++		/* Sound subsys shutdown */
++		snd_card_free(priv->card);
++
++		/* Low level HW shutdown */
++		mpc52xx_ac97_hwshutdown(priv);
++
++		/* Release resources */
++		iounmap(priv->psc);
++		free_irq(priv->irq, priv);
++		irq_dispose_mapping(priv->irq);
++		release_mem_region(priv->mem_start, priv->mem_len);
++	}
++
++	dev_set_drvdata(&op->dev, NULL);
++
++	return 0;
++}
++
++
++static struct of_device_id mpc52xx_ac97_of_match[] = {
++	{
++/*		.type		= "ac97",	FIXME Efika ... */
++		.compatible	= "mpc5200b-psc-ac97",	/* B only for now */
++	},
++};
++/* Prevent autoload during developpment phase ... */
++/* MODULE_DEVICE_TABLE(of, mpc52xx_ac97_of_match); */
++
++
++static struct of_platform_driver mpc52xx_ac97_of_driver = {
++	.owner		= THIS_MODULE,
++	.name		= DRV_NAME,
++	.match_table	= mpc52xx_ac97_of_match,
++	.probe		= mpc52xx_ac97_probe,
++	.remove		= mpc52xx_ac97_remove,
++	.driver		= {
++		.name	= DRV_NAME,
++	},
++};
++
++
++/* ======================================================================== */
++/* Module                                                                   */
++/* ======================================================================== */
++
++static int __init
++mpc52xx_ac97_init(void)
++{
++	int rv;
++
++	/* Set port_config bits[25:26] to 01, keep the others as-is. This
++     sets PSC2 to AC97 mode. */
++	{
++		void *mbar;
++    u32 port_config;
++		mbar = ioremap(0xf0000000, 0x100000);
++    port_config = in_be32(mbar + 0xb00);
++		printk(KERN_INFO "port_config was: %08x\n", port_config);
++    port_config &= ~0x00000060;
++    port_config |=  0x00000020;
++		out_be32(mbar + 0xb00, port_config);
++		printk(KERN_INFO "port_config now: %08x\n", port_config);
++		iounmap(mbar);
++	}
++
++	printk(KERN_INFO "Sound: MPC52xx PSC AC97 driver\n");
++
++	rv = of_register_platform_driver(&mpc52xx_ac97_of_driver);
++	if (rv) {
++		printk(KERN_ERR DRV_NAME ": "
++			"of_register_platform_driver failed (%i)\n", rv);
++		return rv;
++	}
++
++	return 0;
++}
++
++static void __exit
++mpc52xx_ac97_exit(void)
++{
++	of_unregister_platform_driver(&mpc52xx_ac97_of_driver);
++}
++
++module_init(mpc52xx_ac97_init);
++module_exit(mpc52xx_ac97_exit);
++
++MODULE_AUTHOR("Sylvain Munaut <tnt@246tNt.com>");
++MODULE_DESCRIPTION(DRV_NAME ": Freescale MPC52xx PSC AC97 driver");
++MODULE_LICENSE("GPL");
++
diff --git a/packages/linux/linux-efika/defconfig b/packages/linux/linux-efika/defconfig
index 05a06b6c5e..b8a39ffa05 100644
--- a/packages/linux/linux-efika/defconfig
+++ b/packages/linux/linux-efika/defconfig
@@ -1827,7 +1827,7 @@ CONFIG_RPCSEC_GSS_SPKM3=m
 CONFIG_SMB_FS=m
 CONFIG_SMB_NLS_DEFAULT=y
 CONFIG_SMB_NLS_REMOTE="iso8859-1"
-# CONFIG_CIFS is not set
+CONFIG_CIFS=m
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
diff --git a/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb b/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb
index 679bd667d5..fec05ad168 100644
--- a/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb
+++ b/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb
@@ -1,15 +1,16 @@
 DESCRIPTION = "Linux Kernel for the EFIKA dev platform"
 SECTION = "kernel"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 COMPATIBLE_MACHINE = "efika"
 
 SRC_URI = "http://www.efika.de/download/linux-2.6.19-rc6_efika.tgz \
-           http://www.246tnt.com/files/0001-sound-Add-support-for-the-MPC52xx-PSC-AC97-Link.txt;patch=1 \
+           file://0001-sound-Add-support-for-the-MPC52xx-PSC-AC97-Link.txt;patch=1 \
            http://www.246tnt.com/files/0001-powerpc-Add-device-tree-fixup-for-the-EFIKA.txt;patch=1 \
            file://defconfig \
 		   "
+#	http://www.246tnt.com/files/0001-sound-Add-support-for-the-MPC52xx-PSC-AC97-Link.txt;patch=1 \
 #           http://lkml.org/lkml/2006/11/29/335;patch=1 \
 
 S = "${WORKDIR}/linux-2.6.19-rc6_efika"
diff --git a/packages/linux/linux-handhelds-2.6-2.6.16/h1910/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.16/h1910/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-handhelds-2.6-2.6.16/h1910/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6-2.6.16/h1910/defconfig b/packages/linux/linux-handhelds-2.6-2.6.16/h1910/defconfig
new file mode 100644
index 0000000000..c299fd95c7
--- /dev/null
+++ b/packages/linux/linux-handhelds-2.6-2.6.16/h1910/defconfig
@@ -0,0 +1,1201 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.16-hh9
+# Fri Jan 12 03:26:16 2007
+#
+CONFIG_ARM=y
+CONFIG_MMU=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_MTD_XIP=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+CONFIG_SYSCTL=y
+# CONFIG_AUDIT is not set
+CONFIG_IKCONFIG=y
+# CONFIG_MINIMAL_OOPS is not set
+CONFIG_IKCONFIG_PROC=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_UID16=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_EMBEDDED=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SHMEM=y
+CONFIG_USELIB=y
+CONFIG_CORE_DUMP=y
+CONFIG_CC_ALIGN_FUNCTIONS=0
+CONFIG_CC_ALIGN_LABELS=0
+CONFIG_CC_ALIGN_LOOPS=0
+CONFIG_CC_ALIGN_JUMPS=0
+CONFIG_SLAB=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_SLOB is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_OBSOLETE_MODPARM=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+
+#
+# Block layer
+#
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+
+#
+# System Type
+#
+# 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_FOOTBRIDGE is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_IOP3XX is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_L7200 is not set
+CONFIG_ARCH_PXA=y
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_AT91RM9200 is not set
+
+#
+# Intel PXA2xx Implementations
+#
+# CONFIG_ARCH_LUBBOCK is not set
+# CONFIG_MACH_MAINSTONE is not set
+# CONFIG_ARCH_PXA_IDP is not set
+# CONFIG_ARCH_ESERIES is not set
+# CONFIG_MACH_A620 is not set
+# CONFIG_MACH_A716 is not set
+CONFIG_ARCH_H1900=y
+CONFIG_IPAQ_H1900_LCD=y
+CONFIG_IPAQ_H1900_BUTTONS=y
+# CONFIG_ARCH_H2200 is not set
+# CONFIG_ARCH_H3900 is not set
+# CONFIG_MACH_H4000 is not set
+# CONFIG_MACH_H4700 is not set
+# CONFIG_MACH_HX2750 is not set
+# CONFIG_ARCH_H5400 is not set
+# CONFIG_MACH_HIMALAYA is not set
+# CONFIG_MACH_HTCUNIVERSAL is not set
+# CONFIG_MACH_HTCALPINE is not set
+# CONFIG_MACH_MAGICIAN is not set
+# CONFIG_MACH_HTCAPACHE is not set
+# CONFIG_MACH_BLUEANGEL is not set
+# CONFIG_MACH_HTCBEETLES is not set
+# CONFIG_ARCH_AXIMX5 is not set
+# CONFIG_ARCH_AXIMX3 is not set
+# CONFIG_MACH_X30 is not set
+# CONFIG_ARCH_ROVERP1 is not set
+# CONFIG_ARCH_ROVERP5P is not set
+# CONFIG_MACH_XSCALE_PALMLD is not set
+# CONFIG_MACH_T3XSCALE is not set
+# CONFIG_PXA_SHARPSL is not set
+CONFIG_PXA25x=y
+# CONFIG_SA1100_H3100 is not set
+# CONFIG_SA1100_H3600 is not set
+# CONFIG_SA1100_H3800 is not set
+
+#
+# Linux As Bootloader
+#
+# CONFIG_LAB is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_XSCALE=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5T=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_TLB_V4WBI=y
+
+#
+# Processor Features
+#
+CONFIG_ARM_THUMB=y
+CONFIG_XSCALE_PMU=y
+CONFIG_KEXEC=y
+
+#
+# Compaq/iPAQ Platforms
+#
+CONFIG_PXA_IPAQ=y
+
+#
+# XScale-based iPAQ
+#
+CONFIG_IPAQ_HANDHELD=y
+
+#
+# Compaq/iPAQ Drivers
+#
+
+#
+# Compaq/HP iPAQ Drivers
+#
+# CONFIG_IPAQ_SLEEVE is not set
+# CONFIG_IPAQ_SAMCOP is not set
+# CONFIG_IPAQ_HAMCOP is not set
+
+#
+# Bus support
+#
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+CONFIG_PCCARD=y
+CONFIG_PCMCIA_DEBUG=y
+CONFIG_PCMCIA=y
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_PCMCIA_IOCTL=y
+
+#
+# PC-card bridges
+#
+CONFIG_PCMCIA_PXA2XX=y
+
+#
+# Kernel Features
+#
+# CONFIG_PREEMPT is not set
+CONFIG_NO_IDLE_HZ=y
+# CONFIG_AEABI is not set
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="keepinitrd"
+# CONFIG_XIP_KERNEL is not set
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_DEBUG=y
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_STAT_DETAILS=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_PXA=y
+CONFIG_PXA25x_ALTERNATE_FREQS=y
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE_XP is not set
+# CONFIG_FPE_FASTFPE is not set
+
+#
+# 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=y
+# CONFIG_PM_LEGACY is not set
+CONFIG_PM_DEBUG=y
+CONFIG_APM=y
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_NETDEBUG is not set
+CONFIG_PACKET=m
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_TUNNEL is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_BIC=y
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_IPV6_TUNNEL is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+# CONFIG_NETFILTER_NETLINK is not set
+# CONFIG_NETFILTER_XTABLES is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_CONNTRACK=m
+# CONFIG_IP_NF_CT_ACCT is not set
+# CONFIG_IP_NF_CONNTRACK_MARK is not set
+# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
+# CONFIG_IP_NF_CT_PROTO_SCTP is not set
+CONFIG_IP_NF_FTP=m
+CONFIG_IP_NF_IRC=m
+# CONFIG_IP_NF_NETBIOS_NS is not set
+# CONFIG_IP_NF_TFTP is not set
+# CONFIG_IP_NF_AMANDA is not set
+# CONFIG_IP_NF_PPTP is not set
+# CONFIG_IP_NF_QUEUE is not set
+
+#
+# IPv6: Netfilter Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP6_NF_QUEUE is not set
+
+#
+# Bridge: Netfilter Configuration
+#
+# CONFIG_BRIDGE_NF_EBTABLES is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+
+#
+# TIPC Configuration (EXPERIMENTAL)
+#
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+CONFIG_BRIDGE=m
+# 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
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+CONFIG_IRDA=y
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRCOMM=y
+# CONFIG_IRDA_ULTRA is not set
+
+#
+# IrDA options
+#
+# CONFIG_IRDA_CACHE_LAST_LSAP is not set
+# CONFIG_IRDA_FAST_RR is not set
+CONFIG_IRDA_DEBUG=y
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+CONFIG_IRTTY_SIR=m
+
+#
+# Dongle support
+#
+# CONFIG_DONGLE is not set
+
+#
+# Old SIR device drivers
+#
+# CONFIG_IRPORT_SIR is not set
+
+#
+# Old Serial dongle support
+#
+
+#
+# FIR device drivers
+#
+CONFIG_PXA_FICP=y
+# CONFIG_BT is not set
+# CONFIG_IEEE80211 is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_DEBUG_DRIVER is not set
+
+#
+# Connector - unified userspace <-> kernelspace linker
+#
+# CONFIG_CONNECTOR is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=6
+CONFIG_BLK_DEV_RAM_SIZE=8192
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+CONFIG_IDE=m
+CONFIG_BLK_DEV_IDE=m
+
+#
+# Please see Documentation/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_IDE_TASK_IOCTL is not set
+
+#
+# IDE chipset support/bugfixes
+#
+# CONFIG_IDE_GENERIC is not set
+# CONFIG_IDE_ARM is not set
+# CONFIG_BLK_DEV_IDEDMA is not set
+# CONFIG_IDEDMA_AUTO is not set
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# I2O device support
+#
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+
+#
+# PHY device support
+#
+
+#
+# Ethernet (10 or 100Mbit)
+#
+# CONFIG_NET_ETHERNET is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+
+#
+# Ethernet (10000 Mbit)
+#
+
+#
+# Token Ring devices
+#
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# PCMCIA network device support
+#
+# CONFIG_NET_PCMCIA is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+CONFIG_INPUT_TSDEV=y
+CONFIG_INPUT_TSDEV_SCREEN_X=240
+CONFIG_INPUT_TSDEV_SCREEN_Y=320
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK 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_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_PXA=y
+CONFIG_SERIAL_PXA_CONSOLE=y
+CONFIG_SERIAL_PXA_COUNT=4
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=32
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+
+#
+# I2C Algorithms
+#
+# CONFIG_I2C_ALGOBIT is not set
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALGOPCA is not set
+
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_ELV is not set
+CONFIG_I2C_PXA=y
+# CONFIG_I2C_PXA_SLAVE is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_PCA_ISA is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCA9535 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_RTC8564 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_RTC_X1205_I2C 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
+
+#
+# L3 serial bus support
+#
+# CONFIG_L3 is not set
+
+#
+# Mice
+#
+# CONFIG_BUSMOUSE is not set
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_NVRAM is not set
+CONFIG_SA1100_RTC=y
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+
+#
+# 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
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+# CONFIG_TELCLOCK is not set
+
+#
+# SPI support
+#
+CONFIG_SPI=y
+CONFIG_SPI_DEBUG=y
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_BITBANG is not set
+
+#
+# SPI Protocol Masters
+#
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Hardware Monitoring support
+#
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# SoC drivers
+#
+# CONFIG_SOC_MQ11XX is not set
+# CONFIG_SOC_T7L66XB is not set
+# CONFIG_SOC_TC6387XB is not set
+# CONFIG_SOC_TC6393XB is not set
+# CONFIG_HTC_ASIC2 is not set
+CONFIG_HTC_ASIC3=y
+# CONFIG_SOC_TSC2101 is not set
+
+#
+# Misc devices
+#
+CONFIG_BATTERY_MONITOR=y
+
+#
+# Multimedia Capabilities Port drivers
+#
+# CONFIG_MCP is not set
+
+#
+# Multimedia Capabilities Port drivers
+#
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+CONFIG_FB=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_MODE_HELPERS is not set
+CONFIG_FB_TILEBLITTING=y
+# CONFIG_FB_IMAGEON is not set
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FB_PXA=y
+CONFIG_FB_PXA_PARAMETERS=y
+# CONFIG_FB_VIRTUAL is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+# 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=y
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+
+#
+# Logo configuration
+#
+# CONFIG_LOGO is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_DEVICE=y
+CONFIG_LCD_CLASS_DEVICE=y
+CONFIG_LCD_DEVICE=y
+
+#
+# Sound
+#
+CONFIG_SOUND=y
+
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
+# CONFIG_SND_SEQUENCER is not set
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=y
+CONFIG_SND_PCM_OSS=y
+# CONFIG_SND_DYNAMIC_MINORS is not set
+# CONFIG_SND_SUPPORT_OLD_API is not set
+CONFIG_SND_VERBOSE_PRINTK=y
+CONFIG_SND_DEBUG=y
+CONFIG_SND_DEBUG_DETECT=y
+
+#
+# Generic devices
+#
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+
+#
+# ALSA ARM devices
+#
+# CONFIG_SND_A716 is not set
+CONFIG_SND_H1910=y
+# CONFIG_SND_H2200 is not set
+# CONFIG_SND_H4000 is not set
+# CONFIG_SND_HTCMAGICIAN is not set
+# CONFIG_SND_HX4700 is not set
+# CONFIG_SND_HTCUNIVERSAL is not set
+# CONFIG_SND_H5XXX_AK4535 is not set
+CONFIG_SND_PXA2xx_I2SOUND=y
+# CONFIG_SND_PXA2XX_AC97 is not set
+
+#
+# PCMCIA devices
+#
+CONFIG_SND_UDA1380=y
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+
+#
+# USB support
+#
+CONFIG_USB_ARCH_HAS_HCD=y
+# CONFIG_USB_ARCH_HAS_OHCI is not set
+# CONFIG_USB is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# USB Gadget Support
+#
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DEBUG_FILES=y
+CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_NET2280 is not set
+CONFIG_USB_GADGET_PXA2XX=y
+CONFIG_USB_PXA2XX=y
+# CONFIG_USB_PXA2XX_SMALL is not set
+# CONFIG_USB_GADGET_PXA27X is not set
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_MQ11XX is not set
+# CONFIG_USB_GADGET_LH7A40X is not set
+# CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_DUMMY_HCD is not set
+# CONFIG_USB_GADGET_DUALSPEED is not set
+# CONFIG_USB_ZERO is not set
+CONFIG_USB_ETH=y
+# CONFIG_USB_ETH_RNDIS is not set
+# CONFIG_USB_GADGETFS is not set
+# CONFIG_USB_FILE_STORAGE is not set
+# CONFIG_USB_G_SERIAL is not set
+# CONFIG_USB_G_CHAR is not set
+
+#
+# MMC/SD Card support
+#
+CONFIG_MMC=y
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_BLOCK=y
+# CONFIG_MMC_PXA is not set
+# CONFIG_MMC_TMIO is not set
+# CONFIG_MMC_SAMCOP is not set
+CONFIG_MMC_ASIC3=y
+
+#
+# LED devices
+#
+CONFIG_CLASS_LEDS=y
+
+#
+# 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_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_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+# 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_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+# CONFIG_RELAYFS_FS 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_CRAMFS is not set
+# 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
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+# CONFIG_NFSD is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+CONFIG_NLS_CODEPAGE_1250=y
+CONFIG_NLS_CODEPAGE_1251=y
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=y
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+# CONFIG_MAGIC_SYSRQ is not set
+CONFIG_DEBUG_KERNEL=y
+CONFIG_LOG_BUF_SHIFT=15
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_DEBUG_SLAB is not set
+CONFIG_DEBUG_MUTEXES=y
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_FS is not set
+CONFIG_DEBUG_VM=y
+CONFIG_FRAME_POINTER=y
+CONFIG_FORCED_INLINING=y
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_DEBUG_USER=y
+# CONFIG_DEBUG_WAITQ is not set
+CONFIG_DEBUG_ERRORS=y
+# CONFIG_DEBUG_LL is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_SHA1=y
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+CONFIG_CRYPTO_DEFLATE=y
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Hardware crypto devices
+#
+
+#
+# Library routines
+#
+CONFIG_CRC_CCITT=y
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
diff --git a/packages/linux/linux-handhelds-2.6-2.6.16/htcuniversal/defconfig b/packages/linux/linux-handhelds-2.6-2.6.16/htcuniversal/defconfig
index d409f0b3f5..600a3cbf03 100644
--- a/packages/linux/linux-handhelds-2.6-2.6.16/htcuniversal/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.16/htcuniversal/defconfig
@@ -29,7 +29,7 @@ CONFIG_POSIX_MQUEUE=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_SYSCTL=y
-CONFIG_AUDIT=y
+# CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 # CONFIG_MINIMAL_OOPS is not set
 CONFIG_IKCONFIG_PROC=y
diff --git a/packages/linux/linux-handhelds-2.6-2.6.17/htcuniversal/defconfig b/packages/linux/linux-handhelds-2.6-2.6.17/htcuniversal/defconfig
index d409f0b3f5..600a3cbf03 100644
--- a/packages/linux/linux-handhelds-2.6-2.6.17/htcuniversal/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.17/htcuniversal/defconfig
@@ -29,7 +29,7 @@ CONFIG_POSIX_MQUEUE=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_SYSCTL=y
-CONFIG_AUDIT=y
+# CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 # CONFIG_MINIMAL_OOPS is not set
 CONFIG_IKCONFIG_PROC=y
diff --git a/packages/linux/linux-handhelds-2.6-2.6.18/htcuniversal/defconfig b/packages/linux/linux-handhelds-2.6-2.6.18/htcuniversal/defconfig
index d409f0b3f5..600a3cbf03 100644
--- a/packages/linux/linux-handhelds-2.6-2.6.18/htcuniversal/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.18/htcuniversal/defconfig
@@ -29,7 +29,7 @@ CONFIG_POSIX_MQUEUE=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_SYSCTL=y
-CONFIG_AUDIT=y
+# CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 # CONFIG_MINIMAL_OOPS is not set
 CONFIG_IKCONFIG_PROC=y
diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc
index b2e90c6620..bcca0934ba 100644
--- a/packages/linux/linux-handhelds-2.6.inc
+++ b/packages/linux/linux-handhelds-2.6.inc
@@ -3,7 +3,7 @@ DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer h
 LICENSE = "GPL"
 
 COMPATIBLE_HOST = "arm.*-linux"
-COMPATIBLE_MACHINE ?= '(asus730|h1910|h2200|h3600|h3900|h4000|h5000|htcblueangel|htcuniversal|hx4700|jornada56x|magician|simpad|rx3000|h3800)'
+COMPATIBLE_MACHINE ?= '(asus730|h1910|h2200|h3600|h3800|h3900|h4000|h5000|htcblueangel|htcuniversal|hx4700|jornada56x|magician|simpad|rx3000)'
 
 # SRC_URI *must* be overriden in includer, but this is a good reference
 SRC_URI ?= "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
diff --git a/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig b/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig
index d409f0b3f5..ad5cce380d 100644
--- a/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig
+++ b/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig
@@ -1,15 +1,21 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.17-hh1
-# Sun Oct  1 20:32:17 2006
+# Linux kernel version: 2.6.19-hh6
+# Sat Dec 16 20:23:29 2006
 #
 CONFIG_ARM=y
+# CONFIG_GENERIC_TIME is not set
 CONFIG_MMU=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_ARCH_MTD_XIP=y
 CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
 # Code maturity level options
@@ -25,19 +31,23 @@ CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
 CONFIG_POSIX_MQUEUE=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_SYSCTL=y
-CONFIG_AUDIT=y
+# CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 # CONFIG_MINIMAL_OOPS is not set
 CONFIG_IKCONFIG_PROC=y
 # CONFIG_RELAY is not set
 CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
 CONFIG_UID16=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_EMBEDDED is not set
+CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_HOTPLUG=y
@@ -51,6 +61,8 @@ CONFIG_SHMEM=y
 CONFIG_USELIB=y
 CONFIG_CORE_DUMP=y
 CONFIG_SLAB=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_SLOB is not set
@@ -68,6 +80,7 @@ CONFIG_KMOD=y
 #
 # Block layer
 #
+CONFIG_BLOCK=y
 # CONFIG_BLK_DEV_IO_TRACE is not set
 
 #
@@ -86,18 +99,27 @@ CONFIG_DEFAULT_IOSCHED="cfq"
 #
 # 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_INTEGRATOR is not set
-# CONFIG_ARCH_IOP3XX is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP23XX is not set
 # CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_PNX4008 is not set
 CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_SA1100 is not set
@@ -105,12 +127,6 @@ CONFIG_ARCH_PXA=y
 # CONFIG_ARCH_SHARK is not set
 # CONFIG_ARCH_LH7A40X is not set
 # CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_AT91RM9200 is not set
 
 #
 # Intel PXA2xx Implementations
@@ -119,9 +135,11 @@ CONFIG_ARCH_PXA=y
 # CONFIG_MACH_LOGICPD_PXA270 is not set
 # CONFIG_MACH_MAINSTONE is not set
 # CONFIG_ARCH_PXA_IDP is not set
+# CONFIG_TOSHIBA_TMIO_OHCI is not set
 # CONFIG_ARCH_ESERIES is not set
 # CONFIG_MACH_A620 is not set
 # CONFIG_MACH_A716 is not set
+# CONFIG_MACH_A730 is not set
 # CONFIG_ARCH_H1900 is not set
 # CONFIG_ARCH_H2200 is not set
 # CONFIG_MACH_H3900 is not set
@@ -133,25 +151,29 @@ CONFIG_ARCH_PXA=y
 CONFIG_MACH_HTCUNIVERSAL=y
 CONFIG_HTCUNIVERSAL_CORE=y
 CONFIG_HTCUNIVERSAL_UDC=y
-# CONFIG_HTCUNIVERSAL_POWER is not set
+CONFIG_HTCUNIVERSAL_POWER=y
+CONFIG_HTCUNIVERSAL_BACKLIGHT=y
 CONFIG_HTCUNIVERSAL_LCD=y
 CONFIG_HTCUNIVERSAL_TS2=y
-CONFIG_HTCUNIVERSAL_KEYPAD=y
+CONFIG_HTCUNIVERSAL_BUTTONS=y
 CONFIG_HTCUNIVERSAL_BLUETOOTH=y
-# CONFIG_HTCUNIVERSAL_PHONE is not set
+CONFIG_HTCUNIVERSAL_PHONE=y
+CONFIG_HTCUNIVERSAL_AK4641=m
 # CONFIG_MACH_HTCALPINE is not set
 # CONFIG_MACH_MAGICIAN is not set
 # CONFIG_MACH_HTCAPACHE is not set
 # CONFIG_MACH_BLUEANGEL is not set
 # CONFIG_MACH_HTCBEETLES is not set
-# CONFIG_ARCH_AXIMX5 is not set
+# CONFIG_MACH_HW6900 is not set
 # CONFIG_ARCH_AXIMX3 is not set
+# CONFIG_ARCH_AXIMX5 is not set
 # CONFIG_MACH_X30 is not set
 # CONFIG_ARCH_ROVERP1 is not set
 # CONFIG_ARCH_ROVERP5P is not set
 # CONFIG_MACH_XSCALE_PALMLD is not set
 # CONFIG_MACH_T3XSCALE is not set
 # CONFIG_PXA_SHARPSL is not set
+# CONFIG_MACH_TRIZEPS4 is not set
 CONFIG_PXA27x=y
 # CONFIG_SA1100_H3100 is not set
 # CONFIG_SA1100_H3600 is not set
@@ -171,11 +193,14 @@ CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
 
 #
 # Processor Features
 #
 # CONFIG_ARM_THUMB is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
 CONFIG_XSCALE_PMU=y
 # CONFIG_KEXEC is not set
 
@@ -190,7 +215,6 @@ CONFIG_XSCALE_PMU=y
 #
 # Compaq/HP iPAQ Drivers
 #
-# CONFIG_IPAQ_HAMCOP is not set
 
 #
 # Bus support
@@ -218,6 +242,7 @@ CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_RESOURCES_64BIT is not set
 CONFIG_ALIGNMENT_TRAP=y
 
 #
@@ -257,6 +282,8 @@ CONFIG_BINFMT_ELF=y
 CONFIG_PM=y
 CONFIG_PM_LEGACY=y
 CONFIG_PM_DEBUG=y
+# CONFIG_DISABLE_CONSOLE_SUSPEND is not set
+# CONFIG_PM_SYSFS_DEPRECATED is not set
 CONFIG_APM=y
 
 #
@@ -271,6 +298,9 @@ CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
@@ -287,15 +317,20 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_SYN_COOKIES is not set
 # 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_INET_TUNNEL is not set
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_BIC=y
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_IPV6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
 
 #
@@ -321,7 +356,6 @@ CONFIG_TCP_CONG_BIC=y
 # CONFIG_ATALK is not set
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
 
@@ -381,6 +415,7 @@ CONFIG_IRTTY_SIR=m
 # CONFIG_USB_IRDA is not set
 # CONFIG_SIGMATEL_FIR is not set
 CONFIG_PXA_FICP=m
+# CONFIG_MCS_FIR is not set
 CONFIG_BT=m
 CONFIG_BT_L2CAP=m
 CONFIG_BT_SCO=m
@@ -401,7 +436,7 @@ CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 # CONFIG_BT_HCIBCM203X is not set
 # CONFIG_BT_HCIBPA10X is not set
-CONFIG_BT_HCIBFUSB=m
+# CONFIG_BT_HCIBFUSB is not set
 # CONFIG_BT_HCIVHCI is not set
 # CONFIG_IEEE80211 is not set
 CONFIG_WIRELESS_EXT=y
@@ -416,6 +451,7 @@ CONFIG_WIRELESS_EXT=y
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
+# CONFIG_SYS_HYPERVISOR is not set
 
 #
 # Connector - unified userspace <-> kernelspace linker
@@ -459,6 +495,7 @@ CONFIG_BLK_DEV_LOOP=y
 #
 # CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
+# CONFIG_SCSI_NETLINK is not set
 # CONFIG_SCSI_PROC_FS is not set
 
 #
@@ -479,21 +516,26 @@ CONFIG_SCSI=y
 # CONFIG_SCSI_LOGGING is not set
 
 #
-# SCSI Transport Attributes
+# 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_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
 
 #
 # SCSI low-level drivers
 #
 # CONFIG_ISCSI_TCP is not set
-# CONFIG_SCSI_SATA is not set
 # CONFIG_SCSI_DEBUG is not set
 
 #
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+# CONFIG_ATA is not set
+
+#
 # Multi-device support (RAID and LVM)
 #
 # CONFIG_MD is not set
@@ -528,6 +570,7 @@ CONFIG_NETDEVICES=y
 # Ethernet (10 or 100Mbit)
 #
 # CONFIG_NET_ETHERNET is not set
+CONFIG_MII=y
 
 #
 # Ethernet (1000 Mbit)
@@ -551,6 +594,7 @@ CONFIG_NET_RADIO=y
 # Obsolete Wireless cards support (pre-802.11)
 #
 # CONFIG_STRIP is not set
+# CONFIG_USB_ZD1201 is not set
 # CONFIG_HOSTAP is not set
 CONFIG_ACX=m
 # CONFIG_ACX_USB is not set
@@ -571,6 +615,7 @@ CONFIG_PPP_BSDCOMP=m
 # CONFIG_PPP_MPPE is not set
 CONFIG_PPPOE=m
 # CONFIG_SLIP is not set
+CONFIG_SLHC=m
 # CONFIG_SHAPER is not set
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
@@ -585,14 +630,12 @@ CONFIG_PPPOE=m
 # Input device support
 #
 CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
 
 #
 # Userland interfaces
 #
-CONFIG_INPUT_MOUSEDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
+# CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=y
@@ -602,11 +645,15 @@ CONFIG_INPUT_EVDEV=y
 # Input Device Drivers
 #
 CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_ATKBD is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+CONFIG_GPIO_KEYS=y
+CONFIG_KEYBOARD_ASIC3=y
+CONFIG_KEYBOARD_PXA27x=y
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
@@ -617,7 +664,7 @@ CONFIG_KEYBOARD_ATKBD=y
 #
 CONFIG_SERIO=y
 # CONFIG_SERIO_SERPORT is not set
-CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_LIBPS2 is not set
 # CONFIG_SERIO_RAW is not set
 # CONFIG_GAMEPORT is not set
 
@@ -627,6 +674,7 @@ CONFIG_SERIO_LIBPS2=y
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
 
 #
@@ -645,6 +693,31 @@ CONFIG_UNIX98_PTYS=y
 # CONFIG_LEGACY_PTYS is not set
 
 #
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_NVRAM is not set
+# CONFIG_SA1100_RTC is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_RAW_DRIVER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+
+#
 # I2C support
 #
 CONFIG_I2C=y
@@ -653,7 +726,7 @@ CONFIG_I2C_CHARDEV=y
 #
 # I2C Algorithms
 #
-# CONFIG_I2C_ALGOBIT is not set
+CONFIG_I2C_ALGOBIT=m
 # CONFIG_I2C_ALGOPCF is not set
 # CONFIG_I2C_ALGOPCA is not set
 
@@ -661,7 +734,9 @@ CONFIG_I2C_CHARDEV=y
 # I2C Hardware Bus support
 #
 # CONFIG_I2C_ELV is not set
-# CONFIG_I2C_PXA is not set
+CONFIG_I2C_PXA=m
+# CONFIG_I2C_PXA_SLAVE is not set
+# CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_PCA_ISA is not set
@@ -671,11 +746,12 @@ CONFIG_I2C_CHARDEV=y
 #
 # CONFIG_SENSORS_DS1337 is not set
 # CONFIG_SENSORS_DS1374 is not set
-CONFIG_SENSORS_EEPROM=y
+# CONFIG_SENSORS_EEPROM is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCA9539 is not set
 # CONFIG_SENSORS_PCA9535 is not set
 # CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_RTC8564 is not set
 # CONFIG_SENSORS_MAX6875 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
@@ -683,41 +759,6 @@ CONFIG_SENSORS_EEPROM=y
 # CONFIG_I2C_DEBUG_CHIP is not set
 
 #
-# L3 serial bus support
-#
-# CONFIG_L3 is not set
-
-#
-# Mice
-#
-# CONFIG_BUSMOUSE is not set
-
-#
-# IPMI
-#
-# CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
-# CONFIG_NVRAM is not set
-CONFIG_SA1100_RTC=y
-# CONFIG_DTLK is not set
-# CONFIG_R3964 is not set
-
-#
-# Ftape, the floppy tape device driver
-#
-# CONFIG_RAW_DRIVER is not set
-
-#
-# TPM devices
-#
-# CONFIG_TCG_TPM is not set
-# CONFIG_TELCLOCK is not set
-
-#
 # SPI support
 #
 CONFIG_SPI=y
@@ -741,8 +782,57 @@ CONFIG_SPI_BITBANG=y
 #
 # Hardware Monitoring support
 #
-# CONFIG_HWMON is not set
+CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM70 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Hardware Monitoring - Battery
+#
+CONFIG_BATTERY_MONITOR=y
+
+#
+# L3 serial bus support
+#
+# CONFIG_L3 is not set
 
 #
 # SoC drivers
@@ -751,19 +841,23 @@ CONFIG_SPI_BITBANG=y
 # CONFIG_SOC_T7L66XB is not set
 # CONFIG_SOC_TC6387XB is not set
 # CONFIG_SOC_TC6393XB is not set
+# CONFIG_SOC_SAMCOP is not set
+# CONFIG_SOC_HAMCOP is not set
 # CONFIG_HTC_ASIC2 is not set
 CONFIG_HTC_ASIC3=y
 # CONFIG_SOC_TSC2101 is not set
+# CONFIG_SOC_TSC2200 is not set
 
 #
 # Misc devices
 #
-CONFIG_BATTERY_MONITOR=y
 
 #
 # Multimedia Capabilities Port drivers
 #
 # CONFIG_MCP is not set
+# CONFIG_ADC_ADS7846_SSP is not set
+# CONFIG_TIFM_CORE is not set
 
 #
 # LED devices
@@ -782,7 +876,6 @@ CONFIG_BATTERY_MONITOR=y
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
-CONFIG_VIDEO_V4L2=y
 
 #
 # Digital Video Broadcasting Devices
@@ -793,19 +886,23 @@ CONFIG_VIDEO_V4L2=y
 #
 # Graphics support
 #
+CONFIG_FIRMWARE_EDID=y
 CONFIG_FB=y
+# CONFIG_FB_DDC is not set
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_MACMODES is not set
-CONFIG_FB_FIRMWARE_EDID=y
+# CONFIG_FB_BACKLIGHT is not set
 CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_TILEBLITTING is not set
 # CONFIG_FB_IMAGEON is not set
 # CONFIG_FB_S1D13XXX is not set
 CONFIG_FB_PXA=y
-CONFIG_FB_PXA_PARAMETERS=y
+# CONFIG_FB_PXA_PARAMETERS is not set
+# CONFIG_FB_MBX is not set
 # CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_VSFB is not set
 
 #
 # Console display driver support
@@ -843,7 +940,54 @@ CONFIG_BACKLIGHT_CORGI=y
 #
 # Sound
 #
-# CONFIG_SOUND is not set
+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 is not set
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+
+#
+# ALSA ARM devices
+#
+CONFIG_SND_HTCUNIVERSAL=m
+CONFIG_SND_PXA2xx_I2SOUND=m
+# CONFIG_SND_PXA2XX_AC97 is not set
+
+#
+# USB devices
+#
+# CONFIG_SND_USB_AUDIO is not set
+
+#
+# SoC audio support
+#
+# CONFIG_SND_SOC is not set
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
 
 #
 # USB support
@@ -867,7 +1011,7 @@ CONFIG_USB_DEVICEFS=y
 # USB Host Controller Drivers
 #
 # CONFIG_USB_ISP116X_HCD is not set
-CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_OHCI_BIG_ENDIAN is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_SL811_HCD is not set
@@ -924,15 +1068,16 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
 CONFIG_USB_USBNET=y
 CONFIG_USB_NET_CDCETHER=y
 # CONFIG_USB_NET_GL620A is not set
-CONFIG_USB_NET_NET1080=y
+# CONFIG_USB_NET_NET1080 is not set
 # CONFIG_USB_NET_PLUSB is not set
+# CONFIG_USB_NET_MCS7830 is not set
 # CONFIG_USB_NET_RNDIS_HOST is not set
 # CONFIG_USB_NET_CDC_SUBSET is not set
-CONFIG_USB_NET_ZAURUS=y
-# CONFIG_USB_ZD1201 is not set
+# CONFIG_USB_NET_ZAURUS is not set
 # CONFIG_USB_MON is not set
 
 #
@@ -942,23 +1087,63 @@ CONFIG_USB_NET_ZAURUS=y
 #
 # USB Serial Converter support
 #
-# CONFIG_USB_SERIAL is not set
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+# CONFIG_USB_SERIAL_AIRCABLE is not set
+# CONFIG_USB_SERIAL_AIRPRIME is not set
+# CONFIG_USB_SERIAL_ARK3116 is not set
+# CONFIG_USB_SERIAL_BELKIN is not set
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
+# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
+# CONFIG_USB_SERIAL_CP2101 is not set
+# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
+# CONFIG_USB_SERIAL_EMPEG is not set
+# CONFIG_USB_SERIAL_FTDI_SIO is not set
+# CONFIG_USB_SERIAL_FUNSOFT is not set
+# CONFIG_USB_SERIAL_VISOR is not set
+# CONFIG_USB_SERIAL_IPAQ is not set
+# CONFIG_USB_SERIAL_IR is not set
+# CONFIG_USB_SERIAL_EDGEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
+# CONFIG_USB_SERIAL_GARMIN is not set
+# CONFIG_USB_SERIAL_IPW is not set
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+# CONFIG_USB_SERIAL_KEYSPAN is not set
+# CONFIG_USB_SERIAL_KLSI is not set
+# CONFIG_USB_SERIAL_KOBIL_SCT is not set
+# CONFIG_USB_SERIAL_MCT_U232 is not set
+# CONFIG_USB_SERIAL_MOS7720 is not set
+# CONFIG_USB_SERIAL_MOS7840 is not set
+# CONFIG_USB_SERIAL_NAVMAN is not set
+# CONFIG_USB_SERIAL_PL2303 is not set
+# CONFIG_USB_SERIAL_HP4X is not set
+# CONFIG_USB_SERIAL_SAFE is not set
+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
+# CONFIG_USB_SERIAL_TI is not set
+# CONFIG_USB_SERIAL_CYBERJACK is not set
+# CONFIG_USB_SERIAL_XIRCOM is not set
+# CONFIG_USB_SERIAL_OPTION is not set
+# CONFIG_USB_SERIAL_OMNINET is not set
 
 #
 # USB Miscellaneous drivers
 #
 # CONFIG_USB_EMI62 is not set
 # CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
 # CONFIG_USB_AUERSWALD is not set
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_LEGOTOWER is not set
 # CONFIG_USB_LCD is not set
 # CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
 # CONFIG_USB_CYTHERM is not set
-# CONFIG_USB_PHIDGETKIT is not set
-# CONFIG_USB_PHIDGETSERVO is not set
+# CONFIG_USB_PHIDGET is not set
 # CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
 # CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
 # CONFIG_USB_TEST is not set
 
 #
@@ -988,7 +1173,8 @@ CONFIG_USB_ETH=m
 # CONFIG_USB_ETH_RNDIS is not set
 # CONFIG_USB_GADGETFS is not set
 # CONFIG_USB_FILE_STORAGE is not set
-# CONFIG_USB_G_SERIAL is not set
+CONFIG_USB_G_SERIAL=m
+# CONFIG_USB_MIDI_GADGET is not set
 # CONFIG_USB_G_CHAR is not set
 
 #
@@ -998,6 +1184,7 @@ CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_BLOCK=y
 # CONFIG_MMC_PXA is not set
+# CONFIG_MMC_TIFM_SD is not set
 # CONFIG_MMC_TMIO is not set
 # CONFIG_MMC_SAMCOP is not set
 CONFIG_MMC_ASIC3=y
@@ -1006,7 +1193,34 @@ CONFIG_MMC_ASIC3=y
 # Real Time Clock
 #
 CONFIG_RTC_LIB=y
-# CONFIG_RTC_CLASS is not set
+CONFIG_RTC_CLASS=m
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=m
+CONFIG_RTC_INTF_PROC=m
+CONFIG_RTC_INTF_DEV=m
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+
+#
+# RTC drivers
+#
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+CONFIG_RTC_DRV_SA1100=m
+# CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_V3020 is not set
 
 #
 # File systems
@@ -1016,16 +1230,19 @@ CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XIP is not set
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_FS_XATTR is not set
+# CONFIG_EXT4DEV_FS is not set
 CONFIG_JBD=y
 # CONFIG_JBD_DEBUG is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
-# CONFIG_FS_POSIX_ACL is not set
+CONFIG_FS_POSIX_ACL=y
 # 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=y
 CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
 # CONFIG_QUOTA is not set
 CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
@@ -1046,16 +1263,16 @@ CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
 CONFIG_FAT_DEFAULT_CODEPAGE=850
 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-15"
-CONFIG_NTFS_FS=y
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_RW 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_RAMFS=y
 # CONFIG_CONFIGFS_FS is not set
@@ -1080,8 +1297,20 @@ CONFIG_CRAMFS=y
 #
 # Network File Systems
 #
-# CONFIG_NFS_FS is not set
+CONFIG_NFS_FS=m
+CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_NFS_DIRECTIO=y
 # CONFIG_NFSD is not set
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
 CONFIG_SMB_FS=m
 CONFIG_SMB_NLS_DEFAULT=y
 CONFIG_SMB_NLS_REMOTE="utf8"
@@ -1114,7 +1343,7 @@ CONFIG_NLS_CODEPAGE_850=y
 # CONFIG_NLS_CODEPAGE_862 is not set
 # CONFIG_NLS_CODEPAGE_863 is not set
 # CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
+CONFIG_NLS_CODEPAGE_865=y
 # CONFIG_NLS_CODEPAGE_866 is not set
 # CONFIG_NLS_CODEPAGE_869 is not set
 # CONFIG_NLS_CODEPAGE_936 is not set
@@ -1150,13 +1379,15 @@ CONFIG_NLS_UTF8=y
 # Kernel hacking
 #
 # CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_DEBUG_KERNEL is not set
 CONFIG_LOG_BUF_SHIFT=14
-CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_FS is not set
 CONFIG_FRAME_POINTER=y
-# CONFIG_UNWIND_INFO is not set
+# CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_USER is not set
 
 #
@@ -1169,6 +1400,10 @@ CONFIG_FRAME_POINTER=y
 # Cryptographic options
 #
 CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_HMAC=y
 # CONFIG_CRYPTO_NULL is not set
 # CONFIG_CRYPTO_MD4 is not set
@@ -1178,6 +1413,8 @@ CONFIG_CRYPTO_SHA1=y
 # CONFIG_CRYPTO_SHA512 is not set
 # CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CRYPTO_TGR192 is not set
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_CBC=m
 CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
@@ -1207,3 +1444,4 @@ CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
+CONFIG_PLIST=y
diff --git a/packages/linux/linux-handhelds-2.6/rx3000/defconfig b/packages/linux/linux-handhelds-2.6/rx3000/defconfig
index 3d915d7f8f..35ae57e8ac 100644
--- a/packages/linux/linux-handhelds-2.6/rx3000/defconfig
+++ b/packages/linux/linux-handhelds-2.6/rx3000/defconfig
@@ -1,11 +1,13 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.18-hh1
-# Wed Nov 29 21:13:14 2006
+# Linux kernel version: 2.6.19-hh4
+# Sat Dec 16 17:40:31 2006
 #
 CONFIG_ARM=y
+# CONFIG_GENERIC_TIME is not set
 CONFIG_MMU=y
 CONFIG_GENERIC_HARDIRQS=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
@@ -28,9 +30,11 @@ CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
+# CONFIG_IPC_NS is not set
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_TASKSTATS is not set
+# CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 CONFIG_IKCONFIG=y
 # CONFIG_MINIMAL_OOPS is not set
@@ -38,9 +42,10 @@ CONFIG_IKCONFIG_PROC=y
 # CONFIG_RELAY is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
 # CONFIG_EMBEDDED is not set
 CONFIG_UID16=y
-CONFIG_SYSCTL=y
+CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_HOTPLUG=y
@@ -73,6 +78,7 @@ CONFIG_KMOD=y
 #
 # Block layer
 #
+CONFIG_BLOCK=y
 # CONFIG_BLK_DEV_IO_TRACE is not set
 
 #
@@ -105,7 +111,8 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_H720X is not set
 # CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_IOP3XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP23XX is not set
@@ -125,9 +132,11 @@ CONFIG_ARCH_S3C2410=y
 #
 # S3C24XX Implementations
 #
+# CONFIG_MACH_AML_M5900 is not set
 # CONFIG_MACH_ANUBIS is not set
 # CONFIG_MACH_OSIRIS is not set
 # CONFIG_ARCH_BAST is not set
+CONFIG_PM_H1940=y
 # CONFIG_ARCH_H1940 is not set
 # CONFIG_MACH_N30 is not set
 # CONFIG_ARCH_SMDK2410 is not set
@@ -135,9 +144,14 @@ CONFIG_ARCH_S3C2410=y
 # CONFIG_MACH_SMDK2413 is not set
 # CONFIG_MACH_VR1000 is not set
 CONFIG_MACH_RX3715=y
+CONFIG_RX3715_LEDS=m
+CONFIG_RX3715_BLUETOOTH=m
+CONFIG_RX3715_DS1WM=m
 # CONFIG_MACH_OTOM is not set
 # CONFIG_MACH_NEXCODER_2440 is not set
+# CONFIG_MACH_VSTMS is not set
 CONFIG_S3C2410_CLOCK=y
+CONFIG_S3C2410_PM=y
 CONFIG_CPU_S3C244X=y
 CONFIG_CPU_S3C2440=y
 
@@ -172,6 +186,8 @@ CONFIG_CPU_CACHE_V4WT=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_COPY_V4WB=y
 CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
 
 #
 # Processor Features
@@ -225,9 +241,9 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 # Boot options
 #
-CONFIG_ZBOOT_ROM_TEXT=0
-CONFIG_ZBOOT_ROM_BSS=0
-CONFIG_CMDLINE="root=/dev/mmcblk0p2"
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE=""
 # CONFIG_XIP_KERNEL is not set
 
 #
@@ -255,6 +271,8 @@ CONFIG_BINFMT_MISC=y
 CONFIG_PM=y
 CONFIG_PM_LEGACY=y
 CONFIG_PM_DEBUG=y
+# CONFIG_DISABLE_CONSOLE_SUSPEND is not set
+# CONFIG_PM_SYSFS_DEPRECATED is not set
 CONFIG_APM=y
 
 #
@@ -271,6 +289,7 @@ CONFIG_PACKET_MMAP=y
 CONFIG_UNIX=y
 CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
@@ -289,10 +308,12 @@ CONFIG_IP_FIB_HASH=y
 # CONFIG_INET_TUNNEL is not set
 CONFIG_INET_XFRM_MODE_TRANSPORT=y
 CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_BIC=y
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
 
 #
 # IP: Virtual Server Configuration
@@ -389,7 +410,7 @@ CONFIG_IRDA_FAST_RR=y
 #
 # SIR device drivers
 #
-CONFIG_IRTTY_SIR=y
+CONFIG_IRTTY_SIR=m
 
 #
 # Dongle support
@@ -421,11 +442,12 @@ CONFIG_BT_HIDP=m
 #
 # Bluetooth device drivers
 #
-CONFIG_BT_HCIUART=y
+CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
-# CONFIG_BT_HCIUART_BCSP is not set
+CONFIG_BT_HCIUART_BCSP=y
 # CONFIG_BT_HCIVHCI is not set
 # CONFIG_IEEE80211 is not set
+CONFIG_WIRELESS_EXT=y
 
 #
 # Device Drivers
@@ -465,6 +487,7 @@ CONFIG_MTD_BLOCK=y
 # CONFIG_NFTL is not set
 # CONFIG_INFTL is not set
 # CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
 
 #
 # RAM/ROM/Flash chip drivers
@@ -560,6 +583,12 @@ CONFIG_BLK_DEV_INITRD=y
 #
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
+# CONFIG_SCSI_NETLINK is not set
+
+#
+# Serial ATA (prod) and Parallel ATA (experimental) drivers
+#
+# CONFIG_ATA is not set
 
 #
 # Multi-device support (RAID and LVM)
@@ -612,7 +641,17 @@ CONFIG_NETDEVICES=y
 #
 # Wireless LAN (non-hamradio)
 #
-# CONFIG_NET_RADIO is not set
+CONFIG_NET_RADIO=y
+# CONFIG_NET_WIRELESS_RTNETLINK is not set
+
+#
+# Obsolete Wireless cards support (pre-802.11)
+#
+# CONFIG_STRIP is not set
+# CONFIG_HOSTAP is not set
+CONFIG_ACX=m
+CONFIG_ACX_MEM=y
+CONFIG_ACX_RX3715=m
 
 #
 # Wan interfaces
@@ -628,6 +667,7 @@ CONFIG_PPP_BSDCOMP=y
 # CONFIG_PPP_MPPE is not set
 # CONFIG_PPPOE is not set
 # CONFIG_SLIP is not set
+CONFIG_SLHC=y
 # CONFIG_SHAPER is not set
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
@@ -642,12 +682,13 @@ CONFIG_PPP_BSDCOMP=y
 # Input device support
 #
 CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
 
 #
 # Userland interfaces
 #
 CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_INPUT_JOYDEV is not set
@@ -666,19 +707,24 @@ CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
 CONFIG_GPIO_KEYS=y
 CONFIG_KEYBOARD_ASIC3=y
-CONFIG_INPUT_MOUSE=y
-# CONFIG_MOUSE_PS2 is not set
-# CONFIG_MOUSE_SERIAL is not set
-# CONFIG_MOUSE_NAVPOINT is not set
-# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
 CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_S3C2410=y
+# CONFIG_TOUCHSCREEN_S3C2410_DEBUG 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_WM9705 is not set
+# CONFIG_TOUCHSCREEN_WM9712 is not set
+# CONFIG_TOUCHSCREEN_WM9713 is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
 # CONFIG_INPUT_MISC is not set
 
 #
@@ -732,7 +778,6 @@ CONFIG_WATCHDOG=y
 CONFIG_S3C2410_WATCHDOG=y
 CONFIG_HW_RANDOM=y
 # CONFIG_NVRAM is not set
-# CONFIG_S3C2410_RTC is not set
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 
@@ -745,13 +790,12 @@ CONFIG_HW_RANDOM=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
-# CONFIG_TELCLOCK is not set
 
 #
 # I2C support
 #
 CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_CHARDEV=y
 
 #
 # I2C Algorithms
@@ -783,7 +827,7 @@ CONFIG_I2C_S3C2410=m
 # CONFIG_SENSORS_MAX6875 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
-CONFIG_I2C_DEBUG_BUS=y
+# CONFIG_I2C_DEBUG_BUS is not set
 # CONFIG_I2C_DEBUG_CHIP is not set
 
 #
@@ -817,7 +861,12 @@ CONFIG_W1_DS2760=m
 #
 # CONFIG_HWMON is not set
 # CONFIG_HWMON_VID is not set
-CONFIG_BATTERY_MONITOR=y
+
+#
+# Hardware Monitoring - Battery
+#
+CONFIG_BATTERY_MONITOR=m
+CONFIG_RX3715_BATTERY=m
 
 #
 # L3 serial bus support
@@ -834,6 +883,7 @@ CONFIG_BATTERY_MONITOR=y
 # CONFIG_HTC_ASIC2 is not set
 CONFIG_HTC_ASIC3=y
 # CONFIG_SOC_TSC2101 is not set
+# CONFIG_SOC_TSC2200 is not set
 
 #
 # Misc devices
@@ -843,6 +893,8 @@ CONFIG_HTC_ASIC3=y
 # Multimedia Capabilities Port drivers
 #
 # CONFIG_MCP is not set
+# CONFIG_ADC_ADS7846_SSP is not set
+# CONFIG_TIFM_CORE is not set
 
 #
 # LED devices
@@ -854,21 +906,21 @@ CONFIG_LEDS_CLASS=y
 # LED drivers
 #
 # CONFIG_LEDS_S3C24XX is not set
-# CONFIG_LEDS_ASIC3 is not set
+CONFIG_LEDS_ASIC3=y
 
 #
 # LED Triggers
 #
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_TIMER_ASIC3=y
 # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
-# CONFIG_LEDS_TRIGGER_SHARED is not set
+CONFIG_LEDS_TRIGGER_SHARED=y
 
 #
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
-CONFIG_VIDEO_V4L2=y
 
 #
 # Digital Video Broadcasting Devices
@@ -892,6 +944,7 @@ CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_S3C2410=y
 # CONFIG_FB_S3C2410_DEBUG is not set
 # CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_VSFB is not set
 
 #
 # Console display driver support
@@ -925,11 +978,56 @@ CONFIG_BACKLIGHT_DEVICE=y
 CONFIG_LCD_CLASS_DEVICE=y
 CONFIG_LCD_DEVICE=y
 # CONFIG_BACKLIGHT_CORGI is not set
+CONFIG_BACKLIGHT_S3C2410=y
 
 #
 # Sound
 #
-# CONFIG_SOUND is not set
+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 is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+
+#
+# ALSA ARM devices
+#
+CONFIG_SND_RX3715=m
+CONFIG_SND_S3C2410=m
+# CONFIG_SND_S3C2410_DBG is not set
+# CONFIG_SND_S3C2410_DBG_DMA is not set
+
+#
+# SoC audio support
+#
+# CONFIG_SND_SOC is not set
+CONFIG_SND_UDA1380=m
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
 
 #
 # USB support
@@ -946,8 +1044,9 @@ CONFIG_USB_ARCH_HAS_OHCI=y
 #
 # USB Gadget Support
 #
-CONFIG_USB_GADGET=m
+CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
+CONFIG_USB_GADGET_SELECTED=y
 # CONFIG_USB_GADGET_NET2280 is not set
 # CONFIG_USB_GADGET_PXA2XX is not set
 # CONFIG_USB_GADGET_PXA27X is not set
@@ -955,9 +1054,20 @@ CONFIG_USB_GADGET=m
 # CONFIG_USB_GADGET_MQ11XX is not set
 # CONFIG_USB_GADGET_LH7A40X is not set
 # CONFIG_USB_GADGET_OMAP is not set
+CONFIG_USB_GADGET_S3C2410=y
+CONFIG_USB_S3C2410=y
+# CONFIG_USB_S3C2410_DEBUG is not set
 # CONFIG_USB_GADGET_AT91 is not set
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
 # CONFIG_USB_GADGET_DUALSPEED is not set
+# CONFIG_USB_ZERO is not set
+CONFIG_USB_ETH=y
+CONFIG_USB_ETH_RNDIS=y
+# CONFIG_USB_GADGETFS is not set
+# CONFIG_USB_FILE_STORAGE is not set
+# CONFIG_USB_G_SERIAL is not set
+# CONFIG_USB_MIDI_GADGET is not set
+# CONFIG_USB_G_CHAR is not set
 
 #
 # MMC/SD Card support
@@ -965,6 +1075,7 @@ CONFIG_USB_GADGET=m
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_BLOCK=y
+# CONFIG_MMC_TIFM_SD is not set
 # CONFIG_MMC_TMIO is not set
 # CONFIG_MMC_SAMCOP is not set
 CONFIG_MMC_ASIC3=y
@@ -976,6 +1087,7 @@ CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
 
 #
 # RTC interfaces
@@ -1009,10 +1121,12 @@ 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_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
@@ -1044,8 +1158,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # 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_RAMFS=y
 # CONFIG_CONFIGFS_FS is not set
@@ -1082,7 +1198,8 @@ CONFIG_JFFS2_RTIME=y
 #
 # CONFIG_NFS_FS is not set
 # CONFIG_NFSD is not set
-# CONFIG_SMB_FS is not set
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
 # CONFIG_CIFS is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
@@ -1164,6 +1281,7 @@ CONFIG_OPROFILE=y
 # Kernel hacking
 #
 # CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_DEBUG_KERNEL is not set
@@ -1171,7 +1289,7 @@ CONFIG_LOG_BUF_SHIFT=14
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_FS is not set
 CONFIG_FRAME_POINTER=y
-# CONFIG_UNWIND_INFO is not set
+# CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_USER is not set
 CONFIG_DEBUG_S3C2410_UART=2
 
@@ -1185,6 +1303,9 @@ CONFIG_DEBUG_S3C2410_UART=2
 # Cryptographic options
 #
 CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_MANAGER=m
 # CONFIG_CRYPTO_HMAC is not set
 # CONFIG_CRYPTO_NULL is not set
 # CONFIG_CRYPTO_MD4 is not set
@@ -1194,6 +1315,8 @@ CONFIG_CRYPTO_MD5=y
 # CONFIG_CRYPTO_SHA512 is not set
 # CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CRYPTO_TGR192 is not set
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_CBC=m
 CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
diff --git a/packages/linux/linux-handhelds-2.6_2.6.19-hh5.bb b/packages/linux/linux-handhelds-2.6_2.6.19-hh8.bb
index b34d4630a0..b34d4630a0 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.19-hh5.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.19-hh8.bb
diff --git a/packages/linux/linux-jlime-jornada6xx-2.6.17/keyboard-fix-deadkeys.patch b/packages/linux/linux-jlime-jornada6xx-2.6.17/keyboard-fix-deadkeys.patch
new file mode 100644
index 0000000000..73923555d4
--- /dev/null
+++ b/packages/linux/linux-jlime-jornada6xx-2.6.17/keyboard-fix-deadkeys.patch
@@ -0,0 +1,204 @@
+--- linux-2.6.17-linuxsh/drivers/input/keyboard/hp680_keyb.c	2006-12-06 21:56:06.000000000 +0000
++++ linux-2.6.17/drivers/input/keyboard/hp680_keyb.c	2007-01-10 21:00:34.000000000 +0000
+@@ -5,6 +5,7 @@
+  *
+  *  Copyright (C) 2005  Andriy Skulysh
+  *  Copyright (C) 2006  Paul Mundt
++ *  Copyright (C) 2007  Kristoffer Ericson
+  *
+  * Splited from drivers/input/keyboard/hp600_keyb.c
+  *
+@@ -20,6 +21,10 @@
+ #include <asm/io.h>
+ #include "scan_keyb.h"
+ 
++#define PCCR 0xa4000104
++#define PDCR 0xa4000106
++#define PECR 0xa4000108
++#define PFCR 0xa400010a
+ #define PCDR 0xa4000124
+ #define PDDR 0xa4000126
+ #define PEDR 0xa4000128
+@@ -30,6 +35,24 @@
+ #define PKDR 0xa4000132
+ #define PLDR 0xa4000134
+ 
++/***************************************************************
++HP Jornada 680(SWEDISH version) keyboard 
++[!] indicates Special Characters 
++
++_______________________________________________________________________
++| ESC     F1  F2   F3   F4   F5   F6   F7   F8   F9   F10        POWER|
++|  1    2    3    4    5    6    7    8    9    0    +   `    BKPSPACE|
++|*    Q    W    E    R    T    Y    U    I    O    P    !    ^   ENTER|
++| TAB   A    S    D    F    G    H    J    K    L    !    !   '  ENTER|
++| SHIFT   Z    X    C    V    B    N    M    ,    .    -     UP  SHIFT|
++| CTRL  WIN  ALT  ?  =======SPACE========  ALTG  DEL    LEF  DO  RI   ]
++-----------------------------------------------------------------------
++
++
++****************************************************************/
++
++
++
+ /****************************************************************
+ HP Jornada 690(Japanese version) keyboard scan matrix
+ 
+@@ -71,31 +94,56 @@
+ ****************************************************************/
+ 
+ static const unsigned char hp680_japanese_table[] = {
+-	/* PTD1 */
++/*
++      /* PTD1 */
++      /*  ?    ?     ?     ?    Esc    ?     ?     ?  */
+ 	0x3a, 0x70, 0x29, 0x00, 0x01, 0x00, 0x00, 0x00,
++      /* F1   F2    F3     F8    F7    F6    F4    F5  */
+ 	0x3b, 0x3c, 0x3d, 0x42, 0x41, 0x40, 0x3e, 0x3f,
+-	/* PTD5 */
++
++      /* PTD5 */
++      /* /    :    Enter  ?      Z     ?     ?     ?  */	
+ 	0x35, 0x28, 0x1c, 0x00, 0x2c, 0x00, 0x00, 0x00,
++      /* X    C     V     .     ,     M     B     N  */
+ 	0x2d, 0x2e, 0x2f, 0x34, 0x33, 0x32, 0x30, 0x31,
+-	/* PTD7 */
+-	0x50, 0x4d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-	0x00, 0x00, 0x00, 0x4b, 0x00, 0x00, 0x38, 0x7b,
+-	/* PTE0 */
++
++      /* PTD7 */
++      /* Down  Right   ?    ?     ?     ?     ?     ?   */ 	
++ 	0x50, 0x4d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++      /*  ?    ?     ?    Left   ?     ?    Alt    ?	*/
++    	0x00, 0x00, 0x00, 0x4b, 0x00, 0x00, 0x38, 0x7b,
++
++      /* PTE0 */
++      /*   ?    ?      ?    ?    Win    ?     ?     ?  */	
+ 	0x00, 0x00, 0x00, 0x00, 0xdb, 0x00, 0x00, 0x00,
++      /* Ctrl	 ?   Space  Del   _     ?     ?     ?    */ 
+ 	0x1d, 0x00, 0x39, 0x53, 0x73, 0xf9, 0x00, 0x00,
+-	/* PTE1 */
++
++      /* PTE1 */
++      /*  ;    [      ]    ?     A     ?      ?    ?     */
+ 	0x27, 0x1b, 0x2b, 0x00, 0x1e, 0x00, 0x00, 0x00,
++      /*  S    D     F     L     K      J     G    H     */
+ 	0x1f, 0x20, 0x21, 0x26, 0x25, 0x24, 0x22, 0x23,
+-	/* PTE3 */
+-	0x48, 0x7d, 0x36, 0x00, 0x0f, 0x00, 0x00, 0x00,
+-	0x00, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-	/* PTE6 */
++
++      /* PTE3 */
++      /*  Up     \    ShiftR    ?    Q     ?     ?     ? */	
++	0x48,   0x7d,  0x36,  0x00, 0x0f, 0x00, 0x00, 0x00,
++      /*  ?    ShiftL   ?     ?     ?     ?     ?     ?  */	
++	0x00,   0x2a,  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++      
++      /* PTE6 */
++      /*  P     @     BS    ?     Q     ?     ?     ?  */
+ 	0x19, 0x1a, 0x0e, 0x00, 0x10, 0x00, 0x00, 0x00,
++      /*  W     E     R     O     I     U     T     Y  */	
+ 	0x11, 0x12, 0x13, 0x18, 0x17, 0x16, 0x14, 0x15,
+-	/* PTE7 */
+-	0x0b, 0x0c, 0x0d, 0x00, 0x02, 0x00, 0x00, 0x00,
+-	0x03, 0x04, 0x05, 0x0a, 0x09, 0x08, 0x06, 0x07,
+-	/* **** */
++
++      /* PTE7 */
++      /*  0     +    =      ?     1     ?     ?     ?  */
++      	0x0b, 0x0c, 0x0d, 0x00, 0x02, 0x00, 0x00, 0x00,
++      /*  2     3     4     9     8     7     5     6  */
++	0x03, 0x04, 0x05, 0x0a, 0x09, 0x08, 0x06, 0x07, 
++
++      /* **** */
+ 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ };
+@@ -103,37 +151,72 @@
+ static int hp680_japanese_scan_kbd(unsigned char *s)
+ {
+ 	int i;
+-	unsigned char matrix_switch[] = {
+-		0xfd, 0xff,	/* PTD1 */
+-		0xdf, 0xff,	/* PTD5 */
+-		0x7f, 0xff,	/* PTD7 */
+-		0xff, 0xfe,	/* PTE0 */
+-		0xff, 0xfd,	/* PTE1 */
+-		0xff, 0xf7,	/* PTE3 */
+-		0xff, 0xbf,	/* PTE6 */
+-		0xff, 0x7f,	/* PTE7 */
++	unsigned short ec_static,dc_static; /* = UINT16_t */
++        unsigned char matrix_switch[] = {
++		0xfd, 0xff,   /* PTD1 PD(1) */
++		0xdf, 0xff,   /* PTD5 PD(5) */
++		0x7f, 0xff,   /* PTD7 PD(7) */
++		0xff, 0xfe,   /* PTE0 PE(0) */
++		0xff, 0xfd,   /* PTE1 PE(1) */
++                0xff, 0xf7,   /* PTE3 PE(3) */
++		0xff, 0xbf,   /* PTE6 PE(6) */		
++                0xff, 0x7f,   /* PTE7 PE(7) */		
+ 	}, *t=matrix_switch;
++        /* PD(x) :
++	1.   0xcc0c & (1~(1 << (2*(x)+1)))))
++	2.   (0xf0cf & 0xfffff) */
++        /* PE(x) :
++	1.   0xcc0c & 0xffff
++	2.   0xf0cf & (1~(1 << (2*(x)+1))))) */
++        unsigned short matrix_PDE[] = {
++     	        0xcc04, 0xf0cf,  /* PD(1) */
++	        0xc40c, 0xf0cf,	 /* PD(5) */ 
++	        0x4c0c, 0xf0cf,  /* PD(7) */
++		0xcc0c, 0xf0cd,  /* PE(0) */
++		0xcc0c, 0xf0c7,	 /* PE(1) */
++	        0xcc0c, 0xf04f,  /* PE(3) */
++		0xcc0c, 0xd0cf,	 /* PE(6) */
++	        0xcc0c, 0x70cf,	 /* PE(7) */
++	        }
++        , *y=matrix_PDE;
++	/* Save these control reg bits */
++	dc_static = (ctrl_inw(PDCR) & (~0xcc0c));
++        ec_static = (ctrl_inw(PECR) & (~0xf0cf));
+ 
+ 	for(i=0; i<8; i++) {
+-		ctrl_outb(*t++, PDDR);
++                /* disable output for all but the one we want to scan */
++		ctrl_outw((dc_static | *y++), PDCR);
++		ctrl_outw((ec_static | *y++), PECR);
++                udelay(5);
++	       
++		/* Get scanline row */
++	        ctrl_outb(*t++, PDDR);
+ 		ctrl_outb(*t++, PEDR);
++                udelay(50);
++
++		/* Read data */
+ 		*s++=ctrl_inb(PCDR);
+ 		*s++=ctrl_inb(PFDR);
+ 	}
+-
++        /* Scan no lines */
+ 	ctrl_outb(0xff, PDDR);
+ 	ctrl_outb(0xff, PEDR);
++        
++        /* Enable all scanlines */
++	ctrl_outw((dc_static | (0x5555 & 0xcc0c)),PDCR);
++	ctrl_outw((ec_static | (0x5555 & 0xf0cf)),PECR);
++        /* Ignore extra keys and events */
+ 
+ 	*s++=ctrl_inb(PGDR);
+ 	*s++=ctrl_inb(PHDR);
+-
++ 
+ 	return 0;
+ }
+ 
+ static struct scan_keyboard hp680_kbd = {
+ 	.scan		= hp680_japanese_scan_kbd,
+ 	.table		= hp680_japanese_table,
+-	.length		= 18,
++	.length		= 16,
+ };
+ 
+ static int __init hp680_kbd_init_hw(void)
diff --git a/packages/linux/linux-jlime-jornada6xx_2.6.17.bb b/packages/linux/linux-jlime-jornada6xx_2.6.17.bb
index 1c22e230e1..4fdeb52fc4 100644
--- a/packages/linux/linux-jlime-jornada6xx_2.6.17.bb
+++ b/packages/linux/linux-jlime-jornada6xx_2.6.17.bb
@@ -11,7 +11,8 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.gz \
 	   file://LinuxSH-2.6.17.patch;patch=0 \
 	   file://unexpected-int-fix.patch;patch=0 \
 	   file://keymap-fix.patch;patch=0 \
-	   file://io.h-fix.patch;patch=0"
+	   file://io.h-fix.patch;patch=0 \
+	   file://keyboard-fix-deadkeys.patch;patch=0"
 
 S = "${WORKDIR}/linux-${PV}"
 
diff --git a/packages/lsof/lsof_4.77.bb b/packages/lsof/lsof_4.77.bb
index ef82b6179f..054875b861 100644
--- a/packages/lsof/lsof_4.77.bb
+++ b/packages/lsof/lsof_4.77.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "Lsof is a Unix-specific diagnostic tool. \
 Its name stands for LiSt Open Files, and it does just that."
 SECTION = "devel"
 LICENSE = "BSD"
+PR = "r1"
 
 SRC_URI = "ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${PV}.tar.bz2"
 LOCALSRC = "file://${WORKDIR}/lsof_${PV}/lsof_${PV}_src.tar"
@@ -20,7 +21,7 @@ LSOF_OS_linux-uclibc = "linux"
 LSOF_OS_linux-gnueabi = "linux"
 
 do_configure () {
-	./Configure ${LSOF_OS}
+	yes | ./Configure ${LSOF_OS}
 }
 
 export I = "${STAGING_INCDIR}"
diff --git a/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb b/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb
index 6b7eddb03b..72ddfb5613 100644
--- a/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb
+++ b/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb
@@ -7,6 +7,8 @@ RPROVIDES = "gconf"
 
 PR = "r3"
 
+DEFAULT_PREFERENCE = "-1"
+
 SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/g/gconf2/gconf2_${PV}.tar.gz \
            file://gconf-update.patch;patch=1;pnum=0 \
            file://free-entry-fix.diff;patch=1 \
diff --git a/packages/mediatomb/mediatomb_svn.bb b/packages/mediatomb/mediatomb_svn.bb
index 2515356b39..3d18717d63 100644
--- a/packages/mediatomb/mediatomb_svn.bb
+++ b/packages/mediatomb/mediatomb_svn.bb
@@ -19,14 +19,14 @@ EXTRA_OECONF = "--disable-mysql \
 		--enable-taglib \
 		--enable-libexif \
                 --disable-largefile \
-                --with-sqlite3-h=${STAGING_DIR}/${TARGET_SYS}/include \
-                --with-sqlite3-libs=${STAGING_DIR}/${TARGET_SYS}/lib \
-                --with-magic-h=${STAGING_DIR}/${TARGET_SYS}/include \
-                --with-magic-libs=${STAGING_DIR}/${TARGET_SYS}/lib \
-                --with-exif-h=${STAGING_DIR}/${TARGET_SYS}/include \
-                --with-exif-libs=${STAGING_DIR}/${TARGET_SYS}/lib \
-                --with-zlib-h=${STAGING_DIR}/${TARGET_SYS}/include \
-                --with-zlib-libs=${STAGING_DIR}/${TARGET_SYS}/lib \
-                --with-js-h=${STAGING_DIR}/${TARGET_SYS}/include/js \
-                --with-js-libs=${STAGING_DIR}/${TARGET_SYS}/lib \
-                --with-taglib-cfg=${STAGING_DIR}/${BUILD_SYS}/bin/taglib-config"
+                --with-sqlite3-h=${STAGING_INCDIR} \
+                --with-sqlite3-libs=${STAGING_LIBDIR} \
+                --with-magic-h=${STAGING_INCDIR} \
+                --with-magic-libs=${STAGING_LIBDIR} \
+                --with-exif-h=${STAGING_INCDIR} \
+                --with-exif-libs=${STAGING_LIBDIR} \
+                --with-zlib-h=${STAGING_INCDIR} \
+                --with-zlib-libs=${STAGING_LIBDIR} \
+                --with-js-h=${STAGING_INCDIR}/js \
+                --with-js-libs=${STAGING_LIBDIR} \
+                --with-taglib-cfg=${STAGING_BINDIR_CROSS}/taglib-config"
diff --git a/packages/musicpd/mpc_0.11.2.bb b/packages/musicpd/mpc_0.11.2.bb
index 256a2e5ea2..8806653357 100644
--- a/packages/musicpd/mpc_0.11.2.bb
+++ b/packages/musicpd/mpc_0.11.2.bb
@@ -2,8 +2,10 @@ DESCRIPTION = "Command-line (scriptable) Music Player Daemon (mpd) Client"
 HOMEPAGE = "http://www.musicpd.org/mpc.shtml"
 LICENSE = "GPLv2"
 SECTION = "console/multimedia"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://mercury.chem.pitt.edu/~shank/mpc-${PV}.tar.gz"
+EXTRA_OECONF = "--with-iconv-libraries=${STAGING_LIBDIR} \
+		--with-iconv-includes=${STAGING_INCDIR}"
 
 inherit autotools
diff --git a/packages/musicpd/mpc_0.12.0.bb b/packages/musicpd/mpc_0.12.0.bb
new file mode 100644
index 0000000000..1ab29c0d57
--- /dev/null
+++ b/packages/musicpd/mpc_0.12.0.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Command-line (scriptable) Music Player Daemon (mpd) Client"
+HOMEPAGE = "http://www.musicpd.org/mpc.shtml"
+LICENSE = "GPLv2"
+SECTION = "console/multimedia"
+PR = "r0"
+
+SRC_URI = "http://mercury.chem.pitt.edu/~shank/mpc-${PV}.tar.gz"
+EXTRA_OECONF = "--with-iconv-libraries=${STAGING_LIBDIR} \
+		--with-iconv-includes=${STAGING_INCDIR}"
+
+inherit autotools
diff --git a/packages/neon/neon_0.25.5.bb b/packages/neon/neon_0.25.5.bb
index d73081e249..eec428136d 100644
--- a/packages/neon/neon_0.25.5.bb
+++ b/packages/neon/neon_0.25.5.bb
@@ -6,7 +6,7 @@ DEPENDS = "zlib libxml2 expat time"
 
 PR = "r1"
 
-SRC_URI = "http://be.lunar-linux.org/lunar/cache/neon-${PV}.tar.gz"
+SRC_URI = "http://www.webdav.org/${PN}/${P}.tar.gz"
 
 inherit autotools binconfig lib_package
 
diff --git a/packages/networkmanager/files/99_networkmanager b/packages/networkmanager/files/99_networkmanager
index b3e7f94657..20cbcc1bca 100644
--- a/packages/networkmanager/files/99_networkmanager
+++ b/packages/networkmanager/files/99_networkmanager
@@ -1 +1 @@
-d root root 0700 /var/run/NetworkManager
+d root root 0700 /var/run/NetworkManager none
diff --git a/packages/networkmanager/networkmanager_0.6.4.bb b/packages/networkmanager/networkmanager_0.6.4.bb
index 95e85002b0..e14230aadc 100644
--- a/packages/networkmanager/networkmanager_0.6.4.bb
+++ b/packages/networkmanager/networkmanager_0.6.4.bb
@@ -6,7 +6,7 @@ PRIORITY = "optional"
 DEPENDS = "libnl dbus dbus-glib libhal-nm libgpewidget gnome-keyring gconf-dbus wireless-tools libglade"
 RDEPENDS = "wpa-supplicant iproute2 dhcdbd gnome-keyring hicolor-icon-theme"
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI="http://www.handhelds.org/~mmp/files/NetworkManager-${PV}-gpe.tar.gz \
 	file://dbus-api-fix.patch;patch=1 \
diff --git a/packages/notification-daemon/files/.mtn2git_empty b/packages/notification-daemon/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/notification-daemon/files/.mtn2git_empty
diff --git a/packages/notification-daemon/files/dbus-glib-tool-prefix.patch b/packages/notification-daemon/files/dbus-glib-tool-prefix.patch
new file mode 100644
index 0000000000..bfe06f7737
--- /dev/null
+++ b/packages/notification-daemon/files/dbus-glib-tool-prefix.patch
@@ -0,0 +1,13 @@
+Index: notification-daemon-0.3.6/src/Makefile.am
+===================================================================
+--- notification-daemon-0.3.6.orig/src/Makefile.am	2007-01-15 16:25:37.000000000 +0100
++++ notification-daemon-0.3.6/src/Makefile.am	2007-01-15 16:26:01.000000000 +0100
+@@ -13,7 +13,7 @@
+ BUILT_SOURCES = notificationdaemon-dbus-glue.h
+ 
+ notificationdaemon-dbus-glue.h: notificationdaemon.xml
+-	dbus-binding-tool --mode=glib-server \
++	dbus-binding-tool --mode=glib-server --prefix= \
+ 		$(srcdir)/notificationdaemon.xml > notificationdaemon-dbus-glue.h
+ 
+ INCLUDES = \
diff --git a/packages/notification-daemon/notification-daemon_0.3.4.bb b/packages/notification-daemon/notification-daemon_0.3.6.bb
index 8acabfae73..1fdf6f2762 100644
--- a/packages/notification-daemon/notification-daemon_0.3.4.bb
+++ b/packages/notification-daemon/notification-daemon_0.3.6.bb
@@ -9,7 +9,8 @@ FILES_${PN} = "${libexecdir}/notification-daemon \
 	${libdir}/notification-daemon-1.0/engines/libstandard.so \
 	${sysconfdir}/gconf/schemas/notification-daemon.schemas"
 
-SRC_URI =       "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz"
+SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz \
+	file://dbus-glib-tool-prefix.patch;patch=1"
 EXTRA_OECONF =	"--disable-binreloc"
 
 inherit autotools pkgconfig
diff --git a/packages/obsolete/libsdl/.mtn2git_empty b/packages/obsolete/libsdl/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/obsolete/libsdl/.mtn2git_empty
diff --git a/packages/obsolete/libsdl/libsdl-qpe-1.2.7/.mtn2git_empty b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/.mtn2git_empty
diff --git a/packages/libsdl/libsdl-qpe-1.2.7/SDL-Akita.patch b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/SDL-Akita.patch
index b47a127398..b47a127398 100644
--- a/packages/libsdl/libsdl-qpe-1.2.7/SDL-Akita.patch
+++ b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/SDL-Akita.patch
diff --git a/packages/libsdl/libsdl-qpe-1.2.7/acinclude.m4 b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/acinclude.m4
index ca2df9d5e5..ca2df9d5e5 100644
--- a/packages/libsdl/libsdl-qpe-1.2.7/acinclude.m4
+++ b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/acinclude.m4
diff --git a/packages/libsdl/libsdl-qpe-1.2.7/agawa-piro-mickey.patch b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/agawa-piro-mickey.patch
index 7f3622ea4c..7f3622ea4c 100644
--- a/packages/libsdl/libsdl-qpe-1.2.7/agawa-piro-mickey.patch
+++ b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/agawa-piro-mickey.patch
diff --git a/packages/libsdl/libsdl-qpe-1.2.7/fixlibs.patch b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/fixlibs.patch
index 899e31482c..899e31482c 100644
--- a/packages/libsdl/libsdl-qpe-1.2.7/fixlibs.patch
+++ b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/fixlibs.patch
diff --git a/packages/libsdl/libsdl-qpe-1.2.7/gcc34.patch b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/gcc34.patch
index e3738e961e..e3738e961e 100644
--- a/packages/libsdl/libsdl-qpe-1.2.7/gcc34.patch
+++ b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/gcc34.patch
diff --git a/packages/libsdl/libsdl-qpe-1.2.7/ipaq.patch b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/ipaq.patch
index bf57953c08..bf57953c08 100644
--- a/packages/libsdl/libsdl-qpe-1.2.7/ipaq.patch
+++ b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/ipaq.patch
diff --git a/packages/libsdl/libsdl-qpe-1.2.7/kill-stdc++.patch b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/kill-stdc++.patch
index 9629583f9b..9629583f9b 100644
--- a/packages/libsdl/libsdl-qpe-1.2.7/kill-stdc++.patch
+++ b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/kill-stdc++.patch
diff --git a/packages/libsdl/libsdl-qpe-1.2.7/mouse.patch b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/mouse.patch
index 99320fad0d..99320fad0d 100644
--- a/packages/libsdl/libsdl-qpe-1.2.7/mouse.patch
+++ b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/mouse.patch
diff --git a/packages/libsdl/libsdl-qpe-1.2.7/pygame.patch b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/pygame.patch
index 4b39267a8a..4b39267a8a 100644
--- a/packages/libsdl/libsdl-qpe-1.2.7/pygame.patch
+++ b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/pygame.patch
diff --git a/packages/libsdl/libsdl-qpe_1.2.7.bb b/packages/obsolete/libsdl/libsdl-qpe_1.2.7.bb
index 60c2a9d385..60c2a9d385 100644
--- a/packages/libsdl/libsdl-qpe_1.2.7.bb
+++ b/packages/obsolete/libsdl/libsdl-qpe_1.2.7.bb
diff --git a/packages/openobex/openobex_1.2.bb b/packages/openobex/openobex_1.2.bb
index 0c8d118cff..81f9ff68ed 100644
--- a/packages/openobex/openobex_1.2.bb
+++ b/packages/openobex/openobex_1.2.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
 PROVIDES = "openobex-apps"
 DEPENDS = "libusb bluez-libs"
 LICENSE = "GPL"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \
            file://disable-cable-test.patch;patch=1" \
@@ -30,3 +30,5 @@ PACKAGES += "openobex-apps"
 FILES_${PN} = "${libdir}/lib*.so.*"
 FILES_${PN}-dev += "${bindir}/openobex-config"
 FILES_${PN}-apps = "${bindir}/*"
+DEBIAN_NOAUTONAME_${PN} = "1"
+DEBIAN_NOAUTONAME_${PN}-apps = "1"
diff --git a/packages/opie-icon-reload/opie-icon-reload.inc b/packages/opie-icon-reload/opie-icon-reload.inc
index 894577b1a4..01f8247f50 100644
--- a/packages/opie-icon-reload/opie-icon-reload.inc
+++ b/packages/opie-icon-reload/opie-icon-reload.inc
@@ -1,8 +1,10 @@
-SECTION = "opie/settings"
 DESCRIPTION = "Reload .desktop files on the fly"
+SECTION = "opie/settings"
 PRIORITY = "optional"
 LICENSE = "GPL"
 
+PACKAGE_ARCH = "all"
+
 SRC_URI = "file://icon-reload.desktop \
 	   file://icon-reload.sh \
 	   file://reload.png"
diff --git a/packages/opie-icon-reload/opie-icon-reload_0.0.1.bb b/packages/opie-icon-reload/opie-icon-reload_0.0.1.bb
deleted file mode 100644
index 9d87f74817..0000000000
--- a/packages/opie-icon-reload/opie-icon-reload_0.0.1.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SECTION = "opie/settings"
-DESCRIPTION = "Reload .desktop files on the fly"
-PRIORITY = "optional"
-LICENSE = "GPL"
-
-PR = "r3"
-
-SRC_URI = "file://icon-reload.desktop \
-	   file://icon-reload.sh \
-	   file://reload.png"
-
-FILES_${PN} += "/opt"
-
-do_install() {
-	install -d ${D}${palmtopdir}/apps/Settings
-	install -d ${D}${palmtopdir}/bin
-	install -d ${D}${palmtopdir}/pics
-
-	install -m 0644 ${WORKDIR}/icon-reload.desktop ${D}${palmtopdir}/apps/Settings
-	install -m 0755 ${WORKDIR}/icon-reload.sh ${D}${palmtopdir}/bin
-	install -m 0644 ${WORKDIR}/reload.png ${D}${palmtopdir}/pics
-}
-
diff --git a/packages/opie-icon-reload/opie-icon-reload_cvs.bb b/packages/opie-icon-reload/opie-icon-reload_cvs.bb
deleted file mode 100644
index 7c49fdd77b..0000000000
--- a/packages/opie-icon-reload/opie-icon-reload_cvs.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require ${PN}.inc
-
-#Remove the dash below when 1.2.1 changes
-PV = "1.2.2+cvs-${SRCDATE}"
-
diff --git a/packages/opie-multikey/files/.mtn2git_empty b/packages/opie-multikey/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-multikey/files/.mtn2git_empty
diff --git a/packages/opie-multikey/files/friendly-button-names.patch b/packages/opie-multikey/files/friendly-button-names.patch
new file mode 100644
index 0000000000..148204e5b3
--- /dev/null
+++ b/packages/opie-multikey/files/friendly-button-names.patch
@@ -0,0 +1,16 @@
+--- multikey/configdlg.cpp.org	2005-06-15 22:54:50.000000000 +0000
++++ multikey/configdlg.cpp	2007-01-11 19:51:09.000000000 +0000
+@@ -144,11 +144,11 @@
+     add_remove_grid->setMargin(3);
+     add_remove_grid->setSpacing(3);
+ 
+-    add_button = new QPushButton(tr("Add"), add_remove_grid);
++    add_button = new QPushButton(tr("Add custom..."), add_remove_grid);
+     add_button->setFlat(TRUE);
+     connect(add_button, SIGNAL(clicked()), SLOT(addMap()));
+ 
+-    remove_button = new QPushButton(tr("Remove"), add_remove_grid);
++    remove_button = new QPushButton(tr("Remove custom"), add_remove_grid);
+     remove_button->setFlat(TRUE);
+     if (keymaps->currentItem() == 0 || default_maps.find(QFileInfo(current_map).fileName()) != default_maps.end())
+ 	remove_button->setDisabled(true);
diff --git a/packages/opie-multikey/opie-multikey_1.2.2.bb b/packages/opie-multikey/opie-multikey_1.2.2.bb
index 7cd1ac6914..702dda05e9 100644
--- a/packages/opie-multikey/opie-multikey_1.2.2.bb
+++ b/packages/opie-multikey/opie-multikey_1.2.2.bb
@@ -1,6 +1,7 @@
 require ${PN}.inc
-
+PR = "r1"
 
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/multikey \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/share"
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/share \
+           file://friendly-button-names.patch;patch=1"
diff --git a/packages/opie-multikey/opie-multikey_cvs.bb b/packages/opie-multikey/opie-multikey_cvs.bb
index 93d37edfac..5080a4d984 100644
--- a/packages/opie-multikey/opie-multikey_cvs.bb
+++ b/packages/opie-multikey/opie-multikey_cvs.bb
@@ -1,6 +1,8 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/multikey \
-           ${HANDHELDS_CVS};module=opie/share"
+           ${HANDHELDS_CVS};module=opie/share \
+           file://friendly-button-names.patch;patch=1"
diff --git a/packages/opie-pics/opie-pics.inc b/packages/opie-pics/opie-pics.inc
index 78747b9147..1bd67a8077 100644
--- a/packages/opie-pics/opie-pics.inc
+++ b/packages/opie-pics/opie-pics.inc
@@ -2,13 +2,12 @@ DESCRIPTION = "Common Opie pictures usable from all applications"
 SECTION = "opie/base"
 PRIORITY = "optional"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 S = "${WORKDIR}"
 
 SHIP_INLINE_PICS = "yes"
-INLINE_PICS_smallscreen = "pics/inline"
-INLINE_PICS_bigscreen = "pics-hires/inline"
+INLINE_PICS = '${@base_conditional("GUI_MACHINE_CLASS", "bigscreen", "pics-hires/inline", "pics/inline", d)}'
 
 do_install() {
 	install -d ${D}${palmtopdir}/pics/addressbook/
@@ -20,7 +19,7 @@ do_install() {
 	install -m 0664 pics/todo/*.png ${D}${palmtopdir}/pics/todo/	
 
 	if [ "${SHIP_INLINE_PICS}" == "yes" ]; then
-		install -m 0664 ${INLINE_PICS_${GUI_MACHINE_CLASS}}/*.png ${D}${palmtopdir}/pics/
+		install -m 0664 ${INLINE_PICS}/*.png ${D}${palmtopdir}/pics/
 	fi
 }
 
diff --git a/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb b/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb
index 597f28970d..3a8954bebe 100644
--- a/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb
+++ b/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb
@@ -1,9 +1,10 @@
 require ${PN}.inc
-
+PR = "r1"
 
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sysinfo \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/share \
-	   file://jornada-6xx-7xx.patch;patch=1"
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/share"
+
+SRC_URI_append_jlime = "file://jornada-6xx-7xx.patch;patch=1"
diff --git a/packages/opie-taskbar/opie-taskbar.inc b/packages/opie-taskbar/opie-taskbar.inc
index edc2c7a479..4c357f54b6 100644
--- a/packages/opie-taskbar/opie-taskbar.inc
+++ b/packages/opie-taskbar/opie-taskbar.inc
@@ -23,7 +23,9 @@ PIXMAP_SIZE_spitz	= "-640x480"
 PIXMAP_SIZE_akita	= "-640x480"
 PIXMAP_SIZE_tosa 	= "-480x640"
 PIXMAP_SIZE_simpad 	= "-800x600"
+PIXMAP_SIZE_asus730     = "-480x640"
 PIXMAP_SIZE_htcuniversal= "-480x640"
+PIXMAP_SIZE_hx4700      = "-480x640"
 
 inherit opie update-rc.d
 
diff --git a/packages/opie-taskbar/opie-taskbar/htcuniversal/opie b/packages/opie-taskbar/opie-taskbar/htcuniversal/opie
deleted file mode 100644
index ac8cf18df4..0000000000
--- a/packages/opie-taskbar/opie-taskbar/htcuniversal/opie
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/sh
-#
-[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root
-[ -z $HOME ] && export HOME=/home/$LOGNAME
-
-export QTDIR=/opt/QtPalmtop
-export OPIEDIR=/opt/QtPalmtop
-export QPEDIR=/opt/QtPalmtop
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib
-export PATH=$PATH:$OPIEDIR/bin
-export QWS_MOUSE_PROTO=TPanel:`detect-stylus --device`
-export QWS_KEYBOARD=USB:/dev/input/event1
-
-if [ ! -x "$OPIEDIR/bin/qpe" ] ; then 
-    echo Opie not installed
-    exit 0 
-fi
-
-. /etc/profile
-
-for conf in $OPIEDIR/etc/skel/*.conf; do
-	conf_basename=`basename $conf`
-	if [ ! -e "$HOME/Settings/$conf_basename" ] ; then
-		echo "Copying default $conf_basename into $HOME/Settings/"
-		mkdir -p $HOME/Settings/
-		cat $conf >$HOME/Settings/$conf_basename
-	fi
-done
-
-if [ ! -e "$HOME/systeminfo/linkver" ] ; then
-    mkdir -p $HOME/systeminfo/
-    echo "1.13" >$HOME/systeminfo/linkver
-fi
-
-if [ ! -e "/opt/Qtopia" ] ; then
-    ln -sf /opt/QtPalmtop /opt/Qtopia
-fi
-
-case $1 in
-'start')
-    #/sbin/getkey 5 "Starting Opie in 5 seconds... press key to interrupt." && exit 0
-    
-    if [ -x "$OPIEDIR/bin/opie-login" ]; then
-            echo Starting Opie-login....
-            $OPIEDIR/bin/opie-login -terminal 2
-    else
-        $OPIEDIR/bin/opie-reorgfiles
-        if [ -x /usr/bin/ssh-agent ]; then
-             SSHAGENT=/usr/bin/ssh-agent
-        else
-             SSHAGENT=""
-        fi
-        
-        if [ -x "$OPIEDIR/bin/opie-sh-ssh-askpass.sh" ]; then
-            export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh
-        fi           
-        echo Starting Opie....
-        $SSHAGENT $OPIEDIR/bin/qpe -terminal 2
-    fi
-
-    ;;
-
-'stop')
-    echo "Stopping Opie..."
-    killall qpe 2>/dev/null
-    killall opie-login 2>/dev/null
-    killall quicklauncher 2>/dev/null
-
-    ;;
-
-'restart')
-	$0 stop && $0 start
-
-	;;
-
-*)
-    echo "usage: $0 { start | stop | restart }"
-
-    ;;
-
-esac
-
diff --git a/packages/opie-taskbar/opie-taskbar/opie b/packages/opie-taskbar/opie-taskbar/opie
index 3320dbe7c5..b2677ddc0d 100755
--- a/packages/opie-taskbar/opie-taskbar/opie
+++ b/packages/opie-taskbar/opie-taskbar/opie
@@ -16,6 +16,10 @@ fi
 
 . /etc/profile
 
+if [ ! -e $TSLIB_TSDEVICE ]; then
+    export QWS_MOUSE_PROTO=MouseMan:/dev/input/mice
+fi
+
 for conf in $OPIEDIR/etc/skel/*.conf; do
 	conf_basename=`basename $conf`
 	if [ ! -e "$HOME/Settings/$conf_basename" ] ; then
@@ -40,7 +44,7 @@ case $1 in
     
     if [ -x "$OPIEDIR/bin/opie-login" ]; then
             echo Starting Opie-login....
-            $OPIEDIR/bin/opie-login -terminal 2
+            $OPIEDIR/bin/opie-login -terminal 3
     else
         $OPIEDIR/bin/opie-reorgfiles
         if [ -x /usr/bin/ssh-agent ]; then
@@ -53,7 +57,7 @@ case $1 in
             export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh
         fi           
         echo Starting Opie....
-        $SSHAGENT $OPIEDIR/bin/qpe -terminal 2
+        $SSHAGENT $OPIEDIR/bin/qpe -terminal 3
     fi
 
     ;;
diff --git a/packages/opie-taskbar/opie-taskbar_1.2.2.bb b/packages/opie-taskbar/opie-taskbar_1.2.2.bb
index 9b1cd8c461..384fbd0ec8 100644
--- a/packages/opie-taskbar/opie-taskbar_1.2.2.bb
+++ b/packages/opie-taskbar/opie-taskbar_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-PR = "r1"
+PR = "r4"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb
index 799d8a1d30..38172af970 100644
--- a/packages/opie-taskbar/opie-taskbar_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar_cvs.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 PV = "${OPIE_CVS_PV}"
-PR = "r1"
+PR = "r4"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \
diff --git a/packages/ossie/ossie-c-wavloader_svn.bb b/packages/ossie/ossie-c-wavloader_svn.bb
index 5fdc9332cf..8f79f4667e 100644
--- a/packages/ossie/ossie-c-wavloader_svn.bb
+++ b/packages/ossie/ossie-c-wavloader_svn.bb
@@ -1,8 +1,9 @@
-PR = "r0"
 DESCRIPTION = "OSSIE Waveform Loader"
 SECTION =  "apps"
 PRIORITY = "optional"
 LICENSE = "GPL"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
 
 DEPENDS = "ossiecf expat"
 
diff --git a/packages/ossie/ossie-channeldemo_svn.bb b/packages/ossie/ossie-channeldemo_svn.bb
index 93a41b6c3c..ddfab221de 100644
--- a/packages/ossie/ossie-channeldemo_svn.bb
+++ b/packages/ossie/ossie-channeldemo_svn.bb
@@ -1,8 +1,9 @@
-PR = "r0"
 DESCRIPTION = "OSSIE Demo channel component"
 SECTION =  "apps"
 PRIORITY = "optional"
 LICENSE = "GPL"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
 
 DEPENDS = "ossiecf"
 
diff --git a/packages/ossie/ossie-demo_svn.bb b/packages/ossie/ossie-demo_svn.bb
index d2777ecc10..c83ec256e8 100644
--- a/packages/ossie/ossie-demo_svn.bb
+++ b/packages/ossie/ossie-demo_svn.bb
@@ -1,8 +1,9 @@
-PR = "r0"
 DESCRIPTION = "OSSIE Demo waveform"
 SECTION =  "apps"
 PRIORITY = "optional"
 LICENSE = "GPL"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
 
 DEPENDS = "ossiecf ossie-channeldemo ossie-rxdemo"
 RDEPENDS = "ossie-channeldemo ossie-rxdemo"
diff --git a/packages/ossie/ossie-gpp-device_svn.bb b/packages/ossie/ossie-gpp-device_svn.bb
index 39adc0a74c..f2a563624c 100644
--- a/packages/ossie/ossie-gpp-device_svn.bb
+++ b/packages/ossie/ossie-gpp-device_svn.bb
@@ -1,9 +1,10 @@
-PR = "r0"
 DESCRIPTION = "OSSIE General Purpose Processor device"
 SECTION =  "apps"
 PRIORITY = "optional"
 MAINTAINER = "Philip Balister philip@balister.org"
 LICENSE = "GPL"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
 
 DEPENDS = "ossiecf"
 
diff --git a/packages/ossie/ossie-interpolator_svn.bb b/packages/ossie/ossie-interpolator_svn.bb
index ca561fe0a1..5efca0b229 100644
--- a/packages/ossie/ossie-interpolator_svn.bb
+++ b/packages/ossie/ossie-interpolator_svn.bb
@@ -1,8 +1,9 @@
-PR = "r0"
 DESCRIPTION = "OSSIE Interpolator component"
 SECTION =  "apps"
 PRIORITY = "optional"
 LICENSE = "GPL"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
 
 DEPENDS = "ossiecf ossie-standardinterfaces ossie-sigproc"
 
diff --git a/packages/ossie/ossie-modulator_svn.bb b/packages/ossie/ossie-modulator_svn.bb
index c6ac6afe73..4090b671d6 100644
--- a/packages/ossie/ossie-modulator_svn.bb
+++ b/packages/ossie/ossie-modulator_svn.bb
@@ -1,8 +1,9 @@
-PR = "r0"
 DESCRIPTION = "OSSIE Modulator component"
 SECTION =  "apps"
 PRIORITY = "optional"
 LICENSE = "GPL"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
 
 DEPENDS = "ossiecf ossie-standardinterfaces ossie-sigproc"
 
diff --git a/packages/ossie/ossie-nodebooter_svn.bb b/packages/ossie/ossie-nodebooter_svn.bb
index 5a941550db..0e4a4611d2 100644
--- a/packages/ossie/ossie-nodebooter_svn.bb
+++ b/packages/ossie/ossie-nodebooter_svn.bb
@@ -1,8 +1,9 @@
-PR = "r0"
 DESCRIPTION = "OSSIE Node Booter"
 SECTION =  "apps"
 PRIORITY = "optional"
 LICENSE = "GPL"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
 
 DEPENDS = "ossiecf"
 
diff --git a/packages/ossie/ossie-randombits_svn.bb b/packages/ossie/ossie-randombits_svn.bb
index a3ddc23185..7e9854641a 100644
--- a/packages/ossie/ossie-randombits_svn.bb
+++ b/packages/ossie/ossie-randombits_svn.bb
@@ -1,8 +1,9 @@
-PR = "r0"
 DESCRIPTION = "OSSIE Random bit generator component"
 SECTION =  "apps"
 PRIORITY = "optional"
 LICENSE = "GPL"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
 
 DEPENDS = "ossiecf ossie-standardinterfaces ossie-sigproc"
 
diff --git a/packages/ossie/ossie-rxdemo_svn.bb b/packages/ossie/ossie-rxdemo_svn.bb
index 34619b3845..8a0d4355d9 100644
--- a/packages/ossie/ossie-rxdemo_svn.bb
+++ b/packages/ossie/ossie-rxdemo_svn.bb
@@ -1,8 +1,9 @@
-PR = "r0"
 DESCRIPTION = "OSSIE Demo receiver component"
 SECTION =  "apps"
 PRIORITY = "optional"
 LICENSE = "GPL"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
 
 DEPENDS = "ossiecf"
 
diff --git a/packages/ossie/ossie-sigproc_svn.bb b/packages/ossie/ossie-sigproc_svn.bb
index c8ee73fea5..a8fa03052f 100644
--- a/packages/ossie/ossie-sigproc_svn.bb
+++ b/packages/ossie/ossie-sigproc_svn.bb
@@ -1,8 +1,9 @@
-PR = "r0"
 DESCRIPTION = "OSSIE Signal Processing routines"
 SECTION =  "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
 
 DEPENDS = "ossiecf"
 
diff --git a/packages/ossie/ossie-soundout-device_svn.bb b/packages/ossie/ossie-soundout-device_svn.bb
index b70d0f91bb..111a96f493 100644
--- a/packages/ossie/ossie-soundout-device_svn.bb
+++ b/packages/ossie/ossie-soundout-device_svn.bb
@@ -1,9 +1,10 @@
-PR = "r0"
 DESCRIPTION = "OSSIE sound playback device"
 SECTION =  "apps"
 PRIORITY = "optional"
 MAINTAINER = "Philip Balister philip@balister.org"
 LICENSE = "GPL"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
 
 DEPENDS = "alsa-lib ossiecf ossie-standardinterfaces"
 
diff --git a/packages/ossie/ossie-standardinterfaces_svn.bb b/packages/ossie/ossie-standardinterfaces_svn.bb
index 7ed7c0b56f..c00bcd5c6b 100644
--- a/packages/ossie/ossie-standardinterfaces_svn.bb
+++ b/packages/ossie/ossie-standardinterfaces_svn.bb
@@ -1,8 +1,9 @@
-PR = "r0"
 DESCRIPTION = "OSSIE Standard port interfaces"
 SECTION =  "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
 
 DEPENDS = "ossiecf"
 
diff --git a/packages/ossie/ossie-tx-random-data_svn.bb b/packages/ossie/ossie-tx-random-data_svn.bb
index 1597f5ec94..89ffe27a84 100644
--- a/packages/ossie/ossie-tx-random-data_svn.bb
+++ b/packages/ossie/ossie-tx-random-data_svn.bb
@@ -1,8 +1,9 @@
-PR = "r0"
 DESCRIPTION = "OSSIE transmit random bits waveform"
 SECTION =  "apps"
 PRIORITY = "optional"
 LICENSE = "GPL"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
 
 DEPENDS = "ossiecf ossie-randombits ossie-modulator ossie-interpolator ossie-usrp-tx-control ossie-usrp-device ossie-gpp-device"
 RDEPENDS = "ossie-randombits ossie-modulator ossie-interpolator ossie-usrp-tx-control ossie-usrp-device ossie-gpp-device"
diff --git a/packages/ossie/ossie-usrp-device_svn.bb b/packages/ossie/ossie-usrp-device_svn.bb
index 943b53a464..3f29c2c4f2 100644
--- a/packages/ossie/ossie-usrp-device_svn.bb
+++ b/packages/ossie/ossie-usrp-device_svn.bb
@@ -1,9 +1,10 @@
-PR = "r0"
 DESCRIPTION = "OSSIE General Purpose Processor device"
 SECTION =  "apps"
 PRIORITY = "optional"
 MAINTAINER = "Philip Balister philip@balister.org"
 LICENSE = "GPL"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
 
 DEPENDS = "ossiecf usrp ossie-standardinterfaces"
 
diff --git a/packages/ossie/ossie-usrp-tx-control_svn.bb b/packages/ossie/ossie-usrp-tx-control_svn.bb
index b3fca8fe9b..c3af96c2a3 100644
--- a/packages/ossie/ossie-usrp-tx-control_svn.bb
+++ b/packages/ossie/ossie-usrp-tx-control_svn.bb
@@ -1,8 +1,9 @@
-PR = "r0"
 DESCRIPTION = "OSSIE USRP TX side control component"
 SECTION =  "apps"
 PRIORITY = "optional"
 LICENSE = "GPL"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
 
 DEPENDS = "ossiecf ossie-standardinterfaces"
 
diff --git a/packages/ossie/ossiecf_svn.bb b/packages/ossie/ossiecf_svn.bb
index 76317ac8bd..2c7b27ef7c 100644
--- a/packages/ossie/ossiecf_svn.bb
+++ b/packages/ossie/ossiecf_svn.bb
@@ -1,10 +1,10 @@
-PR = "r0"
 DESCRIPTION = "OSSIE Core Framework"
 SECTION =  "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
-
 DEPENDS = "xerces-c omniorb libtool-cross"
+PV = "0.0.0+svn${SRCDATE}"
+PR = "r0"
 
 S="${WORKDIR}/ossie"
 
diff --git a/packages/parted/parted-1.8.0/.mtn2git_empty b/packages/parted/parted-1.8.0/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/parted/parted-1.8.0/.mtn2git_empty
diff --git a/packages/parted/parted-1.8.0/memory_allocation.patch b/packages/parted/parted-1.8.0/memory_allocation.patch
new file mode 100644
index 0000000000..ba3709680b
--- /dev/null
+++ b/packages/parted/parted-1.8.0/memory_allocation.patch
@@ -0,0 +1,42 @@
+--- parted-1.8.0/libparted/exception.c_orig	2006-12-11 19:44:23.000000000 +0000
++++ parted-1.8.0/libparted/exception.c	2006-12-11 19:47:53.000000000 +0000
+@@ -231,6 +231,9 @@
+ 		     PedExceptionOption ex_opts, const char* message, ...)
+ {
+ 	va_list		arg_list;
++        int result;
++	static int size = 1000;
++
+ 
+ 	if (ex)
+ 		ped_exception_catch ();
+@@ -239,16 +242,22 @@
+ 	if (!ex)
+ 		goto no_memory;
+ 
+-	ex->message = (char*) malloc (8192);
+-	if (!ex->message)
+-		goto no_memory;
+-
+ 	ex->type = ex_type;
+ 	ex->options = ex_opts;
+ 
+-	va_start (arg_list, message);
+-	vsnprintf (ex->message, 8192, message, arg_list);
+-	va_end (arg_list);
++        while (1) {
++	            ex->message = (char*) malloc (size);
++		    if (!ex->message)
++		              goto no_memory;
++		    va_start (arg_list, message);
++		    result = vsnprintf (ex->message, size, message, arg_list);
++		    va_end (arg_list);
++		    
++		    if (result > -1 && result < size)
++		                    break;
++		    size += 10;
++		  }
++	            
+ 
+ 	return do_throw ();
+ 
diff --git a/packages/parted/parted_1.8.0.bb b/packages/parted/parted_1.8.0.bb
index 8681055855..bff27a62e8 100644
--- a/packages/parted/parted_1.8.0.bb
+++ b/packages/parted/parted_1.8.0.bb
@@ -5,7 +5,8 @@ SECTION = "console/tools"
 DEPENDS = "readline e2fsprogs-libs"
 PR = "r0"
 
-SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz"
+SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz \
+           file://memory_allocation.patch;patch=0"
 
 EXTRA_OECONF = "--disable-Werror"
 #export CFLAGS = "-mstructure-size-boundary=8"
diff --git a/packages/parted/parted_1.8.2.bb b/packages/parted/parted_1.8.2.bb
new file mode 100644
index 0000000000..1185014aa3
--- /dev/null
+++ b/packages/parted/parted_1.8.2.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "parted, the GNU partition resizing program"
+HOMEPAGE = "http://www.gnu.org/software/parted/parted.html"
+LICENSE = "GPLv2"
+SECTION = "console/tools"
+DEPENDS = "readline e2fsprogs-libs"
+PR = "r0"
+
+SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz"
+           
+#EXTRA_OECONF = "--disable-Werror"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/perl/perl-5.8.7/config.sh-x86_64-linux b/packages/perl/perl-5.8.7/config.sh-x86_64-linux
index 89c830e79a..06a5f0f621 100644
--- a/packages/perl/perl-5.8.7/config.sh-x86_64-linux
+++ b/packages/perl/perl-5.8.7/config.sh-x86_64-linux
@@ -30,30 +30,30 @@ afs='false'
 afsroot='/afs'
 alignbytes='8'
 ansi2knr=''
-aphostname='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin/hostname'
+aphostname='/bin/hostname'
 api_revision='5'
 api_subversion='0'
 api_version='8'
 api_versionstring='5.8.0'
 ar='ar'
-archlib='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/5.8.7/x86_64-linux-thread-multi'
-archlibexp='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/5.8.7/x86_64-linux-thread-multi'
+archlib='/usr/lib/perl5/5.8.7/x86_64-linux-thread-multi'
+archlibexp='/usr/lib/perl5/5.8.7/x86_64-linux-thread-multi'
 archname64=''
 archname='x86_64-linux-thread-multi'
 archobjs=''
-asctime_r_proto='REENTRANT_PROTO_B_SB'
+asctime_r_proto='0'
 awk='awk'
 baserev='5.0'
 bash=''
-bin='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin'
-binexp='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin'
+bin='/usr/bin'
+binexp='/usr/bin'
 bison='bison'
 byacc='byacc'
 byteorder='12345678'
 c=''
 castflags='0'
 cat='cat'
-cc='ccache gcc '
+cc='cc'
 cccdlflags='-fpic'
 ccdlflags='-Wl,-E'
 ccflags='-D_REENTRANT -D_GNU_SOURCE -DTHREADS_HAVE_PIDS -fno-strict-aliasing -pipe -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
@@ -83,11 +83,11 @@ cppminus='-'
 cpprun='ccache gcc  -E'
 cppstdin='ccache gcc  -E'
 cppsymbols='__ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=3 __GNUC__=4 __GNUC_MINOR__=1 __GNU_LIBRARY__=6 _GNU_SOURCE=1 _LARGEFILE64_SOURCE=1 _LARGEFILE_SOURCE=1 _LP64=1 __LP64__=1 _POSIX_C_SOURCE=199506 _POSIX_SOURCE=1 _REENTRANT=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_GNU=1 __USE_LARGEFILE=1 __USE_LARGEFILE64=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_REENTRANT=1 __USE_SVID=1 __USE_UNIX98=1 __USE_XOPEN=1 __USE_XOPEN_EXTENDED=1 _XOPEN_SOURCE=600 _XOPEN_SOURCE_EXTENDED=1 __amd64=1 __amd64__=1 linux=1 __linux=1 __linux__=1 unix=1 __unix=1 __unix__=1'
-crypt_r_proto='REENTRANT_PROTO_B_CCS'
+crypt_r_proto='0'
 cryptlib=''
 csh='csh'
 ctermid_r_proto='0'
-ctime_r_proto='REENTRANT_PROTO_B_SB'
+ctime_r_proto='0'
 d_Gconvert='gcvt((x),(n),(b))'
 d_PRIEUldbl='define'
 d_PRIFUldbl='define'
@@ -503,7 +503,7 @@ dlext='so'
 dlsrc='dl_dlopen.xs'
 doublesize='8'
 drand01='drand48()'
-drand48_r_proto='REENTRANT_PROTO_I_ST'
+drand48_r_proto='0'
 dynamic_ext='B ByteLoader Cwd Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Time/HiRes Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared'
 eagain='EAGAIN'
 ebcdic='undef'
@@ -536,33 +536,33 @@ full_sed='/bin/sed'
 gccansipedantic=''
 gccosandvers=''
 gccversion='4.1.2 20061028 (prerelease) (Debian 4.1.1-19)'
-getgrent_r_proto='REENTRANT_PROTO_I_SBWR'
-getgrgid_r_proto='REENTRANT_PROTO_I_TSBWR'
-getgrnam_r_proto='REENTRANT_PROTO_I_CSBWR'
-gethostbyaddr_r_proto='REENTRANT_PROTO_I_TsISBWRE'
-gethostbyname_r_proto='REENTRANT_PROTO_I_CSBWRE'
-gethostent_r_proto='REENTRANT_PROTO_I_SBWRE'
-getlogin_r_proto='REENTRANT_PROTO_I_BW'
-getnetbyaddr_r_proto='REENTRANT_PROTO_I_uISBWRE'
-getnetbyname_r_proto='REENTRANT_PROTO_I_CSBWRE'
-getnetent_r_proto='REENTRANT_PROTO_I_SBWRE'
-getprotobyname_r_proto='REENTRANT_PROTO_I_CSBWR'
-getprotobynumber_r_proto='REENTRANT_PROTO_I_ISBWR'
-getprotoent_r_proto='REENTRANT_PROTO_I_SBWR'
-getpwent_r_proto='REENTRANT_PROTO_I_SBWR'
-getpwnam_r_proto='REENTRANT_PROTO_I_CSBWR'
-getpwuid_r_proto='REENTRANT_PROTO_I_TSBWR'
-getservbyname_r_proto='REENTRANT_PROTO_I_CCSBWR'
-getservbyport_r_proto='REENTRANT_PROTO_I_ICSBWR'
-getservent_r_proto='REENTRANT_PROTO_I_SBWR'
-getspnam_r_proto='REENTRANT_PROTO_I_CSBWR'
+getgrent_r_proto='0'
+getgrgid_r_proto='0'
+getgrnam_r_proto='0'
+gethostbyaddr_r_proto='0'
+gethostbyname_r_proto='0'
+gethostent_r_proto='0'
+getlogin_r_proto='0'
+getnetbyaddr_r_proto='0'
+getnetbyname_r_proto='0'
+getnetent_r_proto='0'
+getprotobyname_r_proto='0'
+getprotobynumber_r_proto='0'
+getprotoent_r_proto='0'
+getpwent_r_proto='0'
+getpwnam_r_proto='0'
+getpwuid_r_proto='0'
+getservbyname_r_proto='0'
+getservbyport_r_proto='0'
+getservent_r_proto='0'
+getspnam_r_proto='0'
 gidformat='"u"'
 gidsign='1'
 gidsize='4'
 gidtype='gid_t'
 glibpth='/usr/shlib  /lib /usr/lib /lib64 /usr/lib64 /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib '
 gmake='gmake'
-gmtime_r_proto='REENTRANT_PROTO_S_TS'
+gmtime_r_proto='0'
 gnulibc_version='2.3.6'
 grep='grep'
 groupcat='cat /etc/group'
@@ -671,64 +671,62 @@ inc_version_list=' '
 inc_version_list_init='0'
 incpath=''
 inews=''
-installarchlib='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/5.8.7/x86_64-linux-thread-multi'
-installbin='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin'
+installarchlib='./install_me_here/usr/lib/perl5/5.8.7/x86_64-linux-thread-multi'
+installbin='./install_me_here/usr/bin'
 installhtml1dir=''
 installhtml3dir=''
-installman1dir='/home/hrw/devel/build/native/tmp/staging/man/man1'
-installman3dir='/home/hrw/devel/build/native/tmp/staging/man/man3'
-installprefix='/home/hrw/devel/build/native/tmp/staging'
-installprefixexp='/home/hrw/devel/build/native/tmp/staging'
-installprivlib='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/5.8.7'
-installscript='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin'
-installsitearch='/home/hrw/devel/build/native/tmp/staging/local/lib/perl5/site_perl/5.8.7/x86_64-linux-thread-multi'
-installsitebin='/home/hrw/devel/build/native/tmp/staging/local/bin'
+installman1dir='./install_me_here/usr/share/man/man1'
+installman3dir='./install_me_here/usr/share/man/man3'
+installprefix='./install_me_here/usr'
+installprefixexp='./install_me_here/usr'
+installprivlib='./install_me_here/usr/lib/perl5/5.8.7'
+installscript='./install_me_here/usr/bin'
 installsitehtml1dir=''
 installsitehtml3dir=''
-installsitelib='/home/hrw/devel/build/native/tmp/staging/local/lib/perl5/site_perl/5.8.7'
-installsiteman1dir='/home/hrw/devel/build/native/tmp/staging/local/man/man1'
-installsiteman3dir='/home/hrw/devel/build/native/tmp/staging/local/man/man3'
-installsitescript='/home/hrw/devel/build/native/tmp/staging/local/bin'
+installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.7'
+installsiteman1dir='./install_me_here/usr/share/man/man1'
+installsiteman3dir='./install_me_here/usr/share/man/man3'
+installsitescript='./install_me_here/usr/bin'
 installstyle='lib/perl5'
 installusrbinperl='undef'
-installvendorarch='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/vendor_perl/5.8.7/x86_64-linux-thread-multi'
-installvendorbin='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin'
+installvendorarch=''
+installvendorbin=''
 installvendorhtml1dir=''
 installvendorhtml3dir=''
-installvendorlib='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/vendor_perl/5.8.7'
-installvendorman1dir='/home/hrw/devel/build/native/tmp/staging/man/man1'
-installvendorman3dir='/home/hrw/devel/build/native/tmp/staging/man/man3'
-installvendorscript='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin'
+installvendorlib=''
+installvendorman1dir=''
+installvendorman3dir=''
+installvendorscript=''
 intsize='4'
-issymlink='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin/test -h'
+issymlink='/bin/test -h'
 ivdformat='"ld"'
 ivsize='8'
 ivtype='long'
 known_extensions='B ByteLoader Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call GDBM_File I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Thread Time/HiRes Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared'
 ksh=''
-ld='ccache gcc '
-lddlflags='-shared -L/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib -L/usr/local/lib'
-ldflags='-L/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib -Wl,-rpath-link,/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib -Wl,-rpath,/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib -Wl,-O1} -L/usr/local/lib'
+ld='cc'
+lddlflags='-shared'
+ldflags=''
 ldflags_uselargefiles=''
 ldlibpthname='LD_LIBRARY_PATH'
 less='less'
 lib_ext='.a'
 libc='/lib/libc-2.3.6.so'
 libperl='libperl.a'
-libpth='/usr/local/lib /lib /usr/lib /lib64 /usr/lib64'
+libpth='/lib /usr/lib /lib64 /usr/lib64'
 libs='-lnsl -ldl -lm -lcrypt -lutil -lpthread -lc'
 libsdirs=' /usr/lib'
 libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libpthread.so libc.so'
-libsfound=' /usr/lib/libnsl.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libpthread.so /usr/lib/libc.so'
-libspath=' /usr/local/lib /lib /usr/lib /lib64 /usr/lib64'
+libsfound=''
+libspath=' /lib /usr/lib /lib64 /usr/lib64'
 libswanted='sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util pthread c cposix posix ucb BSD'
 libswanted_uselargefiles=''
 line=''
 lint=''
 lkflags=''
 ln='ln'
-lns='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin/ln -s'
-localtime_r_proto='REENTRANT_PROTO_S_TS'
+lns='/bin/ln -s'
+localtime_r_proto='0'
 locincpth='/usr/local/include /opt/local/include /usr/gnu/include /opt/gnu/include /usr/GNU/include /opt/GNU/include'
 loclibpth='/usr/local/lib /opt/local/lib /usr/gnu/lib /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib'
 longdblsize='16'
@@ -746,12 +744,12 @@ make_set_make='#'
 mallocobj=''
 mallocsrc=''
 malloctype='void *'
-man1dir='/home/hrw/devel/build/native/tmp/staging/man/man1'
-man1direxp='/home/hrw/devel/build/native/tmp/staging/man/man1'
+man1dir='/usr/share/man/man1'
+man1direxp='/usr/share/man/man1'
 man1ext='1'
-man3dir='/home/hrw/devel/build/native/tmp/staging/man/man3'
-man3direxp='/home/hrw/devel/build/native/tmp/staging/man/man3'
-man3ext='3perl'
+man3dir='/usr/share/man/man3'
+man3direxp='/usr/share/man/man3'
+man3ext='3'
 mips_type=''
 mistrustnm=''
 mkdir='mkdir'
@@ -802,17 +800,17 @@ perl=''
 perl_patchlevel=''
 perladmin='hrw@home.lan'
 perllibs='-lnsl -ldl -lm -lcrypt -lutil -lpthread -lc'
-perlpath='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin/perl'
+perlpath='/usr/bin/perl'
 pg='pg'
 phostname='hostname'
 pidtype='pid_t'
 plibpth=''
 pmake=''
 pr=''
-prefix='/home/hrw/devel/build/native/tmp/staging'
-prefixexp='/home/hrw/devel/build/native/tmp/staging'
-privlib='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/5.8.7'
-privlibexp='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/5.8.7'
+prefix='/usr'
+prefixexp='/usr'
+privlib='/usr/lib/perl5/5.8.7'
+privlibexp='/usr/lib/perl5/5.8.7'
 procselfexe='"/proc/self/exe"'
 prototype='define'
 ptrsize='8'
@@ -820,12 +818,12 @@ quadkind='2'
 quadtype='long'
 randbits='48'
 randfunc='drand48'
-random_r_proto='REENTRANT_PROTO_I_St'
+random_r_proto='0'
 randseedtype='long'
 ranlib=':'
 rd_nodata='-1'
-readdir64_r_proto='REENTRANT_PROTO_I_TSR'
-readdir_r_proto='REENTRANT_PROTO_I_TSR'
+readdir64_r_proto='0'
+readdir_r_proto='0'
 revision='5'
 rm='rm'
 rmail=''
@@ -845,8 +843,8 @@ sPRIu64='"lu"'
 sPRIx64='"lx"'
 sSCNfldbl='"Lf"'
 sched_yield='sched_yield()'
-scriptdir='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin'
-scriptdirexp='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin'
+scriptdir='/usr/bin'
+scriptdirexp='/usr/bin'
 sed='sed'
 seedfunc='srand48'
 selectminbits='64'
@@ -873,25 +871,25 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 6, 17, 29, 31, 0'
 sig_size='69'
 signal_t='void'
-sitearch='/home/hrw/devel/build/native/tmp/staging/local/lib/perl5/site_perl/5.8.7/x86_64-linux-thread-multi'
-sitearchexp='/home/hrw/devel/build/native/tmp/staging/local/lib/perl5/site_perl/5.8.7/x86_64-linux-thread-multi'
-sitebin='/home/hrw/devel/build/native/tmp/staging/local/bin'
-sitebinexp='/home/hrw/devel/build/native/tmp/staging/local/bin'
+sitearch='/usr/lib/perl5/site_perl/5.8.7/x86_64-linux-thread-multi'
+sitearchexp='/usr/lib/perl5/site_perl/5.8.7/x86_64-linux-thread-multi'
+sitebin='/usr/bin'
+sitebinexp='/usr/bin'
 sitehtml1dir=''
 sitehtml1direxp=''
 sitehtml3dir=''
 sitehtml3direxp=''
-sitelib='/home/hrw/devel/build/native/tmp/staging/local/lib/perl5/site_perl/5.8.7'
-sitelib_stem='/home/hrw/devel/build/native/tmp/staging/local/lib/perl5/site_perl'
-sitelibexp='/home/hrw/devel/build/native/tmp/staging/local/lib/perl5/site_perl/5.8.7'
-siteman1dir='/home/hrw/devel/build/native/tmp/staging/local/man/man1'
-siteman1direxp='/home/hrw/devel/build/native/tmp/staging/local/man/man1'
-siteman3dir='/home/hrw/devel/build/native/tmp/staging/local/man/man3'
-siteman3direxp='/home/hrw/devel/build/native/tmp/staging/local/man/man3'
-siteprefix='/home/hrw/devel/build/native/tmp/staging/local'
-siteprefixexp='/home/hrw/devel/build/native/tmp/staging/local'
-sitescript='/home/hrw/devel/build/native/tmp/staging/local/bin'
-sitescriptexp='/home/hrw/devel/build/native/tmp/staging/local/bin'
+sitelib='/usr/lib/perl5/site_perl/5.8.7'
+sitelib_stem='/usr/lib/perl5/site_perl'
+sitelibexp='/usr/lib/perl5/site_perl/5.8.7'
+siteman1dir='/usr/share/man/man1'
+siteman1direxp='/usr/share/man/man1'
+siteman3dir='/usr/share/man/man3'
+siteman3direxp='/usr/share/man/man3'
+siteprefix='/usr'
+siteprefixexp='/usr'
+sitescript='/usr/bin'
+sitescriptexp='/usr/bin'
 sizesize='8'
 sizetype='size_t'
 sleep=''
@@ -903,11 +901,11 @@ socksizetype='socklen_t'
 sort='sort'
 spackage='Perl5'
 spitshell='cat'
-srand48_r_proto='REENTRANT_PROTO_I_LS'
-srandom_r_proto='REENTRANT_PROTO_I_TS'
+srand48_r_proto='0'
+srandom_r_proto='0'
 src='.'
 ssizetype='ssize_t'
-startperl='#!/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin/perl'
+startperl='#!/usr/bin/perl'
 startsh='#!/bin/sh'
 static_ext=' '
 stdchar='char'
@@ -917,7 +915,7 @@ stdio_cnt='((fp)->_IO_read_end - (fp)->_IO_read_ptr)'
 stdio_filbuf=''
 stdio_ptr='((fp)->_IO_read_ptr)'
 stdio_stream_array=''
-strerror_r_proto='REENTRANT_PROTO_B_IBW'
+strerror_r_proto='0'
 strings='/usr/include/string.h'
 submit=''
 subversion='7'
@@ -930,13 +928,13 @@ tee=''
 test='test'
 timeincl='/usr/include/sys/time.h /usr/include/time.h '
 timetype='time_t'
-tmpnam_r_proto='REENTRANT_PROTO_B_B'
+tmpnam_r_proto='0'
 to=':'
 touch='touch'
 tr='tr'
 trnl='\n'
 troff=''
-ttyname_r_proto='REENTRANT_PROTO_I_IBW'
+ttyname_r_proto='0'
 u16size='2'
 u16type='unsigned short'
 u32size='4'
@@ -985,25 +983,25 @@ uvsize='8'
 uvtype='unsigned long'
 uvuformat='"lu"'
 uvxformat='"lx"'
-vendorarch='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/vendor_perl/5.8.7/x86_64-linux-thread-multi'
-vendorarchexp='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/vendor_perl/5.8.7/x86_64-linux-thread-multi'
-vendorbin='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin'
-vendorbinexp='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin'
+vendorarch=''
+vendorarchexp=''
+vendorbin=''
+vendorbinexp=''
 vendorhtml1dir=' '
 vendorhtml1direxp=''
 vendorhtml3dir=' '
 vendorhtml3direxp=''
-vendorlib='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/vendor_perl/5.8.7'
-vendorlib_stem='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/vendor_perl'
-vendorlibexp='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/vendor_perl/5.8.7'
-vendorman1dir='/home/hrw/devel/build/native/tmp/staging/man/man1'
-vendorman1direxp='/home/hrw/devel/build/native/tmp/staging/man/man1'
-vendorman3dir='/home/hrw/devel/build/native/tmp/staging/man/man3'
-vendorman3direxp='/home/hrw/devel/build/native/tmp/staging/man/man3'
-vendorprefix='/home/hrw/devel/build/native/tmp/staging'
-vendorprefixexp='/home/hrw/devel/build/native/tmp/staging'
-vendorscript='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin'
-vendorscriptexp='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin'
+vendorlib='/usr/lib/perl5/vendor_perl/5.8.7'
+vendorlib_stem='/usr/lib/perl5/vendor_perl'
+vendorlibexp='/usr/lib/perl5/vendor_perl/5.8.7'
+vendorman1dir='/usr/share/man/man1'
+vendorman1direxp='/usr/share/man/man1'
+vendorman3dir='/usr/share/man/man3'
+vendorman3direxp='/usr/share/man/man3'
+vendorprefix=''
+vendorprefixexp=''
+vendorscript='/usr/bin'
+vendorscriptexp='/usr/bin'
 version='5.8.7'
 version_patchlevel_string='version 8 subversion 7'
 versiononly='undef'
@@ -1015,24 +1013,9 @@ yaccflags=''
 zcat=''
 zip='zip'
 # Configure command line arguments.
-config_arg0='./Configure'
-config_args='-Dcc=ccache gcc  -Dcflags=-isystem/home/hrw/devel/build/native/tmp/staging/x86_64-linux/include -O2 -Dldflags=-L/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib -Wl,-rpath-link,/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib -Wl,-rpath,/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib -Wl,-O1} -Dusethreads -Duselargefiles -Dprefix=/home/hrw/devel/build/native/tmp/staging -Dvendorprefix=/home/hrw/devel/build/native/tmp/staging -Dsiteprefix=/home/hrw/devel/build/native/tmp/staging/local -Dman1ext=1 -Dman3ext=3perl -Uafs -Ud_csh -Uusesfio -Uusenm -des'
-config_argc=15
-config_arg1='-Dcc=ccache gcc '
-config_arg2='-Dcflags=-isystem/home/hrw/devel/build/native/tmp/staging/x86_64-linux/include -O2'
-config_arg3='-Dldflags=-L/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib -Wl,-rpath-link,/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib -Wl,-rpath,/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib -Wl,-O1}'
-config_arg4='-Dusethreads'
-config_arg5='-Duselargefiles'
-config_arg6='-Dprefix=/home/hrw/devel/build/native/tmp/staging'
-config_arg7='-Dvendorprefix=/home/hrw/devel/build/native/tmp/staging'
-config_arg8='-Dsiteprefix=/home/hrw/devel/build/native/tmp/staging/local'
-config_arg9='-Dman1ext=1'
-config_arg10='-Dman3ext=3perl'
-config_arg11='-Uafs'
-config_arg12='-Ud_csh'
-config_arg13='-Uusesfio'
-config_arg14='-Uusenm'
-config_arg15='-des'
+config_arg0='Configure'
+config_args=''
+config_argc=0
 PERL_REVISION=5
 PERL_VERSION=8
 PERL_SUBVERSION=7
diff --git a/packages/portmap/portmap-unslung_5-9.bb b/packages/portmap/portmap-unslung_5-9.bb
index ee6c648e9b..c86ae1e892 100644
--- a/packages/portmap/portmap-unslung_5-9.bb
+++ b/packages/portmap/portmap-unslung_5-9.bb
@@ -4,8 +4,8 @@ LICENSE = "GPL"
 PR = "r2"
 COMPATIBLE_MACHINE = "nslu2"
 
-SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \
-	http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \
+SRC_URI = "${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz \
+	${DEBIAN_MIRROR}/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \
 	file://no-libwrap.patch;patch=1;pnum=0 \
 	file://portmap.init \
 	file://make.patch;patch=1"
@@ -18,6 +18,5 @@ do_compile() {
 }
 
 do_install() {
-	oe_runmake 'docdir=${datadir}/doc/portmap' \
-		   'DESTDIR=${D}' install
+	oe_runmake 'docdir=${datadir}/doc/portmap' 'DESTDIR=${D}' install
 }
diff --git a/packages/portmap/portmap.inc b/packages/portmap/portmap.inc
index ad477828fb..bb9d2b6652 100644
--- a/packages/portmap/portmap.inc
+++ b/packages/portmap/portmap.inc
@@ -2,17 +2,13 @@ DESCRIPTION = "RPC program number mapper."
 SECTION = "console/network"
 LICENSE = "GPL"
 
-SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \
-	http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \
+SRC_URI = "${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz \
+	${DEBIAN_MIRROR}/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \
 	file://no-libwrap.patch;patch=1;pnum=0 \
 	file://portmap.init \
 	file://make.patch;patch=1"
 S = "${WORKDIR}/portmap_5beta"
 
-PACKAGES =+ "portmap-utils"
-FILES_portmap-utils = "/sbin/pmap_set /sbin/pmap_dump"
-FILES_${PN}-doc += "${docdir}"
-
 INITSCRIPT_NAME = "portmap"
 INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ."
 
@@ -27,6 +23,9 @@ do_compile() {
 do_install() {
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap
-	oe_runmake 'docdir=${docdir}/portmap' \
-		   'DESTDIR=${D}' install
+	oe_runmake 'docdir=${docdir}/portmap' 'DESTDIR=${D}' install
 }
+
+PACKAGES =+ "portmap-utils"
+FILES_portmap-utils = "/sbin/pmap_set /sbin/pmap_dump"
+FILES_${PN}-doc += "${docdir}"
diff --git a/packages/postfix/files/internal_recipient b/packages/postfix/files/internal_recipient
new file mode 100644
index 0000000000..0d11944beb
--- /dev/null
+++ b/packages/postfix/files/internal_recipient
@@ -0,0 +1,2 @@
+root@   permit_mynetworks,reject
+
diff --git a/packages/postfix/files/main.cf_2.0 b/packages/postfix/files/main.cf_2.0
index 002f681217..1a6ddabbf3 100644
--- a/packages/postfix/files/main.cf_2.0
+++ b/packages/postfix/files/main.cf_2.0
@@ -2,6 +2,7 @@
 cat <<EOF
 # Configure your domain and accounts
 mydomain=sample.com
+mynetworks = 127.0.0.1/32 192.168.1.0/24
 
 virtual_mailbox_domains = sample.com, other.net
 virtual_mailbox_maps = hash:/etc/postfix/virtual
@@ -35,4 +36,66 @@ debug_peer_level = 2
 sendmail_path = /usr/sbin/sendmail
 newaliases_path = /usr/bin/newaliases
 mailq_path = /usr/bin/mailq
+
+smtpd_data_restrictions =
+        permit_mynetworks,
+        reject_unauth_pipelining,
+        permit
+
+smtpd_client_restrictions =
+        permit_mynetworks,
+        # reject_unknown_client, # This can cause a lot of false rejects.
+        reject_invalid_hostname,
+        reject_rbl_client list.dsbl.org,
+        reject_rbl_client sbl.spamhaus.org,
+        reject_rbl_client cbl.abuseat.org,
+        reject_rbl_client dul.dnsbl.sorbs.net,
+        permit
+
+smtpd_helo_required = yes
+smtpd_helo_restrictions =
+        permit_mynetworks,
+        reject_unauth_pipelining,
+        # reject_non_fqdn_hostname, # This can cause a lot of false rejects.
+        # reject_unknown_hostname, # This can cause a lot of false rejects.
+        reject_invalid_hostname,
+        permit
+
+smtpd_sender_restrictions =
+        permit_mynetworks,
+        reject_non_fqdn_sender,
+        # check_sender_access hash:/etc/postfix/access_domains,
+        reject_unknown_sender_domain,
+        permit
+
+smtpd_recipient_restrictions =
+        permit_mynetworks,
+        permit_sasl_authenticated,
+        reject_unauth_destination,
+
+        # check_recipient_access pcre:/etc/postfix/recipient_checks.pcre,
+        # check_helo_access pcre:/etc/postfix/helo_checks.pcre,
+
+        # check_client_access hash:/etc/postfix/maps/access_client,
+        # check_client_access hash:/etc/postfix/maps/exceptions_client,
+        # check_helo_access hash:/etc/postfix/maps/access_helo,
+        # check_helo_access hash:/etc/postfix/maps/verify_helo,
+        # check_sender_access hash:/etc/postfix/maps/access_sender,
+        # check_sender_access hash:/etc/postfix/maps/verify_sender,
+        # check_recipient_access hash:/etc/postfix/maps/access_recipient,
+
+        # reject_multi_recipient_bounce,
+        reject_non_fqdn_recipient,
+        reject_unknown_recipient_domain,
+        # reject_unlisted_recipient,
+        #check_policy_service unix:private/policy,
+
+        # check_sender_access hash:/etc/postfix/maps/no_verify_sender,
+        # check_sender_access hash:/etc/postfix/access_domains,
+        # reject_unverified_sender,
+        # reject_unverified_recipient
+        check_recipient_access hash:/etc/postfix/internal_recipient
+
+disable_vrfy_command = yes
+
 EOF
diff --git a/packages/postfix/files/volatiles b/packages/postfix/files/volatiles
index cb111cd4c0..bc330c99bd 100644
--- a/packages/postfix/files/volatiles
+++ b/packages/postfix/files/volatiles
@@ -1,15 +1,15 @@
-d postfix nogroup 2755 /var/spool/mail
-d root postfix 0755 /var/spool/postfix
-d postfix root 0700 /var/spool/postfix/active
-d postfix root 0700 /var/spool/postfix/bounce
-d postfix root 0700 /var/spool/postfix/corrupt
-d postfix root 0700 /var/spool/postfix/defer
-d postfix root 0700 /var/spool/postfix/deferred
-d postfix root 0700 /var/spool/postfix/flush
-d postfix root 0700 /var/spool/postfix/hold
-d postfix root 0700 /var/spool/postfix/incoming
-d postfix postdrop 0730 /var/spool/postfix/maildrop
-d root root 0755 /var/spool/postfix/pid
-d postfix root 0700 /var/spool/postfix/private
-d postfix postdrop 0710 /var/spool/postfix/public
-d root root 0755 /var/spool/vmail
+d postfix nogroup 2755 /var/spool/mail none
+d root postfix 0755 /var/spool/postfix none
+d postfix root 0700 /var/spool/postfix/active none
+d postfix root 0700 /var/spool/postfix/bounce none
+d postfix root 0700 /var/spool/postfix/corrupt none
+d postfix root 0700 /var/spool/postfix/defer none
+d postfix root 0700 /var/spool/postfix/deferred none
+d postfix root 0700 /var/spool/postfix/flush none
+d postfix root 0700 /var/spool/postfix/hold none
+d postfix root 0700 /var/spool/postfix/incoming none
+d postfix postdrop 0730 /var/spool/postfix/maildrop none
+d root root 0755 /var/spool/postfix/pid none
+d postfix root 0700 /var/spool/postfix/private none
+d postfix postdrop 0710 /var/spool/postfix/public none
+d root root 0755 /var/spool/vmail none
diff --git a/packages/postfix/postfix_2.0.20.bb b/packages/postfix/postfix_2.0.20.bb
index 117fd2fc61..280f073333 100644
--- a/packages/postfix/postfix_2.0.20.bb
+++ b/packages/postfix/postfix_2.0.20.bb
@@ -1,7 +1,7 @@
 SECTION = "console/network"
 DEPENDS = "virtual/db libpcre postfix-native"
 LICENSE = "IPL"
-PR = "r10"
+PR = "r11"
 
 SRC_URI = "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${PV}.tar.gz \
 	   file://${FILESDIR}/makedefs.patch;patch=1 \
@@ -9,6 +9,7 @@ SRC_URI = "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${PV
 	   file://main.cf_2.0 \
 	   file://volatiles \
 	   file://postfix \
+	   file://internal_recipient \
 	   "
 
 S = "${WORKDIR}/postfix-${PV}"
@@ -47,6 +48,7 @@ do_install () {
 	install -m 755 ${WORKDIR}/main.cf_2.0 ${D}${localstatedir}/tmp/main_cf.sh
         install -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/01_postfix
         install -m 755 ${WORKDIR}/postfix ${D}${sysconfdir}/init.d/postfix
+        install -m 644 ${WORKDIR}/internal_recipient ${D}${sysconfdir}/postfix/internal_recipient
 	mv ${D}${sbindir}/sendmail ${D}${sbindir}/sendmail.${PN}
 }
 
diff --git a/packages/povray/povray_3.6.1.bb b/packages/povray/povray_3.6.1.bb
index 914d2eaad6..e1c60570be 100644
--- a/packages/povray/povray_3.6.1.bb
+++ b/packages/povray/povray_3.6.1.bb
@@ -19,7 +19,7 @@ PARALLEL_MAKE = ""
 
 #autoreconf breaks, so we'll skip that. The added advantage is that the patch to ./configure actually has effect
 do_configure() {
-	oe_runconf
+	oe_runconf COMPILED_BY="${MAINTAINER}"
 }
 
 PACKAGES += "${PN}-scenes ${PN}-ini ${PN}-icons ${PN}-scripts ${PN}-includes"
diff --git a/packages/qiv/qiv_1.9.bb b/packages/qiv/qiv_1.9.bb
index c3aeb05bd2..17138452a5 100644
--- a/packages/qiv/qiv_1.9.bb
+++ b/packages/qiv/qiv_1.9.bb
@@ -12,6 +12,9 @@ inherit pkgconfig binconfig
 CFLAGS += " -lSM -lICE -lXdmcp"
 
 do_install() {
- 	install -s -m 0755 qiv ${D}${bindir}/qiv
+	install -d ${D}${bindir}
+	install -d ${D}${mandir}/man1/
+
+	install -s -m 0755 qiv ${D}${bindir}/qiv
         install -m 0644 qiv.1 ${D}${mandir}/man1/qiv.1
 }
diff --git a/packages/qpf-fonts/qpf-qte_2.3.10.bb b/packages/qpf-fonts/qpf-qte_2.3.10.bb
index 33e7d87e32..4d7d739f79 100644
--- a/packages/qpf-fonts/qpf-qte_2.3.10.bb
+++ b/packages/qpf-fonts/qpf-qte_2.3.10.bb
@@ -20,6 +20,8 @@ PROVIDES += "qte-font-smoothserif-140 qte-font-smoothserif-180  qte-font-smooths
 PROVIDES += "qte-font-smoothtimes-100  qte-font-smoothtimes-160 qte-font-smoothtimes-170"
 PROVIDES += "qte-font-smoothtimes-220 qte-font-smoothtimes-250  qte-font-smoothtimes-440"
 PROVIDES += "qte-font-unifont"
+RPROVIDES_qte-font-unifont += "virtual/japanese-font"
+RPROVIDES_qte-font-japanese += "virtual/japanese-font"
 
 SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz"
 S = "${WORKDIR}/qt-${PV}"
diff --git a/packages/qpf-fonts/qpf-unifont_1.0.bb b/packages/qpf-fonts/qpf-unifont_1.0.bb
index 6eefff1c20..ec3a9de4ca 100644
--- a/packages/qpf-fonts/qpf-unifont_1.0.bb
+++ b/packages/qpf-fonts/qpf-unifont_1.0.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "Unicode fonts - QPF Edition"
 LICENSE = "GPL QPL"
 SECTION = "opie/fonts"
 PRIORITY = "optional"
+RPROVIDES = "virtual/japanese-font"
 PACKAGE_ARCH = "all"
 PR = "r1"
 
diff --git a/packages/qte/qte-2.3.10/c700-hardware.patch b/packages/qte/qte-2.3.10/c700-hardware.patch
index 5527ab4a88..fa4bd25f37 100644
--- a/packages/qte/qte-2.3.10/c700-hardware.patch
+++ b/packages/qte/qte-2.3.10/c700-hardware.patch
@@ -3,26 +3,6 @@
 # Patch managed by http://www.holgerschurig.de/patcher.html
 #
 
---- qt-2.3.9-snapshot-20050114/src/kernel/qwindowsystem_qws.cpp~c700-hardware
-+++ qt-2.3.9-snapshot-20050114/src/kernel/qwindowsystem_qws.cpp
-@@ -178,7 +178,7 @@
- static QRect maxwindow_rect;
- extern Q_EXPORT QRect qt_maxWindowRect;
- static const char *defaultMouse =
--#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_YOPY) || defined(QWS_CUSTOMTOUCHPANEL)
-+#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) || defined(QT_QWS_YOPY) || defined(QWS_CUSTOMTOUCHPANEL)
-     "TPanel"
- #elif defined(QT_KEYPAD_MODE)
-     "None"
-@@ -3308,7 +3308,7 @@
- void QWSServer::screenSaverSleep()
- {
-     qt_screen->blank(TRUE);
--#if !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX)
-+#if !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX) && !defined(QT_QWS_SLC700)
-     d->screensavertimer->stop();
- #else
-     if ( screensaverinterval ) {
 --- qt-2.3.9-snapshot-20050114/src/kernel/qwsmouse_qws.cpp~c700-hardware
 +++ qt-2.3.9-snapshot-20050114/src/kernel/qwsmouse_qws.cpp
 @@ -87,6 +87,19 @@
@@ -45,66 +25,3 @@
  #endif
  
  #ifndef QT_QWS_TP_SAMPLE_SIZE
-@@ -592,7 +605,7 @@
- 	sub[nsub++] = new QAutoMouseSubHandler_intellimouse(fd);
- 	notify(fd);
-     }
--#if !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX) && !defined(QT_QWS_K2)
-+#if !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX) && !defined(QT_QWS_K2) && !defined(QT_QWS_SLC700)
-     char fn[] = "/dev/ttyS?";
-     for (int ch='0'; ch<='3'; ch++) {
- 	fn[9] = ch;
-@@ -1274,7 +1287,7 @@
-     numSamples(0), skipCount(0)
- {
-     Q_UNUSED(dev);
--#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2)
-+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700)
- #if defined(QT_QWS_IPAQ)
- # ifdef QT_QWS_IPAQ_RAW
-     if ((mouseFD = open( "/dev/h3600_tsraw", O_RDONLY | O_NDELAY)) < 0) {
-@@ -1284,7 +1297,7 @@
-         qWarning( "Cannot open /dev/h3600_ts (%s)", strerror(errno));
- 	return;
-     }
--#elif defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2)
-+#elif defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700)
- //# ifdef QT_QWS_SL5XXX_TSRAW
- # if 0
-     if ((mouseFD = open( "/dev/tsraw", O_RDONLY | O_NDELAY)) < 0) {
-@@ -1310,7 +1323,7 @@
- 
- QTPanelHandlerPrivate::~QTPanelHandlerPrivate()
- {
--#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2)
-+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700)
-     if (mouseFD >= 0)
- 	close(mouseFD);
- #endif
-@@ -1318,7 +1331,7 @@
- 
- void QTPanelHandlerPrivate::readMouseData()
- {
--#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2)
-+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700)
-     if(!qt_screen)
- 	return;
- 
-@@ -1337,7 +1350,7 @@
- 	uchar *mb = mouseBuf+idx;
- 	data = (TS_EVENT *) mb;
- 	if(data->pressure >= QT_QWS_TP_PRESSURE_THRESHOLD) {
--#ifdef QT_QWS_SL5XXX
-+#if defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700)
- 	    samples[currSample] = QPoint( 1000 - data->x, data->y );
- #else
- 	    samples[currSample] = QPoint( data->x, data->y );
-@@ -1997,7 +2010,7 @@
- 	    handler = new QTSLibHandlerPrivate();
- #elif defined(QT_QWS_YOPY)
- 	    handler = new QYopyTPanelHandlerPrivate(mouseProtocol,mouseDev);
--#elif defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2)
-+#elif defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700)
- 	    handler = new QTPanelHandlerPrivate(mouseProtocol,mouseDev);
- #elif defined(QT_QWS_CASSIOPEIA)
- 	    handler = new QVrTPanelHandlerPrivate( mouseProtocol, mouseDev );
diff --git a/packages/qte/qte-2.3.10/kernel-keymap.patch b/packages/qte/qte-2.3.10/kernel-keymap.patch
index 79c0bd07ad..a17362ba87 100644
--- a/packages/qte/qte-2.3.10/kernel-keymap.patch
+++ b/packages/qte/qte-2.3.10/kernel-keymap.patch
@@ -1,7 +1,7 @@
 Index: src/kernel/kernelkeyboard.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ src/kernel/kernelkeyboard.cpp	2006-04-01 23:42:35.154645456 +0200
++++ qte/src/kernel/kernelkeyboard.cpp	2006-04-01 23:42:35.154645456 +0200
 @@ -0,0 +1,701 @@
 +/*
 +
@@ -706,8 +706,8 @@ Index: src/kernel/kernelkeyboard.cpp
 +}
 Index: src/kernel/qkeyboard_qws.cpp
 ===================================================================
---- src/kernel/qkeyboard_qws.cpp.orig	2006-04-01 23:36:22.499297680 +0200
-+++ src/kernel/qkeyboard_qws.cpp	2006-04-01 23:38:19.913448016 +0200
+--- qte/src/kernel/qkeyboard_qws.cpp.orig	2006-04-01 23:36:22.499297680 +0200
++++ qte/src/kernel/qkeyboard_qws.cpp	2006-04-01 23:38:19.913448016 +0200
 @@ -45,15 +45,18 @@
  #include <ctype.h>
  
@@ -960,7 +960,7 @@ Index: src/kernel/qkeyboard_qws.cpp
 Index: src/kernel/keyboard_linux_to_qt.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ src/kernel/keyboard_linux_to_qt.h	2006-04-01 23:37:03.928999408 +0200
++++ qte/src/kernel/keyboard_linux_to_qt.h	2006-04-01 23:37:03.928999408 +0200
 @@ -0,0 +1,263 @@
 +/*
 + * Generated with a small python utility found at
diff --git a/packages/qte/qte-2.3.10/simpad.patch b/packages/qte/qte-2.3.10/simpad.patch
index bdca2e79a0..8a728ef74a 100644
--- a/packages/qte/qte-2.3.10/simpad.patch
+++ b/packages/qte/qte-2.3.10/simpad.patch
@@ -74,39 +74,6 @@
  #ifdef QT_QWS_SL5XXX
  #include <asm/sharp_char.h>
  #endif
-@@ -165,9 +220,9 @@
- 	    current = 0;
-     }
- 
--    void setAutoRepeat(int d, int p) { if ( d > 0 ) repeatdelay=d; 
-+    void setAutoRepeat(int d, int p) { if ( d > 0 ) repeatdelay=d;
- 				       if ( p > 0 ) repeatperiod=p;}
--    void getAutoRepeat(int *d ,int *p ) { if (d) *d=repeatdelay; 
-+    void getAutoRepeat(int *d ,int *p ) { if (d) *d=repeatdelay;
-     					  if (p) *p=repeatperiod; }
- 
-     void stop()
-@@ -551,9 +606,9 @@
- 
-     void doKey(uchar scancode);
- 
--    
-+
-     void restoreLeds();
--    
-+
- private:
-     bool shift;
-     bool alt;
-@@ -809,7 +864,7 @@
- 
- #if !defined(QT_QWS_SL5XXX)
-     if (code == 224
--#if defined(QT_QWS_IPAQ) 
-+#if defined(QT_QWS_IPAQ)
- 	&& !ipaq_return_pressed
- #endif
- 	) {
 @@ -1775,9 +1830,11 @@
      } else {
  	type = spec;
@@ -371,30 +338,3 @@
  #endif
  
      QSocketNotifier *mouseNotifier;
-@@ -1323,7 +1330,7 @@
- 
- QTPanelHandlerPrivate::~QTPanelHandlerPrivate()
- {
--#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700)
-+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) || defined(QT_QWS_SIMPAD)
-     if (mouseFD >= 0)
- 	close(mouseFD);
- #endif
-@@ -1331,7 +1338,7 @@
- 
- void QTPanelHandlerPrivate::readMouseData()
- {
--#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700)
-+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) || defined(QT_QWS_SIMPAD)
-     if(!qt_screen)
- 	return;
- 
-@@ -2013,7 +2020,7 @@
- 	    handler = new QTSLibHandlerPrivate();
- #elif defined(QT_QWS_YOPY)
- 	    handler = new QYopyTPanelHandlerPrivate(mouseProtocol,mouseDev);
--#elif defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700)
-+#elif defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) || defined(QT_QWS_SIMPAD)
- 	    handler = new QTPanelHandlerPrivate(mouseProtocol,mouseDev);
- #elif defined(QT_QWS_CASSIOPEIA)
- 	    handler = new QVrTPanelHandlerPrivate( mouseProtocol, mouseDev );
diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc
index df00cbf85e..ce9969f3a3 100644
--- a/packages/qte/qte-common_2.3.10.inc
+++ b/packages/qte/qte-common_2.3.10.inc
@@ -54,19 +54,19 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;m
 # add device specific patches here
 #
 SRC_URI_append_simpad       = "file://devfs.patch;patch=1 "
-SRC_URI_append_c7x0         = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-corgi.patch;patch=1 \
+SRC_URI_append_c7x0         = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 \
                                file://c7x0-w100-accel.patch;patch=1 file://suspend-resume-hooks.patch;patch=1 "
-SRC_URI_append_spitz        = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-corgi.patch;patch=1 \
+SRC_URI_append_spitz        = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 \
                                file://kernel-keymap-CXK.patch;patch=1 "
-SRC_URI_append_akita        = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-corgi.patch;patch=1 \
+SRC_URI_append_akita        = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 \
                                file://kernel-keymap-CXK.patch;patch=1 "
-SRC_URI_append_poodle       = "file://kernel-keymap.patch;patch=1;pnum=0 "
-SRC_URI_append_a780         = "file://kernel-keymap.patch;patch=1;pnum=0 "
-SRC_URI_append_e680         = "file://kernel-keymap.patch;patch=1;pnum=0 "
-SRC_URI_append_tosa         = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-tosa.patch;patch=1 "
-SRC_URI_append_jornada6xx   = "file://kernel-keymap.patch;patch=1;pnum=0 "
-SRC_URI_append_jornada7xx   = "file://kernel-keymap.patch;patch=1;pnum=0 file://ipaq_sound_fix.patch;patch=1 "
-SRC_URI_append_jornada56x   = "file://kernel-keymap.patch;patch=1;pnum=0 file://ipaq_sound_fix.patch;patch=1 "
+SRC_URI_append_poodle       = "file://kernel-keymap.patch;patch=1 "
+SRC_URI_append_a780         = "file://kernel-keymap.patch;patch=1 "
+SRC_URI_append_e680         = "file://kernel-keymap.patch;patch=1 "
+SRC_URI_append_tosa         = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-tosa.patch;patch=1 "
+SRC_URI_append_jornada6xx   = "file://kernel-keymap.patch;patch=1 "
+SRC_URI_append_jornada7xx   = "file://kernel-keymap.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
+SRC_URI_append_jornada56x   = "file://kernel-keymap.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
 SRC_URI_append_mnci         = "file://devfs.patch;patch=1 \
                                file://mnci.patch;patch=1 \
                                file://mnci-touchscreen.patch;patch=1 \
@@ -104,11 +104,8 @@ EXTRA_OEMAKE = "-e"
 # add device flags here
 #
 EXTRA_DEFINES 			= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DWARNING_UNKNOWN_DEVICE"
-EXTRA_DEFINES_collie 		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX"
-EXTRA_DEFINES_poodle		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX"
-EXTRA_DEFINES_a780		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_EZX"
-EXTRA_DEFINES_e680		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_EZX"
-EXTRA_DEFINES_tosa		= "-DQT_QWS_TSLIB                 -DQT_QWS_SL5XXX -DQT_QWS_SL6000"
+EXTRA_DEFINES_a780		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
+EXTRA_DEFINES_e680		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
 EXTRA_DEFINES_h1910 		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
 EXTRA_DEFINES_h1940 		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
 EXTRA_DEFINES_h2200 		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
@@ -120,15 +117,25 @@ EXTRA_DEFINES_h5000 		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
 EXTRA_DEFINES_h6300 		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
 EXTRA_DEFINES_hx2000 		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
 EXTRA_DEFINES_hx4700 		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
+EXTRA_DEFINES_rx3000 		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
 EXTRA_DEFINES_asus716 		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
 EXTRA_DEFINES_asus730 		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
+EXTRA_DEFINES_htcuniversal 	= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
+EXTRA_DEFINES_htcblueangel 	= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
+EXTRA_DEFINES_htchimalaya 	= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
+EXTRA_DEFINES_magician	 	= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
 EXTRA_DEFINES_jornada56x	= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
 EXTRA_DEFINES_jornada6xx	= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
 EXTRA_DEFINES_jornada7xx	= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
+EXTRA_DEFINES_palmld		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
+EXTRA_DEFINES_palmtx		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
 EXTRA_DEFINES_simpad		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ   -DQT_QWS_SIMPAD -DQT_QWS_DEVFS"
-EXTRA_DEFINES_c7x0		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX"
-EXTRA_DEFINES_spitz		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK"
-EXTRA_DEFINES_akita             = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK"
+EXTRA_DEFINES_c7x0		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLC700"
+EXTRA_DEFINES_spitz		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLC700 -DQT_QWS_SLCXK"
+EXTRA_DEFINES_akita             = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLC700 -DQT_QWS_SLCXK"
+EXTRA_DEFINES_collie 		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX"
+EXTRA_DEFINES_poodle		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX"
+EXTRA_DEFINES_tosa		= "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SL6000"
 EXTRA_DEFINES_mnci 		= "                               -DQT_QWS_RAMSES                 -DQT_QWS_DEVFS"
 
 #
diff --git a/packages/qte/qte-mt_2.3.10.bb b/packages/qte/qte-mt_2.3.10.bb
index f9a6186c6c..87eccb7e1a 100644
--- a/packages/qte/qte-mt_2.3.10.bb
+++ b/packages/qte/qte-mt_2.3.10.bb
@@ -1,5 +1,5 @@
 require qte-common_${PV}.inc
-PR = "r5"
+PR = "r9"
 
 EXTRA_OECONF += "-thread"
 
diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb
index 8a18de98ae..3304868768 100644
--- a/packages/qte/qte_2.3.10.bb
+++ b/packages/qte/qte_2.3.10.bb
@@ -1,3 +1,3 @@
 require qte-common_${PV}.inc
-PR = "r45"
+PR = "r49"
 
diff --git a/packages/ruby/ruby-1.8.5/.mtn2git_empty b/packages/ruby/ruby-1.8.5/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ruby/ruby-1.8.5/.mtn2git_empty
diff --git a/packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch b/packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch
new file mode 100644
index 0000000000..82137896b9
--- /dev/null
+++ b/packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch
@@ -0,0 +1,16 @@
+--- packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch	f667776fd8760b7048cc9617930112347b0ef2c0
++++ packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch	f667776fd8760b7048cc9617930112347b0ef2c0
+@@ -0,0 +1,13 @@
++--- ruby-1.8.5/ext/socket/extconf.rb.orig	2006-12-30 15:12:31.000000000 +1100
+++++ ruby-1.8.5/ext/socket/extconf.rb	2006-12-30 15:16:24.000000000 +1100
++@@ -216,6 +216,10 @@
++ }
++ EOF
++ end
+++# Ignore the actual result of the above test and assume that
+++# everything is OK.
+++getaddr_info_ok = true
+++
++ if ipv6 and not getaddr_info_ok
++   abort <<EOS
++ 
diff --git a/packages/ruby/ruby-1.8.5/extmk_run.patch b/packages/ruby/ruby-1.8.5/extmk_run.patch
new file mode 100644
index 0000000000..57926f51b0
--- /dev/null
+++ b/packages/ruby/ruby-1.8.5/extmk_run.patch
@@ -0,0 +1,15 @@
+============================================================
+--- packages/ruby/ruby-1.8.5/extmk_run.patch	d9738b5a71e2f9a98d009af9fd0ef1ceaff9ef48
++++ packages/ruby/ruby-1.8.5/extmk_run.patch	d9738b5a71e2f9a98d009af9fd0ef1ceaff9ef48
+@@ -0,0 +1,11 @@
++--- ruby-1.8.5/common.mk.orig	2006-12-30 13:07:32.000000000 +1100
+++++ ruby-1.8.5/common.mk	2006-12-30 13:08:32.000000000 +1100
++@@ -56,7 +56,7 @@
++ 		--make="$(MAKE)" \
++ 		--mflags="$(MFLAGS)" \
++ 		--make-flags="$(MAKEFLAGS)"
++-EXTMK_ARGS    =	$(SCRIPT_ARGS) --extout="$(EXTOUT)" --extension $(EXTS) --extstatic $(EXTSTATIC) --
+++EXTMK_ARGS    =	$(SCRIPT_ARGS) --with-ldflags="%%TARGET_LDFLAGS%%" --with-cflags="%%TARGET_CFLAGS%%" --extout="$(EXTOUT)" --extension $(EXTS) --extstatic $(EXTSTATIC) --
++ 
++ all: $(MKFILES) $(PREP) $(RBCONFIG) $(LIBRUBY)
++ 	@$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS)
diff --git a/packages/ttf-fonts/ttf-dejavu_2.12.bb b/packages/ttf-fonts/ttf-dejavu_2.13.bb
index c1b743aa1b..c1b743aa1b 100644
--- a/packages/ttf-fonts/ttf-dejavu_2.12.bb
+++ b/packages/ttf-fonts/ttf-dejavu_2.13.bb
diff --git a/packages/ttf-fonts/ttf-sazanami_20040629.bb b/packages/ttf-fonts/ttf-sazanami_20040629.bb
index d1c4882d14..a51036155d 100644
--- a/packages/ttf-fonts/ttf-sazanami_20040629.bb
+++ b/packages/ttf-fonts/ttf-sazanami_20040629.bb
@@ -1,16 +1,18 @@
+require ttf.inc
+
 DESCRIPTION = "Sazanami Gothic/Mincho Japanese TrueType fonts"
 DESCRIPTION_ttf-sazanami-gothic = "Sazanami Gothic Japanese TrueType font"
 DESCRIPTION_ttf-sazanami-mincho = "Sazanami Mincho Japanese TrueType font"
-LICENSE = "${PN}"
-SRC_DISTRIBUTE_LICENSES += "${PN}"
 AUTHOR = "Electronic Font Open Laboratory (/efont/)"
 HOMEPAGE = "http://sourceforge.jp/projects/efont/"
+LICENSE = "${PN}"
+SRC_DISTRIBUTE_LICENSES += "${PN}"
+RPROVIDES = "virtual/japanese-font"
+PR = "r1"
 
 SRC_URI = "http://download.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2"
 S = "${WORKDIR}/sazanami-20040629"
 
-require ttf.inc
-
 PACKAGES = "ttf-sazanami-gothic ttf-sazanami-mincho"
 FILES_ttf-sazanami-gothic = "${datadir}/fonts/truetype/sazanami-gothic.ttf \
 			     ${datadir}/doc/ttf-sazanami-gothic/README"
diff --git a/packages/uim/uim-native_1.2.1.bb b/packages/uim/uim-native_1.3.1.bb
index 5249ac6394..5249ac6394 100644
--- a/packages/uim/uim-native_1.2.1.bb
+++ b/packages/uim/uim-native_1.3.1.bb
diff --git a/packages/uim/uim_1.2.1.bb b/packages/uim/uim_1.3.1.bb
index 5d82945df7..5d82945df7 100644
--- a/packages/uim/uim_1.2.1.bb
+++ b/packages/uim/uim_1.3.1.bb
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.7/.mtn2git_empty b/packages/wlan-ng/wlan-ng-modules-0.2.7/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-modules-0.2.7/.mtn2git_empty
diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.7/only-the-modules.patch b/packages/wlan-ng/wlan-ng-modules-0.2.7/only-the-modules.patch
new file mode 100644
index 0000000000..abb3b137da
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-modules-0.2.7/only-the-modules.patch
@@ -0,0 +1,26 @@
+Index: trunk/src/Makefile
+===================================================================
+--- trunk.orig/src/Makefile	2006-08-23 12:50:56.000000000 +0200
++++ trunk/src/Makefile	2006-08-23 12:52:45.000000000 +0200
+@@ -44,7 +44,7 @@
+ 
+ -include ../config.mk
+ 
+-DIRS=mkmeta shared wlanctl nwepgen wlancfg p80211 prism2
++DIRS=mkmeta shared p80211 prism2
+ 
+ ifneq ($(wildcard *.addon),) 
+ DIRS+=`cat *.addon`
+Index: trunk/src/prism2/Makefile
+===================================================================
+--- trunk.orig/src/prism2/Makefile	2006-08-23 12:50:55.000000000 +0200
++++ trunk/src/prism2/Makefile	2006-08-23 12:52:09.000000000 +0200
+@@ -44,7 +44,7 @@
+ 
+ -include ../../config.mk
+ 
+-DIRS=driver ridlist download
++DIRS=driver ridlist
+ 
+ ifneq ($(wildcard *.addon),) 
+ DIRS+=`cat *.addon`
diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.7.bb b/packages/wlan-ng/wlan-ng-modules_0.2.7.bb
new file mode 100644
index 0000000000..169b72dd0b
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.7.bb
@@ -0,0 +1,6 @@
+require wlan-ng-modules.inc
+
+SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2"
+
+S = "${WORKDIR}/linux-wlan-ng-${PV}"
+
diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.7/.mtn2git_empty b/packages/wlan-ng/wlan-ng-utils-0.2.7/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-utils-0.2.7/.mtn2git_empty
diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.7/config.in b/packages/wlan-ng/wlan-ng-utils-0.2.7/config.in
new file mode 100644
index 0000000000..be01488a92
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-utils-0.2.7/config.in
@@ -0,0 +1,21 @@
+WLAN_VERSION=0
+WLAN_PATCHLEVEL=2
+WLAN_SUBLEVEL=3
+WLAN_EXTRAVERSION=
+#LINUX_SRC=$(KERNEL_SOURCE)
+PCMCIA_SRC=.
+PREFIX=
+INST_EXEDIR=/sbin
+#TARGET_ROOT_ON_HOST=
+#RC_DIR=/etc/init.d
+PCMCIA_DIR=/etc/pcmcia
+SYSV_INIT=y
+INSTALL_DEPMOD=
+WLAN_DEBUG=n
+CROSS_COMPILE_ENABLED=n
+CROSS_COMPILE=
+HOST_COMPILE=
+PRISM2_PLX=y
+PRISM2_PCMCIA=y
+PRISM2_PCI=y
+PRISM2_USB=y
diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.7/only-the-utils.patch b/packages/wlan-ng/wlan-ng-utils-0.2.7/only-the-utils.patch
new file mode 100644
index 0000000000..af1f442a4c
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-utils-0.2.7/only-the-utils.patch
@@ -0,0 +1,26 @@
+Index: trunk/src/Makefile
+===================================================================
+--- trunk.orig/src/Makefile	2006-08-21 16:24:58.000000000 +0200
++++ trunk/src/Makefile	2006-08-23 12:49:08.000000000 +0200
+@@ -44,7 +44,7 @@
+ 
+ -include ../config.mk
+ 
+-DIRS=mkmeta shared wlanctl nwepgen wlancfg p80211 prism2
++DIRS=mkmeta shared wlanctl nwepgen wlancfg prism2
+ 
+ ifneq ($(wildcard *.addon),) 
+ DIRS+=`cat *.addon`
+Index: trunk/src/prism2/Makefile
+===================================================================
+--- trunk.orig/src/prism2/Makefile	2006-08-21 16:24:57.000000000 +0200
++++ trunk/src/prism2/Makefile	2006-08-23 12:48:32.000000000 +0200
+@@ -44,7 +44,7 @@
+ 
+ -include ../../config.mk
+ 
+-DIRS=driver ridlist download
++DIRS=ridlist download
+ 
+ ifneq ($(wildcard *.addon),) 
+ DIRS+=`cat *.addon`
diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.7.bb b/packages/wlan-ng/wlan-ng-utils_0.2.7.bb
new file mode 100644
index 0000000000..929f67fe16
--- /dev/null
+++ b/packages/wlan-ng/wlan-ng-utils_0.2.7.bb
@@ -0,0 +1,69 @@
+DESCRIPTION = "linux-wlan-ng userland utilities"
+HOMEPAGE = "http://www.linux-wlan.org"
+SECTION = "kernel/userland"
+DEPENDS = "virtual/kernel"
+LICENSE = "GPL"
+
+SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \
+	file://only-the-utils.patch;patch=1 \
+	file://scripts-makefile-hostcc.patch;patch=1 \
+	file://pcmciasrc.patch;patch=1 \
+	file://hostldflags.patch;patch=1 \
+	file://wlan-ng.modutils \
+	file://wlan.agent \
+	file://usbctl \
+	file://resume \
+	file://pre-up \
+	file://post-down \
+	file://config.in"
+S = "${WORKDIR}/linux-wlan-ng-${PV}"
+
+# yeah, it's kind of backwards, but otherwise the config step will fail
+inherit module
+
+do_configure() {
+	install -m 0655 ${WORKDIR}/config.in ${S}/config.in
+	oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config
+
+        if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then
+                echo "PRISM2_PCMCIA=y"          >> config.mk
+                echo "WLAN_KERN_PCMCIA=y"       >> config.mk
+        fi
+        echo "TARGET_ROOT_ON_HOST=${D}/"		>> config.mk
+	echo "FIRMWARE_DIR=/etc/wlan"		>> config.mk
+        echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk
+	echo "TARGET_INST_EXEDIR=${D}/sbin"			>> config.mk
+        echo "RC_DIR=${sysconfdir}/"             >> config.mk
+	echo "CC=${CC}"			>> config.mk
+	echo "LD=${LD}"			>> config.mk
+
+	# Shut up, you broken buildsystem
+	install -m 0655 config.mk src/prism2/config.mk
+	install -d src/prism2/driver/include
+	ln -sf ${S}/src/include/wlan 		src/prism2/driver/include/wlan
+	ln -sf ${S}/src/prism2/include/prism2	src/prism2/driver/include/prism2
+}
+
+do_compile() {
+	oe_runmake all
+}
+
+do_install() {
+	oe_runmake install
+	mkdir -p ${D}${sysconfdir}/modutils/
+	mkdir -p ${D}${sysconfdir}/hotplug/
+	mkdir -p ${D}${base_sbindir}/
+	install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}${sysconfdir}/modutils/wlan-ng.conf
+	install -m 0755 ${WORKDIR}/wlan.agent ${D}${sysconfdir}/hotplug/wlan.agent
+	install -d ${D}${sysconfdir}/network/if-pre-up.d
+	install -m 0755 ${WORKDIR}/pre-up ${D}${sysconfdir}/network/if-pre-up.d/wlan-ng
+	install -d ${D}${sysconfdir}/network/if-post-down.d
+	install -m 0755 ${WORKDIR}/post-down ${D}${sysconfdir}/network/if-post-down.d/wlan-ng
+	install -d ${D}${sysconfdir}/apm/resume.d
+	install -m 0755 ${WORKDIR}/resume ${D}${sysconfdir}/apm/resume.d/wlan-ng
+	install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl
+	install -d ${D}${mandir}/man1
+	install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/
+}
+
+FILES_${PN} = "/etc /sbin"
diff --git a/packages/wv/.mtn2git_empty b/packages/wv/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/wv/.mtn2git_empty
diff --git a/packages/wv/wv_1.2.0.bb b/packages/wv/wv_1.2.0.bb
new file mode 100644
index 0000000000..10c3264766
--- /dev/null
+++ b/packages/wv/wv_1.2.0.bb
@@ -0,0 +1,12 @@
+LICENSE = "GPLv2"
+
+SRC_URI = "http://switch.dl.sourceforge.net/sourceforge/wvware/wv-${PV}.tar.gz"
+
+S = "${WORKDIR}/${PN}-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage () {
+        autotools_stage_all
+}
+
diff --git a/packages/xfce-mcs-manager/xfce-mcs-manager_4.3.99.2.bb b/packages/xfce-mcs-manager/xfce-mcs-manager_4.3.99.2.bb
new file mode 100644
index 0000000000..de5cf2b012
--- /dev/null
+++ b/packages/xfce-mcs-manager/xfce-mcs-manager_4.3.99.2.bb
@@ -0,0 +1,5 @@
+# xfce-mcs-manager OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+require ${PN}.inc
diff --git a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.3.99.2.bb b/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.3.99.2.bb
new file mode 100644
index 0000000000..02ad97e860
--- /dev/null
+++ b/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.3.99.2.bb
@@ -0,0 +1,5 @@
+# xfce-mcs-plugins OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+require ${PN}.inc
diff --git a/packages/xfce-utils/xfce-utils_4.3.99.2.bb b/packages/xfce-utils/xfce-utils_4.3.99.2.bb
new file mode 100644
index 0000000000..57909f2c2d
--- /dev/null
+++ b/packages/xfce-utils/xfce-utils_4.3.99.2.bb
@@ -0,0 +1,6 @@
+# xfce-utils OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+PR = "r1"
+require ${PN}.inc
diff --git a/packages/xfce4-goodies/xfce4-appfinder_4.3.99.2.bb b/packages/xfce4-goodies/xfce4-appfinder_4.3.99.2.bb
new file mode 100644
index 0000000000..f7c97970d5
--- /dev/null
+++ b/packages/xfce4-goodies/xfce4-appfinder_4.3.99.2.bb
@@ -0,0 +1,5 @@
+# xfce4-appfinder build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+require ${PN}.inc
diff --git a/packages/xfce4-goodies/xfce4-mixer_4.3.99.2.bb b/packages/xfce4-goodies/xfce4-mixer_4.3.99.2.bb
new file mode 100644
index 0000000000..6dd3c0565b
--- /dev/null
+++ b/packages/xfce4-goodies/xfce4-mixer_4.3.99.2.bb
@@ -0,0 +1,5 @@
+# xfce-mixer-plugin OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+require ${PN}.inc
diff --git a/packages/xfce4-panel/xfce4-panel_4.3.99.2.bb b/packages/xfce4-panel/xfce4-panel_4.3.99.2.bb
new file mode 100644
index 0000000000..18dce6fa3c
--- /dev/null
+++ b/packages/xfce4-panel/xfce4-panel_4.3.99.2.bb
@@ -0,0 +1,6 @@
+# xfce4-panel OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+PR="r1"
+require ${PN}.inc
diff --git a/packages/xfdesktop/xfdesktop_4.3.99.2.bb b/packages/xfdesktop/xfdesktop_4.3.99.2.bb
new file mode 100644
index 0000000000..d7af836791
--- /dev/null
+++ b/packages/xfdesktop/xfdesktop_4.3.99.2.bb
@@ -0,0 +1,6 @@
+# xfdesktop OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+PR = "r1"
+require ${PN}.inc
diff --git a/packages/xffm/xffm_4.3.99.2.bb b/packages/xffm/xffm_4.3.99.2.bb
new file mode 100644
index 0000000000..c098e1c96b
--- /dev/null
+++ b/packages/xffm/xffm_4.3.99.2.bb
@@ -0,0 +1,5 @@
+# xffm OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+require ${PN}.inc
diff --git a/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb b/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb
index e2b6e442ba..52e01dde75 100644
--- a/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb
@@ -1,10 +1,10 @@
 SECTION = "x11/base"
 require libx11_${PV}.bb
 
-EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb"
+EXTRA_OECONF += "--disable-udc --enable-xcms --disable-xlocale --disable-xkb"
 CFLAGS += "-D_GNU_SOURCE"
 
-PR = "r2"
+PR = "r4"
 
 SRC_URI += "file://X18NCMSstubs.diff;patch=1 \
 	    file://fix-disable-xlocale.diff;patch=1 \
diff --git a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
index 7ed04075c8..463312d017 100644
--- a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
@@ -17,7 +17,7 @@ FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
 do_compile() {
 	(
 	 unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
-	 cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} makekeys.c -o makekeys
+	 cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
 	) || exit 1
 		rm -f ${STAGING_INCDIR}/X11/Xlib.h
 	oe_runmake
diff --git a/packages/zudoku/zudoku_1.1.bb b/packages/zudoku/zudoku_1.1.bb
index 46c64ebb6e..e9eb09741a 100644
--- a/packages/zudoku/zudoku_1.1.bb
+++ b/packages/zudoku/zudoku_1.1.bb
@@ -5,6 +5,7 @@ LICENSE = "GPL"
 SECTION = "opie/games"
 APPTYPE = "binary"
 APPDESKTOP = "${WORKDIR}"
+PR = "r1"
 
 SRC_URI = "http://www.vanille.de/mirror/zudoku-${PV}.tar.gz \
            file://zudoku.html \
@@ -13,6 +14,7 @@ SRC_URI = "http://www.vanille.de/mirror/zudoku-${PV}.tar.gz \
 inherit opie
 
 EXTRA_QMAKEVARS_POST += "TARGET=zudoku"
+LDFLAGS += "-lstdc++"
 
 do_install() {
 	install -d ${D}${palmtopdir}/help/en/html
author	Marcin Juszkiewicz <hrw@openembedded.org>	2007-01-22 10:04:30 +0000
committer	Marcin Juszkiewicz <hrw@openembedded.org>	2007-01-22 10:04:30 +0000
commit	c3be2a552db104291accd82b2e674d31d5527fcc (patch)
tree	422e82bf481b26c2a0e883d60b459cbc243d436e
parent	3a508238c49e86e0476319bfe71a24fdfdd56b66 (diff)
parent	4693c8ab28f246ce11a0b80b27ab6127aea14c52 (diff)