merge of 465928d6461b2ec29d7c4cccee77f223c3dbb94d

     and 51b6958ca62c0aa799b810b3b989dc1f6a322d7e

20 files changed, 205 insertions, 184 deletions

diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf
index 5dbd9ecc85..46f5b8babc 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -162,6 +162,7 @@ ${PKGDIR}/packages/upslug/*.bb \
 ${PKGDIR}/packages/util-linux/*.bb \
 ${PKGDIR}/packages/vlan/*.bb \
 ${PKGDIR}/packages/wakelan/*.bb \
+${PKGDIR}/packages/watchdog/*.bb \
 ${PKGDIR}/packages/wget/*.bb \
 ${PKGDIR}/packages/xinetd/*.bb \
 ${PKGDIR}/packages/zlib/*.bb \
diff --git a/conf/distro/openzaurus.conf b/conf/distro/openzaurus.conf
index f6975ae961..9208aeda09 100644
--- a/conf/distro/openzaurus.conf
+++ b/conf/distro/openzaurus.conf
@@ -7,3 +7,6 @@ INHERIT += " package_ipk debian"
 # TARGET_OS ?= "linux"
 TARGET_OS = "linux"
 TARGET_FPU = "soft"
+
+PARALLEL_INSTALL_MODULES = "1"
+
diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf
index c321f18009..7eb8e2f9ad 100644
--- a/conf/distro/ucslugc.conf
+++ b/conf/distro/ucslugc.conf
@@ -61,6 +61,12 @@ EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 -D ${OPENSLUG_DE
 # issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf)
 CMDLINE_DEBUG = "noirqdebug"
 
+# IMAGE_PREPROCESS_COMMAND is run before making the image.  In UcSlugC the
+# kernel image is removed from the root file system to recover the space used -
+# UcSlugC is assumed to boot from a separate kernel image in flash (not in the
+# root file system), if this is not the case the following must not be done!
+IMAGE_PREPROCESS_COMMAND = "rm ${IMAGE_ROOTFS}/boot/zImage*;"
+
 # EXTRA PACKAGES
 # --------------
 # UcSlugC builds an openslug-image with no extra packages - to add packages to the
diff --git a/packages/altboot/altboot.bb b/packages/altboot/altboot.bb
index c02f1c6875..e22341483c 100644
--- a/packages/altboot/altboot.bb
+++ b/packages/altboot/altboot.bb
@@ -6,7 +6,6 @@ MAINTAINER = "Matthias 'CoreDump' Hentges  <oe@hentges.net>"
 LICENSE = "GPL"
  
 
-PV = "0.0.1+cvs-${CVSDATE}"
 PR = "r3"
 
 
@@ -49,9 +48,18 @@ pkg_postinst_spitz() {
 	# /l/m only exists on the HDD on spitz
 	if test -d /lib/modules
 	then
-		# FIXME: Do be written
-		a=a # do nothing
-	fi					
+		if [ -e /media/realroot/sbin/init ]; then
+		  ROOT_MOUNT_POINT="/media/realroot"
+		elif [ -e /media/ROM/sbin/init ]; then
+		   ROOT_MOUNT_POINT="/media/ROM"   
+		fi
+		ROOT_MOUNT_DEVICE = `cat /proc/mounts | grep $REALROOT | grep jffs2 | cut -d " " -f 1`
+		mount -oremount,rw $ROOT_MOUNT_DEVICE $ROOT_MOUNT_POINT
+		cp -R /etc/altboot* $ROOT_MOUNT_POINT/etc
+		cp /sbin/init.altboot $ROOT_MOINT_POINT/sbin
+		mv $ROOT_MOUNT_POINT/sbin/init $ROOT_MOUNT_POINT/sbin/init.orig
+		ln -s /sbin/init.altboot $ROOT_MOUNT_POINT/sbin/init
+	fi						
 }
 
 pkg_postrm() {
diff --git a/packages/gpe-appmgr/files/groups.patch b/packages/gpe-appmgr/files/groups.patch
deleted file mode 100644
index 61d71aecf3..0000000000
--- a/packages/gpe-appmgr/files/groups.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- gpe-appmgr-2.4/main.c.old	2004-11-29 20:28:41.000000000 +0000
-+++ gpe-appmgr-2.4/main.c	2004-11-29 20:30:58.000000000 +0000
-@@ -638,15 +638,12 @@
- 	}
-     }
- 
--  g = make_group ("Office");
--  g->categories = g_list_append (g->categories, "Office");
--  g->categories = g_list_append (g->categories, "Viewer");
-+  g = make_group ("PIM");
-+  g->categories = g_list_append (g->categories, "PIM");
-   g = make_group ("Internet");
-   g->categories = g_list_append (g->categories, "Internet");
-   g->categories = g_list_append (g->categories, "Network");
-   g->categories = g_list_append (g->categories, "PPP");
--  g = make_group ("PIM");
--  g->categories = g_list_append (g->categories, "PIM");
-   g = make_group ("Settings");
-   g->categories = g_list_append (g->categories, "SystemSettings");
-   g->categories = g_list_append (g->categories, "Settings");
diff --git a/packages/gpe-appmgr/gpe-appmgr_2.6.bb b/packages/gpe-appmgr/gpe-appmgr_2.6.bb
deleted file mode 100644
index 0d992422f7..0000000000
--- a/packages/gpe-appmgr/gpe-appmgr_2.6.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-SECTION = "gpe"
-DESCRIPTION = "GPE application launcher"
-DEPENDS = "libgpewidget libgpelaunch cairo"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-LICENSE = "GPL"
-PR = "r0"
-
-inherit gpe
-
diff --git a/packages/gpe-appmgr/gpe-appmgr_2.7.bb b/packages/gpe-appmgr/gpe-appmgr_2.7.bb
deleted file mode 100644
index 0d992422f7..0000000000
--- a/packages/gpe-appmgr/gpe-appmgr_2.7.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-SECTION = "gpe"
-DESCRIPTION = "GPE application launcher"
-DEPENDS = "libgpewidget libgpelaunch cairo"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-LICENSE = "GPL"
-PR = "r0"
-
-inherit gpe
-
diff --git a/packages/gpe-appmgr/gpe-appmgr_2.8.bb b/packages/gpe-appmgr/gpe-appmgr_2.8.bb
index 66653a90f3..debd199982 100644
--- a/packages/gpe-appmgr/gpe-appmgr_2.8.bb
+++ b/packages/gpe-appmgr/gpe-appmgr_2.8.bb
@@ -1,10 +1,10 @@
-SECTION = "gpe"
 DESCRIPTION = "GPE application launcher"
 DEPENDS = "libgpewidget libgpelaunch cairo"
+SECTION = "gpe"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 inherit gpe
 
-SRC_URI += " file://no-render-h.patch;patch=1"
+SRC_URI += " file://no-render-h.patch;patch=1 file://cairo-fixes.patch;patch=1"
diff --git a/packages/gpe-irc/gpe-irc-0.07/fix_makefile.patch b/packages/gpe-irc/gpe-irc-0.07/fix_makefile.patch
deleted file mode 100644
index de18063280..0000000000
--- a/packages/gpe-irc/gpe-irc-0.07/fix_makefile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -urNd ../gpe-irc-0.07-r0/gpe-irc-0.07/Makefile gpe-irc-0.07/Makefile
---- ../gpe-irc-0.07-r0/gpe-irc-0.07/Makefile	2004-08-03 15:40:50.000000000 +0100
-+++ gpe-irc-0.07/Makefile	2004-08-03 16:01:29.000000000 +0100
-@@ -1,12 +1,13 @@
- PREFIX = /usr/local
- PACKAGE = gpe-irc
- VERSION = 0.07
--DEBUG = yes
-+DEBUG = no
- CVSBUILD = no
-+BUILD = ./build
- 
- ifeq ($(DEBUG),yes)
- CFLAGS += -O2 -g -DDEBUG
--LDFLAGS = -g #-lefence
-+LDFLAGS += -g #-lefence
- else
- CFLAGS += -Os -fomit-frame-pointer
- endif
-@@ -41,7 +42,7 @@
- 	$(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS)
- 
- install-program: all
--	install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)
-+	install -D -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)
- 	install -D -m 644 $(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps/$(PACKAGE).png
- 	install -d $(DESTDIR)$(PREFIX)/share/gpe/pixmaps/default/irc
- 	install -d $(DESTDIR)$(PREFIX)/share/gpe/pixmaps/default/irc/smileys
-@@ -56,7 +57,6 @@
- 	install -m 644 pixmaps/colors/blue.png $(DESTDIR)$(PREFIX)/share/gpe/pixmaps/default/irc/colors/blue.png
- 	mkdir -p $(DESTDIR)$(PREFIX)/share/applications
- 	install -m 644 $(PACKAGE).desktop $(DESTDIR)$(PREFIX)/share/applications/
--	strip $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)
- 
- clean:
- 	rm -f $(PACKAGE) $(OBJS) $(DEPS)
diff --git a/packages/gpe-irc/gpe-irc_0.07.bb b/packages/gpe-irc/gpe-irc_0.08.bb
index fc08b72de3..77476a7cb9 100644
--- a/packages/gpe-irc/gpe-irc_0.07.bb
+++ b/packages/gpe-irc/gpe-irc_0.08.bb
@@ -4,5 +4,3 @@ DESCRIPTION = "31337 IRC client."
 DEPENDS = "gtk+ libgpewidget"
 SECTION = "gpe"
 PRIORITY = "optional"
-
-SRC_URI += "file://fix_makefile.patch;patch=1"
diff --git a/packages/gstreamer/gpe-gst-plugins_0.8.4.bb b/packages/gstreamer/gpe-gst-plugins_0.8.4.bb
deleted file mode 100644
index 553344b6e6..0000000000
--- a/packages/gstreamer/gpe-gst-plugins_0.8.4.bb
+++ /dev/null
@@ -1,99 +0,0 @@
-LICENSE = "GPL"
-DESCRIPTION = "Plugins for GStreamer"
-SECTION = "x11/libs"
-PRIORITY = "optional"
-MAINTAINER = "Chris Lord <cwiiis@handhelds.org>"
-PROVIDES = "gst-plugins"
-PR = "r2"
-
-DEPENDS = "gstreamer libmikmod libmad libogg tremor libvorbis libid3tag gpe-soundserver gconf"
-
-SRC_URI = "http://gstreamer.freedesktop.org/src/gst-plugins/gst-plugins-${PV}.tar.bz2 \
-	   file://ivorbis.patch;patch=1 \
-	   file://try-esdsink.patch;patch=1 \
-	   file://lame-autoconf.patch;patch=1"
-
-S = "${WORKDIR}/gst-plugins-${PV}/"
-
-EXTRA_OECONF = "--disable-docs-build \
-		--disable-dependency-tracking \
-		--disable-aalib \
-		--disable-alsa \
-		--disable-arts \
-                --disable-artsc \
-		--disable-audiofile \
-		--disable-dirac \
-		--disable-divx \
-		--disable-dts \
-		--disable-dvdread \
-		--disable-dvdnav \
-		--disable-faac \
-		--disable-faad \
-		--disable-gnome_vfs \
-		--disable-gsm \
-		--disable-hermes \
-		--disable-jack \
-		--disable-jpeg \
-		--disable-kio \
-		--disable-ladspa \
-		--disable-lame \
-		--disable-libcaca \
-		--disable-lcs \
-		--disable-libdv \
-		--disable-libfame \
-		--disable-libpng \
-		--disable-librfb \
-		--disable-libvisual \
-		--disable-mpeg2enc \
-		--disable-mplex \
-		--disable-musicbrainz \
-		--disable-nas \
-		--disable-opengl \
-		--disable-oss \
-		--disable-pango \
-		--disable-raw1394 \
-		--disable-sdl \
-		--disable-shout \
-		--disable-shout2 \
-		--disable-sidplay \
-		--disable-smoothwave \
-		--disable-libpng \
-		--disable-speex \
-		--disable-sndfile \
-		--disable-swfdec \
-		--disable-tarkin \
-		--disable-theora \
-		--disable-xvid \
-		--disable-tests \
-		--disable-examples \
-		--disable-freetypetest"
-		
-
-inherit autotools pkgconfig gconf
-
-acpaths = "-I ${S}/common/m4 -I ${S}/m4"
-
-FILES_${PN}_append = " ${libdir}/gstreamer-0.8/*.so"
-
-pkg_postinst_append () {
-	gst-register --gst-registry=/var/cache/gstreamer-0.8/registry.xml
-}
-
-do_stage() {
-	autotools_stage_includes
-	while read a b; do
-		oe_libinstall -C gst-libs/gst/$a -so libgst$b ${STAGING_LIBDIR}
-	done <<EOF
-. interfaces-0.8
-audio audio
-audio audiofilter
-gconf gconf-0.8
-idct idct
-media-info media-info-0.8
-play play-0.8
-resample resample
-riff riff
-video video
-xwindowlistener xwindowlistener
-EOF
-}
diff --git a/packages/gpe-irc/gpe-irc-0.07/.mtn2git_empty b/packages/libsigc++-1.2/libsigc++-1.2-1.2.7/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gpe-irc/gpe-irc-0.07/.mtn2git_empty
+++ b/packages/libsigc++-1.2/libsigc++-1.2-1.2.7/.mtn2git_empty
diff --git a/packages/libsigc++-1.2/libsigc++-1.2-1.2.7/autofoo.patch b/packages/libsigc++-1.2/libsigc++-1.2-1.2.7/autofoo.patch
new file mode 100644
index 0000000000..a5f7063af7
--- /dev/null
+++ b/packages/libsigc++-1.2/libsigc++-1.2-1.2.7/autofoo.patch
@@ -0,0 +1,126 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- libsigc++-1.2.7/configure.in~autofoo.patch
++++ libsigc++-1.2.7/configure.in
+@@ -35,9 +35,9 @@
+ dnl AC_SUBST(SIGC_RELEASE, $SIGC_RELEASE)
+ AC_SUBST(SIGC_VERSION)
+ 
+-AC_DEFINE_UNQUOTED(SIGC_MAJOR_VERSION, $SIGC_MAJOR_VERSION)
+-AC_DEFINE_UNQUOTED(SIGC_MINOR_VERSION, $SIGC_MINOR_VERSION)
+-AC_DEFINE_UNQUOTED(SIGC_MICRO_VERSION, $SIGC_MICRO_VERSION)
++AC_DEFINE_UNQUOTED(SIGC_MAJOR_VERSION, $SIGC_MAJOR_VERSION, [library major version])
++AC_DEFINE_UNQUOTED(SIGC_MINOR_VERSION, $SIGC_MINOR_VERSION, [library minor version])
++AC_DEFINE_UNQUOTED(SIGC_MICRO_VERSION, $SIGC_MICRO_VERSION, [library micro version])
+ 
+ AC_CONFIG_AUX_DIR(scripts)
+ 
+@@ -50,7 +50,23 @@
+ 
+ dnl Specify a configuration file
+ AM_CONFIG_HEADER(sigc++/config/sigcconfig.h)
++AH_BOTTOM([
++// Window DLL declarations 
+ 
++#ifdef LIBSIGC_DLL
++ #if defined(LIBSIGC_COMPILATION) && defined(DLL_EXPORT)
++  #define LIBSIGC_API __declspec(dllexport)
++  #define LIBSIGC_TMPL 
++ #elif !defined(LIBSIGC_COMPILATION)
++  #define LIBSIGC_API __declspec(dllimport)
++  #define LIBSIGC_TMPL extern
++ #else
++  #define LIBSIGC_API
++ #endif /* LIBSIGC_COMPILATION - DLL_EXPORT */
++#else
++ #define LIBSIGC_API
++#endif /* LIBSIGC_DLL */
++])
+ AM_MAINTAINER_MODE
+ 
+ # echo $USE_MAINTAINER_MODE
+@@ -288,7 +304,7 @@
+   };
+ ],[
+ ],
+-  AC_DEFINE(SIGC_CXX_EXPLICIT,explicit)
++  AC_DEFINE(SIGC_CXX_EXPLICIT,explicit,[if C++ compiler supports explicit])
+   ac_cxx_explicit=yes
+ ,
+   AC_DEFINE(SIGC_CXX_EXPLICIT,)
+@@ -305,7 +321,7 @@
+   };
+ ],[
+ ],
+-  AC_DEFINE(SIGC_CXX_EXPLICIT_COPY,explicit)
++  AC_DEFINE(SIGC_CXX_EXPLICIT_COPY,explicit,[if C++ compiler supports explicit copy ctor])
+   ac_cxx_explicit_copy_ctor=yes
+ ,
+   AC_DEFINE(SIGC_CXX_EXPLICIT_COPY,)
+@@ -413,7 +429,7 @@
+   k<void,void> a;
+ ],[
+   ac_cxx_partial_specialization=yes
+-  AC_DEFINE(SIGC_CXX_PARTIAL_SPEC)
++  AC_DEFINE(SIGC_CXX_PARTIAL_SPEC,[if C++ compiler supports partial specialization])
+ ],[
+ #  config_error=yes
+   ac_cxx_partial_specialization=no
+@@ -434,7 +450,7 @@
+ ],[
+   ac_cxx_namespaces=yes
+   AC_MSG_RESULT([$ac_cxx_namespaces])
+-  AC_DEFINE(SIGC_CXX_NAMESPACES)
++  AC_DEFINE(SIGC_CXX_NAMESPACES,,[if C++ compiler supports name spaces])
+ ],[
+   ac_cxx_namespaces=no
+   AC_MSG_RESULT([$ac_cxx_namespaces])
+@@ -474,7 +490,7 @@
+ A<int> i;
+ ],[
+ ],[
+-  AC_DEFINE(SIGC_CXX_INT_CTOR)
++  AC_DEFINE(SIGC_CXX_INT_CTOR,,[if C++ compiler has intrinsic constructors])
+   ac_cxx_tmpl_intctor=yes
+ ],[
+   ac_cxx_tmpl_intctor=no
+@@ -515,7 +531,7 @@
+ ],[
+ ],[
+   ac_cxx_void_return=yes
+-  AC_DEFINE(SIGC_CXX_VOID_RETURN)
++  AC_DEFINE(SIGC_CXX_VOID_RETURN,,[if C++ compiler allows void returns])
+ ],[
+   ac_cxx_void_return=no
+ ])
+@@ -530,7 +546,7 @@
+ ],[
+ ],[
+   ac_cxx_void_cast_return=yes
+-  AC_DEFINE(SIGC_CXX_VOID_CAST_RETURN)
++  AC_DEFINE(SIGC_CXX_VOID_CAST_RETURN,,[if C++ compiler supports void cast return])
+ ],[
+   ac_cxx_void_cast_return=no
+ ])
+@@ -565,7 +581,7 @@
+     P<int&>::ptr q=b;
+ ],[
+   ac_cxx_specialize_references=yes
+-  AC_DEFINE(SIGC_CXX_SPECIALIZE_REFERENCES)
++  AC_DEFINE(SIGC_CXX_SPECIALIZE_REFERENCES,,[if C++ compiler allows specialization of references])
+ ],[
+   ac_cxx_specialize_references=no
+ ])
+--- libsigc++-1.2.7/Makefile.am~autofoo.patch
++++ libsigc++-1.2.7/Makefile.am
+@@ -1,6 +1,6 @@
+ SUBDIRS = sigc++ tests doc MSVC_6 MSVC_Net2003 eVC4
+ DIST_SUBDIRS = $(SUBDIRS) examples scripts
+-ACLOCAL_AMFLAGS = -I $(srcdir)/scripts
++ACLOCAL_AMFLAGS = -I ./scripts
+ 
+ EXTRA_DIST = \
+ 	FEATURES IDEAS			\
diff --git a/packages/libsigc++-1.2/libsigc++-1.2-1.2.7/disable-tests.patch b/packages/libsigc++-1.2/libsigc++-1.2-1.2.7/disable-tests.patch
new file mode 100644
index 0000000000..92145a4ec9
--- /dev/null
+++ b/packages/libsigc++-1.2/libsigc++-1.2-1.2.7/disable-tests.patch
@@ -0,0 +1,13 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- libsigc++-1.2.7/Makefile.am~disable-tests
++++ libsigc++-1.2.7/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = sigc++ tests doc MSVC_6 MSVC_Net2003 eVC4
++SUBDIRS = sigc++
+ DIST_SUBDIRS = $(SUBDIRS) examples scripts
+ ACLOCAL_AMFLAGS = -I ./scripts
+ 
diff --git a/packages/libsigc++-1.2/libsigc++-1.2_1.2.7.bb b/packages/libsigc++-1.2/libsigc++-1.2_1.2.7.bb
new file mode 100644
index 0000000000..75e830fd2b
--- /dev/null
+++ b/packages/libsigc++-1.2/libsigc++-1.2_1.2.7.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "A library for loose coupling of C++ method calls"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL LGPL"
+PR = "r0"
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/1.2/libsigc++-${PV}.tar.bz2 \
+	   file://autofoo.patch;patch=1 \
+           file://disable-tests.patch;patch=1"
+S = "${WORKDIR}/libsigc++-${PV}"
+
+inherit autotools pkgconfig
+
+# FIXME: Check why tests don't compile
+
+acpaths = ""
+
+do_stage() {
+	install -d ${STAGING_LIBDIR}/sigc++-1.2/include
+	install -m 0644 sigc++/config/sigcconfig.h ${STAGING_LIBDIR}/sigc++-1.2/include/
+	oe_libinstall -so -C sigc++ libsigc-1.2 ${STAGING_LIBDIR}
+
+	install -d ${STAGING_INCDIR}/sigc++-1.2/sigc++
+	for f in sigc++/*.h
+	do
+		install -m 0644 $f ${STAGING_INCDIR}/sigc++-1.2/sigc++/
+	done
+}
+
+FILES_${PN}-dev += "${libdir}/sigc++-*/"
diff --git a/packages/linux/linux-openzaurus_2.6.13-rc4-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc4-mm1.bb
index 9df141ed44..c726d24793 100644
--- a/packages/linux/linux-openzaurus_2.6.13-rc4-mm1.bb
+++ b/packages/linux/linux-openzaurus_2.6.13-rc4-mm1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
 KV = "${@bb.data.getVar('PV',d,True)}"
 
-PR = "r0"
+PR = "r1"
 
 DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
 RPSRC = "http://www.rpsys.net/openzaurus/patches"
@@ -37,6 +37,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
            ${RPSRC}/reverse_pagefault-r1.patch;patch=1 \
            ${RPSRC}/preempt_nwfpe-r2.patch;patch=1 \
            ${RPSRC}/oprofile_typo-r0.patch;patch=1 \
+           ${RPSRC}/corgi_tspmufix-r0.patch;patch=1 \
            ${RPSRC}/mmc_bytefix-r0.patch;patch=1 \
            ${RPSRC}/mmc_pxa_roswitch-r0.patch;patch=1 \
            ${RPSRC}/mmc_corgi_roswitch-r0.patch;patch=1 \
@@ -74,7 +75,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
            ${DOSRC}/tosa-udc-r3.patch;patch=1 \
            ${DOSRC}/tosa-irda-r2.patch;patch=1 \
            ${DOSRC}/tosa-lcd-r3.patch;patch=1 \
-           ${DOSRC}/tosa-2.6.13-r2.patch;patch=1 \
+           ${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \
            ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \
            ${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \
            file://add-oz-release-string.patch;patch=1 \
diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index 6d16f9039d..75fe4699a8 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -115,6 +115,7 @@ OPENSLUG_PACKAGES = "\
 	unionfs-modules unionfs-utils \
 	vlan \
 	wakelan \
+	watchdog \
 	wget \
 	xinetd \
 	yp-tools ypbind ypserv \
diff --git a/packages/watchdog/.mtn2git_empty b/packages/watchdog/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/watchdog/.mtn2git_empty
diff --git a/packages/watchdog/watchdog_5.2.bb b/packages/watchdog/watchdog_5.2.bb
new file mode 100644
index 0000000000..1858e52bf5
--- /dev/null
+++ b/packages/watchdog/watchdog_5.2.bb
@@ -0,0 +1,6 @@
+SRC_URI = "http://www.ibiblio.org/pub/Linux/system/daemons/watchdog/${PN}-${PV}.tar.gz" 
+PR = "r0"
+MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
+
+inherit autotools
+
diff --git a/site/arm-linux b/site/arm-linux
index fe0e020666..e3e9968725 100644
--- a/site/arm-linux
+++ b/site/arm-linux
@@ -252,6 +252,7 @@ ac_cv_strerror_r_SUSv3=${ac_cv_strerror_r_SUSv3=no}
 ac_cv_sizeof_wchar_t=4
 
 # lftp
+ac_cv_file___dev_ptc_=yes
 ac_cv_need_trio=${ac_cv_need_trio=no}
 lftp_cv_va_copy=${lftp_cv_va_copy=no}
 lftp_cv_va_val_copy=${lftp_cv_va_val_copy=yes}