From 76d0b06b3f6aa4f804ee17fe04b9e279b44cdc4e Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 11 Jun 2008 23:31:21 +0000
Subject: libmodplug 0.7 update to 0.8

---
 packages/libmodplug/libmodplug_0.7.bb | 13 -------------
 packages/libmodplug/libmodplug_0.8.bb | 12 ++++++++++++
 2 files changed, 12 insertions(+), 13 deletions(-)
 delete mode 100644 packages/libmodplug/libmodplug_0.7.bb
 create mode 100644 packages/libmodplug/libmodplug_0.8.bb

diff --git a/packages/libmodplug/libmodplug_0.7.bb b/packages/libmodplug/libmodplug_0.7.bb
deleted file mode 100644
index 369120e685..0000000000
--- a/packages/libmodplug/libmodplug_0.7.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Library for reading mod-like audio files."
-HOMEPAGE = "http://modplug-xmms.sf.net"
-SECTION = "libs"
-LICENSE = "GPL"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/modplug-xmms/libmodplug-${PV}.tar.gz"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	install -m 0644 ${S}/src/modplug.h ${STAGING_INCDIR}
-	oe_libinstall -C src -so libmodplug ${STAGING_LIBDIR}
-}
diff --git a/packages/libmodplug/libmodplug_0.8.bb b/packages/libmodplug/libmodplug_0.8.bb
new file mode 100644
index 0000000000..335e83f133
--- /dev/null
+++ b/packages/libmodplug/libmodplug_0.8.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Library for reading mod-like audio files."
+HOMEPAGE = "http://modplug-xmms.sf.net"
+SECTION = "libs"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/modplug-xmms/libmodplug-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
-- 
cgit v1.2.3


From 61b3dd67bad9d7ed1c27f30a9d9eafb03034b77f Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 11 Jun 2008 23:37:06 +0000
Subject: modplugplay 1.0 compile w/ newer gccs

---
 packages/libmodplug/libmodplug_0.8.bb   |  4 +++-
 packages/modplugplay/modplugplay_1.0.bb | 12 ++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/libmodplug/libmodplug_0.8.bb b/packages/libmodplug/libmodplug_0.8.bb
index 335e83f133..ead04a7cdb 100644
--- a/packages/libmodplug/libmodplug_0.8.bb
+++ b/packages/libmodplug/libmodplug_0.8.bb
@@ -7,6 +7,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/modplug-xmms/libmodplug-${PV}.tar.gz"
 
 inherit autotools pkgconfig
 
+# NOTE: autotools_stage_all does nothing here, we need to do it manually
 do_stage() {
-	autotools_stage_all
+	install -m 0644 ${S}/src/modplug.h ${STAGING_INCDIR}
+	oe_libinstall -C src -so libmodplug ${STAGING_LIBDIR}
 }
diff --git a/packages/modplugplay/modplugplay_1.0.bb b/packages/modplugplay/modplugplay_1.0.bb
index 45caf8d083..d91e2b3a97 100644
--- a/packages/modplugplay/modplugplay_1.0.bb
+++ b/packages/modplugplay/modplugplay_1.0.bb
@@ -1,20 +1,20 @@
-LICENSE = "GPL"
 DESCRIPTION = "modplugplay is a commandline mod-like audio file player."
+HOMEPAGE = "http://gnu.ethz.ch/linuks.mine.nu/modplugplay/"
+LICENSE = "GPL"
 SECTION = "console/multimedia"
 DEPENDS = "libmodplug"
 PR = "r1"
 
-SRC_URI = "http://www.linuks.mine.nu/modplugplay/modplugplay-${PV}.tar.gz"
+SRC_URI = "http://gnu.ethz.ch/linuks.mine.nu/modplugplay/modplugplay-${PV}.tar.gz"
 
 do_compile() {
 	${CC} -c ${CFLAGS} modplugplay.c -o modplugplay.o
-	${CC} -o modplugplay modplugplay.o ${LDFLAGS} -lmodplug
+	${CC} -o modplugplay modplugplay.o ${LDFLAGS} -lmodplug -lstdc++
 }
 
 do_install() {
 	install -d ${D}${bindir}
 	install -d ${D}${mandir}/man1
-        install -m 0755 modplugplay ${D}${bindir}/
-        install -m 0644 modplugplay.1 ${D}${mandir}/man1/
+	install -m 0755 modplugplay ${D}${bindir}/
+	install -m 0644 modplugplay.1 ${D}${mandir}/man1/
 }
-
-- 
cgit v1.2.3


From b954294f7a83cb53f5984ef75458658ac0607ef8 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 13 Jun 2008 16:49:38 +0000
Subject: beagle-board demo image: remove minimo

---
 packages/images/beagleboard-demo-image.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/images/beagleboard-demo-image.bb b/packages/images/beagleboard-demo-image.bb
index 4dde217cef..d4ac529b9d 100644
--- a/packages/images/beagleboard-demo-image.bb
+++ b/packages/images/beagleboard-demo-image.bb
@@ -21,7 +21,7 @@ IMAGE_INSTALL = "\
     xterm xmms epiphany-firefox-replacement \
     hicolor-icon-theme gnome-icon-theme \
     jaaa nmap iperf gnuplot \
-    abiword gnumeric gimp minimo \
+    abiword gnumeric gimp \
     powertop \
 "
 
-- 
cgit v1.2.3


From b728bd86d8387fa14eb040babd803261d1cf606f Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 13 Jun 2008 16:50:22 +0000
Subject: neuros osd base image: add base for neuros images

---
 packages/images/neuros-osd-base-image.bb | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 packages/images/neuros-osd-base-image.bb

diff --git a/packages/images/neuros-osd-base-image.bb b/packages/images/neuros-osd-base-image.bb
new file mode 100644
index 0000000000..ddf524574a
--- /dev/null
+++ b/packages/images/neuros-osd-base-image.bb
@@ -0,0 +1,18 @@
+# This image is intended to be the base for further neuros images
+
+# Select which Secure Shell Daemon gets included into the rootfs
+DISTRO_SSH_DAEMON ?= "dropbear"
+
+# Include a timestamp that initscripts can use to set the time to a 
+# more sane value after a reboot  
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
+
+IMAGE_INSTALL = "task-boot \
+                 util-linux-mount util-linux-umount \
+                 ${DISTRO_SSH_DAEMON} \
+	         "
+
+IMAGE_LINGUAS = ""
+
+inherit image
+
-- 
cgit v1.2.3


From eccd4cae07edcd7b60a34ce6d7ded38e4e8b8fe0 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 13 Jun 2008 17:10:46 +0000
Subject: angstrom 2008: bump dropbear since someone remove the version we were
 depending upon * why do people keep removing packages that distro have as
 PREFERRED_VERSION? Using grep is hardly rocket science!

---
 conf/distro/include/angstrom-2008-preferred-versions.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index fe7ca91ef2..2ebb06d5c0 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -2,6 +2,7 @@ PREFERRED_VERSION_automake-native = "1.10"
 PREFERRED_VERSION_busybox 	= "1.9.2"
 PREFERRED_VERSION_cairo		= "1.6.4"
 PREFERRED_VERSION_dbus 		= "1.2.1"
+PREFERRED_VERSION_dropbear      = "0.51"
 PREFERRED_VERSION_fontconfig	= "2.4.1"
 PREFERRED_VERSION_glib-2.0 	= "2.16.3"
 PREFERRED_VERSION_gst-pulse 	= "0.9.7"
@@ -18,4 +19,3 @@ PREFERRED_VERSION_pulseaudio 	= "0.9.10"
 PREFERRED_VERSION_tiff 		= "3.8.2+4.0.0beta2"
 PREFERRED_VERSION_udev 		= "118"
 PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
-PREFERRED_VERSION_dropbear 	= "0.50"
-- 
cgit v1.2.3


From 9a2c8e90f77325a2b21f41d7ac83a0f040167349 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 13 Jun 2008 17:22:17 +0000
Subject: gcc-cross-kernel.inc: depend on gcc-cross to get all the paths in
 staging/cross in the right place for the build

---
 packages/gcc/gcc-cross-kernel.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/gcc/gcc-cross-kernel.inc b/packages/gcc/gcc-cross-kernel.inc
index 59938f5500..7bca7d2bf5 100644
--- a/packages/gcc/gcc-cross-kernel.inc
+++ b/packages/gcc/gcc-cross-kernel.inc
@@ -1,6 +1,8 @@
 # Cut-down gcc for kernel builds
 # Only installs ${TARGET_PREFIX}gcc-${PV}, not ${TARGET_PREFIX}gcc.
 
+DEPENDS += "gcc-cross"
+
 PROVIDES = "virtual/${TARGET_PREFIX}gcc-${PV}"
 
 do_install () {
@@ -9,8 +11,6 @@ do_install () {
 
 do_stage () {
 	cd gcc
-	install -d ${CROSS_DIR}/bin/
-	install -d ${CROSS_DIR}/lib/
 	oe_runmake install-common install-headers install-libgcc
 	install -m 0755 xgcc ${CROSS_DIR}/bin/${TARGET_PREFIX}gcc-${PV}
 }
-- 
cgit v1.2.3


From 6b969e40156c42692f98157bf26982adb86da18c Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 13 Jun 2008 18:48:51 +0000
Subject: pulseaudio 0.9.10 add tiny patches from Poky

---
 packages/pulseaudio/pulseaudio-0.9.10/2113.diff    | 19 +++++++++
 packages/pulseaudio/pulseaudio-0.9.10/2114.diff    | 15 +++++++
 .../pulseaudio/pulseaudio-0.9.10/libtool2.patch    | 48 ++++++++++++++++++++++
 packages/pulseaudio/pulseaudio_0.9.10.bb           |  7 +++-
 4 files changed, 87 insertions(+), 2 deletions(-)
 create mode 100644 packages/pulseaudio/pulseaudio-0.9.10/2113.diff
 create mode 100644 packages/pulseaudio/pulseaudio-0.9.10/2114.diff
 create mode 100644 packages/pulseaudio/pulseaudio-0.9.10/libtool2.patch

diff --git a/packages/pulseaudio/pulseaudio-0.9.10/2113.diff b/packages/pulseaudio/pulseaudio-0.9.10/2113.diff
new file mode 100644
index 0000000000..666ed34ad3
--- /dev/null
+++ b/packages/pulseaudio/pulseaudio-0.9.10/2113.diff
@@ -0,0 +1,19 @@
+from upstream svn r2113
+
+Index: configure.ac
+===================================================================
+--- configure.ac	(wersja 2112)
++++ configure.ac	(wersja 2113)
+@@ -172,6 +172,12 @@
+ AC_SUBST(LIBLTDL)
+ AC_CONFIG_SUBDIRS(libltdl)
+ 
++old_LIBS=$LIBS
++LIBS="$LIBS $LIBLTDL"
++AC_CHECK_FUNCS([lt_dlmutex_register])
++LIBS=$old_LIBS
++AC_CHECK_TYPES([lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>])
++
+ if test "x$enable_ltdl_install" = "xno" && test "x$ac_cv_lib_ltdl_lt_dlinit" = "xno" ; then
+     AC_MSG_ERROR([[
+ 
diff --git a/packages/pulseaudio/pulseaudio-0.9.10/2114.diff b/packages/pulseaudio/pulseaudio-0.9.10/2114.diff
new file mode 100644
index 0000000000..cbd82eeb84
--- /dev/null
+++ b/packages/pulseaudio/pulseaudio-0.9.10/2114.diff
@@ -0,0 +1,15 @@
+from upstream svn r2114
+
+Index: configure.ac
+===================================================================
+--- configure.ac	(wersja 2113)
++++ configure.ac	(wersja 2114)
+@@ -176,7 +176,7 @@
+ LIBS="$LIBS $LIBLTDL"
+ AC_CHECK_FUNCS([lt_dlmutex_register])
+ LIBS=$old_LIBS
+-AC_CHECK_TYPES([lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>])
++AC_CHECK_TYPES([struct lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>])
+ 
+ if test "x$enable_ltdl_install" = "xno" && test "x$ac_cv_lib_ltdl_lt_dlinit" = "xno" ; then
+     AC_MSG_ERROR([[
diff --git a/packages/pulseaudio/pulseaudio-0.9.10/libtool2.patch b/packages/pulseaudio/pulseaudio-0.9.10/libtool2.patch
new file mode 100644
index 0000000000..9e9e5f55d3
--- /dev/null
+++ b/packages/pulseaudio/pulseaudio-0.9.10/libtool2.patch
@@ -0,0 +1,48 @@
+Tell where is libltdl from libtool - was needed to get it built with libtool 2.2.4
+
+---
+ configure.ac |   26 +++++++++++++++++++-------
+ 1 file changed, 19 insertions(+), 7 deletions(-)
+
+--- pulseaudio-0.9.10.orig/configure.ac
++++ pulseaudio-0.9.10/configure.ac
+@@ -242,20 +242,32 @@ if test $ret -eq 0 ; then
+ else
+     AC_MSG_RESULT([no])
+ fi
+ 
+ #### libtool stuff ####
+-
+-AC_LTDL_ENABLE_INSTALL
+-AC_LIBLTDL_INSTALLABLE
+-AC_LIBTOOL_DLOPEN
+-AC_LIBTOOL_WIN32_DLL
++LT_PREREQ([2.2])
++LT_INIT([dlopen win32-dll])
+ AC_PROG_LIBTOOL
+-AC_SUBST(LTDLINCL)
+-AC_SUBST(LIBLTDL)
++#AC_SUBST(LTDLINCL)
++#AC_SUBST(LIBLTDL)
+ AC_CONFIG_SUBDIRS(libltdl)
+ 
++AC_ARG_WITH(libltdl-libs,
++	[  --with-libltdl-libs=DIR  path to libltdl libs], libltdl_libs_prefix=$withval)
++if test x$libltdl_libs_prefix != x; then
++	LIBLTDL="-L${libltdl_libs_prefix}/libltdl.so -lltdl"
++fi
++AC_SUBST(LIBLTDL)
++
++AC_ARG_WITH(libltdl-includes,
++	[  --with-libltdl-includes=DIR  path to libltdl includes], libltdl_prefix=$withval)
++if test x$libltdl_prefix != x; then
++	LTDLINCL="-I${libltdl_prefix} ${libltdl_libs_prefix}/libltdl.so"
++fi
++AC_SUBST(LTDLINCL)
++
++
+ old_LIBS=$LIBS
+ LIBS="$LIBS $LIBLTDL"
+ AC_CHECK_FUNCS([lt_dlmutex_register])
+ LIBS=$old_LIBS
+ AC_CHECK_TYPES([struct lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>])
diff --git a/packages/pulseaudio/pulseaudio_0.9.10.bb b/packages/pulseaudio/pulseaudio_0.9.10.bb
index ef5ec03498..fe43a57cb0 100644
--- a/packages/pulseaudio/pulseaudio_0.9.10.bb
+++ b/packages/pulseaudio/pulseaudio_0.9.10.bb
@@ -1,16 +1,19 @@
 require pulseaudio.inc
 
 DEPENDS += "dbus"
-PR = "r2"
+PR = "r3"
 
-# this is not correct (see below)
 SRC_URI += "\
   file://disable-using-glibc-tls.patch;patch=1 \
   file://libpulsedsp-references-libpulsecore.patch;patch=1 \
   file://pa-drop-caps-returns-void.patch;patch=1 \
+#  file://libtool2.patch;patch=1 \
+  file://2113.diff;patch=1;pnum=0 \
+  file://2114.diff;patch=1;pnum=0 \
 "            
 
 # problems w/ pulseaudio 0.9.10 atm:
 # 1.) needs libltdl >= 1.5.24 (yes, any older version will NOT work at runtime)
 # 2.) doesn't build w/ glibc TLS support (hence patched out)
 # 3.) fails with hierarchical pthread stuff w/ gst-pulse (hence patched out)
+
-- 
cgit v1.2.3


From 15a7689077c7238e639975a30420d8dcff62e988 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 13 Jun 2008 20:09:56 +0000
Subject: add python-pyyaml, yaml support for Python

---
 packages/python/python-pyyaml_3.05.bb    | 10 ++++++++++
 packages/tasks/task-python-everything.bb |  7 ++++---
 2 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 packages/python/python-pyyaml_3.05.bb

diff --git a/packages/python/python-pyyaml_3.05.bb b/packages/python/python-pyyaml_3.05.bb
new file mode 100644
index 0000000000..7f86bbadf7
--- /dev/null
+++ b/packages/python/python-pyyaml_3.05.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Python support for YAML"
+HOMEPAGE = "http://www.pyyaml.org"
+SECTION = "devel/python"
+LICENSE = "MIT"
+PR = "ml0"
+
+SRC_URI = "http://pyyaml.org/download/pyyaml/PyYAML-3.05.tar.gz"
+S = "${WORKDIR}/PyYAML-${PV}"
+
+inherit distutils
diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb
index aebfed320f..669c94159b 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 = "ml29"
+PR = "ml30"
 
 RDEPENDS = "\
 		python-ao 		\
@@ -9,10 +9,8 @@ RDEPENDS = "\
 		python-constraint	\
 		python-dbus			\
 		python-dialog		\
-		python-pydirectfb		\
 		task-python-efl			\
 		task-python-efl-examples		\
-		python-pycurl		\
 		python-fam			\
 		python-fnorb		\
 		python-formencode	\
@@ -45,6 +43,8 @@ RDEPENDS = "\
 		python-pycairo		\
 		python-pychecker	\
 		python-pycodes		\
+		python-pycurl		\
+		python-pydirectfb	\
 		python-pyephem		\
 		python-pyfits		\
 		python-pyflakes		\
@@ -69,6 +69,7 @@ RDEPENDS = "\
 		python-pyweather	\
 		python-pyxml		\
 		python-pyxmlrpc		\
+		python-pyyaml		\
 		python-scapy		\
 		python-scons		\
 		python-setuptools	\
-- 
cgit v1.2.3


From 8fb9eed0a27802faf436e7c3e4e0b9d4b34e330a Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 13 Jun 2008 20:29:28 +0000
Subject: angstrom|om|jlime: go back to udev 115

---
 conf/distro/include/angstrom-2008-preferred-versions.inc | 2 +-
 conf/distro/include/preferred-om-2008-versions.inc       | 4 +++-
 conf/distro/jlime-donkey.conf                            | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 2ebb06d5c0..6ce83b996e 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -17,5 +17,5 @@ PREFERRED_VERSION_pkgconfig	= "0.23"
 PREFERRED_VERSION_pkgconfig-native = "0.23"
 PREFERRED_VERSION_pulseaudio 	= "0.9.10"
 PREFERRED_VERSION_tiff 		= "3.8.2+4.0.0beta2"
-PREFERRED_VERSION_udev 		= "118"
+PREFERRED_VERSION_udev 		= "115"
 PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index b86a6f90bb..63665cebcf 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -395,6 +395,8 @@ PREFERRED_VERSION_freeciv ?= "2.0.8"
 PREFERRED_VERSION_freedoom ?= "0.3"
 PREFERRED_VERSION_freedroid ?= "1.0.2"
 PREFERRED_VERSION_freenote ?= "1.12.0"
+PREFERRED_VERSION_freetype ?= "2.3.6"
+PREFERRED_VERSION_freetype-native ?= "2.3.6"
 PREFERRED_VERSION_freeze ?= "1.0"
 PREFERRED_VERSION_frodo ?= "4.2"
 PREFERRED_VERSION_froot ?= "0.7.1"
@@ -1880,7 +1882,7 @@ PREFERRED_VERSION_ubahnnav ?= "0.4.1"
 PREFERRED_VERSION_u-boot ?= "1.2.0"
 PREFERRED_VERSION_u-boot-omap2430sdp ?= "1.1.4"
 PREFERRED_VERSION_u-boot-utils ?= "1.2.0"
-PREFERRED_VERSION_udev ?= "118"
+PREFERRED_VERSION_udev ?= "115"
 PREFERRED_VERSION_udev-hostap-cs-vcc-workaround ?= "1.0"
 PREFERRED_VERSION_udhcp ?= "0.9.8"
 PREFERRED_VERSION_ufraw ?= "0.12"
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index b8c7dae22e..d516241dc4 100644
--- a/conf/distro/jlime-donkey.conf
+++ b/conf/distro/jlime-donkey.conf
@@ -69,7 +69,7 @@ PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
 #<>System-critical software with known working versions.
 #<>------------------------------------------------------------------<
 PREFERRED_VERSION_linux-jlime-jornada6xx = "2.6.24"
-PREFERRED_VERSION_udev = "118"
+PREFERRED_VERSION_udev = "115"
 PREFERRED_VERSION_busybox = "1.9.1"
 
 #<>------------------------------------------------------------------>
-- 
cgit v1.2.3


From 309ed93591708ad85192857c8625e8a93b8fb05c Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 13 Jun 2008 20:30:47 +0000
Subject: remove ezx.conf, use angstrom, generic, or openmoko

---
 conf/distro/ezx.conf | 82 ----------------------------------------------------
 1 file changed, 82 deletions(-)
 delete mode 100644 conf/distro/ezx.conf

diff --git a/conf/distro/ezx.conf b/conf/distro/ezx.conf
deleted file mode 100644
index 5b12b6f93b..0000000000
--- a/conf/distro/ezx.conf
+++ /dev/null
@@ -1,82 +0,0 @@
-#@--------------------------------------------------------------------
-#@TYPE: Distribution
-#@NAME: EZX <http://www.openezx.org>
-#@DESCRIPTION: A Linux Distribution for Motorola GSM phones
-#@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de>
-#@--------------------------------------------------------------------
-
-DISTRO_NAME = "OpenEZX"
-DISTRO_VERSION = ".dev-snapshot-${DATE}"
-DISTRO_TYPE = "debug"
-# DISTRO_TYPE = "release"
-
-INHERIT += " package_ipk debian"
-
-# libc setting:
-# specify whether you want a glibc or uclibc based distribution
-#TARGET_OS = "linux-uclibc"
-TARGET_OS = "linux"
-TARGET_FPU = "soft"
-
-#FEED_URIS += " \
-#           upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
-#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
-#            machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
-#               base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
-#               libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
-#            console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
-#              devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
-
-SRCDATE ?= "20060507"
-
-PREFERRED_PROVIDER_hostap-conf = "hostap-conf"
-
-KERNEL_CONSOLE = "ttyS0"
-#DEBUG_OPTIMIZATION = "-O -g3"
-#DEBUG_BUILD = "1"
-#INHIBIT_PACKAGE_STRIP = "1"
-
-# fix some iconv issues, needs to be commented out when doing uclibc builds
-PREFERRED_PROVIDER_virtual/libiconv = "glibc"
-PREFERRED_PROVIDER_virtual/libintl = "glibc"
-
-#
-# Base
-#
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-
-# ezx-kernel has problems with newer g++ atm.
-PREFERRED_VERSION_gcc ?= "3.4.4"
-PREFERRED_VERSION_gcc-cross ?= "3.4.4"
-PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
-PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1"
-PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
-
-#
-# Utilities
-#
-EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
-BOOTSTRAP_EXTRA_RDEPENDS += "ezx-gpiotool strace"
-
-#
-# Opie
-#
-QTE_VERSION = "2.3.10"
-OPIE_VERSION = "1.2.2"
-PALMTOP_USE_MULTITHREADED_QT = "yes"
-require conf/distro/include/preferred-opie-versions.inc
-
-#
-# GPE
-#
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
-require conf/distro/include/preferred-gpe-versions-2.8.inc
-
-#
-# E
-#
-require conf/distro/include/preferred-e-versions.inc
-
-- 
cgit v1.2.3


From b5bf3dd458c1f1eedb69e6a6c8b472a817ddf7a6 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 13 Jun 2008 20:31:58 +0000
Subject: udev-118: go back in time to udev-115 which seems to work slightly
 better on some Zaurus models Zaurus models: need to force downgrade, I don't
 want to raise PE here.

---
 packages/udev/udev-115/.mtn2git_empty              |   0
 packages/udev/udev-115/flags.patch                 |  56 +++++++
 packages/udev/udev-115/init                        | 171 +++++++++++++++++++++
 packages/udev/udev-115/local.rules                 |  31 ++++
 packages/udev/udev-115/permissions.rules           | 101 ++++++++++++
 packages/udev/udev-115/udev.rules                  | 102 ++++++++++++
 .../udevtrigger_add_devname_filtering.patch        | 104 +++++++++++++
 packages/udev/udev-115/vol_id_ld.patch             |  17 ++
 packages/udev/udev-118/.mtn2git_empty              |   0
 packages/udev/udev-118/flags.patch                 |  56 -------
 packages/udev/udev-118/init                        | 171 ---------------------
 packages/udev/udev-118/local.rules                 |  31 ----
 packages/udev/udev-118/permissions.rules           | 101 ------------
 packages/udev/udev-118/udev.rules                  | 102 ------------
 .../udevtrigger_add_devname_filtering.patch        | 104 -------------
 packages/udev/udev-118/vol_id_ld.patch             |  17 --
 packages/udev/udev.inc                             |  29 ++--
 packages/udev/udev_115.bb                          |  68 ++++++++
 packages/udev/udev_118.bb                          |  72 ---------
 19 files changed, 666 insertions(+), 667 deletions(-)
 create mode 100644 packages/udev/udev-115/.mtn2git_empty
 create mode 100644 packages/udev/udev-115/flags.patch
 create mode 100644 packages/udev/udev-115/init
 create mode 100644 packages/udev/udev-115/local.rules
 create mode 100644 packages/udev/udev-115/permissions.rules
 create mode 100644 packages/udev/udev-115/udev.rules
 create mode 100644 packages/udev/udev-115/udevtrigger_add_devname_filtering.patch
 create mode 100644 packages/udev/udev-115/vol_id_ld.patch
 delete mode 100644 packages/udev/udev-118/.mtn2git_empty
 delete mode 100644 packages/udev/udev-118/flags.patch
 delete mode 100644 packages/udev/udev-118/init
 delete mode 100644 packages/udev/udev-118/local.rules
 delete mode 100644 packages/udev/udev-118/permissions.rules
 delete mode 100644 packages/udev/udev-118/udev.rules
 delete mode 100644 packages/udev/udev-118/udevtrigger_add_devname_filtering.patch
 delete mode 100644 packages/udev/udev-118/vol_id_ld.patch
 create mode 100644 packages/udev/udev_115.bb
 delete mode 100644 packages/udev/udev_118.bb

diff --git a/packages/udev/udev-115/.mtn2git_empty b/packages/udev/udev-115/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/udev/udev-115/flags.patch b/packages/udev/udev-115/flags.patch
new file mode 100644
index 0000000000..13f20eb6a8
--- /dev/null
+++ b/packages/udev/udev-115/flags.patch
@@ -0,0 +1,56 @@
+---
+ Makefile |   16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+Index: udev-115/Makefile
+===================================================================
+--- udev-115.orig/Makefile	2007-08-24 01:29:54.000000000 +0200
++++ udev-115/Makefile	2007-09-20 17:21:45.000000000 +0200
+@@ -112,39 +112,39 @@
+ AR = $(CROSS_COMPILE)ar
+ RANLIB = $(CROSS_COMPILE)ranlib
+ 
+-CFLAGS		+= -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
++override CFLAGS	= -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
+ WARNINGS	= -Wstrict-prototypes -Wsign-compare -Wshadow \
+ 		  -Wchar-subscripts -Wmissing-declarations -Wnested-externs \
+ 		  -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes
+-CFLAGS		+= $(WARNINGS)
++override CFLAGS	+= $(WARNINGS)
+ 
+ LDFLAGS += -Wl,-warn-common,--as-needed
+ 
+ OPTFLAGS = -Os
+-CFLAGS += $(OPTFLAGS)
++override CFLAGS += $(OPTFLAGS)
+ 
+ ifeq ($(strip $(USE_LOG)),true)
+-	CFLAGS += -DUSE_LOG
++	override CFLAGS += -DUSE_LOG
+ endif
+ 
+ # if DEBUG is enabled, then we do not strip
+ ifeq ($(strip $(DEBUG)),true)
+-	CFLAGS  += -DDEBUG
++	override CFLAGS  += -DDEBUG
+ endif
+ 
+ ifeq ($(strip $(USE_GCOV)),true)
+-	CFLAGS += -fprofile-arcs -ftest-coverage
++	override CFLAGS += -fprofile-arcs -ftest-coverage
+ 	LDFLAGS += -fprofile-arcs
+ endif
+ 
+ ifeq ($(strip $(USE_SELINUX)),true)
+ 	UDEV_OBJS += udev_selinux.o
+ 	LIB_OBJS += -lselinux -lsepol
+-	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-115/init b/packages/udev/udev-115/init
new file mode 100644
index 0000000000..e44c675f2f
--- /dev/null
+++ b/packages/udev/udev-115/init
@@ -0,0 +1,171 @@
+#!/bin/sh -e
+### BEGIN INIT INFO
+# Provides:          udev
+# Required-Start:    mountvirtfs 
+# Required-Stop:     
+# Default-Start:     S
+# Default-Stop:
+# Short-Description: Start udevd, populate /dev and load drivers.
+### END INIT INFO
+
+# 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
+  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 udev /dev; then
+    umount /etc/udev
+    echo "udev requires tmpfs support, not started."
+    exit 1
+  fi
+
+  mkdir -p /dev/.static/dev
+  chmod 700 /dev/.static/
+  # The mount options in busybox are non-standard...
+  if test -x /bin/mount.util-linux
+  then
+    /bin/mount.util-linux --move /etc/udev /dev/.static/dev
+  elif test -x /bin/busybox
+  then
+    busybox mount -n -o move /etc/udev /dev/.static/dev
+  else
+    echo "udev requires an identifiable mount command, not started."
+    umount /etc/udev
+    umount /dev
+    exit 1
+  fi
+}
+
+make_extra_nodes() {
+  [ -c /dev/null ] || mknod -m 666 /dev/null c 1 3
+# I hate this hack.  -- Md
+  if [ "$(echo /lib/udev/devices/*)" != "/lib/udev/devices/*" ]; then
+    cp -a /lib/udev/devices/* /dev/
+  fi
+
+  [ -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 -m 600 /dev/$name $arg1 ;;
+      *) echo "links.conf: unparseable line ($type $name $arg1)" ;;
+    esac
+  done
+}
+
+supported_kernel() {
+  case "$(uname -r)" in
+    2.[012345].*|2.6.[0-9]|2.6.[0-9][!0-9]*) return 1 ;;
+    2.6.1[0134]|2.6.1[01234][!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
+}
+
+##############################################################################
+
+PATH="/sbin:/bin:/usr/bin"
+
+[ -x /sbin/udevd ] || exit 0
+
+# defaults
+tmpfs_size="2M"
+
+. /etc/udev/udev.conf
+
+if ! supported_kernel; then
+  echo "udev requires a kernel >= 2.6.15, 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
+
+##############################################################################
+
+# When modifying this script, do not forget that between the time that
+# the new /dev has been mounted and udevsynthesize has been run there will be
+# no /dev/null. This also means that you cannot use the "&" shell command.
+case "$1" in
+    start)
+    unmount_devpts
+    mount_tmpfs
+    [ -d /proc/1 ] || mount -n /proc
+
+    # /dev/null must be created before udevd is started
+    make_extra_nodes
+
+    # It's all over netlink now
+    if [ -e /proc/sys/kernel/hotplug ]; then
+        echo "" > /proc/sys/kernel/hotplug
+    fi
+
+    echo "Starting the hotplug events dispatcher" "udevd"
+    udevd --daemon
+
+    echo "Synthesizing the initial hotplug events"
+    udevtrigger
+    udevsettle
+    ;;
+
+    stop)
+    echo "Stopping the hotplug events dispatcher" "udevd"
+    start-stop-daemon --stop --name udevd --quiet
+    ;;
+
+    restart|force-reload)
+    echo "Stopping the hotplug events dispatcher" "udevd"
+    if start-stop-daemon --stop --name udevd --quiet ; then
+	exit 1
+    fi
+
+    echo "Starting the hotplug events dispatcher" "udevd"
+    udevd --daemon
+    ;;
+
+    *)
+    echo "Usage: /etc/init.d/udev {start|stop|restart|force-reload}"
+    exit 1
+    ;;
+esac
+
+exit 0
+
diff --git a/packages/udev/udev-115/local.rules b/packages/udev/udev-115/local.rules
new file mode 100644
index 0000000000..5b926018f5
--- /dev/null
+++ b/packages/udev/udev-115/local.rules
@@ -0,0 +1,31 @@
+# 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
+#
+
+# Media automounting
+SUBSYSTEM=="block", ACTION=="add"    RUN+="/etc/udev/scripts/mount.sh"
+SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh"
+
+# Handle network interface setup
+SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh"
+SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh"
+
+# The first rtc device is symlinked to /dev/rtc
+KERNEL=="rtc0", SYMLINK+="rtc"
+
+# Try and modprobe for drivers for new hardware
+ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
+
+# Create a symlink to any touchscreen input device
+SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
diff --git a/packages/udev/udev-115/permissions.rules b/packages/udev/udev-115/permissions.rules
new file mode 100644
index 0000000000..99e03b1036
--- /dev/null
+++ b/packages/udev/udev-115/permissions.rules
@@ -0,0 +1,101 @@
+ACTION!="add", GOTO="permissions_end"
+
+# workarounds needed to synchronize with sysfs
+DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*",	WAIT_FOR_SYSFS="bus"
+SUBSYSTEM=="scsi",				WAIT_FOR_SYSFS="ioerr_cnt"
+# only needed for kernels < 2.6.16
+SUBSYSTEM=="net",				WAIT_FOR_SYSFS="address"
+# only needed for kernels < 2.6.17
+SUBSYSTEM=="net", ENV{PHYSDEVDRIVER}=="?*",	WAIT_FOR_SYSFS="device/driver"
+
+# default permissions for block devices
+SUBSYSTEM=="block",				GROUP="disk"
+SUBSYSTEM=="block", SYSFS{removable}=="1",	GROUP="floppy"
+
+# IDE devices
+BUS=="ide", KERNEL=="hd[a-z]|pcd[0-9]*", DRIVER=="ide-cdrom|pcd", \
+	IMPORT{program}="cdrom_id --export $tempnode"
+ENV{ID_CDROM}=="?*",				GROUP="cdrom"
+BUS=="ide", KERNEL=="ht[0-9]*",			GROUP="tape"
+BUS=="ide", KERNEL=="nht[0-9]*",		GROUP="tape"
+
+# SCSI devices
+BUS=="scsi", SYSFS{type}=="1",			GROUP="tape"
+BUS=="scsi", SYSFS{type}=="5",			GROUP="cdrom"
+
+# USB devices
+BUS=="usb", KERNEL=="legousbtower*", MODE="0666"
+BUS=="usb", KERNEL=="lp[0-9]*",			GROUP="lp"
+
+# usbfs-like devices
+SUBSYSTEM=="usb_device",	MODE="0664"
+
+# iRiver music players
+SUBSYSTEM=="usb_device",			GROUP="plugdev", \
+	SYSFS{idVendor}=="4102", SYSFS{idProduct}=="10[01][135789]"
+
+# serial devices
+SUBSYSTEM=="tty",				GROUP="dialout"
+SUBSYSTEM=="capi",				GROUP="dialout"
+SUBSYSTEM=="slamr",				GROUP="dialout"
+SUBSYSTEM=="zaptel",				GROUP="dialout"
+
+# vc devices (all members of the tty subsystem)
+KERNEL=="ptmx",			MODE="0666",	GROUP="root"
+KERNEL=="console",		MODE="0600",	GROUP="root"
+KERNEL=="tty",			MODE="0666",	GROUP="root"
+KERNEL=="tty[0-9]*",				GROUP="root"
+KERNEL=="pty*",			MODE="0666",	GROUP="tty"
+
+# video devices
+SUBSYSTEM=="video4linux",			GROUP="video"
+SUBSYSTEM=="drm",				GROUP="video"
+SUBSYSTEM=="dvb",				GROUP="video"
+SUBSYSTEM=="em8300",				GROUP="video"
+SUBSYSTEM=="graphics",				GROUP="video"
+SUBSYSTEM=="nvidia",				GROUP="video"
+
+# misc devices
+KERNEL=="random",		MODE="0666"
+KERNEL=="urandom",		MODE="0666"
+KERNEL=="mem",			MODE="0640",	GROUP="kmem"
+KERNEL=="kmem",			MODE="0640",	GROUP="kmem"
+KERNEL=="port",			MODE="0640",	GROUP="kmem"
+KERNEL=="full",			MODE="0666"
+KERNEL=="null",			MODE="0666"
+KERNEL=="zero",			MODE="0666"
+KERNEL=="inotify",		MODE="0666"
+KERNEL=="sgi_fetchop",		MODE="0666"
+KERNEL=="sonypi",		MODE="0666"
+KERNEL=="agpgart",				GROUP="video"
+KERNEL=="rtc",					GROUP="audio"
+
+KERNEL=="cdemu[0-9]*",				GROUP="cdrom"
+KERNEL=="pktcdvd[0-9]*",			GROUP="cdrom"
+KERNEL=="pktcdvd",		MODE="0644"
+
+# printers and parallel devices
+SUBSYSTEM=="printer",				GROUP="lp"
+SUBSYSTEM=="ppdev",				GROUP="lp"
+KERNEL=="pt[0-9]*",				GROUP="tape"
+KERNEL=="pht[0-9]*",				GROUP="tape"
+
+# sound devices
+SUBSYSTEM=="sound",				GROUP="audio"
+
+# ieee1394 devices       
+KERNEL=="raw1394",				GROUP="disk"
+KERNEL=="dv1394*",				GROUP="video"
+KERNEL=="video1394*",				GROUP="video"
+
+# input devices
+KERNEL=="event[0-9]*", SYSFS{name}=="*dvb*|*DVB*|* IR *" \
+				MODE="0664",	GROUP="video"
+KERNEL=="js[0-9]*",		MODE="0664"
+
+# AOE character devices
+SUBSYSTEM=="aoe",		MODE="0220",	GROUP="disk"
+SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440"
+
+LABEL="permissions_end"
+
diff --git a/packages/udev/udev-115/udev.rules b/packages/udev/udev-115/udev.rules
new file mode 100644
index 0000000000..72be706e84
--- /dev/null
+++ b/packages/udev/udev-115/udev.rules
@@ -0,0 +1,102 @@
+# 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 'export X=%k; export X=$${X#usbdev}; export B=$${X%%%%.*}; export 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"
+
+KERNEL=="buzzer",		NAME="misc/buzzer"
+
+# 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"
+
+# Firmware Helper
+ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware_helper"
+
+# Samsung UARTS
+KERNEL=="s3c2410_serial[0-9]",   NAME="ttySAC%n"
+
diff --git a/packages/udev/udev-115/udevtrigger_add_devname_filtering.patch b/packages/udev/udev-115/udevtrigger_add_devname_filtering.patch
new file mode 100644
index 0000000000..87cafcaa9d
--- /dev/null
+++ b/packages/udev/udev-115/udevtrigger_add_devname_filtering.patch
@@ -0,0 +1,104 @@
+---
+ udevtrigger.c |   40 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 40 insertions(+)
+
+Index: udev-115/udevtrigger.c
+===================================================================
+--- udev-115.orig/udevtrigger.c	2007-08-24 01:29:54.000000000 +0200
++++ udev-115/udevtrigger.c	2007-09-21 18:45:28.000000000 +0200
+@@ -39,6 +39,8 @@
+ LIST_HEAD(device_list);
+ LIST_HEAD(filter_subsystem_match_list);
+ LIST_HEAD(filter_subsystem_nomatch_list);
++LIST_HEAD(filter_kernel_match_list);
++LIST_HEAD(filter_kernel_nomatch_list);
+ LIST_HEAD(filter_attr_match_list);
+ LIST_HEAD(filter_attr_nomatch_list);
+ 
+@@ -218,6 +220,26 @@
+ 	return 0;
+ }
+ 
++static int kernel_filtered(const char *kernel)
++{
++	struct name_entry *loop_name;
++
++	/* skip devices matching the prohibited kernel device names */
++	list_for_each_entry(loop_name, &filter_kernel_nomatch_list, node)
++		if (fnmatch(loop_name->name, kernel, 0) == 0)
++			return 1;
++
++	/* skip devices not matching the listed kernel device names */
++	if (!list_empty(&filter_kernel_match_list)) {
++		list_for_each_entry(loop_name, &filter_kernel_match_list, node)
++			if (fnmatch(loop_name->name, kernel, 0) == 0)
++				return 0;
++		return 1;
++	}
++
++	return 0;
++}
++
+ static int attr_filtered(const char *path)
+ {
+ 	struct name_entry *loop_name;
+@@ -296,6 +318,9 @@
+ 					if (dent2->d_name[0] == '.')
+ 						continue;
+ 
++					if (kernel_filtered(dent2->d_name))
++						continue;
++
+ 					strlcpy(dirname2, dirname, sizeof(dirname2));
+ 					strlcat(dirname2, "/", sizeof(dirname2));
+ 					strlcat(dirname2, dent2->d_name, sizeof(dirname2));
+@@ -402,6 +427,9 @@
+ 					if (!strcmp(dent2->d_name, "device"))
+ 						continue;
+ 
++					if (kernel_filtered(dent2->d_name))
++						continue;
++
+ 					strlcpy(dirname2, dirname, sizeof(dirname2));
+ 					strlcat(dirname2, "/", sizeof(dirname2));
+ 					strlcat(dirname2, dent2->d_name, sizeof(dirname2));
+@@ -458,6 +486,8 @@
+ 		{ "subsystem-nomatch", 1, NULL, 'S' },
+ 		{ "attr-match", 1, NULL, 'a' },
+ 		{ "attr-nomatch", 1, NULL, 'A' },
++		{ "kernel-match", 1, NULL, 'k' },
++		{ "kernel-nomatch", 1, NULL, 'K' },
+ 		{}
+ 	};
+ 
+@@ -496,6 +526,12 @@
+ 		case 'A':
+ 			name_list_add(&filter_attr_nomatch_list, optarg, 0);
+ 			break;
++		case 'k':
++			name_list_add(&filter_kernel_match_list, optarg, 0);
++			break;
++		case 'K':
++			name_list_add(&filter_kernel_nomatch_list, optarg, 0);
++			break;
+ 		case 'h':
+ 			printf("Usage: udevtrigger OPTIONS\n"
+ 			       "  --verbose                       print the list of devices while running\n"
+@@ -504,6 +540,8 @@
+ 			       "                                  marked as failed during a previous run\n"
+ 			       "  --subsystem-match=<subsystem>   trigger devices from a matching subystem\n"
+ 			       "  --subsystem-nomatch=<subsystem> exclude devices from a matching subystem\n"
++			       "  --kernel-match=<subsystem>      trigger devices from a matching kernel device name\n"
++			       "  --kernel-nomatch=<subsystem>    exclude devices from a matching kernel device name\n"
+ 			       "  --attr-match=<file[=<value>]>   trigger devices with a matching sysfs\n"
+ 			       "                                  attribute\n"
+ 			       "  --attr-nomatch=<file[=<value>]> exclude devices with a matching sysfs\n"
+@@ -549,6 +587,8 @@
+ exit:
+ 	name_list_cleanup(&filter_subsystem_match_list);
+ 	name_list_cleanup(&filter_subsystem_nomatch_list);
++	name_list_cleanup(&filter_kernel_match_list);
++	name_list_cleanup(&filter_kernel_nomatch_list);
+ 	name_list_cleanup(&filter_attr_match_list);
+ 	name_list_cleanup(&filter_attr_nomatch_list);
+ 
diff --git a/packages/udev/udev-115/vol_id_ld.patch b/packages/udev/udev-115/vol_id_ld.patch
new file mode 100644
index 0000000000..11126eef8d
--- /dev/null
+++ b/packages/udev/udev-115/vol_id_ld.patch
@@ -0,0 +1,17 @@
+---
+ extras/volume_id/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: udev-115/extras/volume_id/Makefile
+===================================================================
+--- udev-115.orig/extras/volume_id/Makefile	2007-09-20 18:17:59.000000000 +0200
++++ udev-115/extras/volume_id/Makefile	2007-09-20 18:18:08.000000000 +0200
+@@ -44,7 +44,7 @@
+ ifeq ($(strip $(VOLUME_ID_STATIC)),true)
+ 	$(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) lib/libvolume_id.a $(LIB_OBJS)
+ else
+-	$(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) -Llib -lvolume_id $(LIB_OBJS)
++	$(Q) $(LD) -Llib $(LDFLAGS) -o $@ $@.o $(LIBUDEV) -lvolume_id $(LIB_OBJS)
+ endif
+ 
+ # man pages
diff --git a/packages/udev/udev-118/.mtn2git_empty b/packages/udev/udev-118/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/udev/udev-118/flags.patch b/packages/udev/udev-118/flags.patch
deleted file mode 100644
index 13f20eb6a8..0000000000
--- a/packages/udev/udev-118/flags.patch
+++ /dev/null
@@ -1,56 +0,0 @@
----
- Makefile |   16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-Index: udev-115/Makefile
-===================================================================
---- udev-115.orig/Makefile	2007-08-24 01:29:54.000000000 +0200
-+++ udev-115/Makefile	2007-09-20 17:21:45.000000000 +0200
-@@ -112,39 +112,39 @@
- AR = $(CROSS_COMPILE)ar
- RANLIB = $(CROSS_COMPILE)ranlib
- 
--CFLAGS		+= -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
-+override CFLAGS	= -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
- WARNINGS	= -Wstrict-prototypes -Wsign-compare -Wshadow \
- 		  -Wchar-subscripts -Wmissing-declarations -Wnested-externs \
- 		  -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes
--CFLAGS		+= $(WARNINGS)
-+override CFLAGS	+= $(WARNINGS)
- 
- LDFLAGS += -Wl,-warn-common,--as-needed
- 
- OPTFLAGS = -Os
--CFLAGS += $(OPTFLAGS)
-+override CFLAGS += $(OPTFLAGS)
- 
- ifeq ($(strip $(USE_LOG)),true)
--	CFLAGS += -DUSE_LOG
-+	override CFLAGS += -DUSE_LOG
- endif
- 
- # if DEBUG is enabled, then we do not strip
- ifeq ($(strip $(DEBUG)),true)
--	CFLAGS  += -DDEBUG
-+	override CFLAGS  += -DDEBUG
- endif
- 
- ifeq ($(strip $(USE_GCOV)),true)
--	CFLAGS += -fprofile-arcs -ftest-coverage
-+	override CFLAGS += -fprofile-arcs -ftest-coverage
- 	LDFLAGS += -fprofile-arcs
- endif
- 
- ifeq ($(strip $(USE_SELINUX)),true)
- 	UDEV_OBJS += udev_selinux.o
- 	LIB_OBJS += -lselinux -lsepol
--	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-118/init b/packages/udev/udev-118/init
deleted file mode 100644
index e44c675f2f..0000000000
--- a/packages/udev/udev-118/init
+++ /dev/null
@@ -1,171 +0,0 @@
-#!/bin/sh -e
-### BEGIN INIT INFO
-# Provides:          udev
-# Required-Start:    mountvirtfs 
-# Required-Stop:     
-# Default-Start:     S
-# Default-Stop:
-# Short-Description: Start udevd, populate /dev and load drivers.
-### END INIT INFO
-
-# 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
-  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 udev /dev; then
-    umount /etc/udev
-    echo "udev requires tmpfs support, not started."
-    exit 1
-  fi
-
-  mkdir -p /dev/.static/dev
-  chmod 700 /dev/.static/
-  # The mount options in busybox are non-standard...
-  if test -x /bin/mount.util-linux
-  then
-    /bin/mount.util-linux --move /etc/udev /dev/.static/dev
-  elif test -x /bin/busybox
-  then
-    busybox mount -n -o move /etc/udev /dev/.static/dev
-  else
-    echo "udev requires an identifiable mount command, not started."
-    umount /etc/udev
-    umount /dev
-    exit 1
-  fi
-}
-
-make_extra_nodes() {
-  [ -c /dev/null ] || mknod -m 666 /dev/null c 1 3
-# I hate this hack.  -- Md
-  if [ "$(echo /lib/udev/devices/*)" != "/lib/udev/devices/*" ]; then
-    cp -a /lib/udev/devices/* /dev/
-  fi
-
-  [ -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 -m 600 /dev/$name $arg1 ;;
-      *) echo "links.conf: unparseable line ($type $name $arg1)" ;;
-    esac
-  done
-}
-
-supported_kernel() {
-  case "$(uname -r)" in
-    2.[012345].*|2.6.[0-9]|2.6.[0-9][!0-9]*) return 1 ;;
-    2.6.1[0134]|2.6.1[01234][!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
-}
-
-##############################################################################
-
-PATH="/sbin:/bin:/usr/bin"
-
-[ -x /sbin/udevd ] || exit 0
-
-# defaults
-tmpfs_size="2M"
-
-. /etc/udev/udev.conf
-
-if ! supported_kernel; then
-  echo "udev requires a kernel >= 2.6.15, 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
-
-##############################################################################
-
-# When modifying this script, do not forget that between the time that
-# the new /dev has been mounted and udevsynthesize has been run there will be
-# no /dev/null. This also means that you cannot use the "&" shell command.
-case "$1" in
-    start)
-    unmount_devpts
-    mount_tmpfs
-    [ -d /proc/1 ] || mount -n /proc
-
-    # /dev/null must be created before udevd is started
-    make_extra_nodes
-
-    # It's all over netlink now
-    if [ -e /proc/sys/kernel/hotplug ]; then
-        echo "" > /proc/sys/kernel/hotplug
-    fi
-
-    echo "Starting the hotplug events dispatcher" "udevd"
-    udevd --daemon
-
-    echo "Synthesizing the initial hotplug events"
-    udevtrigger
-    udevsettle
-    ;;
-
-    stop)
-    echo "Stopping the hotplug events dispatcher" "udevd"
-    start-stop-daemon --stop --name udevd --quiet
-    ;;
-
-    restart|force-reload)
-    echo "Stopping the hotplug events dispatcher" "udevd"
-    if start-stop-daemon --stop --name udevd --quiet ; then
-	exit 1
-    fi
-
-    echo "Starting the hotplug events dispatcher" "udevd"
-    udevd --daemon
-    ;;
-
-    *)
-    echo "Usage: /etc/init.d/udev {start|stop|restart|force-reload}"
-    exit 1
-    ;;
-esac
-
-exit 0
-
diff --git a/packages/udev/udev-118/local.rules b/packages/udev/udev-118/local.rules
deleted file mode 100644
index 5b926018f5..0000000000
--- a/packages/udev/udev-118/local.rules
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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
-#
-
-# Media automounting
-SUBSYSTEM=="block", ACTION=="add"    RUN+="/etc/udev/scripts/mount.sh"
-SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh"
-
-# Handle network interface setup
-SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh"
-SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh"
-
-# The first rtc device is symlinked to /dev/rtc
-KERNEL=="rtc0", SYMLINK+="rtc"
-
-# Try and modprobe for drivers for new hardware
-ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
-
-# Create a symlink to any touchscreen input device
-SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
diff --git a/packages/udev/udev-118/permissions.rules b/packages/udev/udev-118/permissions.rules
deleted file mode 100644
index 99e03b1036..0000000000
--- a/packages/udev/udev-118/permissions.rules
+++ /dev/null
@@ -1,101 +0,0 @@
-ACTION!="add", GOTO="permissions_end"
-
-# workarounds needed to synchronize with sysfs
-DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*",	WAIT_FOR_SYSFS="bus"
-SUBSYSTEM=="scsi",				WAIT_FOR_SYSFS="ioerr_cnt"
-# only needed for kernels < 2.6.16
-SUBSYSTEM=="net",				WAIT_FOR_SYSFS="address"
-# only needed for kernels < 2.6.17
-SUBSYSTEM=="net", ENV{PHYSDEVDRIVER}=="?*",	WAIT_FOR_SYSFS="device/driver"
-
-# default permissions for block devices
-SUBSYSTEM=="block",				GROUP="disk"
-SUBSYSTEM=="block", SYSFS{removable}=="1",	GROUP="floppy"
-
-# IDE devices
-BUS=="ide", KERNEL=="hd[a-z]|pcd[0-9]*", DRIVER=="ide-cdrom|pcd", \
-	IMPORT{program}="cdrom_id --export $tempnode"
-ENV{ID_CDROM}=="?*",				GROUP="cdrom"
-BUS=="ide", KERNEL=="ht[0-9]*",			GROUP="tape"
-BUS=="ide", KERNEL=="nht[0-9]*",		GROUP="tape"
-
-# SCSI devices
-BUS=="scsi", SYSFS{type}=="1",			GROUP="tape"
-BUS=="scsi", SYSFS{type}=="5",			GROUP="cdrom"
-
-# USB devices
-BUS=="usb", KERNEL=="legousbtower*", MODE="0666"
-BUS=="usb", KERNEL=="lp[0-9]*",			GROUP="lp"
-
-# usbfs-like devices
-SUBSYSTEM=="usb_device",	MODE="0664"
-
-# iRiver music players
-SUBSYSTEM=="usb_device",			GROUP="plugdev", \
-	SYSFS{idVendor}=="4102", SYSFS{idProduct}=="10[01][135789]"
-
-# serial devices
-SUBSYSTEM=="tty",				GROUP="dialout"
-SUBSYSTEM=="capi",				GROUP="dialout"
-SUBSYSTEM=="slamr",				GROUP="dialout"
-SUBSYSTEM=="zaptel",				GROUP="dialout"
-
-# vc devices (all members of the tty subsystem)
-KERNEL=="ptmx",			MODE="0666",	GROUP="root"
-KERNEL=="console",		MODE="0600",	GROUP="root"
-KERNEL=="tty",			MODE="0666",	GROUP="root"
-KERNEL=="tty[0-9]*",				GROUP="root"
-KERNEL=="pty*",			MODE="0666",	GROUP="tty"
-
-# video devices
-SUBSYSTEM=="video4linux",			GROUP="video"
-SUBSYSTEM=="drm",				GROUP="video"
-SUBSYSTEM=="dvb",				GROUP="video"
-SUBSYSTEM=="em8300",				GROUP="video"
-SUBSYSTEM=="graphics",				GROUP="video"
-SUBSYSTEM=="nvidia",				GROUP="video"
-
-# misc devices
-KERNEL=="random",		MODE="0666"
-KERNEL=="urandom",		MODE="0666"
-KERNEL=="mem",			MODE="0640",	GROUP="kmem"
-KERNEL=="kmem",			MODE="0640",	GROUP="kmem"
-KERNEL=="port",			MODE="0640",	GROUP="kmem"
-KERNEL=="full",			MODE="0666"
-KERNEL=="null",			MODE="0666"
-KERNEL=="zero",			MODE="0666"
-KERNEL=="inotify",		MODE="0666"
-KERNEL=="sgi_fetchop",		MODE="0666"
-KERNEL=="sonypi",		MODE="0666"
-KERNEL=="agpgart",				GROUP="video"
-KERNEL=="rtc",					GROUP="audio"
-
-KERNEL=="cdemu[0-9]*",				GROUP="cdrom"
-KERNEL=="pktcdvd[0-9]*",			GROUP="cdrom"
-KERNEL=="pktcdvd",		MODE="0644"
-
-# printers and parallel devices
-SUBSYSTEM=="printer",				GROUP="lp"
-SUBSYSTEM=="ppdev",				GROUP="lp"
-KERNEL=="pt[0-9]*",				GROUP="tape"
-KERNEL=="pht[0-9]*",				GROUP="tape"
-
-# sound devices
-SUBSYSTEM=="sound",				GROUP="audio"
-
-# ieee1394 devices       
-KERNEL=="raw1394",				GROUP="disk"
-KERNEL=="dv1394*",				GROUP="video"
-KERNEL=="video1394*",				GROUP="video"
-
-# input devices
-KERNEL=="event[0-9]*", SYSFS{name}=="*dvb*|*DVB*|* IR *" \
-				MODE="0664",	GROUP="video"
-KERNEL=="js[0-9]*",		MODE="0664"
-
-# AOE character devices
-SUBSYSTEM=="aoe",		MODE="0220",	GROUP="disk"
-SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440"
-
-LABEL="permissions_end"
-
diff --git a/packages/udev/udev-118/udev.rules b/packages/udev/udev-118/udev.rules
deleted file mode 100644
index 72be706e84..0000000000
--- a/packages/udev/udev-118/udev.rules
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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 'export X=%k; export X=$${X#usbdev}; export B=$${X%%%%.*}; export 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"
-
-KERNEL=="buzzer",		NAME="misc/buzzer"
-
-# 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"
-
-# Firmware Helper
-ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware_helper"
-
-# Samsung UARTS
-KERNEL=="s3c2410_serial[0-9]",   NAME="ttySAC%n"
-
diff --git a/packages/udev/udev-118/udevtrigger_add_devname_filtering.patch b/packages/udev/udev-118/udevtrigger_add_devname_filtering.patch
deleted file mode 100644
index 87cafcaa9d..0000000000
--- a/packages/udev/udev-118/udevtrigger_add_devname_filtering.patch
+++ /dev/null
@@ -1,104 +0,0 @@
----
- udevtrigger.c |   40 ++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 40 insertions(+)
-
-Index: udev-115/udevtrigger.c
-===================================================================
---- udev-115.orig/udevtrigger.c	2007-08-24 01:29:54.000000000 +0200
-+++ udev-115/udevtrigger.c	2007-09-21 18:45:28.000000000 +0200
-@@ -39,6 +39,8 @@
- LIST_HEAD(device_list);
- LIST_HEAD(filter_subsystem_match_list);
- LIST_HEAD(filter_subsystem_nomatch_list);
-+LIST_HEAD(filter_kernel_match_list);
-+LIST_HEAD(filter_kernel_nomatch_list);
- LIST_HEAD(filter_attr_match_list);
- LIST_HEAD(filter_attr_nomatch_list);
- 
-@@ -218,6 +220,26 @@
- 	return 0;
- }
- 
-+static int kernel_filtered(const char *kernel)
-+{
-+	struct name_entry *loop_name;
-+
-+	/* skip devices matching the prohibited kernel device names */
-+	list_for_each_entry(loop_name, &filter_kernel_nomatch_list, node)
-+		if (fnmatch(loop_name->name, kernel, 0) == 0)
-+			return 1;
-+
-+	/* skip devices not matching the listed kernel device names */
-+	if (!list_empty(&filter_kernel_match_list)) {
-+		list_for_each_entry(loop_name, &filter_kernel_match_list, node)
-+			if (fnmatch(loop_name->name, kernel, 0) == 0)
-+				return 0;
-+		return 1;
-+	}
-+
-+	return 0;
-+}
-+
- static int attr_filtered(const char *path)
- {
- 	struct name_entry *loop_name;
-@@ -296,6 +318,9 @@
- 					if (dent2->d_name[0] == '.')
- 						continue;
- 
-+					if (kernel_filtered(dent2->d_name))
-+						continue;
-+
- 					strlcpy(dirname2, dirname, sizeof(dirname2));
- 					strlcat(dirname2, "/", sizeof(dirname2));
- 					strlcat(dirname2, dent2->d_name, sizeof(dirname2));
-@@ -402,6 +427,9 @@
- 					if (!strcmp(dent2->d_name, "device"))
- 						continue;
- 
-+					if (kernel_filtered(dent2->d_name))
-+						continue;
-+
- 					strlcpy(dirname2, dirname, sizeof(dirname2));
- 					strlcat(dirname2, "/", sizeof(dirname2));
- 					strlcat(dirname2, dent2->d_name, sizeof(dirname2));
-@@ -458,6 +486,8 @@
- 		{ "subsystem-nomatch", 1, NULL, 'S' },
- 		{ "attr-match", 1, NULL, 'a' },
- 		{ "attr-nomatch", 1, NULL, 'A' },
-+		{ "kernel-match", 1, NULL, 'k' },
-+		{ "kernel-nomatch", 1, NULL, 'K' },
- 		{}
- 	};
- 
-@@ -496,6 +526,12 @@
- 		case 'A':
- 			name_list_add(&filter_attr_nomatch_list, optarg, 0);
- 			break;
-+		case 'k':
-+			name_list_add(&filter_kernel_match_list, optarg, 0);
-+			break;
-+		case 'K':
-+			name_list_add(&filter_kernel_nomatch_list, optarg, 0);
-+			break;
- 		case 'h':
- 			printf("Usage: udevtrigger OPTIONS\n"
- 			       "  --verbose                       print the list of devices while running\n"
-@@ -504,6 +540,8 @@
- 			       "                                  marked as failed during a previous run\n"
- 			       "  --subsystem-match=<subsystem>   trigger devices from a matching subystem\n"
- 			       "  --subsystem-nomatch=<subsystem> exclude devices from a matching subystem\n"
-+			       "  --kernel-match=<subsystem>      trigger devices from a matching kernel device name\n"
-+			       "  --kernel-nomatch=<subsystem>    exclude devices from a matching kernel device name\n"
- 			       "  --attr-match=<file[=<value>]>   trigger devices with a matching sysfs\n"
- 			       "                                  attribute\n"
- 			       "  --attr-nomatch=<file[=<value>]> exclude devices with a matching sysfs\n"
-@@ -549,6 +587,8 @@
- exit:
- 	name_list_cleanup(&filter_subsystem_match_list);
- 	name_list_cleanup(&filter_subsystem_nomatch_list);
-+	name_list_cleanup(&filter_kernel_match_list);
-+	name_list_cleanup(&filter_kernel_nomatch_list);
- 	name_list_cleanup(&filter_attr_match_list);
- 	name_list_cleanup(&filter_attr_nomatch_list);
- 
diff --git a/packages/udev/udev-118/vol_id_ld.patch b/packages/udev/udev-118/vol_id_ld.patch
deleted file mode 100644
index 11126eef8d..0000000000
--- a/packages/udev/udev-118/vol_id_ld.patch
+++ /dev/null
@@ -1,17 +0,0 @@
----
- extras/volume_id/Makefile |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: udev-115/extras/volume_id/Makefile
-===================================================================
---- udev-115.orig/extras/volume_id/Makefile	2007-09-20 18:17:59.000000000 +0200
-+++ udev-115/extras/volume_id/Makefile	2007-09-20 18:18:08.000000000 +0200
-@@ -44,7 +44,7 @@
- ifeq ($(strip $(VOLUME_ID_STATIC)),true)
- 	$(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) lib/libvolume_id.a $(LIB_OBJS)
- else
--	$(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) -Llib -lvolume_id $(LIB_OBJS)
-+	$(Q) $(LD) -Llib $(LDFLAGS) -o $@ $@.o $(LIBUDEV) -lvolume_id $(LIB_OBJS)
- endif
- 
- # man pages
diff --git a/packages/udev/udev.inc b/packages/udev/udev.inc
index d04b63e1e0..87361aef8a 100644
--- a/packages/udev/udev.inc
+++ b/packages/udev/udev.inc
@@ -2,15 +2,16 @@ DESCRIPTION ?= "udev is a program which dynamically creates and removes device n
 /dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel."
 LICENSE = "GPL"
 
-SRC_URI += " \
-	   file://udev.rules \
-	   file://devfs-udev.rules \
-	   file://links.conf \
-           file://permissions.rules \
-	   file://mount.sh \
-	   file://network.sh \
-	   file://local.rules \
-           file://init"
+SRC_URI += "\
+  file://udev.rules \
+  file://devfs-udev.rules \
+  file://links.conf \
+  file://permissions.rules \
+  file://mount.sh \
+  file://network.sh \
+  file://local.rules \
+  file://init \
+"
 
 inherit update-rc.d autotools pkgconfig
 
@@ -37,9 +38,11 @@ EXTRA_OEMAKE = "-e \
 		'STRIP=echo'"
 
 do_install () {
-	install -d ${D}${usrsbindir} \
-		   ${D}${sbindir}
+	install -d ${D}${usrsbindir}
+	install -d ${D}${sbindir}
+
 	oe_runmake 'DESTDIR=${D}' INSTALL=install install
+
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
 
@@ -60,8 +63,8 @@ do_install () {
 
 do_stage () {
 	autotools_stage_all
-        install -m 0644 ${S}/extras/volume_id/lib/libvolume_id.h ${STAGING_INCDIR}
-        oe_libinstall -C extras/volume_id/lib -so libvolume_id ${STAGING_LIBDIR}
+	install -m 0644 ${S}/extras/volume_id/lib/libvolume_id.h ${STAGING_INCDIR}
+	oe_libinstall -C extras/volume_id/lib -so libvolume_id ${STAGING_LIBDIR}
 }
 
 PACKAGES =+ "udev-utils libvolume-id libvolume-id-dev"
diff --git a/packages/udev/udev_115.bb b/packages/udev/udev_115.bb
new file mode 100644
index 0000000000..2e68b017ca
--- /dev/null
+++ b/packages/udev/udev_115.bb
@@ -0,0 +1,68 @@
+DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
+/dev/, handles hotplug events and loads drivers at boot time. It replaces \
+the hotplug package and requires a kernel not older than 2.6.12."
+RPROVIDES_${PN} = "hotplug"
+PR = "r0"
+
+SRC_URI = "\
+ http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
+ file://flags.patch;patch=1 \
+ file://vol_id_ld.patch;patch=1 \
+ file://udevtrigger_add_devname_filtering.patch;patch=1 \
+ file://noasmlinkage.patch;patch=1 \
+ file://mount.blacklist \
+"
+
+require udev.inc
+
+INITSCRIPT_PARAMS = "start 03 S ."
+
+FILES_${PN} += "${base_libdir}/udev/*"
+FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
+UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/"
+EXTRA_OEMAKE += "libudevdir=/lib/udev libdir=${base_libdir} prefix="
+
+do_install () {
+	install -d ${D}${usrsbindir}
+	install -d ${D}${sysconfdir}
+	install -d ${D}${sbindir}
+
+	oe_runmake 'DESTDIR=${D}' INSTALL=install install
+
+	install -d ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
+
+	install -d ${D}${sysconfdir}/udev/rules.d/
+
+	install -m 0644 ${WORKDIR}/mount.blacklist     ${D}${sysconfdir}/udev/
+	install -m 0644 ${WORKDIR}/local.rules         ${D}${sysconfdir}/udev/rules.d/local.rules
+	install -m 0644 ${WORKDIR}/permissions.rules   ${D}${sysconfdir}/udev/rules.d/permissions.rules
+	install -m 0644 ${WORKDIR}/udev.rules          ${D}${sysconfdir}/udev/rules.d/udev.rules
+	install -m 0644 ${WORKDIR}/links.conf          ${D}${sysconfdir}/udev/links.conf
+	if [ "${UDEV_DEVFS_RULES}" = "1" ]; then
+		install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules
+	fi
+
+	install -d ${D}${sysconfdir}/udev/scripts/
+
+	install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh
+	install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts
+
+	install -d ${D}${base_libdir}/udev/
+}
+
+pkg_postinst_append() {
+
+       # Add the root partition to mount.blacklist to avoid a bug in the auto-mounter,
+       # causing confusion with fsck on boot
+
+        while read dev mp fs junk
+        do
+                if test "$mp" = "/"
+                then
+                        root_partition="$dev"
+                        echo "$root_partition" >> ${sysconfdir}/udev/mount.blacklist
+                fi
+        done < ${sysconfdir}/fstab
+}
+
diff --git a/packages/udev/udev_118.bb b/packages/udev/udev_118.bb
deleted file mode 100644
index 20fef83d74..0000000000
--- a/packages/udev/udev_118.bb
+++ /dev/null
@@ -1,72 +0,0 @@
-DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
-/dev/, handles hotplug events and loads drivers at boot time. It replaces \
-the hotplug package and requires a kernel not older than 2.6.12."
-RPROVIDES_${PN} = "hotplug"
-
-PR = "r3"
-
-DEFAULT_PREFERENCE = "-118"
-
-SRC_URI = "\
- http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
- file://flags.patch;patch=1 \
- file://vol_id_ld.patch;patch=1 \
- file://udevtrigger_add_devname_filtering.patch;patch=1 \
- file://mount.blacklist \
-"
-
-require udev.inc
-
-INITSCRIPT_PARAMS = "start 03 S ."
-
-FILES_${PN} += "${base_libdir}/udev/*"
-FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
-UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/"
-EXTRA_OEMAKE += "libudevdir=/lib/udev libdir=${base_libdir} prefix="
-
-do_compile_prepend() {
-	sed -i s,asmlinkage,, *.c
-}
-
-do_install () {
-	install -d ${D}${usrsbindir} \
-                   ${D}${sysconfdir} \
-                   ${D}${sbindir}
-	oe_runmake 'DESTDIR=${D}' INSTALL=install install
-	install -d ${D}${sysconfdir}/init.d
-	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
-
-	install -d ${D}${sysconfdir}/udev/rules.d/
-
-	install -m 0644 ${WORKDIR}/mount.blacklist     ${D}${sysconfdir}/udev/
-	install -m 0644 ${WORKDIR}/local.rules         ${D}${sysconfdir}/udev/rules.d/local.rules
-	install -m 0644 ${WORKDIR}/permissions.rules   ${D}${sysconfdir}/udev/rules.d/permissions.rules
-	install -m 0644 ${WORKDIR}/udev.rules          ${D}${sysconfdir}/udev/rules.d/udev.rules
-	install -m 0644 ${WORKDIR}/links.conf          ${D}${sysconfdir}/udev/links.conf
-	if [ "${UDEV_DEVFS_RULES}" = "1" ]; then
-		install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules
-	fi
-
-	install -d ${D}${sysconfdir}/udev/scripts/
-
-	install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh
-	install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts
-
-	install -d ${D}${base_libdir}/udev/
-}
-
-pkg_postinst_append() {
-
-       # Add the root partition to mount.blacklist to avoid a bug in the auto-mounter,
-       # causing confusion with fsck on boot
-
-        while read dev mp fs junk
-        do
-                if test "$mp" = "/"
-                then
-                        root_partition="$dev"
-                        echo "$root_partition" >> ${sysconfdir}/udev/mount.blacklist
-                fi
-        done < ${sysconfdir}/fstab
-}
-
-- 
cgit v1.2.3


From e458e31a792e1ffae09b971e765094b345f3dcd8 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 14 Jun 2008 08:38:15 +0000
Subject: disapproval of revision 'a41ea1ad763bed9b2597a75fd878c89397de75e0'

---
 packages/udev/udev-115/.mtn2git_empty              |   0
 packages/udev/udev-115/flags.patch                 |  56 -------
 packages/udev/udev-115/init                        | 171 ---------------------
 packages/udev/udev-115/local.rules                 |  31 ----
 packages/udev/udev-115/permissions.rules           | 101 ------------
 packages/udev/udev-115/udev.rules                  | 102 ------------
 .../udevtrigger_add_devname_filtering.patch        | 104 -------------
 packages/udev/udev-115/vol_id_ld.patch             |  17 --
 packages/udev/udev-118/.mtn2git_empty              |   0
 packages/udev/udev-118/flags.patch                 |  56 +++++++
 packages/udev/udev-118/init                        | 171 +++++++++++++++++++++
 packages/udev/udev-118/local.rules                 |  31 ++++
 packages/udev/udev-118/permissions.rules           | 101 ++++++++++++
 packages/udev/udev-118/udev.rules                  | 102 ++++++++++++
 .../udevtrigger_add_devname_filtering.patch        | 104 +++++++++++++
 packages/udev/udev-118/vol_id_ld.patch             |  17 ++
 packages/udev/udev.inc                             |  29 ++--
 packages/udev/udev_115.bb                          |  68 --------
 packages/udev/udev_118.bb                          |  72 +++++++++
 19 files changed, 667 insertions(+), 666 deletions(-)
 delete mode 100644 packages/udev/udev-115/.mtn2git_empty
 delete mode 100644 packages/udev/udev-115/flags.patch
 delete mode 100644 packages/udev/udev-115/init
 delete mode 100644 packages/udev/udev-115/local.rules
 delete mode 100644 packages/udev/udev-115/permissions.rules
 delete mode 100644 packages/udev/udev-115/udev.rules
 delete mode 100644 packages/udev/udev-115/udevtrigger_add_devname_filtering.patch
 delete mode 100644 packages/udev/udev-115/vol_id_ld.patch
 create mode 100644 packages/udev/udev-118/.mtn2git_empty
 create mode 100644 packages/udev/udev-118/flags.patch
 create mode 100644 packages/udev/udev-118/init
 create mode 100644 packages/udev/udev-118/local.rules
 create mode 100644 packages/udev/udev-118/permissions.rules
 create mode 100644 packages/udev/udev-118/udev.rules
 create mode 100644 packages/udev/udev-118/udevtrigger_add_devname_filtering.patch
 create mode 100644 packages/udev/udev-118/vol_id_ld.patch
 delete mode 100644 packages/udev/udev_115.bb
 create mode 100644 packages/udev/udev_118.bb

diff --git a/packages/udev/udev-115/.mtn2git_empty b/packages/udev/udev-115/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/udev/udev-115/flags.patch b/packages/udev/udev-115/flags.patch
deleted file mode 100644
index 13f20eb6a8..0000000000
--- a/packages/udev/udev-115/flags.patch
+++ /dev/null
@@ -1,56 +0,0 @@
----
- Makefile |   16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-Index: udev-115/Makefile
-===================================================================
---- udev-115.orig/Makefile	2007-08-24 01:29:54.000000000 +0200
-+++ udev-115/Makefile	2007-09-20 17:21:45.000000000 +0200
-@@ -112,39 +112,39 @@
- AR = $(CROSS_COMPILE)ar
- RANLIB = $(CROSS_COMPILE)ranlib
- 
--CFLAGS		+= -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
-+override CFLAGS	= -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
- WARNINGS	= -Wstrict-prototypes -Wsign-compare -Wshadow \
- 		  -Wchar-subscripts -Wmissing-declarations -Wnested-externs \
- 		  -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes
--CFLAGS		+= $(WARNINGS)
-+override CFLAGS	+= $(WARNINGS)
- 
- LDFLAGS += -Wl,-warn-common,--as-needed
- 
- OPTFLAGS = -Os
--CFLAGS += $(OPTFLAGS)
-+override CFLAGS += $(OPTFLAGS)
- 
- ifeq ($(strip $(USE_LOG)),true)
--	CFLAGS += -DUSE_LOG
-+	override CFLAGS += -DUSE_LOG
- endif
- 
- # if DEBUG is enabled, then we do not strip
- ifeq ($(strip $(DEBUG)),true)
--	CFLAGS  += -DDEBUG
-+	override CFLAGS  += -DDEBUG
- endif
- 
- ifeq ($(strip $(USE_GCOV)),true)
--	CFLAGS += -fprofile-arcs -ftest-coverage
-+	override CFLAGS += -fprofile-arcs -ftest-coverage
- 	LDFLAGS += -fprofile-arcs
- endif
- 
- ifeq ($(strip $(USE_SELINUX)),true)
- 	UDEV_OBJS += udev_selinux.o
- 	LIB_OBJS += -lselinux -lsepol
--	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-115/init b/packages/udev/udev-115/init
deleted file mode 100644
index e44c675f2f..0000000000
--- a/packages/udev/udev-115/init
+++ /dev/null
@@ -1,171 +0,0 @@
-#!/bin/sh -e
-### BEGIN INIT INFO
-# Provides:          udev
-# Required-Start:    mountvirtfs 
-# Required-Stop:     
-# Default-Start:     S
-# Default-Stop:
-# Short-Description: Start udevd, populate /dev and load drivers.
-### END INIT INFO
-
-# 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
-  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 udev /dev; then
-    umount /etc/udev
-    echo "udev requires tmpfs support, not started."
-    exit 1
-  fi
-
-  mkdir -p /dev/.static/dev
-  chmod 700 /dev/.static/
-  # The mount options in busybox are non-standard...
-  if test -x /bin/mount.util-linux
-  then
-    /bin/mount.util-linux --move /etc/udev /dev/.static/dev
-  elif test -x /bin/busybox
-  then
-    busybox mount -n -o move /etc/udev /dev/.static/dev
-  else
-    echo "udev requires an identifiable mount command, not started."
-    umount /etc/udev
-    umount /dev
-    exit 1
-  fi
-}
-
-make_extra_nodes() {
-  [ -c /dev/null ] || mknod -m 666 /dev/null c 1 3
-# I hate this hack.  -- Md
-  if [ "$(echo /lib/udev/devices/*)" != "/lib/udev/devices/*" ]; then
-    cp -a /lib/udev/devices/* /dev/
-  fi
-
-  [ -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 -m 600 /dev/$name $arg1 ;;
-      *) echo "links.conf: unparseable line ($type $name $arg1)" ;;
-    esac
-  done
-}
-
-supported_kernel() {
-  case "$(uname -r)" in
-    2.[012345].*|2.6.[0-9]|2.6.[0-9][!0-9]*) return 1 ;;
-    2.6.1[0134]|2.6.1[01234][!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
-}
-
-##############################################################################
-
-PATH="/sbin:/bin:/usr/bin"
-
-[ -x /sbin/udevd ] || exit 0
-
-# defaults
-tmpfs_size="2M"
-
-. /etc/udev/udev.conf
-
-if ! supported_kernel; then
-  echo "udev requires a kernel >= 2.6.15, 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
-
-##############################################################################
-
-# When modifying this script, do not forget that between the time that
-# the new /dev has been mounted and udevsynthesize has been run there will be
-# no /dev/null. This also means that you cannot use the "&" shell command.
-case "$1" in
-    start)
-    unmount_devpts
-    mount_tmpfs
-    [ -d /proc/1 ] || mount -n /proc
-
-    # /dev/null must be created before udevd is started
-    make_extra_nodes
-
-    # It's all over netlink now
-    if [ -e /proc/sys/kernel/hotplug ]; then
-        echo "" > /proc/sys/kernel/hotplug
-    fi
-
-    echo "Starting the hotplug events dispatcher" "udevd"
-    udevd --daemon
-
-    echo "Synthesizing the initial hotplug events"
-    udevtrigger
-    udevsettle
-    ;;
-
-    stop)
-    echo "Stopping the hotplug events dispatcher" "udevd"
-    start-stop-daemon --stop --name udevd --quiet
-    ;;
-
-    restart|force-reload)
-    echo "Stopping the hotplug events dispatcher" "udevd"
-    if start-stop-daemon --stop --name udevd --quiet ; then
-	exit 1
-    fi
-
-    echo "Starting the hotplug events dispatcher" "udevd"
-    udevd --daemon
-    ;;
-
-    *)
-    echo "Usage: /etc/init.d/udev {start|stop|restart|force-reload}"
-    exit 1
-    ;;
-esac
-
-exit 0
-
diff --git a/packages/udev/udev-115/local.rules b/packages/udev/udev-115/local.rules
deleted file mode 100644
index 5b926018f5..0000000000
--- a/packages/udev/udev-115/local.rules
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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
-#
-
-# Media automounting
-SUBSYSTEM=="block", ACTION=="add"    RUN+="/etc/udev/scripts/mount.sh"
-SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh"
-
-# Handle network interface setup
-SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh"
-SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh"
-
-# The first rtc device is symlinked to /dev/rtc
-KERNEL=="rtc0", SYMLINK+="rtc"
-
-# Try and modprobe for drivers for new hardware
-ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
-
-# Create a symlink to any touchscreen input device
-SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
diff --git a/packages/udev/udev-115/permissions.rules b/packages/udev/udev-115/permissions.rules
deleted file mode 100644
index 99e03b1036..0000000000
--- a/packages/udev/udev-115/permissions.rules
+++ /dev/null
@@ -1,101 +0,0 @@
-ACTION!="add", GOTO="permissions_end"
-
-# workarounds needed to synchronize with sysfs
-DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*",	WAIT_FOR_SYSFS="bus"
-SUBSYSTEM=="scsi",				WAIT_FOR_SYSFS="ioerr_cnt"
-# only needed for kernels < 2.6.16
-SUBSYSTEM=="net",				WAIT_FOR_SYSFS="address"
-# only needed for kernels < 2.6.17
-SUBSYSTEM=="net", ENV{PHYSDEVDRIVER}=="?*",	WAIT_FOR_SYSFS="device/driver"
-
-# default permissions for block devices
-SUBSYSTEM=="block",				GROUP="disk"
-SUBSYSTEM=="block", SYSFS{removable}=="1",	GROUP="floppy"
-
-# IDE devices
-BUS=="ide", KERNEL=="hd[a-z]|pcd[0-9]*", DRIVER=="ide-cdrom|pcd", \
-	IMPORT{program}="cdrom_id --export $tempnode"
-ENV{ID_CDROM}=="?*",				GROUP="cdrom"
-BUS=="ide", KERNEL=="ht[0-9]*",			GROUP="tape"
-BUS=="ide", KERNEL=="nht[0-9]*",		GROUP="tape"
-
-# SCSI devices
-BUS=="scsi", SYSFS{type}=="1",			GROUP="tape"
-BUS=="scsi", SYSFS{type}=="5",			GROUP="cdrom"
-
-# USB devices
-BUS=="usb", KERNEL=="legousbtower*", MODE="0666"
-BUS=="usb", KERNEL=="lp[0-9]*",			GROUP="lp"
-
-# usbfs-like devices
-SUBSYSTEM=="usb_device",	MODE="0664"
-
-# iRiver music players
-SUBSYSTEM=="usb_device",			GROUP="plugdev", \
-	SYSFS{idVendor}=="4102", SYSFS{idProduct}=="10[01][135789]"
-
-# serial devices
-SUBSYSTEM=="tty",				GROUP="dialout"
-SUBSYSTEM=="capi",				GROUP="dialout"
-SUBSYSTEM=="slamr",				GROUP="dialout"
-SUBSYSTEM=="zaptel",				GROUP="dialout"
-
-# vc devices (all members of the tty subsystem)
-KERNEL=="ptmx",			MODE="0666",	GROUP="root"
-KERNEL=="console",		MODE="0600",	GROUP="root"
-KERNEL=="tty",			MODE="0666",	GROUP="root"
-KERNEL=="tty[0-9]*",				GROUP="root"
-KERNEL=="pty*",			MODE="0666",	GROUP="tty"
-
-# video devices
-SUBSYSTEM=="video4linux",			GROUP="video"
-SUBSYSTEM=="drm",				GROUP="video"
-SUBSYSTEM=="dvb",				GROUP="video"
-SUBSYSTEM=="em8300",				GROUP="video"
-SUBSYSTEM=="graphics",				GROUP="video"
-SUBSYSTEM=="nvidia",				GROUP="video"
-
-# misc devices
-KERNEL=="random",		MODE="0666"
-KERNEL=="urandom",		MODE="0666"
-KERNEL=="mem",			MODE="0640",	GROUP="kmem"
-KERNEL=="kmem",			MODE="0640",	GROUP="kmem"
-KERNEL=="port",			MODE="0640",	GROUP="kmem"
-KERNEL=="full",			MODE="0666"
-KERNEL=="null",			MODE="0666"
-KERNEL=="zero",			MODE="0666"
-KERNEL=="inotify",		MODE="0666"
-KERNEL=="sgi_fetchop",		MODE="0666"
-KERNEL=="sonypi",		MODE="0666"
-KERNEL=="agpgart",				GROUP="video"
-KERNEL=="rtc",					GROUP="audio"
-
-KERNEL=="cdemu[0-9]*",				GROUP="cdrom"
-KERNEL=="pktcdvd[0-9]*",			GROUP="cdrom"
-KERNEL=="pktcdvd",		MODE="0644"
-
-# printers and parallel devices
-SUBSYSTEM=="printer",				GROUP="lp"
-SUBSYSTEM=="ppdev",				GROUP="lp"
-KERNEL=="pt[0-9]*",				GROUP="tape"
-KERNEL=="pht[0-9]*",				GROUP="tape"
-
-# sound devices
-SUBSYSTEM=="sound",				GROUP="audio"
-
-# ieee1394 devices       
-KERNEL=="raw1394",				GROUP="disk"
-KERNEL=="dv1394*",				GROUP="video"
-KERNEL=="video1394*",				GROUP="video"
-
-# input devices
-KERNEL=="event[0-9]*", SYSFS{name}=="*dvb*|*DVB*|* IR *" \
-				MODE="0664",	GROUP="video"
-KERNEL=="js[0-9]*",		MODE="0664"
-
-# AOE character devices
-SUBSYSTEM=="aoe",		MODE="0220",	GROUP="disk"
-SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440"
-
-LABEL="permissions_end"
-
diff --git a/packages/udev/udev-115/udev.rules b/packages/udev/udev-115/udev.rules
deleted file mode 100644
index 72be706e84..0000000000
--- a/packages/udev/udev-115/udev.rules
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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 'export X=%k; export X=$${X#usbdev}; export B=$${X%%%%.*}; export 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"
-
-KERNEL=="buzzer",		NAME="misc/buzzer"
-
-# 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"
-
-# Firmware Helper
-ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware_helper"
-
-# Samsung UARTS
-KERNEL=="s3c2410_serial[0-9]",   NAME="ttySAC%n"
-
diff --git a/packages/udev/udev-115/udevtrigger_add_devname_filtering.patch b/packages/udev/udev-115/udevtrigger_add_devname_filtering.patch
deleted file mode 100644
index 87cafcaa9d..0000000000
--- a/packages/udev/udev-115/udevtrigger_add_devname_filtering.patch
+++ /dev/null
@@ -1,104 +0,0 @@
----
- udevtrigger.c |   40 ++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 40 insertions(+)
-
-Index: udev-115/udevtrigger.c
-===================================================================
---- udev-115.orig/udevtrigger.c	2007-08-24 01:29:54.000000000 +0200
-+++ udev-115/udevtrigger.c	2007-09-21 18:45:28.000000000 +0200
-@@ -39,6 +39,8 @@
- LIST_HEAD(device_list);
- LIST_HEAD(filter_subsystem_match_list);
- LIST_HEAD(filter_subsystem_nomatch_list);
-+LIST_HEAD(filter_kernel_match_list);
-+LIST_HEAD(filter_kernel_nomatch_list);
- LIST_HEAD(filter_attr_match_list);
- LIST_HEAD(filter_attr_nomatch_list);
- 
-@@ -218,6 +220,26 @@
- 	return 0;
- }
- 
-+static int kernel_filtered(const char *kernel)
-+{
-+	struct name_entry *loop_name;
-+
-+	/* skip devices matching the prohibited kernel device names */
-+	list_for_each_entry(loop_name, &filter_kernel_nomatch_list, node)
-+		if (fnmatch(loop_name->name, kernel, 0) == 0)
-+			return 1;
-+
-+	/* skip devices not matching the listed kernel device names */
-+	if (!list_empty(&filter_kernel_match_list)) {
-+		list_for_each_entry(loop_name, &filter_kernel_match_list, node)
-+			if (fnmatch(loop_name->name, kernel, 0) == 0)
-+				return 0;
-+		return 1;
-+	}
-+
-+	return 0;
-+}
-+
- static int attr_filtered(const char *path)
- {
- 	struct name_entry *loop_name;
-@@ -296,6 +318,9 @@
- 					if (dent2->d_name[0] == '.')
- 						continue;
- 
-+					if (kernel_filtered(dent2->d_name))
-+						continue;
-+
- 					strlcpy(dirname2, dirname, sizeof(dirname2));
- 					strlcat(dirname2, "/", sizeof(dirname2));
- 					strlcat(dirname2, dent2->d_name, sizeof(dirname2));
-@@ -402,6 +427,9 @@
- 					if (!strcmp(dent2->d_name, "device"))
- 						continue;
- 
-+					if (kernel_filtered(dent2->d_name))
-+						continue;
-+
- 					strlcpy(dirname2, dirname, sizeof(dirname2));
- 					strlcat(dirname2, "/", sizeof(dirname2));
- 					strlcat(dirname2, dent2->d_name, sizeof(dirname2));
-@@ -458,6 +486,8 @@
- 		{ "subsystem-nomatch", 1, NULL, 'S' },
- 		{ "attr-match", 1, NULL, 'a' },
- 		{ "attr-nomatch", 1, NULL, 'A' },
-+		{ "kernel-match", 1, NULL, 'k' },
-+		{ "kernel-nomatch", 1, NULL, 'K' },
- 		{}
- 	};
- 
-@@ -496,6 +526,12 @@
- 		case 'A':
- 			name_list_add(&filter_attr_nomatch_list, optarg, 0);
- 			break;
-+		case 'k':
-+			name_list_add(&filter_kernel_match_list, optarg, 0);
-+			break;
-+		case 'K':
-+			name_list_add(&filter_kernel_nomatch_list, optarg, 0);
-+			break;
- 		case 'h':
- 			printf("Usage: udevtrigger OPTIONS\n"
- 			       "  --verbose                       print the list of devices while running\n"
-@@ -504,6 +540,8 @@
- 			       "                                  marked as failed during a previous run\n"
- 			       "  --subsystem-match=<subsystem>   trigger devices from a matching subystem\n"
- 			       "  --subsystem-nomatch=<subsystem> exclude devices from a matching subystem\n"
-+			       "  --kernel-match=<subsystem>      trigger devices from a matching kernel device name\n"
-+			       "  --kernel-nomatch=<subsystem>    exclude devices from a matching kernel device name\n"
- 			       "  --attr-match=<file[=<value>]>   trigger devices with a matching sysfs\n"
- 			       "                                  attribute\n"
- 			       "  --attr-nomatch=<file[=<value>]> exclude devices with a matching sysfs\n"
-@@ -549,6 +587,8 @@
- exit:
- 	name_list_cleanup(&filter_subsystem_match_list);
- 	name_list_cleanup(&filter_subsystem_nomatch_list);
-+	name_list_cleanup(&filter_kernel_match_list);
-+	name_list_cleanup(&filter_kernel_nomatch_list);
- 	name_list_cleanup(&filter_attr_match_list);
- 	name_list_cleanup(&filter_attr_nomatch_list);
- 
diff --git a/packages/udev/udev-115/vol_id_ld.patch b/packages/udev/udev-115/vol_id_ld.patch
deleted file mode 100644
index 11126eef8d..0000000000
--- a/packages/udev/udev-115/vol_id_ld.patch
+++ /dev/null
@@ -1,17 +0,0 @@
----
- extras/volume_id/Makefile |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: udev-115/extras/volume_id/Makefile
-===================================================================
---- udev-115.orig/extras/volume_id/Makefile	2007-09-20 18:17:59.000000000 +0200
-+++ udev-115/extras/volume_id/Makefile	2007-09-20 18:18:08.000000000 +0200
-@@ -44,7 +44,7 @@
- ifeq ($(strip $(VOLUME_ID_STATIC)),true)
- 	$(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) lib/libvolume_id.a $(LIB_OBJS)
- else
--	$(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) -Llib -lvolume_id $(LIB_OBJS)
-+	$(Q) $(LD) -Llib $(LDFLAGS) -o $@ $@.o $(LIBUDEV) -lvolume_id $(LIB_OBJS)
- endif
- 
- # man pages
diff --git a/packages/udev/udev-118/.mtn2git_empty b/packages/udev/udev-118/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/udev/udev-118/flags.patch b/packages/udev/udev-118/flags.patch
new file mode 100644
index 0000000000..13f20eb6a8
--- /dev/null
+++ b/packages/udev/udev-118/flags.patch
@@ -0,0 +1,56 @@
+---
+ Makefile |   16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+Index: udev-115/Makefile
+===================================================================
+--- udev-115.orig/Makefile	2007-08-24 01:29:54.000000000 +0200
++++ udev-115/Makefile	2007-09-20 17:21:45.000000000 +0200
+@@ -112,39 +112,39 @@
+ AR = $(CROSS_COMPILE)ar
+ RANLIB = $(CROSS_COMPILE)ranlib
+ 
+-CFLAGS		+= -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
++override CFLAGS	= -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
+ WARNINGS	= -Wstrict-prototypes -Wsign-compare -Wshadow \
+ 		  -Wchar-subscripts -Wmissing-declarations -Wnested-externs \
+ 		  -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes
+-CFLAGS		+= $(WARNINGS)
++override CFLAGS	+= $(WARNINGS)
+ 
+ LDFLAGS += -Wl,-warn-common,--as-needed
+ 
+ OPTFLAGS = -Os
+-CFLAGS += $(OPTFLAGS)
++override CFLAGS += $(OPTFLAGS)
+ 
+ ifeq ($(strip $(USE_LOG)),true)
+-	CFLAGS += -DUSE_LOG
++	override CFLAGS += -DUSE_LOG
+ endif
+ 
+ # if DEBUG is enabled, then we do not strip
+ ifeq ($(strip $(DEBUG)),true)
+-	CFLAGS  += -DDEBUG
++	override CFLAGS  += -DDEBUG
+ endif
+ 
+ ifeq ($(strip $(USE_GCOV)),true)
+-	CFLAGS += -fprofile-arcs -ftest-coverage
++	override CFLAGS += -fprofile-arcs -ftest-coverage
+ 	LDFLAGS += -fprofile-arcs
+ endif
+ 
+ ifeq ($(strip $(USE_SELINUX)),true)
+ 	UDEV_OBJS += udev_selinux.o
+ 	LIB_OBJS += -lselinux -lsepol
+-	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-118/init b/packages/udev/udev-118/init
new file mode 100644
index 0000000000..e44c675f2f
--- /dev/null
+++ b/packages/udev/udev-118/init
@@ -0,0 +1,171 @@
+#!/bin/sh -e
+### BEGIN INIT INFO
+# Provides:          udev
+# Required-Start:    mountvirtfs 
+# Required-Stop:     
+# Default-Start:     S
+# Default-Stop:
+# Short-Description: Start udevd, populate /dev and load drivers.
+### END INIT INFO
+
+# 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
+  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 udev /dev; then
+    umount /etc/udev
+    echo "udev requires tmpfs support, not started."
+    exit 1
+  fi
+
+  mkdir -p /dev/.static/dev
+  chmod 700 /dev/.static/
+  # The mount options in busybox are non-standard...
+  if test -x /bin/mount.util-linux
+  then
+    /bin/mount.util-linux --move /etc/udev /dev/.static/dev
+  elif test -x /bin/busybox
+  then
+    busybox mount -n -o move /etc/udev /dev/.static/dev
+  else
+    echo "udev requires an identifiable mount command, not started."
+    umount /etc/udev
+    umount /dev
+    exit 1
+  fi
+}
+
+make_extra_nodes() {
+  [ -c /dev/null ] || mknod -m 666 /dev/null c 1 3
+# I hate this hack.  -- Md
+  if [ "$(echo /lib/udev/devices/*)" != "/lib/udev/devices/*" ]; then
+    cp -a /lib/udev/devices/* /dev/
+  fi
+
+  [ -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 -m 600 /dev/$name $arg1 ;;
+      *) echo "links.conf: unparseable line ($type $name $arg1)" ;;
+    esac
+  done
+}
+
+supported_kernel() {
+  case "$(uname -r)" in
+    2.[012345].*|2.6.[0-9]|2.6.[0-9][!0-9]*) return 1 ;;
+    2.6.1[0134]|2.6.1[01234][!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
+}
+
+##############################################################################
+
+PATH="/sbin:/bin:/usr/bin"
+
+[ -x /sbin/udevd ] || exit 0
+
+# defaults
+tmpfs_size="2M"
+
+. /etc/udev/udev.conf
+
+if ! supported_kernel; then
+  echo "udev requires a kernel >= 2.6.15, 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
+
+##############################################################################
+
+# When modifying this script, do not forget that between the time that
+# the new /dev has been mounted and udevsynthesize has been run there will be
+# no /dev/null. This also means that you cannot use the "&" shell command.
+case "$1" in
+    start)
+    unmount_devpts
+    mount_tmpfs
+    [ -d /proc/1 ] || mount -n /proc
+
+    # /dev/null must be created before udevd is started
+    make_extra_nodes
+
+    # It's all over netlink now
+    if [ -e /proc/sys/kernel/hotplug ]; then
+        echo "" > /proc/sys/kernel/hotplug
+    fi
+
+    echo "Starting the hotplug events dispatcher" "udevd"
+    udevd --daemon
+
+    echo "Synthesizing the initial hotplug events"
+    udevtrigger
+    udevsettle
+    ;;
+
+    stop)
+    echo "Stopping the hotplug events dispatcher" "udevd"
+    start-stop-daemon --stop --name udevd --quiet
+    ;;
+
+    restart|force-reload)
+    echo "Stopping the hotplug events dispatcher" "udevd"
+    if start-stop-daemon --stop --name udevd --quiet ; then
+	exit 1
+    fi
+
+    echo "Starting the hotplug events dispatcher" "udevd"
+    udevd --daemon
+    ;;
+
+    *)
+    echo "Usage: /etc/init.d/udev {start|stop|restart|force-reload}"
+    exit 1
+    ;;
+esac
+
+exit 0
+
diff --git a/packages/udev/udev-118/local.rules b/packages/udev/udev-118/local.rules
new file mode 100644
index 0000000000..5b926018f5
--- /dev/null
+++ b/packages/udev/udev-118/local.rules
@@ -0,0 +1,31 @@
+# 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
+#
+
+# Media automounting
+SUBSYSTEM=="block", ACTION=="add"    RUN+="/etc/udev/scripts/mount.sh"
+SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh"
+
+# Handle network interface setup
+SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh"
+SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh"
+
+# The first rtc device is symlinked to /dev/rtc
+KERNEL=="rtc0", SYMLINK+="rtc"
+
+# Try and modprobe for drivers for new hardware
+ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
+
+# Create a symlink to any touchscreen input device
+SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
diff --git a/packages/udev/udev-118/permissions.rules b/packages/udev/udev-118/permissions.rules
new file mode 100644
index 0000000000..99e03b1036
--- /dev/null
+++ b/packages/udev/udev-118/permissions.rules
@@ -0,0 +1,101 @@
+ACTION!="add", GOTO="permissions_end"
+
+# workarounds needed to synchronize with sysfs
+DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*",	WAIT_FOR_SYSFS="bus"
+SUBSYSTEM=="scsi",				WAIT_FOR_SYSFS="ioerr_cnt"
+# only needed for kernels < 2.6.16
+SUBSYSTEM=="net",				WAIT_FOR_SYSFS="address"
+# only needed for kernels < 2.6.17
+SUBSYSTEM=="net", ENV{PHYSDEVDRIVER}=="?*",	WAIT_FOR_SYSFS="device/driver"
+
+# default permissions for block devices
+SUBSYSTEM=="block",				GROUP="disk"
+SUBSYSTEM=="block", SYSFS{removable}=="1",	GROUP="floppy"
+
+# IDE devices
+BUS=="ide", KERNEL=="hd[a-z]|pcd[0-9]*", DRIVER=="ide-cdrom|pcd", \
+	IMPORT{program}="cdrom_id --export $tempnode"
+ENV{ID_CDROM}=="?*",				GROUP="cdrom"
+BUS=="ide", KERNEL=="ht[0-9]*",			GROUP="tape"
+BUS=="ide", KERNEL=="nht[0-9]*",		GROUP="tape"
+
+# SCSI devices
+BUS=="scsi", SYSFS{type}=="1",			GROUP="tape"
+BUS=="scsi", SYSFS{type}=="5",			GROUP="cdrom"
+
+# USB devices
+BUS=="usb", KERNEL=="legousbtower*", MODE="0666"
+BUS=="usb", KERNEL=="lp[0-9]*",			GROUP="lp"
+
+# usbfs-like devices
+SUBSYSTEM=="usb_device",	MODE="0664"
+
+# iRiver music players
+SUBSYSTEM=="usb_device",			GROUP="plugdev", \
+	SYSFS{idVendor}=="4102", SYSFS{idProduct}=="10[01][135789]"
+
+# serial devices
+SUBSYSTEM=="tty",				GROUP="dialout"
+SUBSYSTEM=="capi",				GROUP="dialout"
+SUBSYSTEM=="slamr",				GROUP="dialout"
+SUBSYSTEM=="zaptel",				GROUP="dialout"
+
+# vc devices (all members of the tty subsystem)
+KERNEL=="ptmx",			MODE="0666",	GROUP="root"
+KERNEL=="console",		MODE="0600",	GROUP="root"
+KERNEL=="tty",			MODE="0666",	GROUP="root"
+KERNEL=="tty[0-9]*",				GROUP="root"
+KERNEL=="pty*",			MODE="0666",	GROUP="tty"
+
+# video devices
+SUBSYSTEM=="video4linux",			GROUP="video"
+SUBSYSTEM=="drm",				GROUP="video"
+SUBSYSTEM=="dvb",				GROUP="video"
+SUBSYSTEM=="em8300",				GROUP="video"
+SUBSYSTEM=="graphics",				GROUP="video"
+SUBSYSTEM=="nvidia",				GROUP="video"
+
+# misc devices
+KERNEL=="random",		MODE="0666"
+KERNEL=="urandom",		MODE="0666"
+KERNEL=="mem",			MODE="0640",	GROUP="kmem"
+KERNEL=="kmem",			MODE="0640",	GROUP="kmem"
+KERNEL=="port",			MODE="0640",	GROUP="kmem"
+KERNEL=="full",			MODE="0666"
+KERNEL=="null",			MODE="0666"
+KERNEL=="zero",			MODE="0666"
+KERNEL=="inotify",		MODE="0666"
+KERNEL=="sgi_fetchop",		MODE="0666"
+KERNEL=="sonypi",		MODE="0666"
+KERNEL=="agpgart",				GROUP="video"
+KERNEL=="rtc",					GROUP="audio"
+
+KERNEL=="cdemu[0-9]*",				GROUP="cdrom"
+KERNEL=="pktcdvd[0-9]*",			GROUP="cdrom"
+KERNEL=="pktcdvd",		MODE="0644"
+
+# printers and parallel devices
+SUBSYSTEM=="printer",				GROUP="lp"
+SUBSYSTEM=="ppdev",				GROUP="lp"
+KERNEL=="pt[0-9]*",				GROUP="tape"
+KERNEL=="pht[0-9]*",				GROUP="tape"
+
+# sound devices
+SUBSYSTEM=="sound",				GROUP="audio"
+
+# ieee1394 devices       
+KERNEL=="raw1394",				GROUP="disk"
+KERNEL=="dv1394*",				GROUP="video"
+KERNEL=="video1394*",				GROUP="video"
+
+# input devices
+KERNEL=="event[0-9]*", SYSFS{name}=="*dvb*|*DVB*|* IR *" \
+				MODE="0664",	GROUP="video"
+KERNEL=="js[0-9]*",		MODE="0664"
+
+# AOE character devices
+SUBSYSTEM=="aoe",		MODE="0220",	GROUP="disk"
+SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440"
+
+LABEL="permissions_end"
+
diff --git a/packages/udev/udev-118/udev.rules b/packages/udev/udev-118/udev.rules
new file mode 100644
index 0000000000..72be706e84
--- /dev/null
+++ b/packages/udev/udev-118/udev.rules
@@ -0,0 +1,102 @@
+# 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 'export X=%k; export X=$${X#usbdev}; export B=$${X%%%%.*}; export 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"
+
+KERNEL=="buzzer",		NAME="misc/buzzer"
+
+# 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"
+
+# Firmware Helper
+ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware_helper"
+
+# Samsung UARTS
+KERNEL=="s3c2410_serial[0-9]",   NAME="ttySAC%n"
+
diff --git a/packages/udev/udev-118/udevtrigger_add_devname_filtering.patch b/packages/udev/udev-118/udevtrigger_add_devname_filtering.patch
new file mode 100644
index 0000000000..87cafcaa9d
--- /dev/null
+++ b/packages/udev/udev-118/udevtrigger_add_devname_filtering.patch
@@ -0,0 +1,104 @@
+---
+ udevtrigger.c |   40 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 40 insertions(+)
+
+Index: udev-115/udevtrigger.c
+===================================================================
+--- udev-115.orig/udevtrigger.c	2007-08-24 01:29:54.000000000 +0200
++++ udev-115/udevtrigger.c	2007-09-21 18:45:28.000000000 +0200
+@@ -39,6 +39,8 @@
+ LIST_HEAD(device_list);
+ LIST_HEAD(filter_subsystem_match_list);
+ LIST_HEAD(filter_subsystem_nomatch_list);
++LIST_HEAD(filter_kernel_match_list);
++LIST_HEAD(filter_kernel_nomatch_list);
+ LIST_HEAD(filter_attr_match_list);
+ LIST_HEAD(filter_attr_nomatch_list);
+ 
+@@ -218,6 +220,26 @@
+ 	return 0;
+ }
+ 
++static int kernel_filtered(const char *kernel)
++{
++	struct name_entry *loop_name;
++
++	/* skip devices matching the prohibited kernel device names */
++	list_for_each_entry(loop_name, &filter_kernel_nomatch_list, node)
++		if (fnmatch(loop_name->name, kernel, 0) == 0)
++			return 1;
++
++	/* skip devices not matching the listed kernel device names */
++	if (!list_empty(&filter_kernel_match_list)) {
++		list_for_each_entry(loop_name, &filter_kernel_match_list, node)
++			if (fnmatch(loop_name->name, kernel, 0) == 0)
++				return 0;
++		return 1;
++	}
++
++	return 0;
++}
++
+ static int attr_filtered(const char *path)
+ {
+ 	struct name_entry *loop_name;
+@@ -296,6 +318,9 @@
+ 					if (dent2->d_name[0] == '.')
+ 						continue;
+ 
++					if (kernel_filtered(dent2->d_name))
++						continue;
++
+ 					strlcpy(dirname2, dirname, sizeof(dirname2));
+ 					strlcat(dirname2, "/", sizeof(dirname2));
+ 					strlcat(dirname2, dent2->d_name, sizeof(dirname2));
+@@ -402,6 +427,9 @@
+ 					if (!strcmp(dent2->d_name, "device"))
+ 						continue;
+ 
++					if (kernel_filtered(dent2->d_name))
++						continue;
++
+ 					strlcpy(dirname2, dirname, sizeof(dirname2));
+ 					strlcat(dirname2, "/", sizeof(dirname2));
+ 					strlcat(dirname2, dent2->d_name, sizeof(dirname2));
+@@ -458,6 +486,8 @@
+ 		{ "subsystem-nomatch", 1, NULL, 'S' },
+ 		{ "attr-match", 1, NULL, 'a' },
+ 		{ "attr-nomatch", 1, NULL, 'A' },
++		{ "kernel-match", 1, NULL, 'k' },
++		{ "kernel-nomatch", 1, NULL, 'K' },
+ 		{}
+ 	};
+ 
+@@ -496,6 +526,12 @@
+ 		case 'A':
+ 			name_list_add(&filter_attr_nomatch_list, optarg, 0);
+ 			break;
++		case 'k':
++			name_list_add(&filter_kernel_match_list, optarg, 0);
++			break;
++		case 'K':
++			name_list_add(&filter_kernel_nomatch_list, optarg, 0);
++			break;
+ 		case 'h':
+ 			printf("Usage: udevtrigger OPTIONS\n"
+ 			       "  --verbose                       print the list of devices while running\n"
+@@ -504,6 +540,8 @@
+ 			       "                                  marked as failed during a previous run\n"
+ 			       "  --subsystem-match=<subsystem>   trigger devices from a matching subystem\n"
+ 			       "  --subsystem-nomatch=<subsystem> exclude devices from a matching subystem\n"
++			       "  --kernel-match=<subsystem>      trigger devices from a matching kernel device name\n"
++			       "  --kernel-nomatch=<subsystem>    exclude devices from a matching kernel device name\n"
+ 			       "  --attr-match=<file[=<value>]>   trigger devices with a matching sysfs\n"
+ 			       "                                  attribute\n"
+ 			       "  --attr-nomatch=<file[=<value>]> exclude devices with a matching sysfs\n"
+@@ -549,6 +587,8 @@
+ exit:
+ 	name_list_cleanup(&filter_subsystem_match_list);
+ 	name_list_cleanup(&filter_subsystem_nomatch_list);
++	name_list_cleanup(&filter_kernel_match_list);
++	name_list_cleanup(&filter_kernel_nomatch_list);
+ 	name_list_cleanup(&filter_attr_match_list);
+ 	name_list_cleanup(&filter_attr_nomatch_list);
+ 
diff --git a/packages/udev/udev-118/vol_id_ld.patch b/packages/udev/udev-118/vol_id_ld.patch
new file mode 100644
index 0000000000..11126eef8d
--- /dev/null
+++ b/packages/udev/udev-118/vol_id_ld.patch
@@ -0,0 +1,17 @@
+---
+ extras/volume_id/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: udev-115/extras/volume_id/Makefile
+===================================================================
+--- udev-115.orig/extras/volume_id/Makefile	2007-09-20 18:17:59.000000000 +0200
++++ udev-115/extras/volume_id/Makefile	2007-09-20 18:18:08.000000000 +0200
+@@ -44,7 +44,7 @@
+ ifeq ($(strip $(VOLUME_ID_STATIC)),true)
+ 	$(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) lib/libvolume_id.a $(LIB_OBJS)
+ else
+-	$(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) -Llib -lvolume_id $(LIB_OBJS)
++	$(Q) $(LD) -Llib $(LDFLAGS) -o $@ $@.o $(LIBUDEV) -lvolume_id $(LIB_OBJS)
+ endif
+ 
+ # man pages
diff --git a/packages/udev/udev.inc b/packages/udev/udev.inc
index 87361aef8a..d04b63e1e0 100644
--- a/packages/udev/udev.inc
+++ b/packages/udev/udev.inc
@@ -2,16 +2,15 @@ DESCRIPTION ?= "udev is a program which dynamically creates and removes device n
 /dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel."
 LICENSE = "GPL"
 
-SRC_URI += "\
-  file://udev.rules \
-  file://devfs-udev.rules \
-  file://links.conf \
-  file://permissions.rules \
-  file://mount.sh \
-  file://network.sh \
-  file://local.rules \
-  file://init \
-"
+SRC_URI += " \
+	   file://udev.rules \
+	   file://devfs-udev.rules \
+	   file://links.conf \
+           file://permissions.rules \
+	   file://mount.sh \
+	   file://network.sh \
+	   file://local.rules \
+           file://init"
 
 inherit update-rc.d autotools pkgconfig
 
@@ -38,11 +37,9 @@ EXTRA_OEMAKE = "-e \
 		'STRIP=echo'"
 
 do_install () {
-	install -d ${D}${usrsbindir}
-	install -d ${D}${sbindir}
-
+	install -d ${D}${usrsbindir} \
+		   ${D}${sbindir}
 	oe_runmake 'DESTDIR=${D}' INSTALL=install install
-
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
 
@@ -63,8 +60,8 @@ do_install () {
 
 do_stage () {
 	autotools_stage_all
-	install -m 0644 ${S}/extras/volume_id/lib/libvolume_id.h ${STAGING_INCDIR}
-	oe_libinstall -C extras/volume_id/lib -so libvolume_id ${STAGING_LIBDIR}
+        install -m 0644 ${S}/extras/volume_id/lib/libvolume_id.h ${STAGING_INCDIR}
+        oe_libinstall -C extras/volume_id/lib -so libvolume_id ${STAGING_LIBDIR}
 }
 
 PACKAGES =+ "udev-utils libvolume-id libvolume-id-dev"
diff --git a/packages/udev/udev_115.bb b/packages/udev/udev_115.bb
deleted file mode 100644
index 2e68b017ca..0000000000
--- a/packages/udev/udev_115.bb
+++ /dev/null
@@ -1,68 +0,0 @@
-DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
-/dev/, handles hotplug events and loads drivers at boot time. It replaces \
-the hotplug package and requires a kernel not older than 2.6.12."
-RPROVIDES_${PN} = "hotplug"
-PR = "r0"
-
-SRC_URI = "\
- http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
- file://flags.patch;patch=1 \
- file://vol_id_ld.patch;patch=1 \
- file://udevtrigger_add_devname_filtering.patch;patch=1 \
- file://noasmlinkage.patch;patch=1 \
- file://mount.blacklist \
-"
-
-require udev.inc
-
-INITSCRIPT_PARAMS = "start 03 S ."
-
-FILES_${PN} += "${base_libdir}/udev/*"
-FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
-UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/"
-EXTRA_OEMAKE += "libudevdir=/lib/udev libdir=${base_libdir} prefix="
-
-do_install () {
-	install -d ${D}${usrsbindir}
-	install -d ${D}${sysconfdir}
-	install -d ${D}${sbindir}
-
-	oe_runmake 'DESTDIR=${D}' INSTALL=install install
-
-	install -d ${D}${sysconfdir}/init.d
-	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
-
-	install -d ${D}${sysconfdir}/udev/rules.d/
-
-	install -m 0644 ${WORKDIR}/mount.blacklist     ${D}${sysconfdir}/udev/
-	install -m 0644 ${WORKDIR}/local.rules         ${D}${sysconfdir}/udev/rules.d/local.rules
-	install -m 0644 ${WORKDIR}/permissions.rules   ${D}${sysconfdir}/udev/rules.d/permissions.rules
-	install -m 0644 ${WORKDIR}/udev.rules          ${D}${sysconfdir}/udev/rules.d/udev.rules
-	install -m 0644 ${WORKDIR}/links.conf          ${D}${sysconfdir}/udev/links.conf
-	if [ "${UDEV_DEVFS_RULES}" = "1" ]; then
-		install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules
-	fi
-
-	install -d ${D}${sysconfdir}/udev/scripts/
-
-	install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh
-	install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts
-
-	install -d ${D}${base_libdir}/udev/
-}
-
-pkg_postinst_append() {
-
-       # Add the root partition to mount.blacklist to avoid a bug in the auto-mounter,
-       # causing confusion with fsck on boot
-
-        while read dev mp fs junk
-        do
-                if test "$mp" = "/"
-                then
-                        root_partition="$dev"
-                        echo "$root_partition" >> ${sysconfdir}/udev/mount.blacklist
-                fi
-        done < ${sysconfdir}/fstab
-}
-
diff --git a/packages/udev/udev_118.bb b/packages/udev/udev_118.bb
new file mode 100644
index 0000000000..20fef83d74
--- /dev/null
+++ b/packages/udev/udev_118.bb
@@ -0,0 +1,72 @@
+DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
+/dev/, handles hotplug events and loads drivers at boot time. It replaces \
+the hotplug package and requires a kernel not older than 2.6.12."
+RPROVIDES_${PN} = "hotplug"
+
+PR = "r3"
+
+DEFAULT_PREFERENCE = "-118"
+
+SRC_URI = "\
+ http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
+ file://flags.patch;patch=1 \
+ file://vol_id_ld.patch;patch=1 \
+ file://udevtrigger_add_devname_filtering.patch;patch=1 \
+ file://mount.blacklist \
+"
+
+require udev.inc
+
+INITSCRIPT_PARAMS = "start 03 S ."
+
+FILES_${PN} += "${base_libdir}/udev/*"
+FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
+UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/"
+EXTRA_OEMAKE += "libudevdir=/lib/udev libdir=${base_libdir} prefix="
+
+do_compile_prepend() {
+	sed -i s,asmlinkage,, *.c
+}
+
+do_install () {
+	install -d ${D}${usrsbindir} \
+                   ${D}${sysconfdir} \
+                   ${D}${sbindir}
+	oe_runmake 'DESTDIR=${D}' INSTALL=install install
+	install -d ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
+
+	install -d ${D}${sysconfdir}/udev/rules.d/
+
+	install -m 0644 ${WORKDIR}/mount.blacklist     ${D}${sysconfdir}/udev/
+	install -m 0644 ${WORKDIR}/local.rules         ${D}${sysconfdir}/udev/rules.d/local.rules
+	install -m 0644 ${WORKDIR}/permissions.rules   ${D}${sysconfdir}/udev/rules.d/permissions.rules
+	install -m 0644 ${WORKDIR}/udev.rules          ${D}${sysconfdir}/udev/rules.d/udev.rules
+	install -m 0644 ${WORKDIR}/links.conf          ${D}${sysconfdir}/udev/links.conf
+	if [ "${UDEV_DEVFS_RULES}" = "1" ]; then
+		install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules
+	fi
+
+	install -d ${D}${sysconfdir}/udev/scripts/
+
+	install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh
+	install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts
+
+	install -d ${D}${base_libdir}/udev/
+}
+
+pkg_postinst_append() {
+
+       # Add the root partition to mount.blacklist to avoid a bug in the auto-mounter,
+       # causing confusion with fsck on boot
+
+        while read dev mp fs junk
+        do
+                if test "$mp" = "/"
+                then
+                        root_partition="$dev"
+                        echo "$root_partition" >> ${sysconfdir}/udev/mount.blacklist
+                fi
+        done < ${sysconfdir}/fstab
+}
+
-- 
cgit v1.2.3


From d63e35340a6a2b0c7a7e049e921d624469bbd0dd Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 14 Jun 2008 08:45:32 +0000
Subject: disapproval of revision '4eeab448d8f0ea43702fbbac1fad0e283ba87b91'

---
 conf/distro/include/angstrom-2008-preferred-versions.inc | 2 +-
 conf/distro/include/preferred-om-2008-versions.inc       | 4 +---
 conf/distro/jlime-donkey.conf                            | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 6ce83b996e..2ebb06d5c0 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -17,5 +17,5 @@ PREFERRED_VERSION_pkgconfig	= "0.23"
 PREFERRED_VERSION_pkgconfig-native = "0.23"
 PREFERRED_VERSION_pulseaudio 	= "0.9.10"
 PREFERRED_VERSION_tiff 		= "3.8.2+4.0.0beta2"
-PREFERRED_VERSION_udev 		= "115"
+PREFERRED_VERSION_udev 		= "118"
 PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 63665cebcf..b86a6f90bb 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -395,8 +395,6 @@ PREFERRED_VERSION_freeciv ?= "2.0.8"
 PREFERRED_VERSION_freedoom ?= "0.3"
 PREFERRED_VERSION_freedroid ?= "1.0.2"
 PREFERRED_VERSION_freenote ?= "1.12.0"
-PREFERRED_VERSION_freetype ?= "2.3.6"
-PREFERRED_VERSION_freetype-native ?= "2.3.6"
 PREFERRED_VERSION_freeze ?= "1.0"
 PREFERRED_VERSION_frodo ?= "4.2"
 PREFERRED_VERSION_froot ?= "0.7.1"
@@ -1882,7 +1880,7 @@ PREFERRED_VERSION_ubahnnav ?= "0.4.1"
 PREFERRED_VERSION_u-boot ?= "1.2.0"
 PREFERRED_VERSION_u-boot-omap2430sdp ?= "1.1.4"
 PREFERRED_VERSION_u-boot-utils ?= "1.2.0"
-PREFERRED_VERSION_udev ?= "115"
+PREFERRED_VERSION_udev ?= "118"
 PREFERRED_VERSION_udev-hostap-cs-vcc-workaround ?= "1.0"
 PREFERRED_VERSION_udhcp ?= "0.9.8"
 PREFERRED_VERSION_ufraw ?= "0.12"
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index d516241dc4..b8c7dae22e 100644
--- a/conf/distro/jlime-donkey.conf
+++ b/conf/distro/jlime-donkey.conf
@@ -69,7 +69,7 @@ PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
 #<>System-critical software with known working versions.
 #<>------------------------------------------------------------------<
 PREFERRED_VERSION_linux-jlime-jornada6xx = "2.6.24"
-PREFERRED_VERSION_udev = "115"
+PREFERRED_VERSION_udev = "118"
 PREFERRED_VERSION_busybox = "1.9.1"
 
 #<>------------------------------------------------------------------>
-- 
cgit v1.2.3