udev: drop 168 and associated files

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

17 files changed, 0 insertions, 1537 deletions

diff --git a/meta-oe/recipes-core/udev/udev/links.conf b/meta-oe/recipes-core/udev/udev/links.conf
deleted file mode 100644
index a9f8b58b27..0000000000
--- a/meta-oe/recipes-core/udev/udev/links.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file does not exist. Please do not ask the debian maintainer about it.
-# You may use it to do strange and wonderful things, at your risk.
-
-L fd		/proc/self/fd
-L stdin		/proc/self/fd/0
-L stdout	/proc/self/fd/1
-L stderr	/proc/self/fd/2
-L core		/proc/kcore
-L sndstat	/proc/asound/oss/sndstat
-L MAKEDEV	/sbin/MAKEDEV
-
-D pts
-D shm
-
-M null         c   1 3
-M console      c   5 1
-
-# Hic sunt leones.
-M ppp		c 108 0
-D loop
-M loop/0	b 7 0
-D net
-M net/tun	c 10 200
-
diff --git a/meta-oe/recipes-core/udev/udev/local.rules b/meta-oe/recipes-core/udev/udev/local.rules
deleted file mode 100644
index da4b38593c..0000000000
--- a/meta-oe/recipes-core/udev/udev/local.rules
+++ /dev/null
@@ -1,35 +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"
-
-#The first framebuffer is symlinked to /dev/fb
-KERNEL=="fb0",  SYMLINK+="fb"
-
-# 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]*", ATTRS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
-SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{modalias}=="ads7846", SYMLINK+="input/touchscreen0"
diff --git a/meta-oe/recipes-core/udev/udev/mount.blacklist b/meta-oe/recipes-core/udev/udev/mount.blacklist
deleted file mode 100644
index d3ebb17176..0000000000
--- a/meta-oe/recipes-core/udev/udev/mount.blacklist
+++ /dev/null
@@ -1,3 +0,0 @@
-/dev/loop
-/dev/ram
-/dev/mtdblock
diff --git a/meta-oe/recipes-core/udev/udev/mount.sh b/meta-oe/recipes-core/udev/udev/mount.sh
deleted file mode 100644
index 81bcfba5e3..0000000000
--- a/meta-oe/recipes-core/udev/udev/mount.sh
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/sh
-#
-# Called from udev
-# Attemp to mount any added block devices 
-# and remove any removed devices
-#
-
-MOUNT="/bin/mount"
-PMOUNT="/usr/bin/pmount"
-UMOUNT="/bin/umount"
-name="`basename "$DEVNAME"`"
-
-for line in `cat /etc/udev/mount.blacklist | grep -v ^#`
-do
-	if ( echo "$DEVNAME" | grep -q "$line" )
-	then
-		logger "udev/mount.sh" "[$DEVNAME] is blacklisted, ignoring"
-		exit 0
-	fi
-done
-
-automount() {	
-	! test -d "/media/$name" && mkdir -p "/media/$name"
-	
-	if ! $MOUNT -t auto -o async,relatime $DEVNAME "/media/$name"
-	then
-		#logger "mount.sh/automount" "$MOUNT -t auto $DEVNAME \"/media/$name\" failed!"
-		rm_dir "/media/$name"
-	else
-		logger "mount.sh/automount" "Auto-mount of [/media/$name] successful"
-		touch "/tmp/.automount-$name"
-	fi
-}
-	
-rm_dir() {
-	# We do not want to rm -r populated directories
-	if test "`find "$1" | wc -l | tr -d " "`" -lt 2 -a -d "$1"
-	then
-		! test -z "$1" && rm -r "$1"
-	else
-		logger "mount.sh/automount" "Not removing non-empty directory [$1]"
-	fi
-}
-
-if [ "$ACTION" = "add" ] && [ -n "$DEVNAME" ]; then
-	if [ -x "$PMOUNT" ]; then
-		$PMOUNT $DEVNAME 2> /dev/null
-	elif [ -x $MOUNT ]; then
-    		$MOUNT $DEVNAME 2> /dev/null
-	fi
-	
-	# If the device isn't mounted at this point, it isn't configured in fstab
-	# 20061107: Small correction: The rootfs partition may be called just "rootfs" and not by
-	# 	    its true device name so this would break. If the rootfs is mounted on two places
-	#	    during boot, it confuses the heck out of fsck. So Im auto-adding the root-partition
-	#	    to /etc/udev/mount.blacklist via postinst 
-
-	cat /proc/mounts | awk '{print $1}' | grep -q "^$DEVNAME$" || automount 
-	
-fi
-
-
-
-if [ "$ACTION" = "remove" ] && [ -x "$UMOUNT" ] && [ -n "$DEVNAME" ]; then
-	for mnt in `cat /proc/mounts | grep "$DEVNAME" | cut -f 2 -d " " `
-	do
-		$UMOUNT -l $mnt
-	done
-	
-	# Remove empty directories from auto-mounter
-	test -e "/tmp/.automount-$name" && rm_dir "/media/$name"
-fi
diff --git a/meta-oe/recipes-core/udev/udev/network.sh b/meta-oe/recipes-core/udev/udev/network.sh
deleted file mode 100644
index 182c26d86a..0000000000
--- a/meta-oe/recipes-core/udev/udev/network.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-
-# udevd does clearenv(). Export shell PATH to children.
-export PATH
-
-# Do not run when pcmcia-cs is installed
-test -x /sbin/cardctl && exit 0
-
-# We get two "add" events for hostap cards due to wifi0
-echo "$INTERFACE" | grep -q wifi && exit 0
-
-
-# Check if /etc/init.d/network has been run yet to see if we are 
-# called by starting /etc/rcS.d/S03udev and not by hotplugging a device
-#
-# At this stage, network interfaces should not be brought up
-# automatically because:
-# a)	/etc/init.d/network has not been run yet (security issue)
-# b) 	/var has not been populated yet so /etc/resolv,conf points to 
-#	oblivion, making the network unusable
-#
-
-spoofp="`grep ^spoofprotect /etc/network/options`"
-if test -z "$spoofp"
-then
-	# This is the default from /etc/init.d/network
-	spoofp_val=yes
-else
-	spoofp_val=${spoofp#spoofprotect=}
-fi
-
-test "$spoofp_val" = yes && spoofp_val=1 || spoofp_val=0
-
-# I think it is safe to assume that "lo" will always be there ;)
-if test "`cat /proc/sys/net/ipv4/conf/lo/rp_filter`" != "$spoofp_val" -a -n "$spoofp_val"
-then
-	echo "$INTERFACE" >> /dev/udev_network_queue	
-	exit 0
-fi
-
-#
-# Code taken from pcmcia-cs:/etc/pcmcia/network
-#
-
-# if this interface has an entry in /etc/network/interfaces, let ifupdown
-# handle it
-if grep -q "iface \+$INTERFACE" /etc/network/interfaces; then
-  case $ACTION in
-    add)
-    	ifconfig | grep -q "^$INTERFACE" || ifup $INTERFACE
-    	;;
-    remove)
-    	ifdown $INTERFACE
-    	;;
-  esac
-  
-  exit 0
-fi
diff --git a/meta-oe/recipes-core/udev/udev/noasmlinkage.patch b/meta-oe/recipes-core/udev/udev/noasmlinkage.patch
deleted file mode 100644
index 0d8e854c0e..0000000000
--- a/meta-oe/recipes-core/udev/udev/noasmlinkage.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- udev-062/udev.c~noasmlinkage.patch
-+++ udev-062/udev.c
-@@ -54,7 +54,7 @@
- }
- #endif
- 
--static void asmlinkage sig_handler(int signum)
-+static void sig_handler(int signum)
- {
- 	switch (signum) {
- 		case SIGALRM:
---- udev-062/udevd.c~noasmlinkage.patch
-+++ udev-062/udevd.c
-@@ -639,7 +639,7 @@
- 	return msg;
- }
- 
--static void asmlinkage sig_handler(int signum)
-+static void sig_handler(int signum)
- {
- 	int rc;
- 
---- udev-062/udevstart.c~noasmlinkage.patch
-+++ udev-062/udevstart.c
-@@ -323,7 +323,7 @@
- 	exec_list(&device_list);
- }
- 
--static void asmlinkage sig_handler(int signum)
-+static void sig_handler(int signum)
- {
- 	switch (signum) {
- 		case SIGALRM:
diff --git a/meta-oe/recipes-core/udev/udev/permissions.rules b/meta-oe/recipes-core/udev/udev/permissions.rules
deleted file mode 100644
index f4f94a6dbe..0000000000
--- a/meta-oe/recipes-core/udev/udev/permissions.rules
+++ /dev/null
@@ -1,110 +0,0 @@
-ACTION!="add", GOTO="permissions_end"
-
-# devices needed to load the drivers providing them
-KERNEL=="tun",					OPTIONS+="ignore_remove"
-KERNEL=="ppp",					OPTIONS+="ignore_remove"
-KERNEL=="loop[0-9]*",				OPTIONS+="ignore_remove"
-
-# default permissions for block devices
-SUBSYSTEM=="block",				GROUP="disk"
-# the aacraid driver is broken and reports that disks removable (see #404927)
-SUBSYSTEM=="block", ATTRS{removable}=="1", \
-	DRIVERS!="aacraid",			GROUP="floppy"
-# all block devices on these buses are "removable"
-SUBSYSTEM=="block", SUBSYSTEMS=="usb|ieee1394|mmc|pcmcia", GROUP="floppy"
-
-# IDE devices
-KERNEL=="hd[a-z]|pcd[0-9]*", 			DRIVERS=="ide-cdrom|pcd", \
-	IMPORT{program}="cdrom_id --export $tempnode"
-ENV{ID_CDROM}=="?*",				GROUP="cdrom"
-KERNEL=="ht[0-9]*", 				GROUP="tape"
-KERNEL=="nht[0-9]*", 				GROUP="tape"
-
-# SCSI devices
-KERNEL=="sr[0-9]*", IMPORT{program}="cdrom_id --export $tempnode"
-SUBSYSTEMS=="scsi", ATTRS{type}=="1",				GROUP="tape"
-SUBSYSTEMS=="scsi", ATTRS{type}=="4",				GROUP="cdrom"
-SUBSYSTEMS=="scsi", ATTRS{type}=="5",				GROUP="cdrom"
-SUBSYSTEMS=="scsi", ATTRS{type}=="8",				GROUP="tape"
-
-# USB devices
-KERNEL=="legousbtower*",	MODE="0666"
-KERNEL=="lp[0-9]*", SUBSYSTEMS=="usb",		GROUP="lp"
-
-# usbfs-like devices
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", \
-				MODE="0664"
-
-# iRiver music players
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device",	GROUP="plugdev", \
-	ATTRS{idVendor}=="4102", ATTRS{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|rtc[0-9]*",			GROUP="audio"
-KERNEL=="kqemu",		MODE="0666"
-KERNEL=="tun",			MODE="0666",
-
-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=="irlpt*",				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]*", ATTRS{name}=="*dvb*|*DVB*|* IR *" \
-				MODE="0664",	GROUP="video"
-KERNEL=="js[0-9]*",		MODE="0664"
-KERNEL=="lirc[0-9]*",				GROUP="video"
-
-# AOE character devices
-SUBSYSTEM=="aoe",		MODE="0220",	GROUP="disk"
-SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440"
-
-LABEL="permissions_end"
-
diff --git a/meta-oe/recipes-core/udev/udev/run.rules b/meta-oe/recipes-core/udev/udev/run.rules
deleted file mode 100644
index 75d71375bb..0000000000
--- a/meta-oe/recipes-core/udev/udev/run.rules
+++ /dev/null
@@ -1,14 +0,0 @@
-# debugging monitor
-RUN+="socket:/org/kernel/udev/monitor"
-
-# run a command on remove events
-ACTION=="remove", ENV{REMOVE_CMD}!="", RUN+="$env{REMOVE_CMD}"
-
-# ignore the events generated by virtual consoles
-KERNEL=="ptmx",		OPTIONS+="last_rule"
-KERNEL=="console",	OPTIONS+="last_rule"
-KERNEL=="tty"	,	OPTIONS+="last_rule"
-KERNEL=="tty[0-9]*",	OPTIONS+="last_rule"
-KERNEL=="pty*",		OPTIONS+="last_rule"
-SUBSYSTEM=="vc",	OPTIONS+="last_rule"
-
diff --git a/meta-oe/recipes-core/udev/udev/udev-compat-wrapper-patch b/meta-oe/recipes-core/udev/udev/udev-compat-wrapper-patch
deleted file mode 100644
index c90d05aefa..0000000000
--- a/meta-oe/recipes-core/udev/udev/udev-compat-wrapper-patch
+++ /dev/null
@@ -1,37 +0,0 @@
-This patch should be applied on platforms which support kernels < 2.6.27 and need udev-compat package.
-
-It should be applied after:
-sed -i "s:/sbin/udevd:\$UDEVD:g;s:/sbin/udevadm:\$UDEVADM:g" init
-
-It has not .patch suffix, because such files would not be copied to
-WORKDIR and cannot be selectively applied on another source file.
-
---- init
-+++ init
-@@ -11,6 +11,17 @@
- 
- export TZ=/etc/localtime
- 
-+UDEVD="/sbin/udevd"
-+UDEVADM="/sbin/udevadm"
-+# If we are running an old kernel and have a static udev present use that instead
-+if [ -e /sbin/udevd-compat ] ; then
-+	KERNELMICROVER="$(uname -r | sed 's/^[0-9]*\.[0-9]*\.\([0-9]*\).*$/\1/')"
-+	if [ $KERNELMICROVER -lt 27 ] ; then
-+		UDEVD="/sbin/udevd-compat"
-+		UDEVADM="/sbin/udevadm-compat"
-+	fi
-+fi
-+
- [ -d /sys/class ] || exit 1
- [ -r /proc/mounts ] || exit 1
- [ -x $UDEVD ] || exit 1
-@@ -21,6 +32,8 @@
-         if [ -x /sbin/pidof ]; then
-                 pid=`/sbin/pidof -x udevd`
-                 [ -n "$pid" ] && kill $pid
-+                pid=`/sbin/pidof -x udevd-compat`
-+                [ -n "$pid" ] && kill $pid
-         fi
- }
- 
diff --git a/meta-oe/recipes-core/udev/udev/udev-replace-le16toh.patch b/meta-oe/recipes-core/udev/udev/udev-replace-le16toh.patch
deleted file mode 100644
index 7776c9a10e..0000000000
--- a/meta-oe/recipes-core/udev/udev/udev-replace-le16toh.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-This patch is needed on uclibc.
-
--Khem
-
-Index: udev-151/extras/ata_id/ata_id.c
-===================================================================
---- udev-151.orig/extras/ata_id/ata_id.c	2010-06-04 14:08:41.912730501 -0700
-+++ udev-151/extras/ata_id/ata_id.c	2010-06-04 14:09:31.492734527 -0700
-@@ -168,7 +168,11 @@ static void disk_identify_fixup_uint16 (
- 	uint16_t *p;
- 
- 	p = (uint16_t *) identify;
--	p[offset_words] = le16toh (p[offset_words]);
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
-+	p[offset_words] = p[offset_words];
-+#else
-+	p[offset_words] = __bswap_16 (p[offset_words]);
-+#endif
- }
- 
- /**
diff --git a/meta-oe/recipes-core/udev/udev/udev-replace-lutimes.patch b/meta-oe/recipes-core/udev/udev/udev-replace-lutimes.patch
deleted file mode 100644
index dd77897345..0000000000
--- a/meta-oe/recipes-core/udev/udev/udev-replace-lutimes.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This patch is needed on uclibc
-
--Khem
-Index: udev-151/udev/udev-node.c
-===================================================================
---- udev-151.orig/udev/udev-node.c	2010-06-04 14:18:59.082727182 -0700
-+++ udev-151/udev/udev-node.c	2010-06-04 14:20:27.485282812 -0700
-@@ -57,7 +57,7 @@ int udev_node_mknod(struct udev_device *
- 			preserve = 1;
- 			udev_selinux_lsetfilecon(udev, file, mode);
- 			/* update time stamp when we re-use the node, like on media change events */
--			utimes(file, NULL);
-+			utimensat(AT_FDCWD, file, NULL, 0);
- 		} else {
- 			char file_tmp[UTIL_PATH_SIZE + sizeof(TMP_FILE_EXT)];
- 
-@@ -178,7 +178,7 @@ static int node_symlink(struct udev *ude
- 					info(udev, "preserve already existing symlink '%s' to '%s'\n",
- 					     slink, target);
- 					udev_selinux_lsetfilecon(udev, slink, S_IFLNK);
--					lutimes(slink, NULL);
-+					utimensat(AT_FDCWD, slink, NULL, AT_SYMLINK_NOFOLLOW);
- 					goto exit;
- 				}
- 			}
diff --git a/meta-oe/recipes-core/udev/udev/udev.rules b/meta-oe/recipes-core/udev/udev/udev.rules
deleted file mode 100644
index c20cdcc153..0000000000
--- a/meta-oe/recipes-core/udev/udev/udev.rules
+++ /dev/null
@@ -1,113 +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
-#
-
-# workaround for devices which do not report media changes
-SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", \
-	ENV{ID_MODEL}=="IOMEGA_ZIP*", OPTIONS+="all_partitions"
-SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTRS{media}=="floppy", \
-	OPTIONS+="all_partitions"
-
-# SCSI devices
-SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*",	NAME="scd%n", SYMLINK+="sr%n"
-
-# USB devices
-SUBSYSTEMS=="usb", KERNEL=="auer[0-9]*",	NAME="usb/%k"
-SUBSYSTEMS=="usb", KERNEL=="cpad[0-9]*",	NAME="usb/%k"
-SUBSYSTEMS=="usb", KERNEL=="dabusb*",		NAME="usb/%k"
-SUBSYSTEMS=="usb", KERNEL=="hiddev*",		NAME="usb/%k"
-SUBSYSTEMS=="usb", KERNEL=="legousbtower*",	NAME="usb/%k"
-SUBSYSTEMS=="usb", KERNEL=="lp[0-9]*",		NAME="usb/%k"
-SUBSYSTEMS=="usb", KERNEL=="ttyUSB*", \
-	ATTRS{product}=="Palm Handheld*|Handspring Visor|palmOne Handheld", \
-					SYMLINK+="pilot"
-
-# usbfs-like devices
-SUBSYSTEM=="usb_device",	PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", ACTION=="add", \
-				NAME="%c"
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device",	NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}"
-
-# serial devices
-KERNEL=="capi",			NAME="capi20", SYMLINK+="isdn/capi20"
-KERNEL=="capi[0-9]*",		NAME="capi/%n"
-
-# video devices
-KERNEL=="dvb*",			PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}", ACTION=="add", \
-				NAME="%c"
-KERNEL=="card[0-9]*",		NAME="dri/%k"
-
-# misc devices
-KERNEL=="hw_random",		NAME="hwrng"
-KERNEL=="tun",			NAME="net/%k"
-KERNEL=="evtchn",		NAME="xen/%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=="rdma_ucm",		NAME="infiniband/%k"
-
-# ALSA devices
-KERNEL=="controlC[0-9]*",	NAME="snd/%k"
-KERNEL=="hwC[D0-9]*",		NAME="snd/%k"
-KERNEL=="pcmC[D0-9cp]*",	NAME="snd/%k"
-KERNEL=="midiC[D0-9]*",		NAME="snd/%k"
-KERNEL=="timer",		NAME="snd/%k"
-KERNEL=="seq",			NAME="snd/%k"
-
-# ieee1394 devices       
-KERNEL=="dv1394*",		NAME="dv1394/%n"
-KERNEL=="video1394*",		NAME="video1394/%n"
-
-# input devices
-KERNEL=="mice",			NAME="input/%k"
-KERNEL=="mouse[0-9]*",		NAME="input/%k"
-KERNEL=="event[0-9]*",		NAME="input/%k"
-KERNEL=="js[0-9]*",		NAME="input/%k"
-KERNEL=="ts[0-9]*",		NAME="input/%k"
-KERNEL=="uinput",		NAME="input/%k"
-
-# Zaptel
-KERNEL=="zapctl",		NAME="zap/ctl"
-KERNEL=="zaptimer",		NAME="zap/timer"
-KERNEL=="zapchannel",		NAME="zap/channel"
-KERNEL=="zappseudo",		NAME="zap/pseudo"
-KERNEL=="zap[0-9]*",		NAME="zap/%n"
-
-# AOE character devices
-SUBSYSTEM=="aoe", KERNEL=="discover",	NAME="etherd/%k"
-SUBSYSTEM=="aoe", KERNEL=="err",	NAME="etherd/%k"
-SUBSYSTEM=="aoe", KERNEL=="interfaces",	NAME="etherd/%k"
-SUBSYSTEM=="aoe", KERNEL=="revalidate",	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]*", GROUP="users", MODE="0660"
-
-# Samsung UARTS
-KERNEL=="s3c2410_serial[0-9]",   NAME="ttySAC%n"
-
-# MXC UARTs
-KERNEL=="ttymxc[0-4]",   NAME="ttymxc%n"
-
diff --git a/meta-oe/recipes-core/udev/udev/udev_network_queue.sh b/meta-oe/recipes-core/udev/udev/udev_network_queue.sh
deleted file mode 100644
index 05e08e9d1b..0000000000
--- a/meta-oe/recipes-core/udev/udev/udev_network_queue.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
-#
-# Filename: udev_network_queue.sh
-# Date: 03-May-06
-
-do_start() {
-	if test -e /dev/udev_network_queue
-	then
-		echo "Activating queued NICs..."
-		for NIC in `cat /dev/udev_network_queue`
-		do	
-			export INTERFACE="$NIC" ; export ACTION=add
-			/etc/udev/scripts/network.sh
-		done
-		echo ""
-	else
-		echo "No NICs queued"
-	fi
-}
-
-do_stop() {
-	/bin/true
-}
-
-case "$1" in
-start)		do_start;;
-stop)		do_stop;;
-restart)	do_stop
-		do_start;;
-*)	echo "Usage: `basename $0` [ start | stop | restart ]"
-	exit 0;;
-esac
diff --git a/meta-oe/recipes-core/udev/udev/udevsynthesize.patch b/meta-oe/recipes-core/udev/udev/udevsynthesize.patch
deleted file mode 100644
index 7811188485..0000000000
--- a/meta-oe/recipes-core/udev/udev/udevsynthesize.patch
+++ /dev/null
@@ -1,776 +0,0 @@
---- udev-081/udevsynthesize.c.orig	2006-01-29 12:22:45.000000000 +0100
-+++ udev-081/udevsynthesize.c	2006-01-29 12:22:40.000000000 +0100
-@@ -0,0 +1,763 @@
-+/*
-+ * udevcoldplug.c
-+ *
-+ * Copyright (C) 2005 SUSE Linux Products GmbH
-+ *
-+ * Author:
-+ *   Kay Sievers <kay.sievers@vrfy.org>
-+ *
-+ * Synthesize kernel events from sysfs information and pass them
-+ * to the udevd daemon.
-+ *
-+ *	This program is free software; you can redistribute it and/or modify it
-+ *	under the terms of the GNU General Public License as published by the
-+ *	Free Software Foundation version 2 of the License.
-+ * 
-+ *	This program is distributed in the hope that it will be useful, but
-+ *	WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *	General Public License for more details.
-+ * 
-+ *	You should have received a copy of the GNU General Public License along
-+ *	with this program; if not, write to the Free Software Foundation, Inc.,
-+ *	675 Mass Ave, Cambridge, MA 02139, USA.
-+ *
-+ */
-+
-+#include <stdlib.h>
-+#include <stddef.h>
-+#include <string.h>
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <errno.h>
-+#include <ctype.h>
-+#include <fcntl.h>
-+#include <dirent.h>
-+#include <signal.h>
-+#include <syslog.h>
-+#include <sys/socket.h>
-+#include <sys/un.h>
-+#include <sys/wait.h>
-+#include <sys/stat.h>
-+#include <sys/types.h>
-+
-+#include "udev_libc_wrapper.h"
-+#include "udev.h"
-+#include "udevd.h"
-+#include "udev_version.h"
-+#include "logging.h"
-+
-+#include "list.h"
-+
-+#ifndef DT_DIR
-+#define DT_DIR			4
-+#endif
-+
-+static const char *udev_log_str;
-+static int udevd_sock = -1;
-+
-+#ifdef USE_LOG
-+void log_message(int priority, const char *format, ...)
-+{
-+	va_list args;
-+
-+	if (priority > udev_log_priority)
-+		return;
-+
-+	va_start(args, format);
-+	vsyslog(priority, format, args);
-+	va_end(args);
-+}
-+#endif
-+
-+struct device {
-+	struct list_head node;
-+	struct udevd_msg msg;
-+	size_t bufpos;
-+	char *path;
-+};
-+
-+static dev_t read_devt(const char *path)
-+{
-+	char filename[PATH_SIZE];
-+	char majorminor[64];
-+	unsigned int major, minor;
-+	ssize_t count;
-+	int fd;
-+
-+	snprintf(filename, sizeof(filename), "%s/%s", path, "dev");
-+	filename[sizeof(filename)-1] = '\0';
-+
-+	fd = open(filename, O_RDONLY);
-+	if (fd < 0)
-+		return 0;
-+
-+	count = read(fd, majorminor, sizeof(majorminor));
-+	close(fd);
-+	majorminor[count] = '\0';
-+	if (sscanf(majorminor, "%u:%u", &major, &minor) != 2)
-+		return 0;
-+	dbg("found major=%d, minor=%d", major, minor);
-+
-+	return makedev(major, minor);
-+}
-+
-+static ssize_t read_file(const char *directory, const char *file, char *str, size_t len)
-+{
-+	char filename[PATH_SIZE];
-+	ssize_t count;
-+	int fd;
-+
-+	memset(filename, 0, sizeof(filename));
-+	snprintf(filename, sizeof(filename), "%s/%s", directory, file);
-+	filename[sizeof(filename)-1] = '\0';
-+
-+	fd = open(filename, O_RDONLY);
-+	if (fd < 0)
-+		return -1;
-+
-+	count = read(fd, str, len-1);
-+	close(fd);
-+
-+	if (count > (ssize_t)len)
-+		count = len;
-+	str[count-1] = '\0';
-+
-+	return count;
-+}
-+
-+static ssize_t read_link(const char *directory, const char *file, char *str, size_t size)
-+{
-+	char filename[PATH_SIZE];
-+	char target[PATH_SIZE];
-+	int len;
-+	char *back;
-+	char *strip;
-+	int level = 1;
-+
-+	snprintf(filename, sizeof(filename), "%s/%s", directory, file);
-+	filename[sizeof(filename)-1] = '\0';
-+
-+	len = readlink(filename, target, sizeof(target)-1);
-+	if (len < 0)
-+		return -1;
-+	target[len] = '\0';
-+
-+	back = target;
-+	while (strncmp(back, "../", 3) == 0) {
-+		back += 3;
-+		level++;
-+	}
-+	while(level--) {
-+		strip = strrchr(filename, '/');
-+		if (!strip)
-+			return -1;
-+		strip[0] = '\0';
-+	}
-+
-+	snprintf(str, size, "%s/%s", filename, back);
-+	str[size-1] = '\0';
-+
-+	return len;
-+}
-+
-+static char *add_env_key(struct device *device, const char *key, const char *value)
-+{
-+	size_t pos = device->bufpos;
-+	device->bufpos += sprintf(&device->msg.envbuf[device->bufpos], "%s=%s", key, value)+1;
-+	return &device->msg.envbuf[pos];
-+}
-+
-+static struct device *device_create(const char *path, const char *subsystem, dev_t devt)
-+{
-+	struct device *device;
-+	const char *devpath = &path[strlen(sysfs_path)];
-+	char target[PATH_SIZE];
-+
-+	device = malloc(sizeof(struct device));
-+	if (device == NULL) {
-+		dbg("error malloc");
-+		return NULL;
-+	}
-+	memset(device, 0x00, sizeof(struct device));
-+
-+	device->path = add_env_key(device, "DEVPATH", devpath);
-+	device->path += strlen("DEVPATH=");
-+	add_env_key(device, "SUBSYSTEM", subsystem);
-+	add_env_key(device, "ACTION", "add");
-+	add_env_key(device, "UDEV_COLDPLUG", "1");
-+
-+	if (major(devt)) {
-+		char number[32];
-+		sprintf(number, "%u", major(devt));
-+		add_env_key(device, "MAJOR", number);
-+		sprintf(number, "%u", minor(devt));
-+		add_env_key(device, "MINOR", number);
-+	}
-+
-+	if (strncmp(devpath, "/block/", strlen("/block/")) == 0 ||
-+	    strncmp(devpath, "/class/", strlen("/class/")) == 0) {
-+		char physpath[PATH_SIZE];
-+
-+		if (read_link(path, "device", physpath, sizeof(physpath)) > (ssize_t)strlen(sysfs_path)) {
-+			add_env_key(device, "PHYSDEVPATH", &physpath[strlen(sysfs_path)]);
-+			if (read_link(physpath, "driver", target, sizeof(target)) > (ssize_t)strlen(sysfs_path)) {
-+				char *pos = strrchr(target, '/');
-+				if (pos)
-+					add_env_key(device, "PHYSDEVDRIVER", &pos[1]);
-+			}
-+			if (read_link(physpath, "bus", target, sizeof(target)) > (ssize_t)strlen(sysfs_path)) {
-+				char *pos = strrchr(target, '/');
-+				if (pos)
-+					add_env_key(device, "PHYSDEVBUS", &pos[1]);
-+			}
-+		}
-+	} else if (strncmp(devpath, "/devices/", strlen("/devices/")) == 0) {
-+		if (read_link(path, "driver", target, sizeof(target)) > (ssize_t)strlen(sysfs_path)) {
-+			char *pos = strrchr(target, '/');
-+			if (pos)
-+				add_env_key(device, "PHYSDEVDRIVER", &pos[1]);
-+		}
-+		if (read_link(path, "bus", target, sizeof(target)) > (ssize_t)strlen(sysfs_path)) {
-+			char *pos = strrchr(target, '/');
-+			if (pos)
-+				add_env_key(device, "PHYSDEVBUS", &pos[1]);
-+		}
-+	}
-+
-+	return device;
-+}
-+
-+static int device_list_insert(struct list_head *device_list, struct device *device)
-+{
-+	struct device *loop_device;
-+
-+	dbg("insert: '%s'", device->path);
-+
-+	/* sort files in lexical order */
-+	list_for_each_entry(loop_device, device_list, node)
-+		if (strcmp(loop_device->path, device->path) > 0)
-+			break;
-+
-+	list_add_tail(&device->node, &loop_device->node);
-+
-+	return 0;
-+}
-+
-+static int add_device_udevd(struct device *device)
-+{
-+	size_t msg_len;
-+	struct sockaddr_un saddr;
-+	socklen_t addrlen;
-+	int retval;
-+
-+	memset(&saddr, 0x00, sizeof(struct sockaddr_un));
-+	saddr.sun_family = AF_LOCAL;
-+	/* use abstract namespace for socket path */
-+	strcpy(&saddr.sun_path[1], UDEVD_SOCK_PATH);
-+	addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
-+
-+	strcpy(device->msg.magic, UDEV_MAGIC);
-+	device->msg.type = UDEVD_UEVENT_UDEVSEND;
-+
-+	msg_len = offsetof(struct udevd_msg, envbuf) + device->bufpos;
-+	dbg("msg_len=%i", msg_len);
-+
-+	retval = sendto(udevd_sock, &device->msg, msg_len, 0, (struct sockaddr *)&saddr, addrlen);
-+	if (retval < 0)
-+		return -1;
-+
-+	return 0;
-+}
-+
-+static void exec_list(struct list_head *device_list, const char *first[], const char *last[])
-+{
-+	struct device *loop_device;
-+	struct device *tmp_device;
-+	int i;
-+
-+	/* handle the "first" type devices first */
-+	if (first)
-+		list_for_each_entry_safe(loop_device, tmp_device, device_list, node) {
-+			for (i = 0; first[i] != NULL; i++) {
-+				if (strncmp(loop_device->path, first[i], strlen(first[i])) == 0) {
-+					add_device_udevd(loop_device);
-+					list_del(&loop_device->node);
-+					free(loop_device);
-+					break;
-+				}
-+			}
-+		}
-+
-+	/* handle the devices we are allowed to, excluding the "last" type devices */
-+	if (last)
-+		list_for_each_entry_safe(loop_device, tmp_device, device_list, node) {
-+			int found = 0;
-+			for (i = 0; last[i] != NULL; i++) {
-+				if (strncmp(loop_device->path, last[i], strlen(last[i])) == 0) {
-+					found = 1;
-+					break;
-+				}
-+			}
-+			if (found)
-+				continue;
-+
-+		add_device_udevd(loop_device);
-+		list_del(&loop_device->node);
-+		free(loop_device);
-+	}
-+
-+	/* handle the rest of the devices */
-+	list_for_each_entry_safe(loop_device, tmp_device, device_list, node) {
-+		add_device_udevd(loop_device);
-+		list_del(&loop_device->node);
-+		free(loop_device);
-+	}
-+}
-+
-+static int udev_scan_class(void)
-+{
-+	char base[PATH_SIZE];
-+	DIR *dir;
-+	struct dirent *dent;
-+	LIST_HEAD(device_list);
-+
-+	/* we want /dev/null and /dev/console first */
-+	const char *first[] = {
-+		"/class/mem",
-+		"/class/tty",
-+		NULL,
-+	};
-+
-+	snprintf(base, sizeof(base), "%s/class", sysfs_path);
-+	base[sizeof(base)-1] = '\0';
-+
-+	dir = opendir(base);
-+	if (!dir)
-+		return -1;
-+
-+	for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
-+		char dirname[PATH_SIZE];
-+		DIR *dir2;
-+		struct dirent *dent2;
-+
-+		if (dent->d_name[0] == '.')
-+			continue;
-+
-+		snprintf(dirname, sizeof(dirname), "%s/%s", base, dent->d_name);
-+		dirname[sizeof(dirname)-1] = '\0';
-+
-+		dir2 = opendir(dirname);
-+		if (!dir2)
-+			continue;
-+		for (dent2 = readdir(dir2); dent2 != NULL; dent2 = readdir(dir2)) {
-+			char dirname2[PATH_SIZE];
-+			struct device *device;
-+			dev_t devt;
-+
-+			if (dent2->d_name[0] == '.')
-+				continue;
-+			if (dent2->d_type != DT_DIR)
-+				continue;
-+
-+			snprintf(dirname2, sizeof(dirname2), "%s/%s", dirname, dent2->d_name);
-+			dirname2[sizeof(dirname2)-1] = '\0';
-+			devt = read_devt(dirname2);
-+			device = device_create(dirname2, dent->d_name, devt);
-+
-+			if (strcmp(dent->d_name, "net") == 0 ||
-+			    strcmp(dent->d_name, "bluetooth") == 0) {
-+				add_env_key(device, "INTERFACE", dent2->d_name);
-+			} else if (strcmp(dent->d_name, "pcmcia_socket") == 0 &&
-+				   strlen(dent->d_name) > 14) {
-+				add_env_key(device, "SOCKET_NO",
-+					dent2->d_name + 14);
-+			}
-+
-+			device_list_insert(&device_list, device);
-+		}
-+		closedir(dir2);
-+	}
-+	closedir(dir);
-+	exec_list(&device_list, first, NULL);
-+
-+	return 0;
-+}
-+
-+static int udev_scan_block(void)
-+{
-+	char base[PATH_SIZE];
-+	DIR *dir;
-+	struct dirent *dent;
-+	LIST_HEAD(device_list);
-+
-+	/* dm wants to have the block devices around before it */
-+	const char *last[] = {
-+		"/block/dm",
-+		NULL,
-+	};
-+
-+	snprintf(base, sizeof(base), "%s/block", sysfs_path);
-+	base[sizeof(base)-1] = '\0';
-+
-+	dir = opendir(base);
-+	if (!dir)
-+		return -1;
-+
-+	for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
-+		char dirname[PATH_SIZE];
-+		struct device *device;
-+		struct dirent *dent2;
-+		DIR *dir2;
-+		dev_t devt;
-+
-+		if (dent->d_name[0] == '.')
-+			continue;
-+		if (dent->d_type != DT_DIR)
-+			continue;
-+
-+		snprintf(dirname, sizeof(dirname), "%s/%s", base, dent->d_name);
-+		dirname[sizeof(dirname)-1] = '\0';
-+		devt = read_devt(dirname);
-+		if (major(devt)) {
-+			device = device_create(dirname, "block", devt);
-+			device_list_insert(&device_list, device);
-+		}
-+
-+		/* look for partitions */
-+		dir2 = opendir(dirname);
-+		if (!dir2)
-+			continue;
-+		for (dent2 = readdir(dir2); dent2 != NULL; dent2 = readdir(dir2)) {
-+			char dirname2[PATH_SIZE];
-+
-+			if (dent2->d_name[0] == '.')
-+				continue;
-+			if (dent2->d_type != DT_DIR)
-+				continue;
-+
-+			snprintf(dirname2, sizeof(dirname2), "%s/%s", dirname, dent2->d_name);
-+			dirname2[sizeof(dirname2)-1] = '\0';
-+			devt = read_devt(dirname2);
-+			if (major(devt)) {
-+				device = device_create(dirname2, "block", devt);
-+				device_list_insert(&device_list, device);
-+				continue;
-+			}
-+		}
-+		closedir(dir2);
-+	}
-+	closedir(dir);
-+	exec_list(&device_list, NULL, last);
-+
-+	return 0;
-+}
-+
-+static int pci_handler(struct device *device)
-+{
-+	char path[PATH_SIZE];
-+	char value[PATH_SIZE];
-+	char vendor[PATH_SIZE];
-+	char product[PATH_SIZE];
-+	const char *name;
-+
-+	snprintf(path, sizeof(path), "%s%s", sysfs_path, device->path);
-+	path[sizeof(path)-1] = '\0';
-+
-+	if (read_file(path, "modalias", value, sizeof(value)) > 0)
-+		add_env_key(device, "MODALIAS", value);
-+
-+	name = strrchr(device->path, '/');
-+	if (name)
-+		add_env_key(device, "PCI_SLOT_NAME", &name[1]);
-+
-+	if (read_file(path, "class", value, sizeof(value)) > 0)
-+		add_env_key(device, "PCI_CLASS", &value[2]);
-+
-+	if (read_file(path, "vendor", vendor, sizeof(vendor)) > 0 &&
-+	    read_file(path, "device", product, sizeof(product)) > 0) {
-+		snprintf(value, sizeof(value), "%s:%s", &vendor[2], &product[2]);
-+		path[sizeof(value)-1] = '\0';
-+		add_env_key(device, "PCI_ID", value);
-+	}
-+
-+	if (read_file(path, "subsystem_vendor", vendor, sizeof(vendor)) > 0 &&
-+	    read_file(path, "subsystem_device", product, sizeof(product)) > 0) {
-+		snprintf(value, sizeof(value), "%s:%s", &vendor[2], &product[2]);
-+		path[sizeof(value)-1] = '\0';
-+		add_env_key(device, "PCI_SUBSYS_ID", value);
-+	}
-+
-+	return 0;
-+}
-+
-+static int usb_handler(struct device *device)
-+{
-+	char path[PATH_SIZE];
-+	char value[PATH_SIZE];
-+	char str1[PATH_SIZE];
-+	char str2[PATH_SIZE];
-+	char str3[PATH_SIZE];
-+	unsigned int int1;
-+	unsigned int int2;
-+	unsigned int int3;
-+	char *pos;
-+
-+	snprintf(path, sizeof(path), "%s%s", sysfs_path, device->path);
-+	path[sizeof(path)-1] = '\0';
-+
-+	/* device events have : in their directory name */
-+	pos = strrchr(path, '/');
-+	if (!strchr(pos, ':'))
-+		return 0;	/* and do not have other variables */
-+
-+	if (read_file(path, "modalias", value, sizeof(value)) > 0)
-+		add_env_key(device, "MODALIAS", value);
-+
-+	if (read_file(path, "bInterfaceClass", str1, sizeof(str1)) > 0 &&
-+	    read_file(path, "bInterfaceSubClass", str2, sizeof(str2)) > 0 &&
-+	    read_file(path, "bInterfaceProtocol", str3, sizeof(str3)) > 0) {
-+		int1 = (int) strtol(str1, NULL, 16);
-+		int2 = (int) strtol(str2, NULL, 16);
-+		int3 = (int) strtol(str3, NULL, 16);
-+		snprintf(value, sizeof(value), "%u/%u/%u", int1, int2, int3);
-+		path[sizeof(value)-1] = '\0';
-+		add_env_key(device, "INTERFACE", value);
-+	}
-+
-+	/* move to the parent directory */
-+	pos[0] = '\0';
-+
-+	if (read_file(path, "idVendor", str1, sizeof(str1)) > 0 &&
-+	    read_file(path, "idProduct", str2, sizeof(str2)) > 0 &&
-+	    read_file(path, "bcdDevice", str3, sizeof(str3)) > 0) {
-+		int1 = (int) strtol(str1, NULL, 16);
-+		int2 = (int) strtol(str2, NULL, 16);
-+		int3 = (int) strtol(str3, NULL, 16);
-+		snprintf(value, sizeof(value), "%x/%x/%x", int1, int2, int3);
-+		path[sizeof(value)-1] = '\0';
-+		add_env_key(device, "PRODUCT", value);
-+	}
-+
-+	if (read_file(path, "bDeviceClass", str1, sizeof(str1)) > 0 &&
-+	    read_file(path, "bDeviceSubClass", str2, sizeof(str2)) > 0 &&
-+	    read_file(path, "bDeviceProtocol", str3, sizeof(str3)) > 0) {
-+		int1 = (int) strtol(str1, NULL, 16);
-+		int2 = (int) strtol(str2, NULL, 16);
-+		int3 = (int) strtol(str3, NULL, 16);
-+		snprintf(value, sizeof(value), "%u/%u/%u", int1, int2, int3);
-+		path[sizeof(value)-1] = '\0';
-+		add_env_key(device, "TYPE", value);
-+	}
-+
-+	if (read_file(path, "devnum", str2, sizeof(str2)) > 0) {
-+		pos = strrchr(path, 'b');
-+		int1 = (int) strtol(pos + 1, NULL, 16);
-+		int2 = (int) strtol(str2, NULL, 16);
-+		snprintf(value, sizeof(value),
-+			"/proc/bus/usb/%03d/%03d", int1, int2);
-+		path[sizeof(value)-1] = '\0';
-+		add_env_key(device, "DEVICE", value);
-+	}
-+
-+	return 0;
-+}
-+
-+static int serio_handler(struct device *device)
-+{
-+	char path[PATH_SIZE];
-+	char value[PATH_SIZE];
-+
-+	snprintf(path, sizeof(path), "%s%s", sysfs_path, device->path);
-+	path[sizeof(path)-1] = '\0';
-+
-+	if (read_file(path, "modalias", value, sizeof(value)) > 0)
-+		add_env_key(device, "MODALIAS", value);
-+
-+	if (read_file(path, "id/type", value, sizeof(value)) > 0)
-+		add_env_key(device, "SERIO_TYPE", value);
-+
-+	if (read_file(path, "id/proto", value, sizeof(value)) > 0)
-+		add_env_key(device, "SERIO_PROTO", value);
-+
-+	if (read_file(path, "id/id", value, sizeof(value)) > 0)
-+		add_env_key(device, "SERIO_ID", value);
-+
-+	if (read_file(path, "id/extra", value, sizeof(value)) > 0)
-+		add_env_key(device, "SERIO_EXTRA", value);
-+
-+	return 0;
-+}
-+
-+static int ccw_handler(struct device *device)
-+{
-+	char path[PATH_SIZE];
-+	char value[PATH_SIZE], *tmp;
-+
-+	snprintf(path, sizeof(path), "%s%s", sysfs_path, device->path);
-+	path[sizeof(path)-1] = '\0';
-+
-+	if (read_file(path, "modalias", value, sizeof(value)) > 0)
-+		add_env_key(device, "MODALIAS", value);
-+
-+	if (read_file(path, "cutype", value, sizeof(value)) > 0) {
-+		value[4] = 0;
-+		tmp = &value[5];
-+		add_env_key(device, "CU_TYPE", value);
-+		add_env_key(device, "CU_MODEL", tmp);
-+	}
-+
-+	if (read_file(path, "devtype", value, sizeof(value)) > 0) {
-+		if (value[0] == 'n') {
-+			add_env_key(device, "DEV_TYPE", "0000");
-+			add_env_key(device, "DEV_MODEL", "00");
-+		}
-+		else {
-+			value[4] = 0;
-+			tmp = &value[5];
-+			add_env_key(device, "DEV_TYPE", value);
-+			add_env_key(device, "DEV_MODEL", tmp);
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+static int modalias_handler(struct device *device)
-+{
-+	char path[PATH_SIZE];
-+	char value[PATH_SIZE];
-+
-+	snprintf(path, sizeof(path), "%s%s", sysfs_path, device->path);
-+	path[sizeof(path)-1] = '\0';
-+
-+	if (read_file(path, "modalias", value, sizeof(value)) > 0)
-+		add_env_key(device, "MODALIAS", value);
-+
-+	return 0;
-+}
-+
-+static int udev_scan_bus(const char *bus, int bus_handler(struct device *device))
-+{
-+	char base[PATH_SIZE];
-+	DIR *dir;
-+	struct dirent *dent;
-+	LIST_HEAD(device_list);
-+
-+	snprintf(base, sizeof(base), "%s/bus/%s/devices", sysfs_path, bus);
-+	base[sizeof(base)-1] = '\0';
-+
-+	dir = opendir(base);
-+	if (!dir)
-+		return -1;
-+	for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
-+		char devpath[PATH_SIZE];
-+		struct device *device;
-+
-+		if (dent->d_name[0] == '.')
-+			continue;
-+
-+		if (read_link(base, dent->d_name, devpath, sizeof(devpath)) < 0)
-+			continue;
-+
-+		device = device_create(devpath, bus, makedev(0, 0));
-+		if (bus_handler) {
-+			if (bus_handler(device) < 0) {
-+				dbg("'%s' bus handler skipped event", devpath);
-+				free(device);
-+				continue;
-+			}
-+		}
-+
-+		device_list_insert(&device_list, device);
-+	}
-+	closedir(dir);
-+	exec_list(&device_list, NULL, NULL);
-+
-+	return 0;
-+}
-+
-+static int udev_scan_devices(void)
-+{
-+	char base[PATH_SIZE];
-+	DIR *dir;
-+	struct dirent *dent;
-+
-+	snprintf(base, sizeof(base), "%s/bus", sysfs_path);
-+	base[sizeof(base)-1] = '\0';
-+
-+	dir = opendir(base);
-+	if (!dir)
-+		return -1;
-+
-+	for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
-+		if (dent->d_name[0] == '.')
-+			continue;
-+		if (dent->d_type != DT_DIR)
-+			continue;
-+
-+		/* add bus specific env values */
-+		if (strcmp(dent->d_name, "pci") == 0)
-+			udev_scan_bus("pci", pci_handler);
-+		else if (strcmp(dent->d_name, "usb") == 0)
-+			udev_scan_bus("usb", usb_handler);
-+		else if (strcmp(dent->d_name, "serio") == 0)
-+			udev_scan_bus("serio", serio_handler);
-+		else if (strcmp(dent->d_name, "ccw") == 0)
-+			udev_scan_bus("ccw", ccw_handler);
-+		else
-+			udev_scan_bus(dent->d_name, modalias_handler);
-+	}
-+	closedir(dir);
-+
-+	return 0;
-+}
-+
-+int main(int argc, char *argv[], char *envp[])
-+{
-+	LIST_HEAD(device_list);
-+	int i;
-+
-+	logging_init("udevcoldplug");
-+	udev_config_init(); sysfs_init();
-+	dbg("version %s", UDEV_VERSION);
-+
-+	udev_log_str = getenv("UDEV_LOG");
-+
-+	/* disable all logging if not explicitely requested */
-+	if (udev_log_str == NULL)
-+		udev_log_priority = 0;
-+
-+	for (i = 1 ; i < argc; i++) {
-+		char *arg = argv[i];
-+
-+		if (strcmp(arg, "help") == 0  || strcmp(arg, "--help") == 0  || strcmp(arg, "-h") == 0) {
-+			printf("Usage: udevcoldplug \n"
-+				"  --help                   print this help text\n\n");
-+			exit(0);
-+		} else {
-+			fprintf(stderr, "unknown option\n\n");
-+			exit(1);
-+		}
-+	}
-+
-+	udevd_sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
-+	if (udevd_sock < 0) {
-+		err("error getting socket");
-+		return 1;
-+	}
-+
-+	/* create nodes for already available devices */
-+	udev_scan_class();
-+	udev_scan_block();
-+
-+	/* synthesize events for bus devices
-+	 * may load modules or configure the device */
-+	udev_scan_devices();
-+
-+	if (udevd_sock >= 0)
-+		close(udevd_sock);
-+	logging_close();
-+
-+	return 0;
-+}
---- udev-081/Makefile
-+++ udev-081/Makefile
-@@ -58,6 +58,7 @@ PROGRAMS = \
- 	udevmonitor			\
- 	udevinfo			\
- 	udevtest			\
-+	udevsynthesize			\
- 	udevstart
- 
- HEADERS = \
diff --git a/meta-oe/recipes-core/udev/udev/udevsynthesize.sh b/meta-oe/recipes-core/udev/udev/udevsynthesize.sh
deleted file mode 100644
index d58217c144..0000000000
--- a/meta-oe/recipes-core/udev/udev/udevsynthesize.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh -e
-
-load_input_modules() {
-  for module in mousedev evdev joydev; do
-    modprobe -q $module || true
-  done
-}
-
-if [ ! -e /sys/class/mem/null/uevent ]; then # <= 2.6.14
-  /lib/udev/udevsynthesize
-  load_input_modules
-  exit 0
-fi
-
-# replace $IFS with something which is not likely to appear in a sysfs path,
-# because some buggy drivers have spaces in their names
-oldifs="$IFS"
-IFS="|"
-
-for file in /sys/bus/*/devices/*/uevent /sys/class/*/*/uevent \
-		/sys/block/*/uevent /sys/block/*/*/uevent; do
-  case "$file" in
-    */device/uevent) ;;		# skip followed device symlinks
-    */\*/*) ;;
-
-    */class/mem/*)		# for /dev/null
-    first="$first${IFS}$file" ;;
-
-    */block/md[0-9]*)
-    last="$last${IFS}$file" ;;
-
-    *)
-    default="$default${IFS}$file" ;;
-  esac
-done
-
-for file in $first${IFS}$default${IFS}$last; do
-  [ "$file" ] || continue
-  echo 'add' > "$file" || true
-done
-
-IFS="$oldifs"
-
-case "$(uname -r)" in
-  2.6.1[0-5]|2.6.1[0-5][!0-9]*) # <= 2.6.15
-  load_input_modules
-  ;;
-esac
-
-exit 0
-
diff --git a/meta-oe/recipes-core/udev/udev_168.bb b/meta-oe/recipes-core/udev/udev_168.bb
deleted file mode 100644
index c37d087618..0000000000
--- a/meta-oe/recipes-core/udev/udev_168.bb
+++ /dev/null
@@ -1,122 +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.27."
-
-# udev 169 will bump kernel requirements up to 2.6.36 for ARM: 
-# http://git.kernel.org/?p=linux/hotplug/udev.git;a=commit;h=67a77c8bf299f6264f001677becd056316ebce2f
-
-LICENSE = "GPLv2+ & LGPLv2.1+"
-LICENSE_${PN} = "GPLv2+"
-LICENSE_libudev = "LGPLv2.1+"
-LICENSE_libgudev = "LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
-                    file://libudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
-                    file://extras/gudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
-
-# Needed for udev-extras
-DEPENDS = "gperf-native usbutils acl glib-2.0"
-
-SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz"
-SRC_URI[md5sum] = "08eb7c2564bc89defcefdaa6ec4a9fc1"
-SRC_URI[sha256sum] = "1d5c548d7c85d30b3508b82ad88d853e28dddb6c526d0e67aa92ac18af93d218"
-
-SRC_URI += " \
-       file://run.rules \
-       file://udev.rules \
-       file://links.conf \
-       file://permissions.rules \
-       file://mount.sh \
-       file://mount.blacklist \
-       file://network.sh \
-       file://local.rules \
-       file://default \
-       file://init \
-       file://cache \
-       file://udev-compat-wrapper-patch \
-"
-
-PR = "r3"
-
-inherit update-rc.d autotools
-
-EXTRA_OECONF += " --with-udev-prefix= \
-                  --with-libdir-name=${base_libdir} \
-                  --with-pci-ids-path=/usr/share/misc \
-                  --disable-introspection \
-                  ac_cv_file__usr_share_pci_ids=no \
-                  ac_cv_file__usr_share_hwdata_pci_ids=no \
-                  ac_cv_file__usr_share_misc_pci_ids=yes \
-                  --sbindir=${base_sbindir} \
-                  --libexecdir=${base_libdir}/udev \
-                  --with-rootlibdir=${base_libdir} \
-                  --with-systemdsystemunitdir=${base_libdir}/systemd/system/ \
-"
-
-INITSCRIPT_NAME = "udev"
-INITSCRIPT_PARAMS = "start 04 S ."
-
-PACKAGES =+ "${PN}-systemd libudev libgudev udev-utils udev-consolekit"
-
-FILES_${PN}-systemd = "${base_libdir}/systemd/system/"
-
-FILES_libudev = "${base_libdir}/libudev.so.*"
-FILES_libgudev = "${base_libdir}/libgudev*.so.*"
-
-FILES_udev-utils = "${bindir}/udevinfo ${bindir}/udevtest ${base_sbindir}/udevadm"
-
-RPROVIDES_${PN} = "hotplug"
-FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd"
-FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug"
-RDEPENDS_${PN} += "module-init-tools-depmod udev-utils"
-
-# udev installs binaries under $(udev_prefix)/lib/udev, even if ${libdir}
-# is ${prefix}/lib64
-FILES_${PN} += "/lib/udev*"
-FILES_${PN}-dbg += "/lib/udev/.debug"
-
-FILES_${PN}-consolekit += "${libdir}/ConsoleKit"
-RDEPENDS_${PN}-consolekit += "consolekit"
-
-# Package up systemd files
-FILES_${PN} += "${base_libdir}/systemd"
-
-do_install () {
-	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
-	install -m 0755 ${WORKDIR}/cache ${D}${sysconfdir}/init.d/udev-cache
-
-	install -d ${D}${sysconfdir}/default
-	install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/udev
-
- 	cp ${S}/rules/rules.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}/run.rules          ${D}${sysconfdir}/udev/rules.d/run.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
-
-	touch ${D}${sysconfdir}/udev/saved.uname
-	touch ${D}${sysconfdir}/udev/saved.cmdline
-	touch ${D}${sysconfdir}/udev/saved.devices
-	touch ${D}${sysconfdir}/udev/saved.atags
-
-	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
-}
-
-# Create the cache after checkroot has run
-pkg_postinst_udev_append() {
-	if test "x$D" != "x"; then
-		OPT="-r $D"
-	else
-		OPT="-s"
-	fi
-	update-rc.d $OPT udev-cache start 36 S .
-}
diff --git a/meta-oe/recipes-core/udev/udev_171.bb b/meta-oe/recipes-core/udev/udev_171.bb
index 612da1062a..c02f4f3256 100644
--- a/meta-oe/recipes-core/udev/udev_171.bb
+++ b/meta-oe/recipes-core/udev/udev_171.bb
@@ -13,9 +13,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
                     file://libudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
                     file://extras/gudev/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
 
-# Needs more testing
-DEFAULT_PREFERENCE = "-1"
-
 # Needed for udev-extras
 DEPENDS = "gperf-native usbutils acl glib-2.0"