udev: downgraded to 141 to fix kernel incompatibilities (added README file too)

diff --git a/udev/.footprint b/udev/.footprint
index ab87a846f7de9490dda6317f0fb345e6bb1d5fab..6242dbd82053ebd7a711aebf0ee80e51bc4427b7 100644 (file)
--- a/udev/.footprint
+++ b/udev/.footprint
@@ -1,11 +1,14 @@
 drwxr-xr-x     root/root       etc/
+-rw-r--r--     root/root       etc/scsi_id.config
 drwxr-xr-x     root/root       etc/udev/
 drwxr-xr-x     root/root       etc/udev/rules.d/
 -rw-r--r--     root/root       etc/udev/udev.conf
 drwxr-xr-x     root/root       lib/
 drwxr-xr-x     root/root       lib/firmware/
-lrwxrwxrwx     root/root       lib/libudev.so.0 -> libudev.so.0.5.1
--rwxr-xr-x     root/root       lib/libudev.so.0.5.1
+lrwxrwxrwx     root/root       lib/libudev.so.0 -> libudev.so.0.2.0
+-rwxr-xr-x     root/root       lib/libudev.so.0.2.0
+lrwxrwxrwx     root/root       lib/libvolume_id.so.1 -> libvolume_id.so.1.1.0
+-rwxr-xr-x     root/root       lib/libvolume_id.so.1.1.0
 drwxr-xr-x     root/root       lib/udev/
 -rwxr-xr-x     root/root       lib/udev/ata_id
 -rwxr-xr-x     root/root       lib/udev/cdrom_id
@@ -25,15 +28,14 @@ crw-rw-rw-  root/root       lib/udev/devices/zero (1, 5)
 -rwxr-xr-x     root/root       lib/udev/edd_id
 -rwxr-xr-x     root/root       lib/udev/firmware.sh
 -rwxr-xr-x     root/root       lib/udev/fstab_import
--rwxr-xr-x     root/root       lib/udev/input_id
 -rwxr-xr-x     root/root       lib/udev/path_id
 -rw-r--r--     root/root       lib/udev/rule_generator.functions
 drwxr-xr-x     root/root       lib/udev/rules.d/
+-rw-r--r--     root/root       lib/udev/rules.d/40-alsa.rules
 -rw-r--r--     root/root       lib/udev/rules.d/50-firmware.rules
 -rw-r--r--     root/root       lib/udev/rules.d/50-udev-default.rules
 -rw-r--r--     root/root       lib/udev/rules.d/55-lfs.rules
 -rw-r--r--     root/root       lib/udev/rules.d/60-cdrom_id.rules
--rw-r--r--     root/root       lib/udev/rules.d/60-persistent-alsa.rules
 -rw-r--r--     root/root       lib/udev/rules.d/60-persistent-input.rules
 -rw-r--r--     root/root       lib/udev/rules.d/60-persistent-serial.rules
 -rw-r--r--     root/root       lib/udev/rules.d/60-persistent-storage-tape.rules
@@ -48,29 +50,38 @@ drwxr-xr-x  root/root       lib/udev/rules.d/
 -rw-r--r--     root/root       lib/udev/rules.d/95-udev-late.rules
 -rwxr-xr-x     root/root       lib/udev/scsi_id
 -rwxr-xr-x     root/root       lib/udev/usb_id
--rwxr-xr-x     root/root       lib/udev/v4l_id
+-rwxr-xr-x     root/root       lib/udev/vol_id
 -rwxr-xr-x     root/root       lib/udev/write_cd_rules
 -rwxr-xr-x     root/root       lib/udev/write_net_rules
 drwxr-xr-x     root/root       sbin/
+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
 drwxr-xr-x     root/root       usr/include/
 -rw-r--r--     root/root       usr/include/libudev.h
+-rw-r--r--     root/root       usr/include/libvolume_id.h
 drwxr-xr-x     root/root       usr/lib/
-lrwxrwxrwx     root/root       usr/lib/libudev.so -> ../../lib/libudev.so.0.5.1
+lrwxrwxrwx     root/root       usr/lib/libudev.so -> ../../lib/libudev.so.0.2.0
+lrwxrwxrwx     root/root       usr/lib/libvolume_id.so -> ../../lib/libvolume_id.so.1.1.0
 drwxr-xr-x     root/root       usr/lib/pkgconfig/
 -rw-r--r--     root/root       usr/lib/pkgconfig/libudev.pc
+-rw-r--r--     root/root       usr/lib/pkgconfig/libvolume_id.pc
 drwxr-xr-x     root/root       usr/man/
 drwxr-xr-x     root/root       usr/man/man7/
 -rw-r--r--     root/root       usr/man/man7/udev.7.gz
 drwxr-xr-x     root/root       usr/man/man8/
+-rw-r--r--     root/root       usr/man/man8/ata_id.8.gz
+-rw-r--r--     root/root       usr/man/man8/cdrom_id.8.gz
+-rw-r--r--     root/root       usr/man/man8/create_floppy_devices.8.gz
+-rw-r--r--     root/root       usr/man/man8/edd_id.8.gz
+-rw-r--r--     root/root       usr/man/man8/path_id.8.gz
 -rw-r--r--     root/root       usr/man/man8/scsi_id.8.gz
 -rw-r--r--     root/root       usr/man/man8/udevadm.8.gz
 -rw-r--r--     root/root       usr/man/man8/udevd.8.gz
-drwxr-xr-x     root/root       usr/share/
-drwxr-xr-x     root/root       usr/share/pkgconfig/
--rw-r--r--     root/root       usr/share/pkgconfig/udev.pc
+-rw-r--r--     root/root       usr/man/man8/usb_id.8.gz
+-rw-r--r--     root/root       usr/man/man8/vol_id.8.gz

diff --git a/udev/.md5sum b/udev/.md5sum
index 9117844f3fe7cfd71f542a1a4388f83684865c99..8f85b6f5b6438947638ca37a68bcd65065092a88 100644 (file)
--- a/udev/.md5sum
+++ b/udev/.md5sum
@@ -1,3 +1,3 @@
 f27ca9ef668bcf7561717e7543d06f4c  start_udev
-b218bd15939e8afc6368e1907a48bb26  udev-149.tar.bz2
-dc6424ac6fa38635328ad962b4e489db  udev-config-20090523.tar.bz2
+1670fe81cabf5161319c52084cf81134  udev-141.tar.bz2
+54a23553332b0f1aa6366f884cd4799e  udev-config-20081015.tar.bz2

diff --git a/udev/Pkgfile b/udev/Pkgfile
index b94c9e966a89156dc360b7a090d109d50f4e9c35..f456ea9765b4722114a35873cd13664b2e16fd2f 100644 (file)
--- a/udev/Pkgfile
+++ b/udev/Pkgfile
@@ -5,35 +5,30 @@
 # Depends on:
 
 name=udev
-version=149
-release=2
+version=141
+release=1
 source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$name-$version.tar.bz2 \
-       http://crux.nu/files/distfiles/udev-config-20090523.tar.bz2 \
-       start_udev)
+        http://crux.nu/files/distfiles/udev-config-20081015.tar.bz2 \
+        start_udev)
 
 build() {
   cd udev-$version
-  
+
   ./configure --build=$CHOST \
               --host=$CTARGET \
               --prefix=/usr \
               --exec-prefix= \
               --sysconfdir=/etc \
-              --libexecdir=/lib/udev \
-              --mandir=/usr/man \
-              --disable-extras \
-              --disable-introspection
+              --mandir=/usr/man
 
   make
-  make install DESTDIR=$PKG \
-       pkgconfigdir=/usr/lib/pkgconfig
+  make install DESTDIR=$PKG
 
-  mkdir -p $PKG/lib/{firmware,udev/devices/{pts,shm}}
-  mkdir -p $PKG/usr/lib
+  # scsi_id + vol_id need to be multi-path
+  (cd $PKG/sbin; ln -s ../lib/udev/vol_id vol_id)
+  (cd $PKG/sbin; ln -s ../lib/udev/scsi_id scsi_id)
 
-  # Fix location of devel lib
-  rm $PKG/lib/libudev.so
-  ln -sf ../../lib/libudev.so.0.5.1 $PKG/usr/lib/libudev.so
+  mkdir -p $PKG/lib/{firmware,udev/devices/{pts,shm}}
 
   # Populate nodes
   mknod -m 600 $PKG/lib/udev/devices/console c 5 1
@@ -45,21 +40,21 @@ build() {
   ln -s /proc/self/fd/2 $PKG/lib/udev/devices/stderr
   ln -s /proc/kcore $PKG/lib/udev/devices/core
 
+  # Install some upstream rules
+  cp -a rules/packages/40-alsa.rules $PKG/lib/udev/rules.d/
+
   # Add CRUX items + LFS rules
   install -m 0755 $SRC/start_udev $PKG/sbin
 
-  pushd $SRC/udev-config-20090523
+  pushd $SRC/udev-config-20081015
   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
-
-  # Remove junk
-  rm -rf $PKG/usr/share/{gtk-,}doc
-  rm $PKG/lib/libudev.la
 }
-        # Fix location of devel lib
-        rm $PKG/lib/libudev.so
-        ln -sf ../../lib/libudev.so.0.5.1 $PKG/usr/lib/libudev.so

diff --git a/udev/README b/udev/README
new file mode 100644 (file)
index 0000000..422a574
--- /dev/null
+++ b/udev/README
@@ -0,0 +1,10 @@
+
+README for udev
+
+
+  Udev requires certain versions of the linux kernel to work.
+  If you're in troubles with the current udev port in the core
+  collection, consideer the fact of downgrade it.
+
+  Please read http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary
+  to get more information.