merge of '046b893ab8fe9a75380cca2843abba168e1dc148'

     and '3601dddeaadc9f1eec11df4baadff513d463bbe4'

32 files changed, 385 insertions, 17 deletions

diff --git a/packages/dbus-java/dbus-java_2.3.bb b/packages/dbus-java/dbus-java_2.3.bb
index 72d99c3854..1c30fc7fe4 100644
--- a/packages/dbus-java/dbus-java_2.3.bb
+++ b/packages/dbus-java/dbus-java_2.3.bb
@@ -4,7 +4,6 @@ DESCRIPTION_dbus-java-bin = "${DESCRIPTION} (Binaries)"
 
 LICENSE = "GPLv2 AFL"
 SECTION = "libs"
-MAINTAINER = "Fabian Koester, tarent GmbH Bonn <f.koester@tarent.de>"
 HOMEPAGE = "http://jalimo.org"
 AUTHOR = "Matthew Johnson <dbus@matthew.ath.cx>"
 
diff --git a/packages/fuse/fuse-2.7.2/.mtn2git_empty b/packages/fuse/fuse-2.7.2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/fuse/fuse-2.7.2/.mtn2git_empty
diff --git a/packages/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch b/packages/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch
new file mode 100644
index 0000000000..903a8baa9e
--- /dev/null
+++ b/packages/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch
@@ -0,0 +1,15 @@
+Index: fuse-2.7.2/util/Makefile.am
+===================================================================
+--- fuse-2.7.2.orig/util/Makefile.am	2007-04-26 01:36:47.000000000 +0930
++++ fuse-2.7.2/util/Makefile.am	2008-02-10 16:43:19.000000000 +1030
+@@ -33,10 +33,6 @@
+ 	$(INSTALL_PROGRAM) $(srcdir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
+ 	$(mkdir_p) $(DESTDIR)$(INIT_D_PATH)
+ 	$(INSTALL_PROGRAM) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse
+-	@if test -x /usr/sbin/update-rc.d; then \
+-		echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true"; \
+-		/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true; \
+-	fi
+ 
+ install-data-local:
+ 	$(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)
diff --git a/packages/fuse/fuse-module-2.5.3/.mtn2git_empty b/packages/fuse/fuse-module-2.5.3/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/fuse/fuse-module-2.5.3/.mtn2git_empty
diff --git a/packages/fuse/fuse-module-2.5.3/preserve_CC_with_2_4_kernel.patch b/packages/fuse/fuse-module-2.5.3/preserve_CC_with_2_4_kernel.patch
new file mode 100644
index 0000000000..05619d557c
--- /dev/null
+++ b/packages/fuse/fuse-module-2.5.3/preserve_CC_with_2_4_kernel.patch
@@ -0,0 +1,11 @@
+--- fuse-2.5.3/kernel/Makefile.in.orig	2008-01-05 20:43:00.000000000 -0600
++++ fuse-2.5.3/kernel/Makefile.in	2008-01-05 20:43:25.000000000 -0600
+@@ -54,8 +54,6 @@
+ 
+ ifeq ($(majver), 2.4)
+ 
+-CC = gcc
+-LD = ld
+ CFLAGS = -O2 -Wall -Wstrict-prototypes -fno-strict-aliasing -pipe @KERNELCFLAGS@
+ CPPFLAGS = -I@kernelsrc@/include -I. -D__KERNEL__ -DMODULE -D_LOOSE_KERNEL_NAMES -DFUSE_VERSION=\"$(VERSION)\" @KERNELCPPFLAGS@
+ 
diff --git a/packages/fuse/fuse-module_2.5.3.bb b/packages/fuse/fuse-module_2.5.3.bb
new file mode 100644
index 0000000000..f707888c94
--- /dev/null
+++ b/packages/fuse/fuse-module_2.5.3.bb
@@ -0,0 +1,31 @@
+require fuse.inc
+
+PR = "r0"
+
+SRC_URI += "file://preserve_CC_with_2_4_kernel.patch;patch=1"
+
+S = "${WORKDIR}/fuse-${PV}"
+
+FILES_${PN} = "${base_libdir}/modules"
+
+EXTRA_OECONF = " --enable-kernel-module  --with-kernel=${STAGING_KERNEL_DIR}"
+
+inherit module
+
+do_configure() {
+	cd ${S}
+	oe_runconf
+}
+
+do_compile(){
+	LDFLAGS=""
+	cd ${S}/kernel
+	oe_runmake
+}
+
+fakeroot do_install() {
+	LDFLAGS=""
+	cd ${S}/kernel
+	oe_runmake install DESTDIR=${D}
+}
+
diff --git a/packages/fuse/fuse-module_2.7.2.bb b/packages/fuse/fuse-module_2.7.2.bb
new file mode 100644
index 0000000000..48cc33a338
--- /dev/null
+++ b/packages/fuse/fuse-module_2.7.2.bb
@@ -0,0 +1,29 @@
+require fuse.inc
+
+RRECOMMENDS = "fuse"
+PR = "r0"
+
+S = "${WORKDIR}/fuse-${PV}"
+FILES_${PN} = "/dev ${base_libdir}/modules ${sysconfdir}"
+EXTRA_OECONF = " --enable-kernel-module  --with-kernel=${STAGING_KERNEL_DIR}"
+
+inherit module
+
+do_configure() {
+	cd ${S} ; oe_runconf
+}
+
+do_compile(){
+	LDFLAGS=""
+	cd ${S}/kernel
+	oe_runmake
+}
+
+fakeroot do_install() {
+	LDFLAGS=""
+	install -d ${D}${sysconfdir}/udev/rules.d/
+	install -m 644 util/udev.rules ${D}${sysconfdir}/udev/rules.d/
+	cd ${S}/kernel
+	oe_runmake install DESTDIR=${D}
+}
+
diff --git a/packages/fuse/fuse_2.7.2.bb b/packages/fuse/fuse_2.7.2.bb
new file mode 100644
index 0000000000..a1795e7f0c
--- /dev/null
+++ b/packages/fuse/fuse_2.7.2.bb
@@ -0,0 +1,27 @@
+require fuse.inc
+
+PR = "r0"
+
+SRC_URI += "file://not-run-updaterc.d-on-host.patch;patch=1"
+
+EXTRA_OECONF = " --disable-kernel-module"
+
+#package utils in a sperate package and stop debian.bbclass renaming it to libfuse-utils, we want it to be fuse-utils
+PACKAGES =+ "fuse-utils-dbg fuse-utils libulockmgr libulockmgr-dev libulockmgr-dbg"
+FILES_${PN} += "${libdir}/libfuse.so.*"
+FILES_${PN}-dev += "${libdir}/libfuse*.la"
+
+FILES_libulockmgr = "${libdir}/libulockmgr.so.*"
+FILES_libulockmgr-dev += "${libdir}/libulock*.la"
+FILES_libulockmgr-dbg += "${libdir}/.debug/libulock*"
+
+FILES_fuse-utils = "${bindir} ${base_sbindir}"
+FILES_fuse-utils-dbg = "${bindir}/.debug ${base_sbindir}/.debug"
+DEBIAN_NOAUTONAME_fuse-utils = "1"
+DEBIAN_NOAUTONAME_fuse-utils-dbg = "1"
+
+fakeroot do_stage() {
+        autotools_stage_all
+}
+
+
diff --git a/packages/kobodeluxe/.mtn2git_empty b/packages/kobodeluxe/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/kobodeluxe/.mtn2git_empty
diff --git a/packages/kobodeluxe/files/.mtn2git_empty b/packages/kobodeluxe/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/kobodeluxe/files/.mtn2git_empty
diff --git a/packages/kobodeluxe/files/buildfix.patch b/packages/kobodeluxe/files/buildfix.patch
new file mode 100644
index 0000000000..01a97e14f2
--- /dev/null
+++ b/packages/kobodeluxe/files/buildfix.patch
@@ -0,0 +1,21 @@
+Index: kobodeluxe-0.5.1/graphics/gfxengine.cpp
+===================================================================
+--- kobodeluxe-0.5.1.orig/graphics/gfxengine.cpp	2008-02-10 03:02:29.000000000 +0100
++++ kobodeluxe-0.5.1/graphics/gfxengine.cpp	2008-02-10 03:03:45.000000000 +0100
+@@ -25,6 +25,7 @@
+ 
+ #include <string.h>
+ #include <math.h>
++#include <stdlib.h>
+ 
+ #include "gfxengine.h"
+ #include "filters.h"
+@@ -765,7 +766,7 @@
+ 		return 0;
+ 
+ 	if(_centered && !_fullscreen)
+-		SDL_putenv((char *)"SDL_VIDEO_CENTERED=1");
++		putenv((char *)"SDL_VIDEO_CENTERED=1");
+ 
+ 	log_printf(DLOG, "Opening screen...\n");
+ 	if(!SDL_WasInit(SDL_INIT_VIDEO))
diff --git a/packages/kobodeluxe/files/debian-kobo.patch b/packages/kobodeluxe/files/debian-kobo.patch
new file mode 100644
index 0000000000..90b1d84080
--- /dev/null
+++ b/packages/kobodeluxe/files/debian-kobo.patch
@@ -0,0 +1,72 @@
+--- kobodeluxe-0.5.1.orig/kobo.cpp
++++ kobodeluxe-0.5.1/kobo.cpp
+@@ -141,21 +141,21 @@
+ 	 * Graphics data
+ 	 */
+ 	/* Current dir; from within the build tree */
+-	fmap->addpath("GFX", "./data/gfx");
++	//fmap->addpath("GFX", "./data/gfx");
+ 	/* Real data dir */
+ 	fmap->addpath("GFX", "DATA>>gfx");
+ 	/* Current dir */
+-	fmap->addpath("GFX", "./gfx");
++	//fmap->addpath("GFX", "./gfx");
+ 
+ 	/*
+ 	 * Sound data
+ 	 */
+ 	/* Current dir; from within the build tree */
+-	fmap->addpath("SFX", "./data/sfx");
++	//fmap->addpath("SFX", "./data/sfx");
+ 	/* Real data dir */
+ 	fmap->addpath("SFX", "DATA>>sfx");
+ 	/* Current dir */
+-	fmap->addpath("SFX", "./sfx");
++	//fmap->addpath("SFX", "./sfx");
+ 
+ 	/*
+ 	 * Score files (user and global)
+@@ -173,7 +173,7 @@
+ 	/* System local */
+ 	fmap->addpath("CONFIG", SYSCONF_DIR);
+ 	/* In current dir (last resort) */
+-	fmap->addpath("CONFIG", "./");
++	//fmap->addpath("CONFIG", "./");
+ }
+ 
+ 
+--- kobodeluxe-0.5.1.orig/graphics/window.cpp
++++ kobodeluxe-0.5.1/graphics/window.cpp
+@@ -331,7 +331,7 @@
+ }
+ 
+ 
+-void window_t::center_token(int _x, int _y, const char *txt, char token)
++void window_t::center_token(int _x, int _y, const char *txt, signed char token)
+ {
+ 	center_token_fxp(PIXEL2CS(_x), PIXEL2CS(_y), txt, token);
+ }
+@@ -374,7 +374,7 @@
+ }
+ 
+ 
+-void window_t::center_token_fxp(int _x, int _y, const char *txt, char token)
++void window_t::center_token_fxp(int _x, int _y, const char *txt, signed char token)
+ {
+ 	_x = CS2PIXEL((_x * xs + 128) >> 8);
+ 	_y = CS2PIXEL((_y * ys + 128) >> 8);
+--- kobodeluxe-0.5.1.orig/graphics/window.h
++++ kobodeluxe-0.5.1/graphics/window.h
+@@ -265,10 +265,10 @@
+ 	void font(int fnt);
+ 	void string(int _x, int _y, const char *txt);
+ 	void center(int _y, const char *txt);
+-	void center_token(int _x, int _y, const char *txt, char token = 0);
++	void center_token(int _x, int _y, const char *txt, signed char token = 0);
+ 	void string_fxp(int _x, int _y, const char *txt);
+ 	void center_fxp(int _y, const char *txt);
+-	void center_token_fxp(int _x, int _y, const char *txt, char token = 0);
++	void center_token_fxp(int _x, int _y, const char *txt, signed char token = 0);
+ 	int textwidth(const char *txt, int min = 0, int max = 255);
+ 	int textwidth_fxp(const char *txt, int min = 0, int max = 255);
+ 	int fontheight();
diff --git a/packages/kobodeluxe/kobodeluxe_0.5.1.bb b/packages/kobodeluxe/kobodeluxe_0.5.1.bb
new file mode 100644
index 0000000000..25f2f3ceb6
--- /dev/null
+++ b/packages/kobodeluxe/kobodeluxe_0.5.1.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "Fast-paced 2D top-down shooter where you have to destroy space station"
+SECTION = "games"
+PRIORITY = "optional"
+LICENSE = "GPL"
+AUTHOR = "David Olofson <david@olofson.net>"
+HOMEPAGE = "http://olofson.net/kobodl"
+
+PR = "r1"
+
+DEPENDS = "libsdl-image virtual/libsdl"
+
+RDEPENDS_${PN} = "${PN}-data"
+
+SRC_URI = "http://olofson.net/kobodl/download/KoboDeluxe-${PV}.tar.bz2 \
+					 file://debian-kobo.patch;patch=1 \
+					 file://buildfix.patch;patch=1 \
+          "
+
+S = "${WORKDIR}/KoboDeluxe-${PV}"
+
+inherit autotools
+
+export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
+
+EXTRA_OECONF = "--disable-opengl --disable-sdltest"
+
+PACKAGES += "${PN}-data"
+
+FILES_${PN}-data = "${datadir}"
+
+PACKAGE_ARCH_${PN}-data = "all"
diff --git a/packages/libmatthew/libmatthew_0.5.bb b/packages/libmatthew/libmatthew_0.5.bb
index 23ee04ed26..7a1b05478b 100644
--- a/packages/libmatthew/libmatthew_0.5.bb
+++ b/packages/libmatthew/libmatthew_0.5.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Unix socket, debug and hexdump libraries"
 LICENSE = "LGPL"
 SECTION = "libs"
-MAINTAINER = "Fabian Koester, tarent GmbH Bonn <f.koester@tarent.de>"
 HOMEPAGE = "http://jalimo.org"
 AUTHOR = "Matthew Johnson <web@matthew.ath.cx>"
 
diff --git a/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24 b/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24
index 28b69a82ed..061c0c0724 100644
--- a/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24
+++ b/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24
@@ -243,6 +243,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE=" noirqdebug console=ttyS0,115200n8"
 # CONFIG_XIP_KERNEL is not set
 CONFIG_KEXEC=y
+CONFIG_ATAGS_PROC=y
 
 #
 # Floating point emulation
diff --git a/packages/linux/linux-ixp4xx_2.6.24.bb b/packages/linux/linux-ixp4xx_2.6.24.bb
index 9942433b56..9a5967afa2 100644
--- a/packages/linux/linux-ixp4xx_2.6.24.bb
+++ b/packages/linux/linux-ixp4xx_2.6.24.bb
@@ -11,7 +11,7 @@ KERNEL_RELEASE = "2.6.24"
 #PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}"
 
 PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
-PR = "r0"
+PR = "r1"
 
 # ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \
 
diff --git a/packages/logic-analyzer/logic-analyzer_0.8.bb b/packages/logic-analyzer/logic-analyzer_0.8.bb
index ce691093fa..f66752ad31 100644
--- a/packages/logic-analyzer/logic-analyzer_0.8.bb
+++ b/packages/logic-analyzer/logic-analyzer_0.8.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "A Java-based logical analyzer for home use."
 LICENSE = "GPL"
-MAINTAINER = "Robert Schuster, tarent GmbH Bonn <robert.schuster@tarent.de>"
 HOMEPAGE = "http://sump.org/projects/analyzer/"
 
 inherit java
diff --git a/packages/madwifi/madwifi-ng_r3314-20080131.bb b/packages/madwifi/madwifi-ng_r3314-20080131.bb
new file mode 100644
index 0000000000..a7b4af725f
--- /dev/null
+++ b/packages/madwifi/madwifi-ng_r3314-20080131.bb
@@ -0,0 +1,13 @@
+# Bitbake recipe for the madwifi-ng driver
+
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_ixp4xx = "1"
+
+# Disable stripping of kernel modules, since this action strips too
+# much out, and the resulting module won't load.
+INHIBIT_PACKAGE_STRIP = "1"
+
+require madwifi-ng_r.inc
+
+# PR set after the include, to override what's set in the included file.
+# PR = "r1"
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 6e8d9e4089..d0c3324e7f 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -5,10 +5,10 @@
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r44"
+PR = "r47"
 CONFLICTS = "db3"
 
-COMPATIBLE_MACHINE = "nslu2"
+COMPATIBLE_MACHINE = "nslu2|ixp4xx"
 EXCLUDE_FROM_WORLD = "1"
 INHIBIT_DEFAULT_DEPS = "1"
 ALLOW_EMPTY = "1"
@@ -76,7 +76,6 @@ SLUGOS_PACKAGES = "\
 	dnsmasq \
 	e2fsprogs \
 	e2fsprogs-libs \
-	eciadsl \
 	expat \
 	ez-ipupdate \
 	fconfig \
@@ -97,11 +96,11 @@ SLUGOS_PACKAGES = "\
 	gphoto2 \
 	grep \
 	groff \
-	gspcav1 \
 	gtk-doc \
 	gzip \
 	hdparm \
 	ifupdown \
+	inetutils \
 	iperf \
 	ipkg-utils \
 	iptables \
@@ -109,6 +108,7 @@ SLUGOS_PACKAGES = "\
 	irssi \
 	joe \
 	jpeg \
+	kexec-tools \
 	lcdproc \
 	less \
 	libao \
@@ -193,6 +193,7 @@ SLUGOS_PACKAGES = "\
 	reiserfsprogs reiser4progs \
 	rng-tools \
 	rsync \
+	rtorrent \
 	samba \
 	sane-backends \
 	screen \
@@ -245,7 +246,9 @@ SLUGOS_PACKAGES = "\
 SLUGOS_BROKEN_PACKAGES = "\
 	bwmon \
 	dsniff \
+	eciadsl \
 	fetchmail \
+	gspcav1 \
 	lirc-modules lirc \
 	madfu \
 	openldap \
diff --git a/packages/netbase/netbase/slugos/if-pre-up.d/test-nfsroot b/packages/netbase/netbase/slugos/if-pre-up.d/test-nfsroot
new file mode 100644
index 0000000000..bbfd7d9bb3
--- /dev/null
+++ b/packages/netbase/netbase/slugos/if-pre-up.d/test-nfsroot
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+if [ X"$IFACE" == "Xeth0" ] ; then
+  nfsroot=`grep ' / nfs ' /proc/mounts`
+  if [ -n "$nfsroot" ]; then
+    echo "WARNING: Refusing to ifup eth0 when booted to a nfs-mounted rootfs."
+    exit 1
+  fi
+fi
+exit 0
diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb
index 1f2837a8c1..73e765376c 100644
--- a/packages/netbase/netbase_4.21.bb
+++ b/packages/netbase/netbase_4.21.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \
 infrastructure for basic TCP/IP based networking."
 SECTION = "base"
 LICENSE = "GPL"
-PR = "r26"
+PR = "r27"
 
 inherit update-rc.d
 
diff --git a/packages/python/python-pyqt_4.3.3.bb b/packages/python/python-pyqt_4.3.3.bb
index 2fd6fcc38b..9dd2040a5b 100644
--- a/packages/python/python-pyqt_4.3.3.bb
+++ b/packages/python/python-pyqt_4.3.3.bb
@@ -4,6 +4,7 @@ AUTHOR = "Phil Thomson @ riverbank.co.uk"
 SECTION = "devel/python"
 PRIORITY = "optional"
 LICENSE = "GPL"
+DEPENDS = "sip-native python-sip"
 RDEPENDS = "python-core"
 SRCNAME = "pyqt"
 PR = "ml1"
diff --git a/packages/python/python-sqlalchemy_0.4.2p3.bb b/packages/python/python-sqlalchemy_0.4.2p3.bb
new file mode 100644
index 0000000000..2a797eb439
--- /dev/null
+++ b/packages/python/python-sqlalchemy_0.4.2p3.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Python SQL toolkit and Object Relational Mapper that gives application developers the full power and flexibility of SQL"
+HOMEPAGE = "http://www.sqlalchemy.org/"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "MIT"          
+SRCNAME = "SQLAlchemy"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/sqlalchemy/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit setuptools
diff --git a/packages/rxtx/rxtx_2.1-7r2.bb b/packages/rxtx/rxtx_2.1-7r2.bb
index e91a406cfc..260b70a1fe 100644
--- a/packages/rxtx/rxtx_2.1-7r2.bb
+++ b/packages/rxtx/rxtx_2.1-7r2.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "RXTX provides serial and parallel communication for Java applications"
 LICENSE = "LGPL"
 SECTION = "libs"
-MAINTAINER = "Robert Schuster, tarent GmbH Bonn <robert.schuster@tarent.de>"
 HOMEPAGE = "http://rxtx.org"
 
 inherit autotools java-library
diff --git a/packages/slugos-init/files/boot/network b/packages/slugos-init/files/boot/network
index 8c0635d3ac..8124f19ab2 100644
--- a/packages/slugos-init/files/boot/network
+++ b/packages/slugos-init/files/boot/network
@@ -25,7 +25,7 @@ iface="$(config iface)"
 test -z "$iface" && exit 1 
 #
 # Fire up a process in the background to load the firmware if necessary
-sysf="/sys/class/firmware/$iface"
+sysf="/sys/class/firmware/firmware-$iface"
 (
 	# Wait for the firware to be requested, if required
 	[ -f $sysf/loading ] || sleep 1
diff --git a/packages/slugos-init/slugos-init_4.8.bb b/packages/slugos-init/slugos-init_4.8.bb
index 92ac7e30f3..4babf89d61 100644
--- a/packages/slugos-init/slugos-init_4.8.bb
+++ b/packages/slugos-init/slugos-init_4.8.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \
diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb
index a23589111d..18455f5b96 100644
--- a/packages/tasks/task-python-everything.bb
+++ b/packages/tasks/task-python-everything.bb
@@ -1,7 +1,7 @@
 DESCRIPTION= "Everything Python"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
-PR = "ml25"
+PR = "ml26"
 
 RDEPENDS = "\
 		python-ao 		\
@@ -75,6 +75,7 @@ RDEPENDS = "\
 		python-soappy		\
 		python-spydi		\
 		python-spyro		\
+		python-sqlalchemy	\
 		python-sqlobject	\
 		python-sword		\
 		python-tlslite		\
diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb
index bdcfcf7cd3..01cdaa21b4 100644
--- a/packages/tasks/task-slugos.bb
+++ b/packages/tasks/task-slugos.bb
@@ -6,7 +6,7 @@
 DESCRIPTION = "Task packages for the SlugOS distribution"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r16"
+PR = "r17"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 ALLOW_EMPTY = "1"
 
@@ -67,6 +67,7 @@ kernel-module-ext3 \
 kernel-module-vfat \
 kernel-module-nls-cp437 \
 kernel-module-nls-utf8 \
+kernel-module-nfs \
 "
 
 # Add daemon required for HW RNG support
@@ -102,7 +103,6 @@ kernel-module-via-velocity \
 #
 # portmap \
 # kexec-tools \
-# kernel-module-nfs \
 # kernel-module-isofs \
 # kernel-module-udf \
 # kernel-module-loop \
diff --git a/packages/udev/files/slugos/mount.sh b/packages/udev/files/slugos/mount.sh
new file mode 100644
index 0000000000..11714c1390
--- /dev/null
+++ b/packages/udev/files/slugos/mount.sh
@@ -0,0 +1,77 @@
+#!/bin/sh
+#
+# Called from udev
+# Attemp to mount any added block devices 
+# and remove any removed devices
+#
+
+MOUNT="/bin/mount"
+PMOUNT="/usr/bin/pmount"
+UMOUNT="/bin/umount"
+name="`basename "$DEVNAME"`"
+
+for line in `cat /etc/udev/mount.blacklist | grep -v ^#`
+do
+	if ( echo "$DEVNAME" | grep -q "$line" )
+	then
+		logger "udev/mount.sh" "[$DEVNAME] is blacklisted, ignoring"
+		exit 0
+	fi
+done
+
+automount() {	
+	! test -d "/media/$name" && mkdir -p "/media/$name"
+	
+	if ! $MOUNT -t auto -o sync $DEVNAME "/media/$name"
+	then
+		#logger "mount.sh/automount" "$MOUNT -t auto $DEVNAME \"/media/$name\" failed!"
+		rm_dir "/media/$name"
+	else
+		logger "mount.sh/automount" "Auto-mount of [/media/$name] successful"
+		touch "/tmp/.automount-$name"
+	fi
+}
+	
+rm_dir() {
+	# We do not want to rm -r populated directories
+	if test "`find "$1" | wc -l | tr -d " "`" -lt 2 -a -d "$1"
+	then
+		! test -z "$1" && rm -r "$1"
+	else
+		logger "mount.sh/automount" "Not removing non-empty directory [$1]"
+	fi
+}
+
+if [ "$ACTION" = "add" ] && [ -n "$DEVNAME" ]; then
+	# SlugOS: we pivot to the rootfs based on UUID, not on fstab -- so the fstab may not
+	# be correct at this point in the boot.  So we must not let udev mount devices based
+	# soley on the fstab, lest we mount overtop the real rootfs.  For now we just comment
+	# out the logic below and let the automount logic (far below) deal with all udev mount
+	# operations.
+	#if [ -x "$PMOUNT" ]; then
+	#	$PMOUNT $DEVNAME 2> /dev/null
+	#elif [ -x $MOUNT ]; then
+	#	$MOUNT $DEVNAME 2> /dev/null
+	#fi
+	
+	# If the device isn't mounted at this point, it isn't configured in fstab
+	# 20061107: Small correction: The rootfs partition may be called just "rootfs" and not by
+	# 	    its true device name so this would break. If the rootfs is mounted on two places
+	#	    during boot, it confuses the heck out of fsck. So Im auto-adding the root-partition
+	#	    to /etc/udev/mount.blacklist via postinst 
+
+	cat /proc/mounts | awk '{print $1}' | grep -q "^$DEVNAME$" || automount 
+	
+fi
+
+
+
+if [ "$ACTION" = "remove" ] && [ -x "$UMOUNT" ] && [ -n "$DEVNAME" ]; then
+	for mnt in `cat /proc/mounts | grep "$DEVNAME" | cut -f 2 -d " " `
+	do
+		$UMOUNT $mnt
+	done
+	
+	# Remove empty directories from auto-mounter
+	test -e "/tmp/.automount-$name" && rm_dir "/media/$name"
+fi
diff --git a/packages/udev/udev_100.bb b/packages/udev/udev_100.bb
index ac981bbe9c..c8840e1a8f 100644
--- a/packages/udev/udev_100.bb
+++ b/packages/udev/udev_100.bb
@@ -9,12 +9,13 @@ used to detect the type of a file system and read its metadata."
 DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \
 needed to link programs with libvolume_id."
 
-PR = "r10"
+PR = "r11"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://noasmlinkage.patch;patch=1 \
 	   file://flags.patch;patch=1 \
 	   file://mount.blacklist \
+	   file://mount.sh \
 	   "
 
 require udev.inc
diff --git a/packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
index 26f8666076..622b32179d 100644
--- a/packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
@@ -7,7 +7,7 @@ DEPENDS += "libxkbfile libxcalibrate"
 PROVIDES = "virtual/xserver"
 
 PE = "1"
-PR = "r3"
+PR = "r4"
 
 FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-1.2.0:${FILE_DIRNAME}/xserver-kdrive"
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
@@ -21,6 +21,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
         file://kdrive-imageon.patch;patch=1 \
         file://xcalibrate_coords.patch;patch=1 \
         file://enable-builtin-fonts.patch;patch=1 \
+	file://fix-picturestr-include-order.patch;patch=1 \
         "
        
 S = "${WORKDIR}/xorg-server-${PV}"
diff --git a/packages/xorg-xserver/xserver-kdrive/fix-picturestr-include-order.patch b/packages/xorg-xserver/xserver-kdrive/fix-picturestr-include-order.patch
new file mode 100644
index 0000000000..3da235e1e1
--- /dev/null
+++ b/packages/xorg-xserver/xserver-kdrive/fix-picturestr-include-order.patch
@@ -0,0 +1,15 @@
+# Reverse include order in render/picturestr.h to be able to compile against renderproto >= 0.9.3
+Index: xorg-server-1.2.0/render/picturestr.h
+===================================================================
+--- xorg-server-1.2.0.orig/render/picturestr.h	2008-02-09 22:54:46.000000000 +0100
++++ xorg-server-1.2.0/render/picturestr.h	2008-02-09 22:54:50.000000000 +0100
+@@ -26,8 +26,8 @@
+ #ifndef _PICTURESTR_H_
+ #define _PICTURESTR_H_
+ 
+-#include "glyphstr.h"
+ #include "scrnintstr.h"
++#include "glyphstr.h"
+ #include "resource.h"
+ 
+ typedef struct _DirectFormat {