merge of 75f6e838caafacb9445ca7479d4abd0d053ac979

     and e488e05a801c89ca783a2c8ad4c0e30f9621864f

50 files changed, 1099 insertions, 152 deletions

diff --git a/packages/avahi/avahi_0.5.bb b/packages/avahi/avahi_0.5.bb
new file mode 100644
index 0000000000..dc1ff36f83
--- /dev/null
+++ b/packages/avahi/avahi_0.5.bb
@@ -0,0 +1,52 @@
+DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS"
+HOMEPAGE = "http://www.freedesktop.org/Software/Avahi"
+LICENCE= "GPL"
+DEPENDS = "expat libdaemon dbus-0.50"
+RRECOMMENDS = "libnss-mdns"
+SECTION = "net"
+PRIORITY = "optional"
+PR = "r0"
+
+SRC_URI = "http://www.freedesktop.org/~lennart/avahi-${PV}.tar.gz"
+
+PACKAGES = "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc"
+
+FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
+FILES_libavahi-core= "${libdir}/libavahi-core.so.*"
+FILES_avahi-daemon = "${sbindir}/avahi-daemon \
+		      ${sysconfdir}/avahi/avahi-daemon.conf \
+		      ${sysconfdir}/avahi/services \
+		      ${sysconfdir}/dbus-1 \
+		      ${sysconfdir}/init.d/avahi-daemon \
+		      ${datadir}/avahi/introspection/*.introspect \
+		      ${datadir}/avahi/avahi-service.dtd \
+		      ${datadir}/avahi/service-types"
+FILES_libavahi-client = "${libdir}/libavahi-client.so.*"
+FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
+			${sysconfdir}/avahi/avahi-dnsconfd.action \
+			${sysconfdir}/init.d/avahi-dnsconfd"
+FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
+
+CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
+
+EXTRA_OECONF = "--with-distro=debian --disable-mono --disable-mono-docs --disable-gtk  --disable-qt3  --disable-qt4 --disable-python"
+inherit autotools
+inherit update-rc.d
+
+INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd"
+INITSCRIPT_NAME_avahi-daemon = "avahi-daemon"
+INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19"
+INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd"
+INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19"
+
+pkg_postinst_avahi-daemon () {
+	grep avahi /etc/group || addgroup avahi
+	grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi
+	/etc/init.d/dbus-1 force-reload
+}
+
+pkg_postrm_avahi-daemon () {
+	deluser avahi || true
+	delgroup avahi || true
+}
+
diff --git a/packages/gnuz/gnuz/intro_level.patch b/packages/gnuz/gnuz/intro_level.patch
deleted file mode 100644
index ad1a69dff0..0000000000
--- a/packages/gnuz/gnuz/intro_level.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../intro.conf.orig	2003-09-13 18:55:01 +0200
-+++ ../intro.conf	2004-10-12 23:35:18 +0200
-@@ -1,8 +1,9 @@
- LevelName=Welcome Screen
- LevelAuthor=WarCow
--LevelPicFilename=intro_new.png
--LevelMaskFilename=intro_new_mask.png
-+LevelPicFilename=intro.png
-+LevelMaskFilename=intro_mask.png
- LevelDifficulty=0
-+LevelParTime=0
- 
- GnuCount=23
- GnuMinSave=0
diff --git a/packages/gnuz/gnuz_0.3.bb b/packages/gnuz/gnuz_0.3.bb
index 23a1832596..3e986cf398 100644
--- a/packages/gnuz/gnuz_0.3.bb
+++ b/packages/gnuz/gnuz_0.3.bb
@@ -5,49 +5,26 @@ MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 LICENSE = "GPL"
 AUTHOR = "Lukas Fraser"
 HOMEPAGE = "http://gnuz.4cows.net/eraser/gnuz/"
-DEPENDS = "gnuz-levelmaker-native gnuz-package-native"
+PR = "r1"
+
+APPTYPE = "binary"
+APPNAME = "gnuz"
+APPDESKTOP = "${S}/data/"
 
 SRC_URI = "http://gnuz.4cows.net/eraser/gnuz/gnuz_0.3.tar.gz \
-           http://gnuz.4cows.net/eraser/gnuz/gnuz_0.3_levels.tar.gz \
-		   file://intro_level.patch;patch=1;pnum=0"
+           http://www.hrw.one.pl/_pliki/oe/files/gnuz-levels-0.3.tar.bz2"
 
 S = "${WORKDIR}/gnuz"
 
-export OE_QMAKE_LINK="${CXX}"
-EXTRA_QMAKEVARS_POST += "LIBS+=-lqpe"
-
-inherit palmtop
-
-do_compile_append() {
-
-	cd ${WORKDIR}
-	
-	for level in *.conf
-	do
-		if [ $level != 'intro.conf' ] ;then
-			${STAGING_BINDIR}/gnuz_levelmaker `basename $level .conf`.lvl $level
-		fi
-	done
-	${STAGING_BINDIR}/gnuz_levelmaker intro intro.conf
-	cd ${S}/data/
-	${STAGING_BINDIR}/gnuz_package guiimages.dat gui
-	${STAGING_BINDIR}/gnuz_package gnuimages.dat gnu
-	
-	
-}
-
-do_install() {
+inherit opie
 
-	install -d ${D}${palmtopdir}/apps/Games \
-			   ${D}${palmtopdir}/pics \
-			   ${D}${palmtopdir}/bin \
-			   ${D}${palmtopdir}/share/gnuz/levels
+do_install_append() {
 
-	install -m 0755 gnuz ${D}${palmtopdir}/bin/
-	install -m 0644 data/gnuz.desktop ${D}${palmtopdir}/apps/Games/
-	install -m 0644 data/gnuz.png ${D}${palmtopdir}/pics/
-	install -m 0644 ${WORKDIR}/*.lvl ${D}${palmtopdir}/share/gnuz/levels/
-	install -m 0644 ${WORKDIR}/intro ${D}${palmtopdir}/share/gnuz/levels/
-	install -m 0644 ${S}/data/*images.dat ${D}${palmtopdir}/share/gnuz/
+        install -d ${D}${palmtopdir}/apps/Games \
+                   ${D}${palmtopdir}/pics \
+                   ${D}${palmtopdir}/share/gnuz/levels
 
+        install -m 0644 data/gnuz.png ${D}${palmtopdir}/pics/
+        install -m 0644 ${WORKDIR}/gnuz-levels/share/gnuz/levels/* ${D}${palmtopdir}/share/gnuz/levels/
+        install -m 0644 ${WORKDIR}/gnuz-levels/share/gnuz/*images.dat ${D}${palmtopdir}/share/gnuz/
 }
diff --git a/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb b/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb
index 31781cc37d..82a674c752 100644
--- a/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb
+++ b/packages/gpe-mini-browser/gpe-mini-browser_cvs.bb
@@ -4,7 +4,7 @@ PV = "0.17+cvs-${CVSDATE}"
 SRC_URI = "${HANDHELDS_CVS};module=gpe/base/gpe-mini-browser"
 DESCRIPTION = "A lightweight webbrowser for the GPE platform"
 LICENSE = "GPL"
-DEPENDS = "sqlite osb-nrcit libgpewidget"
+DEPENDS = "sqlite gettext gtk+ glib-2.0 osb-nrcit libgpewidget"
 DEFAULT_PREFERENCE = "-1"
 
 S = "${WORKDIR}/gpe-mini-browser"
diff --git a/packages/hostap/hostap-modules_0.4.4.bb b/packages/hostap/hostap-modules_0.4.4.bb
index fd7a3eaff9..ef4de4449b 100644
--- a/packages/hostap/hostap-modules_0.4.4.bb
+++ b/packages/hostap/hostap-modules_0.4.4.bb
@@ -5,6 +5,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 
 SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \
+           file://kernel_updates.patch;patch=1 \
            file://hostap_cs.conf "
 
 SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \
diff --git a/packages/ipkg/ipkg-native_0.99.154.bb b/packages/ipkg/ipkg-native_0.99.154.bb
new file mode 100644
index 0000000000..d59eab3a61
--- /dev/null
+++ b/packages/ipkg/ipkg-native_0.99.154.bb
@@ -0,0 +1,2 @@
+include ipkg_${PV}.bb
+include ipkg-native.inc
diff --git a/packages/ipkg/ipkg_0.99.154.bb b/packages/ipkg/ipkg_0.99.154.bb
new file mode 100644
index 0000000000..1898c6656e
--- /dev/null
+++ b/packages/ipkg/ipkg_0.99.154.bb
@@ -0,0 +1 @@
+include ipkg.inc
diff --git a/packages/gnuz/gnuz/.mtn2git_empty b/packages/libcwd/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gnuz/gnuz/.mtn2git_empty
+++ b/packages/libcwd/.mtn2git_empty
diff --git a/packages/libcwd/libcwd_0.99.40.bb b/packages/libcwd/libcwd_0.99.40.bb
new file mode 100644
index 0000000000..a2650eec85
--- /dev/null
+++ b/packages/libcwd/libcwd_0.99.40.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Libcwd is a thread-safe, full-featured debugging support library for C++ developers. \
+It includes ostream-based debug output with custom debug channels and devices, \
+powerful memory allocation debugging support, as well as run-time support for \
+printing source line number information and demangled type names."
+SECTION = "devel/libs"
+LICENSE = "QPL"
+HOMEPAGE = "http://libcwd.sourceforge.net"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+PR = "r0"
+
+SRC_URI = "http://puzzle.dl.sourceforge.net/sourceforge/libcwd/libcwd-${PV}.tar.gz"
+
+inherit autotools
+
+PARALLEL_MAKE = ""
+
+PACKAGES =+ "${PN}-config ${PN}-mt"
+FILES_${PN} = "${libdir}/libcwd.so*"
+FILES_${PN}-mt = "${libdir}/libcwd_r.so*"
+FILES_${PN}-config = "${datadir}"
+RRECOMMENDS_${PN} = "${PN}-config"
+RRECOMMENDS_${PN}-mt = "${PN}-config"
diff --git a/packages/linux/handhelds-pxa-2.6_2.6.12-hh3.bb b/packages/linux/handhelds-pxa-2.6_2.6.12-hh3.bb
new file mode 100644
index 0000000000..1ecc553cf9
--- /dev/null
+++ b/packages/linux/handhelds-pxa-2.6_2.6.12-hh3.bb
@@ -0,0 +1,25 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel for PXA based devices."
+MAINTAINER = "Greg Gilbert <greg@treke.net>"
+LICENSE = "GPL"
+#
+COMPATIBLE_HOST = "arm.*-linux"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}"
+
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')}"
+
+S = "${WORKDIR}/kernel26"
+
+inherit kernel
+
+K_MAJOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[0]}"
+K_MINOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[1]}"
+K_MICRO = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[2]}"
+HHV     = "${@bb.data.getVar('PV',d,1).split('-')[1].split('hh')[-1]}"
+
+KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}"
+do_configure() {
+	install -m 0644 arch/arm/configs/ipaqpxa_defconfig .config
+        yes '' | oe_runmake oldconfig
+}
diff --git a/packages/linux/linux-openzaurus-2.6.13-mm3/.mtn2git_empty b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-openzaurus-2.6.13-mm3/.mtn2git_empty
+++ b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/.mtn2git_empty
diff --git a/packages/linux/linux-openzaurus-2.6.13-mm3/add-elpp-stuff.patch b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/add-elpp-stuff.patch
index 04ab185f4f..04ab185f4f 100644
--- a/packages/linux/linux-openzaurus-2.6.13-mm3/add-elpp-stuff.patch
+++ b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/add-elpp-stuff.patch
diff --git a/packages/linux/linux-openzaurus-2.6.13-mm3/add-oz-release-string.patch b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/add-oz-release-string.patch
index 22a6fd3943..22a6fd3943 100644
--- a/packages/linux/linux-openzaurus-2.6.13-mm3/add-oz-release-string.patch
+++ b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/add-oz-release-string.patch
diff --git a/packages/linux/linux-openzaurus-2.6.13-mm3/connectplus-remove-ide-HACK.patch b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/connectplus-remove-ide-HACK.patch
index 4414b21191..4414b21191 100644
--- a/packages/linux/linux-openzaurus-2.6.13-mm3/connectplus-remove-ide-HACK.patch
+++ b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/connectplus-remove-ide-HACK.patch
diff --git a/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-c7x0
index 542bedc9f6..9dd7c230e7 100644
--- a/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-c7x0
+++ b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-c7x0
@@ -695,15 +695,20 @@ CONFIG_NET_RADIO=y
 #
 # Wireless 802.11b ISA/PCI cards support
 #
-# CONFIG_HERMES is not set
+CONFIG_HERMES=m
 # CONFIG_ATMEL is not set
 
 #
 # Wireless 802.11b Pcmcia/Cardbus cards support
 #
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
 # CONFIG_AIRO_CS is not set
 # CONFIG_PCMCIA_WL3501 is not set
-# CONFIG_HOSTAP is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_CS=m
+# CONFIG_ACX is not set
 CONFIG_NET_WIRELESS=y
 
 #
diff --git a/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-collie b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-collie
index 9f51b61169..9f51b61169 100644
--- a/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-collie
+++ b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-collie
diff --git a/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-ipaq-pxa-2.6 b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-ipaq-pxa-2.6
index 8b41380784..8b41380784 100644
--- a/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-ipaq-pxa-2.6
+++ b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-ipaq-pxa-2.6
diff --git a/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-poodle b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-poodle
index a0810f8381..a0810f8381 100644
--- a/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-poodle
+++ b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-poodle
diff --git a/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-spitz b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-spitz
index e61a999627..f838a497a3 100644
--- a/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-spitz
+++ b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-spitz
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.13-rc5-mm1
-# Sun Aug 28 18:06:14 2005
+# Linux kernel version: 2.6.13-mm3
+# Fri Sep 16 13:04:01 2005
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -22,6 +22,7 @@ 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
@@ -32,6 +33,7 @@ CONFIG_SYSCTL=y
 CONFIG_HOTPLUG=y
 CONFIG_KOBJECT_UEVENT=y
 # CONFIG_IKCONFIG is not set
+CONFIG_INITRAMFS_SOURCE=""
 CONFIG_EMBEDDED=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
@@ -97,9 +99,10 @@ CONFIG_PXA_SHARPSL=y
 # CONFIG_MACH_HX2750 is not set
 # CONFIG_PXA_SHARPSL_25x is not set
 CONFIG_PXA_SHARPSL_27x=y
-CONFIG_MACH_SPITZ=y
 CONFIG_MACH_AKITA=y
+CONFIG_MACH_SPITZ=y
 CONFIG_MACH_BORZOI=y
+# CONFIG_MACH_TOSA is not set
 CONFIG_PXA27x=y
 # CONFIG_PXA_KEYS is not set
 CONFIG_PXA_SHARP_Cxx00=y
@@ -145,7 +148,6 @@ CONFIG_PCMCIA_PXA2XX=y
 #
 # Kernel Features
 #
-# CONFIG_SMP is not set
 CONFIG_PREEMPT=y
 # CONFIG_NO_IDLE_HZ is not set
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
@@ -155,6 +157,7 @@ CONFIG_FLATMEM_MANUAL=y
 # CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_ALIGNMENT_TRAP=y
 
 #
@@ -162,7 +165,7 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/hda1 rootfstype=ext3   debug"
+CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/hda1 rootfstype=ext3 rw   debug"
 # CONFIG_XIP_KERNEL is not set
 
 #
@@ -217,8 +220,8 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_TUNNEL is not set
-CONFIG_IP_TCPDIAG=y
-# CONFIG_IP_TCPDIAG_IPV6 is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_BIC=y
 
@@ -246,6 +249,7 @@ CONFIG_IP_NF_CONNTRACK=m
 CONFIG_IP_NF_CT_PROTO_SCTP=m
 CONFIG_IP_NF_FTP=m
 CONFIG_IP_NF_IRC=m
+# CONFIG_IP_NF_NETBIOS_NS is not set
 CONFIG_IP_NF_TFTP=m
 CONFIG_IP_NF_AMANDA=m
 CONFIG_IP_NF_QUEUE=m
@@ -271,8 +275,10 @@ CONFIG_IP_NF_MATCH_OWNER=m
 CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_MATCH_REALM=m
 CONFIG_IP_NF_MATCH_SCTP=m
+# CONFIG_IP_NF_MATCH_DCCP is not set
 CONFIG_IP_NF_MATCH_COMMENT=m
 CONFIG_IP_NF_MATCH_HASHLIMIT=m
+# CONFIG_IP_NF_MATCH_STRING is not set
 CONFIG_IP_NF_FILTER=m
 # CONFIG_IP_NF_TARGET_REJECT is not set
 CONFIG_IP_NF_TARGET_LOG=m
@@ -295,6 +301,7 @@ CONFIG_IP_NF_MANGLE=m
 # CONFIG_IP_NF_TARGET_DSCP is not set
 # CONFIG_IP_NF_TARGET_MARK is not set
 # CONFIG_IP_NF_TARGET_CLASSIFY is not set
+# CONFIG_IP_NF_TARGET_TTL is not set
 CONFIG_IP_NF_RAW=m
 # CONFIG_IP_NF_TARGET_NOTRACK is not set
 CONFIG_IP_NF_ARPTABLES=m
@@ -321,8 +328,10 @@ CONFIG_IP6_NF_MATCH_LENGTH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
 CONFIG_IP6_NF_FILTER=m
 # CONFIG_IP6_NF_TARGET_LOG is not set
+# CONFIG_IP6_NF_TARGET_REJECT is not set
 CONFIG_IP6_NF_MANGLE=m
 # CONFIG_IP6_NF_TARGET_MARK is not set
+# CONFIG_IP6_NF_TARGET_HL is not set
 CONFIG_IP6_NF_RAW=m
 
 #
@@ -432,7 +441,11 @@ CONFIG_BT_HCIBT3C=m
 CONFIG_BT_HCIBLUECARD=m
 CONFIG_BT_HCIBTUART=m
 CONFIG_BT_HCIVHCI=m
-# CONFIG_IEEE80211 is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT_WEP=m
+# CONFIG_IEEE80211_CRYPT_CCMP is not set
+# CONFIG_IEEE80211_CRYPT_TKIP is not set
 
 #
 # Device Drivers
@@ -538,7 +551,6 @@ CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_UB is not set
 # CONFIG_BLK_DEV_RAM is not set
 CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CDROM_PKTCDVD is not set
 
 #
@@ -581,6 +593,7 @@ CONFIG_IDE_GENERIC=y
 #
 # SCSI device support
 #
+# CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=m
 CONFIG_SCSI_PROC_FS=y
 
@@ -608,10 +621,17 @@ CONFIG_SCSI_MULTI_LUN=y
 # 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
+
+#
+# SCSI Transport Layers
+#
+# CONFIG_SAS_CLASS 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
 
@@ -696,15 +716,20 @@ CONFIG_NET_RADIO=y
 #
 # Wireless 802.11b ISA/PCI cards support
 #
-# CONFIG_HERMES is not set
+CONFIG_HERMES=m
 # CONFIG_ATMEL is not set
 
 #
 # Wireless 802.11b Pcmcia/Cardbus cards support
 #
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
 # CONFIG_AIRO_CS is not set
 # CONFIG_PCMCIA_WL3501 is not set
-# CONFIG_HOSTAP is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_CS=m
+# CONFIG_ACX is not set
 CONFIG_NET_WIRELESS=y
 
 #
@@ -848,12 +873,12 @@ CONFIG_SA1100_RTC=y
 # I2C support
 #
 # CONFIG_I2C is not set
-# CONFIG_I2C_SENSOR is not set
 
 #
 # Hardware Monitoring support
 #
 CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
@@ -861,6 +886,10 @@ CONFIG_HWMON=y
 #
 
 #
+# Multimedia Capabilities Port drivers
+#
+
+#
 # SoC drivers
 #
 # CONFIG_SOC is not set
@@ -982,6 +1011,7 @@ CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_SDDR09 is not set
 # CONFIG_USB_STORAGE_SDDR55 is not set
 # CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
 
 #
 # USB Input Devices
@@ -1033,30 +1063,14 @@ CONFIG_USB_KAWETH=m
 CONFIG_USB_PEGASUS=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_USBNET=m
-
-#
-# USB Host-to-Host Cables
-#
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_GENESYS=y
-CONFIG_USB_NET1080=y
-CONFIG_USB_PL2301=y
-CONFIG_USB_KC2190=y
-
-#
-# Intelligent USB Devices/Gadgets
-#
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_ZAURUS=y
-CONFIG_USB_CDCETHER=y
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_AX8817X=y
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDCETHER=m
+# CONFIG_USB_NET_GL620A is not set
+CONFIG_USB_NET_NET1080=m
+# CONFIG_USB_NET_PLUSB is not set
+# CONFIG_USB_NET_RNDIS_HOST is not set
+# CONFIG_USB_NET_CDC_SUBSET is not set
+CONFIG_USB_NET_ZAURUS=m
 # CONFIG_USB_ZD1201 is not set
 CONFIG_USB_MON=y
 
@@ -1183,11 +1197,8 @@ CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
-
-#
-# XFS support
-#
 # 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
@@ -1218,13 +1229,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 #
 CONFIG_PROC_FS=y
 CONFIG_SYSFS=y
-# CONFIG_DEVPTS_FS_XATTR is not set
 CONFIG_TMPFS=y
-# CONFIG_TMPFS_XATTR is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
-# CONFIG_CONFIGFS_FS is not set
 # CONFIG_RELAYFS_FS is not set
+# CONFIG_CONFIGFS_FS is not set
 
 #
 # Miscellaneous filesystems
@@ -1417,6 +1426,7 @@ CONFIG_CRYPTO_TEST=m
 # Library routines
 #
 CONFIG_CRC_CCITT=y
+# CONFIG_CRC16 is not set
 CONFIG_CRC32=y
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=y
diff --git a/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-tosa b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-tosa
index dd1e70fa03..dd1e70fa03 100644
--- a/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-tosa
+++ b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/defconfig-tosa
diff --git a/packages/linux/linux-openzaurus-2.6.13-mm3/dtl1_cs-add-socket-revE.patch b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/dtl1_cs-add-socket-revE.patch
index 9fe3bd06d3..9fe3bd06d3 100644
--- a/packages/linux/linux-openzaurus-2.6.13-mm3/dtl1_cs-add-socket-revE.patch
+++ b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/dtl1_cs-add-socket-revE.patch
diff --git a/packages/linux/linux-openzaurus-2.6.13-mm3/pxa-serial-hack.patch b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/pxa-serial-hack.patch
index 7892a0f929..7892a0f929 100644
--- a/packages/linux/linux-openzaurus-2.6.13-mm3/pxa-serial-hack.patch
+++ b/packages/linux/linux-openzaurus-2.6.14-rc1-mm1/pxa-serial-hack.patch
diff --git a/packages/linux/linux-openzaurus_2.6.13-mm3.bb b/packages/linux/linux-openzaurus_2.6.14-rc1-mm1.bb
index 1213b8416a..dc6674c2c4 100644
--- a/packages/linux/linux-openzaurus_2.6.13-mm3.bb
+++ b/packages/linux/linux-openzaurus_2.6.14-rc1-mm1.bb
@@ -18,50 +18,59 @@ BASRC = "http://www.orca.cx/zaurus/patches"
 # ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.14-rc1.bz2;patch=1 \
 # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
 
+# Recently Merged
+#           ${RPSRC}/corgi_cleanup-r0.patch;patch=1 \
+#           ${RPSRC}/poodle_cleanup-r0.patch;patch=1 \
+#           ${RPSRC}/poodle_mmc-r0.patch;patch=1 \
+#           ${RPSRC}/scoop_collie_fix-r0.patch;patch=1 \
+#           ${RPSRC}/sharpsl_ssp-r4.patch;patch=1 \
+#           ${RPSRC}/sharpsl_lcd-r4.patch;patch=1 \
+#           ${RPSRC}/sharpsl_ts-r6.patch;patch=1 \
+#           ${RPSRC}/sharpsl_bl-r5a.patch;patch=1 \
+#           ${RPSRC}/spitzkbd-r3.patch;patch=1 \
+#           ${RPSRC}/spitz_base-r17.patch;patch=1 \
+#           ${RPSRC}/sharpsl_bl_miss-r0.patch;patch=1 \
+#           ${RPSRC}/sharpsl_mtd_extras-r1.patch;patch=1 \
+#           ${RPSRC}/ohci_portcount-r0.patch;patch=1 \
+#           ${RPSRC}/pxa_ohci_power-r0.patch;patch=1 \
+
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
-
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
-           ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13/2.6.13-mm3/2.6.13-mm3.bz2;patch=1 \
+           ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.14-rc1.bz2;patch=1 \
+           ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc1/2.6.14-rc1-mm1/2.6.14-rc1-mm1.bz2;patch=1 \	   
            ${RPSRC}/borzoi_machtype-r0.patch;patch=1 \
-           ${RPSRC}/sharpsl_bl_miss-r0.patch;patch=1 \
-           ${RPSRC}/sharpsl_mtd_extras-r1.patch;patch=1 \
-           ${RPSRC}/ohci_portcount-r0.patch;patch=1 \
-           ${RPSRC}/pxa_ohci_power-r0.patch;patch=1 \
-           ${RPSRC}/pxa_i2c_fixes-r0.patch;patch=1 \
-           ${RPSRC}/spitz_usbsuspend-r0.patch;patch=1 \	   
-           ${RPSRC}/pxa_ohci_platform-r0.patch;patch=1 \
+           ${RPSRC}/poodle_irda-r0.patch;patch=1 \
+           ${RPSRC}/pxa_i2c_fixes-r1.patch;patch=1 \
+           ${RPSRC}/pcmcia_really_resume-r0.patch;patch=1 \
+           ${RPSRC}/pxa_ohci_platform-r1.patch;patch=1 \
+           ${RPSRC}/pxa_ohci_suspend-r0.patch;patch=1 \	   
            ${RPSRC}/sharpsl_pm-r8.patch;patch=1 \
            ${RPSRC}/corgi_pm-r3.patch;patch=1 \
            ${RPSRC}/spitz_base_extras-r2.patch;patch=1 \
            ${RPSRC}/spitz_pm-r3.patch;patch=1 \
-           ${RPSRC}/corgi_cleanup-r0.patch;patch=1 \
-           ${RPSRC}/poodle_cleanup-r0.patch;patch=1 \
-           ${RPSRC}/poodle_mmc-r0.patch;patch=1 \
-           ${RPSRC}/poodle_irda-r0.patch;patch=1 \
-           ${RPSRC}/scoop_collie_fix-r0.patch;patch=1 \
            ${RPSRC}/spitz_kbd_fix1-r0.patch;patch=1 \
            ${RPSRC}/spitzcf-r3.patch;patch=1 \
            ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
            ${RPSRC}/pxa_remove_static-r0.patch;patch=1 \
-           ${RPSRC}/pxa_irda-r3.patch;patch=1 \
+           ${RPSRC}/pxa_irda-r4.patch;patch=1 \
            ${RPSRC}/corgi_irda-r3.patch;patch=1 \
            ${RPSRC}/pxa_rtc-r1.patch;patch=1 \
            ${RPSRC}/scoop_susres-r1.patch;patch=1 \
-           ${RPSRC}/input_power-r2.patch;patch=1 \
+           ${RPSRC}/input_power-r3.patch;patch=1 \
            ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
            ${RPSRC}/sharpsl_bl_kick-r1.patch;patch=1 \
            ${RPSRC}/corgi_snd-r10.patch;patch=1 \
            ${RPSRC}/ipaq/hx2750_base-r20.patch;patch=1 \
-           ${RPSRC}/ipaq/hx2750_bl-r1.patch;patch=1 \
+           ${RPSRC}/ipaq/hx2750_bl-r2.patch;patch=1 \
            ${RPSRC}/ipaq/hx2750_pcmcia-r1.patch;patch=1 \
            ${RPSRC}/ipaq/pxa_keys-r2.patch;patch=1 \
-           ${RPSRC}/ipaq/tsc2101-r7.patch;patch=1 \
+           ${RPSRC}/ipaq/tsc2101-r8.patch;patch=1 \
            ${RPSRC}/ipaq/hx2750_test1-r2.patch;patch=1 \
            ${DOSRC}/pxa2xx-ir-dma-r0.patch;patch=1 \
            ${DOSRC}/tc6393-device-r5.patch;patch=1 \
            ${DOSRC}/tc6393_nand-r6.patch;patch=1 \
-           ${DOSRC}/tosa-machine-base-r11.patch;patch=1 \
+           ${DOSRC}/tosa-machine-base-r12.patch;patch=1 \
            ${DOSRC}/tosa-keyboard-r6.patch;patch=1 \
            ${RPSRC}/temp/tc6393fb-r7.patch;patch=1 \
            ${DOSRC}/tosa-power-r6.patch;patch=1 \
@@ -69,7 +78,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
            ${DOSRC}/tosa-udc-r4.patch;patch=1 \
            ${DOSRC}/tosa-irda-r3.patch;patch=1 \
            ${DOSRC}/tosa-lcd-r3.patch;patch=1 \
-           ${DOSRC}/tosa-bl-r5.patch;patch=1 \
+           ${RPSRC}/temp/tosa-bl-r7.patch;patch=1 \
            ${RPSRC}/pcmcia_dev_ids-r1.patch;patch=1 \
            ${RPSRC}/mmc_timeout-r0.patch;patch=1 \	   
            ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \
@@ -178,7 +187,7 @@ do_configure() {
 # Check the kernel is below the 1272*1024 byte limit for the PXA Zaurii
 do_compile_append() {
 	case ${MACHINE} in
-		c7x0 | akita | poodle | spitz | borzoi )
+		c7x0 | akita | poodle | spitz | borzoi | tosa )
 			size=`ls arch/${ARCH}/boot/${KERNEL_IMAGETYPE} -s | cut -d ' ' -f 1`
 			if [ $size -ge 1271 ]; then	
 				rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
diff --git a/packages/linux/nslu2-kernel_2.6.12.2.bb b/packages/linux/nslu2-kernel_2.6.12.2.bb
index 8b6e9cedc7..41f35d77ea 100644
--- a/packages/linux/nslu2-kernel_2.6.12.2.bb
+++ b/packages/linux/nslu2-kernel_2.6.12.2.bb
@@ -1,5 +1,5 @@
 # Kernel for NSLU2
-PR = "r14"
+PR = "r15"
 include nslu2-kernel.inc
 
 # N2K_EXTRA_PATCHES - list of patches to apply (can include
diff --git a/packages/linux/openslug-kernel-2.6.12.2/defconfig b/packages/linux/openslug-kernel-2.6.12.2/defconfig
index 5f40047926..51434a652d 100644
--- a/packages/linux/openslug-kernel-2.6.12.2/defconfig
+++ b/packages/linux/openslug-kernel-2.6.12.2/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.12.2
-# Tue Jul 12 10:37:36 2005
+# Fri Sep 16 22:26:41 2005
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -186,7 +186,7 @@ CONFIG_BINFMT_ELF=y
 #
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_FW_LOADER is not set
+CONFIG_FW_LOADER=m
 
 #
 # Memory Technology Devices (MTD)
@@ -384,7 +384,22 @@ CONFIG_SCSI_QLA2XXX=y
 #
 # Multi-device support (RAID and LVM)
 #
-# CONFIG_MD is not set
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID5=m
+CONFIG_MD_RAID6=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_CRYPT is not set
+# CONFIG_DM_SNAPSHOT is not set
+# CONFIG_DM_MIRROR is not set
+# CONFIG_DM_ZERO is not set
+# CONFIG_DM_MULTIPATH is not set
 
 #
 # Fusion MPT device support
@@ -401,13 +416,11 @@ CONFIG_SCSI_QLA2XXX=y
 #
 # CONFIG_I2O is not set
 
-
 #
 # Networking support
 #
 CONFIG_NET=y
 
-
 #
 # Networking options
 #
@@ -547,7 +560,7 @@ CONFIG_IPDDP_DECAP=y
 # QoS and/or fair queueing
 #
 # CONFIG_NET_SCHED is not set
-# CONFIG_NET_CLS_ROUTE is not set
+CONFIG_NET_CLS_ROUTE=y
 
 #
 # Network testing
@@ -569,7 +582,6 @@ CONFIG_BT_BNEP_MC_FILTER=y
 CONFIG_BT_BNEP_PROTO_FILTER=y
 # CONFIG_BT_HIDP is not set
 
-
 #
 # Bluetooth device drivers
 #
@@ -706,7 +718,7 @@ CONFIG_INPUT=m
 #
 # Userland interfaces
 #
-CONFIG_INPUT_MOUSEDEV=n
+# CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=m
@@ -715,8 +727,8 @@ CONFIG_INPUT_EVDEV=m
 #
 # Input Device Drivers
 #
-CONFIG_INPUT_KEYBOARD=n
-CONFIG_INPUT_MOUSE=n
+# 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
@@ -724,7 +736,7 @@ CONFIG_INPUT_MOUSE=n
 #
 # Hardware I/O ports
 #
-CONFIG_SERIO=n
+# CONFIG_SERIO is not set
 # CONFIG_GAMEPORT is not set
 
 #
@@ -901,20 +913,26 @@ CONFIG_VIDEO_DEV=m
 #
 # Video Adapters
 #
-# CONFIG_VIDEO_BT848 is not set
-# CONFIG_VIDEO_CPIA is not set
-# CONFIG_VIDEO_SAA5246A is not set
-# CONFIG_VIDEO_SAA5249 is not set
-# CONFIG_TUNER_3036 is not set
-# CONFIG_VIDEO_STRADIS is not set
-# CONFIG_VIDEO_ZORAN is not set
-# CONFIG_VIDEO_SAA7134 is not set
-# CONFIG_VIDEO_MXB is not set
-# CONFIG_VIDEO_DPC is not set
-# CONFIG_VIDEO_HEXIUM_ORION is not set
-# CONFIG_VIDEO_HEXIUM_GEMINI is not set
-# CONFIG_VIDEO_CX88 is not set
-# CONFIG_VIDEO_OVCAMCHIP is not set
+CONFIG_VIDEO_BT848=m
+CONFIG_VIDEO_CPIA=m
+CONFIG_VIDEO_CPIA_USB=m
+CONFIG_VIDEO_SAA5246A=m
+CONFIG_VIDEO_SAA5249=m
+CONFIG_TUNER_3036=m
+CONFIG_VIDEO_STRADIS=m
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_DPC=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_OVCAMCHIP=m
 
 #
 # Radio Adapters
@@ -927,6 +945,14 @@ CONFIG_VIDEO_DEV=m
 # Digital Video Broadcasting Devices
 #
 # CONFIG_DVB is not set
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_VIDEO_VIDEOBUF=m
+CONFIG_VIDEO_TUNER=m
+CONFIG_VIDEO_BUF=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_IR=m
+CONFIG_VIDEO_TVEEPROM=m
 
 #
 # Graphics support
@@ -942,8 +968,73 @@ CONFIG_SOUND=m
 # Advanced Linux Sound Architecture
 #
 CONFIG_SND=m
-CONFIG_SND_MIXER_OSS=m
+# CONFIG_SND_SEQUENCER is not set
 CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+# CONFIG_SND_PCM_OSS is not set
+# CONFIG_SND_RTCTIMER 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
+
+#
+# PCI devices
+#
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_TRIDENT is not set
+# CONFIG_SND_YMFPCI is not set
+# CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_HDA_INTEL is not set
+
+#
+# ALSA ARM devices
+#
+
+#
+# USB devices
+#
+# CONFIG_SND_USB_AUDIO is not set
 
 #
 # Open Sound System
@@ -1043,6 +1134,7 @@ CONFIG_USB_KBD=m
 # CONFIG_USB_SE401 is not set
 # CONFIG_USB_SN9C102 is not set
 # CONFIG_USB_STV680 is not set
+# CONFIG_USB_W9968CF is not set
 # CONFIG_USB_PWC is not set
 
 #
diff --git a/packages/matchbox-wm/matchbox-wm_svn.bb b/packages/matchbox-wm/matchbox-wm_svn.bb
index fdf38d6e68..d747243740 100644
--- a/packages/matchbox-wm/matchbox-wm_svn.bb
+++ b/packages/matchbox-wm/matchbox-wm_svn.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Matchbox window manager"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
 RDEPENDS = "matchbox-common"
-PV = "0.9cvs${CVSDATE}"
+PV = "0.9.5+cvs-${CVSDATE}"
 PR = "r1"
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/meta/meta-opie-all.bb b/packages/meta/meta-opie-all.bb
index 9abd270212..8b6a3df829 100644
--- a/packages/meta/meta-opie-all.bb
+++ b/packages/meta/meta-opie-all.bb
@@ -4,7 +4,7 @@ ALLOW_EMPTY = 1
 PACKAGE_ARCH = "all"
 LICENSE = "MIT"
 DEPENDS = "meta-opie"
-PR = "r1"
+PR = "r2"
 
 PACKAGES = "task-qpe-applets task-qpe-games task-qpe-inputmethods \
 	task-qpe-multimedia task-qpe-emulators task-qpe-applications \
@@ -79,6 +79,7 @@ fish \
 froot \
 gemdropx \
 glider \
+gnuz \
 hexatrolic \
 iaimaster \
 icebloxx \
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2.inc b/packages/opie-mediaplayer2/opie-mediaplayer2.inc
index 00247fe6ad..fed919a9c0 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2.inc
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2.inc
@@ -5,9 +5,8 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 DEPENDS = "libxine-fb libqtaux2 opie-mediaplayer2-skin-default"
-RDEPENDS = "opie-mediaplayer2-skin"
-RRECOMMENDS = "opie-mediaplayer2-skin-default \
-libxine-plugin-ao-out-oss libxine-plugin-inp-file \
+RDEPENDS = "opie-mediaplayer2-skin-default"
+RRECOMMENDS = "libxine-plugin-ao-out-oss libxine-plugin-inp-file \
 libxine-plugin-decode-ff libxine-plugin-decode-mad \
 libxine-plugin-dmx-audio libxine-plugin-dmx-avi libxine-plugin-dmx-mpeg"
 APPNAME = "opieplayer2"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.1.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.1.bb
index 1dcf37adae..41de8fc487 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.1.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.1.bb
@@ -1,5 +1,6 @@
 include ${PN}.inc
 
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/opieplayer2 \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
index d3219e85b0..8f9450842a 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
@@ -1,6 +1,7 @@
 include ${PN}.inc
-    
+
 PV = "1.2.1+cvs-${CVSDATE}"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/opieplayer2 \
            ${HANDHELDS_CVS};module=opie/pics \
diff --git a/packages/opie-wellenreiter/files/.mtn2git_empty b/packages/opie-wellenreiter/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-wellenreiter/files/.mtn2git_empty
diff --git a/packages/opie-wellenreiter/files/0916_wellenreiter-fontfix.patch b/packages/opie-wellenreiter/files/0916_wellenreiter-fontfix.patch
new file mode 100644
index 0000000000..b85d46cb08
--- /dev/null
+++ b/packages/opie-wellenreiter/files/0916_wellenreiter-fontfix.patch
@@ -0,0 +1,43 @@
+
+This patch is backport from OPIE CVS.
+Submitted upstream by Marcin Juszkiewicz <openembedded@hrw.one.pl>
+Date: 2005-09-16
+
+Index: packetview.cpp
+===================================================================
+RCS file: /cvs/opie/noncore/net/wellenreiter/gui/packetview.cpp,v
+retrieving revision 1.9
+diff -u -r1.9 packetview.cpp
+--- wellenreiter/gui/packetview.cpp	24 Aug 2004 11:53:44 -0000	1.9
++++ wellenreiter/gui/packetview.cpp	16 Sep 2005 17:41:03 -0000
+@@ -20,6 +20,7 @@
+ #include <opie2/odebug.h>
+ #include <opie2/olistview.h>
+ #include <opie2/oapplication.h>
++#include <qpe/config.h>
+ 
+ /* QT */
+ #include <qfont.h>
+@@ -38,6 +39,9 @@
+ PacketView::PacketView( QWidget * parent, const char * name, WFlags f )
+            :QFrame( parent, name, f )
+ {
++    Config c( "qpe" );
++    c.setGroup( "Appearance" );
++    
+     _number = new QSpinBox( this );
+     _number->setPrefix( "Pkt# " );
+     _label = new QLabel( this );
+@@ -47,11 +51,10 @@
+     _list->setColumnAlignment( 0, Qt::AlignCenter );
+     _list->setColumnAlignment( 1, Qt::AlignLeft );
+     _list->setAllColumnsShowFocus( true );
+-    _list->setFont( QFont( "Fixed", 8 ) );
+ 
+     _hex = new QTextView( this );
+     _hex->setMargin( 0 );
+-    _hex->setFont( QFont( "Fixed", 8 ) );
++    _hex->setFont( QFont( c.readEntry( "FixedFontFamily", "Fixed" ), c.readNumEntry( "FixedFontSize", 8 ) ) );
+ 
+     QVBoxLayout* vb = new QVBoxLayout( this, 2, 2 );
+     QHBoxLayout* hb = new QHBoxLayout( vb, 2 );
diff --git a/packages/opie-wellenreiter/opie-wellenreiter_1.2.1.bb b/packages/opie-wellenreiter/opie-wellenreiter_1.2.1.bb
index b2e3975f7a..7dc43ad8d6 100644
--- a/packages/opie-wellenreiter/opie-wellenreiter_1.2.1.bb
+++ b/packages/opie-wellenreiter/opie-wellenreiter_1.2.1.bb
@@ -1,6 +1,8 @@
 include ${PN}.inc
 
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/wellenreiter \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+	   file://0916_wellenreiter-fontfix.patch;patch=1"
diff --git a/packages/orinoco/spectrum-fw.bb b/packages/orinoco/spectrum-fw.bb
new file mode 100644
index 0000000000..749b6e71f7
--- /dev/null
+++ b/packages/orinoco/spectrum-fw.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Firmware for Spectrum Wireless LAN cards"
+LICENSE = "unknown"
+PR = "r0"
+
+SRC_URI = "file://get_symbol_fw \
+           file://parse_symbol_fw"
+
+S = "${WORKDIR}"
+
+do_compile() {
+	get_symbol_fw
+}
+
+FILES_${PN} += "${base_libdir}/firmware/symbol*"
+
+do_install() {
+	install -d ${D}${base_libdir}/firmware/
+	install -m 0755 ${WORKDIR}/symbol_sp24t_prim_fw ${D}${base_libdir}/firmware/symbol_sp24t_prim_fw
+	install -m 0755 ${WORKDIR}/symbol_sp24t_sec_fw ${D}${base_libdir}/firmware/symbol_sp24t_sec_fw
+}
diff --git a/packages/orinoco/spectrum-fw/.mtn2git_empty b/packages/orinoco/spectrum-fw/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/orinoco/spectrum-fw/.mtn2git_empty
diff --git a/packages/orinoco/spectrum-fw/get_symbol_fw b/packages/orinoco/spectrum-fw/get_symbol_fw
new file mode 100755
index 0000000000..e7b0bf2d44
--- /dev/null
+++ b/packages/orinoco/spectrum-fw/get_symbol_fw
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+# Get firmware for Symbol Spectrum24 Trilogy.
+# Both the header file and the binary firmware files are produced.
+
+# Copyright (C) 2004 Pavel Roskin <proski@gnu.org>
+
+# This script is Free Software, and it can be copied, distributed and
+# modified as defined in the GNU General Public License.  A copy of
+# its license can be downloaded from http://www.gnu.org/copyleft/gpl.html
+
+# Usage: get_symbol_fw
+# Output: spectrum_fw.h symbol_sp24t_prim_fw symbol_sp24t_sec_fw
+# Needed tools: curl (or wget), unzip, perl.
+
+set -e
+
+URL_BASE='ftp://symstore.longisland.com/Symstore/services_download/wirless_prod/'
+DL_FILE='MC&DriverOnlyInstallers.zip'
+DL_INT1='S24DRVR392B67-01.exe'
+DL_INT2='Driver Only Installer/NetWLan5.sys'
+DRIVER1=symbol1.drv
+DRIVER2=symbol2.drv
+
+get_file() {
+    curl --remote-name "$1" || \
+    wget --passive-ftp "$1" || \
+    wget "$1" || \
+    ftp "$1" </dev/null || \
+    exit 1
+}
+		    
+if ! test -f $DL_FILE; then
+    get_file $URL_BASE/$DL_FILE
+fi
+			
+unzip -p $DL_FILE "$DL_INT1" >$DRIVER1
+unzip -p $DRIVER1 "$DL_INT2" >$DRIVER2
+			
+perl parse_symbol_fw $DRIVER2 spectrum_fw.h symbol_sp24t_prim_fw \
+    symbol_sp24t_sec_fw
+			    
+rm -f $DRIVER1 $DRIVER2
\ No newline at end of file
diff --git a/packages/orinoco/spectrum-fw/parse_symbol_fw b/packages/orinoco/spectrum-fw/parse_symbol_fw
new file mode 100755
index 0000000000..7fe0ea57c4
--- /dev/null
+++ b/packages/orinoco/spectrum-fw/parse_symbol_fw
@@ -0,0 +1,129 @@
+#!/usr/bin/perl -w
+
+# Extract Symbol firmware and convert is to a header file and two binary
+# files.
+
+# Copyright (C) 2004 Pavel Roskin <proski@gnu.org>
+
+# This script is Free Software, and it can be copied, distributed and
+# modified as defined in the GNU General Public License.  A copy of
+# its license can be downloaded from http://www.gnu.org/copyleft/gpl.html
+
+# Usage:
+#  parse_symbol_fw infile header binfile1 binfile2
+
+use strict;
+
+# Print message and exit (like "die", but without raising an exception).
+# Newline is added at the end.
+sub error
+{
+	printf STDERR "ERROR: ";
+	printf STDERR @_;
+	printf STDERR "\n";
+	exit 1;
+}
+
+sub readnum_ba ()
+{
+	my $byte_a;
+	read INFILE,$byte_a,1;
+	my $byte_b;
+	read INFILE,$byte_b,1;
+	return (ord($byte_b) << 8) + ord($byte_a);
+}
+
+
+if ($#ARGV != 3) {
+	error ("Usage: parse_symbol_fw infile header binfile1 binfile2");
+}
+
+unless (open (INFILE, "< $ARGV[0]")) {
+	error ("couldn't open $ARGV[0] for reading: $!");
+}
+
+unless (open (OUTFILE, "> $ARGV[1]")) {
+	error ("couldn't open $ARGV[1] for writing: $!");
+}
+
+# Process one array, either for primary or for secondary firmware
+sub process_one_array($$) {
+	my $arrname = shift(@_);
+	my $binfile = shift(@_);
+	my $offset = -1;
+	my $str_offset = 0;
+
+	# Skip to the beginning of firmware
+	$/ = "\x00";
+	while (<INFILE>) {
+		if (m{FILE: }g) {
+			$offset = $str_offset + pos() - 6;
+			last;
+		}
+		$str_offset = tell(INFILE);
+	}
+
+	if ($offset == -1) {
+		error("Cannot find FILE: marker");
+	}
+
+	my @fwdata = split;
+	print $fwdata[1] . "\n";
+	seek(INFILE, $offset, 0);
+
+	my $blknum = $fwdata[3];
+	my $pdrlen = $fwdata[4];
+	my $crclen = $fwdata[5];
+	my $compatlen = $fwdata[6];
+
+	while (!eof(INFILE)) {
+		my $byte;
+		read INFILE, $byte, 1;
+		last if (ord($byte) == 0x1a);
+	}
+
+	# Walk all blocks
+	my $block = $blknum;
+	while ($block-- > 0) {
+		seek(INFILE, 4, 1);
+		my $len = readnum_ba();
+		seek(INFILE, $len, 1);
+	}
+
+	my $img_len = tell(INFILE) - $offset + $pdrlen + $crclen + $compatlen + 2;
+	seek(INFILE, $offset, 0);
+
+	# Write binary file for the section
+	unless (open (BINFILE, "> $binfile")) {
+		error ("couldn't open $binfile for writing: $!");
+	}
+
+	# Output the array
+	printf OUTFILE "/* %s %s */\n", $fwdata[1], $fwdata[2];
+	printf OUTFILE "static u8 %s[] = {\n", $arrname;
+
+	my $count = 0;
+	while ($count++ < $img_len) {
+		my $byte;
+		read INFILE, $byte, 1;
+		$byte = ord($byte);
+		printf OUTFILE "0x%02x,", $byte;
+		printf BINFILE "%c", $byte;
+		if ($count % 16 == 0) {
+			printf OUTFILE "\n";
+		}
+	}
+
+	if ($img_len % 16) {
+		printf OUTFILE "\n";
+	}
+
+	print OUTFILE "};\n";
+	close(BINFILE);
+}
+
+process_one_array("primsym", $ARGV[2]);
+process_one_array("secsym", $ARGV[3]);
+
+close(INFILE);
+close(OUTFILE);
diff --git a/packages/pvrusb2-mci/.mtn2git_empty b/packages/pvrusb2-mci/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pvrusb2-mci/.mtn2git_empty
diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20050911/.mtn2git_empty b/packages/pvrusb2-mci/pvrusb2-mci-20050911/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pvrusb2-mci/pvrusb2-mci-20050911/.mtn2git_empty
diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20050911/Makefile.patch b/packages/pvrusb2-mci/pvrusb2-mci-20050911/Makefile.patch
new file mode 100644
index 0000000000..829c741b69
--- /dev/null
+++ b/packages/pvrusb2-mci/pvrusb2-mci-20050911/Makefile.patch
@@ -0,0 +1,15 @@
+--- driver/Makefile-	2005-09-11 13:22:08.000000000 -1000
++++ driver/Makefile	2005-09-17 01:02:06.341217389 -1000
+@@ -37,10 +37,10 @@
+   all: modules
+ 
+   modules modules_install clean:
+-	$(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) $@
++	$(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS)" -C $(KDIR) M=$(shell pwd) $@
+ 
+   install:
+-	$(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(shell pwd) modules_install
++	$(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) CFLAGS="$(CFLAGS)" -C $(KDIR) M=$(shell pwd) modules_install
+ 
+ else
+ 
diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20050911.bb b/packages/pvrusb2-mci/pvrusb2-mci_20050911.bb
new file mode 100644
index 0000000000..94589e268c
--- /dev/null
+++ b/packages/pvrusb2-mci/pvrusb2-mci_20050911.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2"
+PRIORITY = "optional"
+SECTION = "kernel/modules"
+MAINTAINER = "dyoung <dyoung@thestuffguy.com>"
+LICENSE = "GPL"
+PR = "r0"
+# It in fact requires these modules, but for now is using the local ones.
+# RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115"
+ 
+SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-20050911.tar.bz2 \
+           file://Makefile.patch;patch=1" 
+
+S = "${WORKDIR}/pvrusb2-mci-20050911/driver"
+
+inherit module
+
+CFLAGS = "'-I${KERNEL_SOURCE}/include' \
+          '-D__LINUX_ARM_ARCH__=5'"
+
+EXTRA_OEMAKE = "'CFLAGS=${CFLAGS}' \
+                'CC=${KERNEL_CC}' \
+                'LD=${KERNEL_LD}' \
+                'KDIR=${STAGING_KERNEL_DIR}'" 
+
+do_install() {   
+        install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
+        install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media
+}
+
diff --git a/packages/udev/udev-070/.mtn2git_empty b/packages/udev/udev-070/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/udev/udev-070/.mtn2git_empty
diff --git a/packages/udev/udev-070/fix-alignment.patch b/packages/udev/udev-070/fix-alignment.patch
new file mode 100644
index 0000000000..8c7b8b5ac5
--- /dev/null
+++ b/packages/udev/udev-070/fix-alignment.patch
@@ -0,0 +1,24 @@
+diff --git a/udev_rules_parse.c b/udev_rules_parse.c
+--- a/udev_rules_parse.c
++++ b/udev_rules_parse.c
+@@ -241,6 +241,7 @@ static int add_to_rules(struct udev_rule
+ 	int valid;
+ 	char *linepos;
+ 	char *attr;
++	size_t padding;
+ 	int retval;
+ 
+ 	/* get all the keys */
+@@ -506,6 +507,11 @@ static int add_to_rules(struct udev_rule
+ 
+ 	/* grow buffer and add rule */
+ 	rule_size = sizeof(struct udev_rule) + rule->bufsize;
++	padding = (sizeof(size_t) - rule_size % sizeof(size_t)) % sizeof(size_t);
++	dbg("add %zi padding bytes", padding);
++	rule_size += padding;
++	rule->bufsize += padding;
++
+ 	rules->buf = realloc(rules->buf, rules->bufsize + rule_size);
+ 	if (!rules->buf) {
+ 		err("realloc failed");
+
diff --git a/packages/udev/udev-070/flags.patch b/packages/udev/udev-070/flags.patch
new file mode 100644
index 0000000000..bd04041f78
--- /dev/null
+++ b/packages/udev/udev-070/flags.patch
@@ -0,0 +1,70 @@
+--- udev-070/Makefile~flags	2005-09-15 01:19:07 +0200
++++ udev-070/Makefile	2005-09-16 11:44:37 +0200
+@@ -160,36 +160,36 @@
+ # check if compiler option is supported
+ cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi;}
+ 
+-CFLAGS		+= -Wall -fno-builtin -Wchar-subscripts -Wpointer-arith \
++override CFLAGS		+= -Wall -fno-builtin -Wchar-subscripts -Wpointer-arith \
+ 		   -Wstrict-prototypes -Wsign-compare
+-CFLAGS		+= $(call cc-supports, -Wdeclaration-after-statement, )
+-CFLAGS		+= -pipe
+-CFLAGS		+= -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
++override CFLAGS		+= $(call cc-supports, -Wdeclaration-after-statement, )
++override CFLAGS		+= -pipe
++override CFLAGS		+= -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
+ 
+ # use '-Os' optimization if available, else use -O2
+ OPTFLAGS := $(call cc-supports, -Os, -O2)
+ 
+ # include our local copy of libsysfs
+-CFLAGS +=	-I$(PWD)/libsysfs/sysfs	\
++override CFLAGS +=	-I$(PWD)/libsysfs/sysfs	\
+ 		-I$(PWD)/libsysfs
+ 
+ ifeq ($(strip $(USE_LOG)),true)
+-	CFLAGS += -DUSE_LOG
++	override CFLAGS += -DUSE_LOG
+ endif
+ 
+ # if DEBUG is enabled, then we do not strip or optimize
+ ifeq ($(strip $(DEBUG)),true)
+-	CFLAGS  += -O1 -g -DDEBUG
++	override CFLAGS  += -O1 -g -DDEBUG
+ 	LDFLAGS += -Wl
+ 	STRIPCMD = /bin/true -Since_we_are_debugging
+ else
+-	CFLAGS  += $(OPTFLAGS) -fomit-frame-pointer
++	override CFLAGS  += $(OPTFLAGS) -fomit-frame-pointer
+ 	LDFLAGS += -s -Wl
+ 	STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment
+ endif
+ 
+ ifeq ($(strip $(USE_GCOV)),true)
+-	CFLAGS += -fprofile-arcs -ftest-coverage
++	override CFLAGS += -fprofile-arcs -ftest-coverage
+ 	LDFLAGS = -fprofile-arcs
+ endif
+ 
+@@ -200,18 +200,18 @@
+ 	CC		= $(KLCC)
+ 	LD		= $(KLCC)
+ else
+-	CFLAGS		+= -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
++	override CFLAGS		+= -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
+ 	LDFLAGS		+= -Wl,-warn-common
+ endif
+ 
+ ifeq ($(strip $(USE_SELINUX)),true)
+ 	UDEV_OBJS += udev_selinux.o
+ 	LIB_OBJS += -lselinux
+-	CFLAGS += -DUSE_SELINUX
++	override CFLAGS += -DUSE_SELINUX
+ endif
+ 
+ ifeq ($(strip $(USE_STATIC)),true)
+-	CFLAGS += -DUSE_STATIC
++	override CFLAGS += -DUSE_STATIC
+ 	LDFLAGS += -static
+ endif
+ 
diff --git a/packages/udev/udev-070/init b/packages/udev/udev-070/init
new file mode 100644
index 0000000000..d9fd45a600
--- /dev/null
+++ b/packages/udev/udev-070/init
@@ -0,0 +1,196 @@
+#!/bin/sh -e
+
+UDEVSTART=/sbin/udevstart
+
+# defaults
+tmpfs_size="10M"
+udev_root="/dev"
+
+[ -x $UDEVSTART ] || exit 0
+
+. /etc/udev/udev.conf
+
+##############################################################################
+
+# we need to unmount /dev/pts/ and remount it later over the tmpfs
+unmount_devpts() {
+  if mountpoint -q /dev/pts/; then
+    umount -l /dev/pts/
+  fi
+
+  if mountpoint -q /dev/shm/; then
+    umount -l /dev/shm/
+  fi
+}
+
+# mount a tmpfs over /dev, if somebody did not already do it
+mount_tmpfs() {
+  if grep -E -q "^[^[:space:]]+ /dev tmpfs" /proc/mounts; then
+    return 0
+  fi
+
+  # /dev/.static/dev/ is used by MAKEDEV to access the real /dev/ directory.
+  # /etc/udev/ is recycled as a temporary mount point because it's the only
+  # directory which is guaranteed to be available.
+  mount -n -o bind /dev /etc/udev
+
+  if ! mount -n -o size=$tmpfs_size,mode=0755 -t tmpfs tmpfs /dev; then
+    umount /etc/udev
+    echo "udev requires tmpfs support, not started."
+    exit 1
+  fi
+
+  # using ln to test if /dev works, because touch is in /usr/bin/
+  if ln -s test /dev/test-file; then
+    rm /dev/test-file
+  else
+    echo "udev requires tmpfs support, not started."
+    umount /etc/udev
+    umount /dev
+    exit 1
+  fi
+
+  mkdir -p /dev/.static/dev
+  chmod 700 /dev/.static/
+  mount -n -o move /etc/udev /dev/.static/dev
+}
+
+# I hate this hack.  -- Md
+make_extra_nodes() {
+  [ -e /etc/udev/links.conf ] || return 0
+  grep '^[^#]' /etc/udev/links.conf | \
+  while read type name arg1; do
+    [ "$type" -a "$name" -a ! -e "/dev/$name" -a ! -L "/dev/$name" ] ||continue
+    case "$type" in
+      L) ln -s $arg1 /dev/$name ;;
+      D) mkdir -p /dev/$name ;;
+      M) mknod --mode=600 /dev/$name $arg1 ;;
+      *) echo "links.conf: unparseable line ($type $name $arg1)" ;;
+    esac
+  done
+}
+
+# this function is duplicated in preinst, postinst and d-i
+supported_kernel() {
+  case "$(uname -r)" in
+    2.[012345].*|2.6.[0-9]|2.6.[0-9][!0-9]*) return 1 ;;
+    2.6.1[01]|2.6.1[01][!0-9]*) return 1 ;;
+  esac
+  return 0
+}
+
+# shell version of /usr/bin/tty
+my_tty() {
+  [ -x /bin/readlink ] || return 0
+  [ -e /proc/self/fd/0 ] || return 0
+  readlink --silent /proc/self/fd/0 || true
+}
+
+warn_if_interactive() {
+  if [ "$RUNLEVEL" = "S" -a "$PREVLEVEL" = "N" ]; then
+    return 0
+  fi
+
+  TTY=$(my_tty)
+  if [ -z "$TTY" -o "$TTY" = "/dev/console" ]; then
+    return 0
+  fi
+
+  printf "\n\n\nIt has been detected that the command\n\n\t$0 $*\n\n"
+  printf "has been run from an interactive shell.\n"
+  printf "It will probably not do what you expect, so this script will wait\n"
+  printf "60 seconds before continuing. Press ^C to stop it.\n"
+  printf "RUNNING THIS COMMAND IS HIGHLY DISCOURAGED!\n\n\n\n"
+  sleep 60
+}
+
+##############################################################################
+
+if ! supported_kernel; then
+  echo "udev requires a kernel >= 2.6.12, not started."
+  exit 1
+fi
+
+if [ ! -e /proc/filesystems ]; then
+  echo "udev requires a mounted procfs, not started."
+  exit 1
+fi
+
+if ! grep -q '[[:space:]]tmpfs$' /proc/filesystems; then
+  echo "udev requires tmpfs support, not started."
+  exit 1
+fi
+
+if [ ! -d /sys/class/ ]; then
+  echo "udev requires a mounted sysfs, not started."
+  exit 1
+fi
+
+if [ ! -e /proc/sys/kernel/hotplug ]; then
+  echo "udev requires hotplug support, not started."
+  exit 1
+fi
+
+##############################################################################
+
+# When modifying this script, do not forget that between the time that
+# the new /dev has been mounted and udevstart has been run there will be
+# no /dev/null. This also means that you cannot use the "&" shell command.
+
+case "$1" in
+  start)
+    if [ -e "$udev_root/.udevdb" ]; then
+      if mountpoint -q /dev/; then
+        TMPFS_MOUNTED=1
+      else
+        echo ".udevdb already exists on the old $udev_root!"
+      fi
+    fi
+    warn_if_interactive
+
+    #echo /sbin/udevsend > /proc/sys/kernel/hotplug
+    echo "" > /proc/sys/kernel/hotplug
+    udevsend
+    if [ "$UDEV_DISABLED" = "yes" ]; then
+      echo "udev disabled on the kernel command line, not started."
+      exit 0
+    fi
+
+    if [ ! "$TMPFS_MOUNTED" ]; then
+      unmount_devpts
+      mount_tmpfs
+      [ -d /proc/1 ] || mount -n /proc
+      # if this directory is not present /dev will not be updated by udev
+      mkdir /dev/.udevdb/
+      echo "Creating initial device nodes..."
+      udevstart
+    fi
+    make_extra_nodes
+    ;;
+  stop)
+    warn_if_interactive
+    start-stop-daemon --stop --exec /sbin/udevd --quiet
+    unmount_devpts
+    if [ -d /dev/.static/dev/ ]; then
+      umount -l /dev/.static/dev/ || true
+    fi
+    echo "Unmounting /dev..."
+    # unmounting with -l should never fail
+    if ! umount -l /dev; then
+      exit 1
+    fi
+    ;;
+  restart|force-reload)
+    start-stop-daemon --stop --exec /sbin/udevd --quiet
+    log_begin_msg "Recreating device nodes..."
+    udevstart
+    make_extra_nodes
+    log_end_msg 0
+    ;;
+  *)
+    echo "Usage: /etc/init.d/udev {start|stop|restart|force-reload}"
+    exit 1
+    ;;
+esac
+
+exit 0
diff --git a/packages/udev/udev-070/links.conf b/packages/udev/udev-070/links.conf
new file mode 100644
index 0000000000..8fff922db6
--- /dev/null
+++ b/packages/udev/udev-070/links.conf
@@ -0,0 +1,21 @@
+# This file does not exist. Please do not ask the debian maintainer about it.
+# You may use it to do strange and wonderful things, at your risk.
+
+L fd		/proc/self/fd
+L stdin		/proc/self/fd/0
+L stdout	/proc/self/fd/1
+L stderr	/proc/self/fd/2
+L core		/proc/kcore
+L sndstat	/proc/asound/oss/sndstat
+L MAKEDEV	/sbin/MAKEDEV
+
+D pts
+D shm
+
+# Hic sunt leones.
+M ppp		c 108 0
+D loop
+M loop/0	b 7 0
+D net
+M net/tun	c 10 200
+
diff --git a/packages/udev/udev-070/noasmlinkage.patch b/packages/udev/udev-070/noasmlinkage.patch
new file mode 100644
index 0000000000..0d8e854c0e
--- /dev/null
+++ b/packages/udev/udev-070/noasmlinkage.patch
@@ -0,0 +1,38 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- udev-062/udev.c~noasmlinkage.patch
++++ udev-062/udev.c
+@@ -54,7 +54,7 @@
+ }
+ #endif
+ 
+-static void asmlinkage sig_handler(int signum)
++static void sig_handler(int signum)
+ {
+ 	switch (signum) {
+ 		case SIGALRM:
+--- udev-062/udevd.c~noasmlinkage.patch
++++ udev-062/udevd.c
+@@ -639,7 +639,7 @@
+ 	return msg;
+ }
+ 
+-static void asmlinkage sig_handler(int signum)
++static void sig_handler(int signum)
+ {
+ 	int rc;
+ 
+--- udev-062/udevstart.c~noasmlinkage.patch
++++ udev-062/udevstart.c
+@@ -323,7 +323,7 @@
+ 	exec_list(&device_list);
+ }
+ 
+-static void asmlinkage sig_handler(int signum)
++static void sig_handler(int signum)
+ {
+ 	switch (signum) {
+ 		case SIGALRM:
diff --git a/packages/udev/udev-070/tty-symlinks.patch b/packages/udev/udev-070/tty-symlinks.patch
new file mode 100644
index 0000000000..28bdf92af8
--- /dev/null
+++ b/packages/udev/udev-070/tty-symlinks.patch
@@ -0,0 +1,13 @@
+--- udev-068/etc/udev/udev-devfs.rules.orig	2005-08-22 20:22:18.000000000 +0200
++++ udev-068/etc/udev/udev-devfs.rules	2005-08-22 20:22:44.000000000 +0200
+@@ -14,8 +14,8 @@
+ KERNEL="fd[0-9]*", NAME="floppy/%n"
+ 
+ # tty devices
+-KERNEL="tty[0-9]*",    NAME="vc/%n"
+-KERNEL="ttyS[0-9]*",   NAME="tts/%n"
++KERNEL="tty[0-9]*",    NAME="vc/%n", SYMLINK="%k"
++KERNEL="ttyS[0-9]*",   NAME="tts/%n", SYMLINK="%k"
+ KERNEL="ttyUSB[0-9]*", NAME="tts/USB%n"
+ 
+ # vc devices
diff --git a/packages/udev/udev-070/udev.rules b/packages/udev/udev-070/udev.rules
new file mode 100644
index 0000000000..f81e250966
--- /dev/null
+++ b/packages/udev/udev-070/udev.rules
@@ -0,0 +1,93 @@
+# There are a number of modifiers that are allowed to be used in some
+# of the different fields. They provide the following subsitutions:
+#
+# %n the "kernel number" of the device.
+#    For example, 'sda3' has a "kernel number" of '3'
+# %e the smallest number for that name which does not matches an existing node
+# %k the kernel name for the device
+# %M the kernel major number for the device
+# %m the kernel minor number for the device
+# %b the bus id for the device
+# %c the string returned by the PROGRAM
+# %s{filename} the content of a sysfs attribute
+# %% the '%' char itself
+#
+
+# SCSI devices
+BUS=="scsi", KERNEL=="sr[0-9]*",	NAME="scd%n", SYMLINK+="sr%n"
+
+# USB devices
+BUS=="usb", KERNEL=="auer[0-9]*",	NAME="usb/%k"
+BUS=="usb", KERNEL=="cpad[0-9]*",	NAME="usb/%k"
+BUS=="usb", KERNEL=="dabusb*",		NAME="usb/%k"
+BUS=="usb", KERNEL=="hiddev*",		NAME="usb/%k"
+BUS=="usb", KERNEL=="legousbtower*",	NAME="usb/%k"
+BUS=="usb", KERNEL=="lp[0-9]*",		NAME="usb/%k"
+BUS=="usb", KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", \
+					SYMLINK+="pilot"
+
+# usbfs-like devices
+SUBSYSTEM=="usb_device", \
+	PROGRAM="/bin/sh -c 'X=%k X=$${X#usbdev} B=$${X%%%%.*} D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c"
+
+# serial devices
+KERNEL=="capi",			NAME="capi20", SYMLINK+="isdn/capi20"
+KERNEL=="capi[0-9]*",		NAME="capi/%n"
+
+# video devices
+KERNEL=="card[0-9]*",		NAME="dri/%k"
+
+# misc devices
+KERNEL=="hw_random",		NAME="hwrng"
+KERNEL=="tun",			NAME="net/%k"
+
+KERNEL=="cdemu[0-9]*",		NAME="cdemu/%n"
+KERNEL=="pktcdvd[0-9]*",	NAME="pktcdvd/%n"
+KERNEL=="pktcdvd",		NAME="pktcdvd/control"
+
+KERNEL=="cpu[0-9]*",		NAME="cpu/%n/cpuid"
+KERNEL=="msr[0-9]*",		NAME="cpu/%n/msr"
+KERNEL=="microcode",		NAME="cpu/microcode"
+
+KERNEL=="umad*",		NAME="infiniband/%k"
+KERNEL=="issm*",		NAME="infiniband/%k"
+KERNEL=="uverbs*",		NAME="infiniband/%k"
+KERNEL=="ucm",			NAME="infiniband/%k"
+
+# ALSA devices
+KERNEL=="controlC[0-9]*",	NAME="snd/%k"
+KERNEL=="hwC[D0-9]*",		NAME="snd/%k"
+KERNEL=="pcmC[D0-9cp]*",	NAME="snd/%k"
+KERNEL=="midiC[D0-9]*",		NAME="snd/%k"
+KERNEL=="timer",		NAME="snd/%k"
+KERNEL=="seq",			NAME="snd/%k"
+
+# ieee1394 devices       
+KERNEL=="dv1394*",		NAME="dv1394/%n"
+KERNEL=="video1394*",		NAME="video1394/%n"
+
+# input devices
+KERNEL=="mice",			NAME="input/%k"
+KERNEL=="mouse[0-9]*",		NAME="input/%k"
+KERNEL=="event[0-9]*",		NAME="input/%k"
+KERNEL=="js[0-9]*",		NAME="input/%k"
+KERNEL=="ts[0-9]*",		NAME="input/%k"
+KERNEL=="uinput",		NAME="input/%k"
+
+# Zaptel
+KERNEL=="zapctl",		NAME="zap/ctl"
+KERNEL=="zaptimer",		NAME="zap/timer"
+KERNEL=="zapchannel",		NAME="zap/channel"
+KERNEL=="zappseudo",		NAME="zap/pseudo"
+KERNEL=="zap[0-9]*",		NAME="zap/%n"
+
+# AOE character devices
+SUBSYSTEM=="aoe", KERNEL=="discover",	NAME="etherd/%k"
+SUBSYSTEM=="aoe", KERNEL=="err",	NAME="etherd/%k"
+SUBSYSTEM=="aoe", KERNEL=="interfaces",	NAME="etherd/%k"
+
+# device mapper creates its own device nodes, so ignore these
+KERNEL=="dm-[0-9]*",		OPTIONS+="ignore_device"
+KERNEL=="device-mapper",	NAME="mapper/control"
+
+KERNEL="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660"
diff --git a/packages/udev/udev_070.bb b/packages/udev/udev_070.bb
new file mode 100644
index 0000000000..3fd3c3f522
--- /dev/null
+++ b/packages/udev/udev_070.bb
@@ -0,0 +1,27 @@
+SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
+           file://tmpfs.patch;patch=1 \
+           file://noasmlinkage.patch;patch=1 \
+           file://flags.patch;patch=1 \
+           file://tty-symlinks.patch;patch=1 \
+	   file://udev.rules \
+	   file://links.conf \
+           file://init"
+
+UDEV_DEVFS_RULES = "0"
+
+include udev.inc
+
+PR = "r0"
+
+UDEV_EXTRAS = "extras/scsi_id/ extras/volume_id/ extras/run_directory/"
+
+do_install_append() {
+	install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/
+	install -m 0644 ${WORKDIR}/links.conf ${D}${sysconfdir}/udev/links.conf
+}
+
+#FIXME UDEV MIGRATION PLAN:
+#FIXME      a) udevd is now a netlink daemon and needs to be started by the init script (ours is way too old)
+#FIXME      b) sbin/hotplug should no longer be called by the kernel, i.e. echo "" >/proc/sys/kernel/hotplug
+#FIXME done c) until d) happens, udev will emulate hotplugd behaviour (see do_install_append()
+#FIXME      d) eventually hotplug should no longer be used at all, all agents shall be converted to udev rules