From b764bcb0af5a9b14a2a77df5f58a76f3dc635930 Mon Sep 17 00:00:00 2001
From: Tilman Sauerbeck <tilman@crux.nu>
Date: Fri, 5 Jun 2009 14:10:27 +0200
Subject: [PATCH] udev: updated to new LFS rules.

Also dropped the broken vol_id symlink.
---
 udev/.footprint |  1 -
 udev/.md5sum    |  2 +-
 udev/Pkgfile    | 13 ++++---------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/udev/.footprint b/udev/.footprint
index cce3fc38..f7899755 100644
--- a/udev/.footprint
+++ b/udev/.footprint
@@ -55,7 +55,6 @@ lrwxrwxrwx	root/root	sbin/scsi_id -> ../lib/udev/scsi_id
 -rwxr-xr-x	root/root	sbin/start_udev
 -rwxr-xr-x	root/root	sbin/udevadm
 -rwxr-xr-x	root/root	sbin/udevd
-lrwxrwxrwx	root/root	sbin/vol_id -> ../lib/udev/vol_id
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 lrwxrwxrwx	root/root	usr/bin/udevinfo -> /sbin/udevadm
diff --git a/udev/.md5sum b/udev/.md5sum
index 5a7e740d..44927f20 100644
--- a/udev/.md5sum
+++ b/udev/.md5sum
@@ -1,3 +1,3 @@
 f27ca9ef668bcf7561717e7543d06f4c  start_udev
 3edc4cf383dccb06d866c5156d59ddd5  udev-142.tar.bz2
-54a23553332b0f1aa6366f884cd4799e  udev-config-20081015.tar.bz2
+dc6424ac6fa38635328ad962b4e489db  udev-config-20090523.tar.bz2
diff --git a/udev/Pkgfile b/udev/Pkgfile
index 591542c7..b293a55f 100644
--- a/udev/Pkgfile
+++ b/udev/Pkgfile
@@ -4,9 +4,9 @@
 
 name=udev
 version=142
-release=1
+release=2
 source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$name-$version.tar.bz2 \
-	http://crux.nu/files/distfiles/udev-config-20081015.tar.bz2 \
+	http://crux.nu/files/distfiles/udev-config-20090523.tar.bz2 \
 	start_udev)
 
 build() {
@@ -18,8 +18,7 @@ build() {
 	make
 	make install DESTDIR=$PKG
 
-	# scsi_id + vol_id need to be multi-path
-	(cd $PKG/sbin; ln -s ../lib/udev/vol_id vol_id)
+	# scsi_id needs to be multi-path
 	(cd $PKG/sbin; ln -s ../lib/udev/scsi_id scsi_id)
 
 	mkdir -p $PKG/lib/{firmware,udev/devices/{pts,shm}}
@@ -40,14 +39,10 @@ build() {
 	# Add CRUX items + LFS rules
 	install -m 0755 $SRC/start_udev $PKG/sbin
 
-	pushd $SRC/udev-config-20081015
+	pushd $SRC/udev-config-20090523
 	make DESTDIR=$PKG RULES_DIR=/lib/udev/rules.d install
 	popd
 
-	# Comment uucp lines in default rules
-	sed -i 's|.*uucp.*|#&|g' $PKG/lib/udev/rules.d/50-udev-default.rules
-	sed -i 's|.*uucp.*|#&|g' $PKG/lib/udev/rules.d/55-lfs.rules
-
 	# Keep udevinfo for legacy support
 	mkdir -p $PKG/usr/bin
 	ln -s /sbin/udevadm $PKG/usr/bin/udevinfo