commit ac757fe387b8f7ddae8ae577af066ebbb71c6c32 Author: Andrew Brouwers <abrouwers@gmail.com> Date: Sun Sep 30 17:59:20 2007 +0200 udev: updated to 115. diff --git a/udev/.footprint b/udev/.footprint index d66dfb8..134ed7e 100644 --- a/udev/.footprint +++ b/udev/.footprint @@ -5,16 +5,21 @@ drwxr-xr-x root/root etc/udev/ drwxr-xr-x root/root etc/udev/rules.d/ -rw-r--r-- root/root etc/udev/rules.d/05-udev-early.rules -rw-r--r-- root/root etc/udev/rules.d/25-lfs.rules --rw-r--r-- root/root etc/udev/rules.d/26-crux.rules -rw-r--r-- root/root etc/udev/rules.d/26-modprobe.rules -rw-r--r-- root/root etc/udev/rules.d/27-firmware.rules +-rw-r--r-- root/root etc/udev/rules.d/50-udev-default.rules +-rw-r--r-- root/root etc/udev/rules.d/60-cdrom_id.rules +-rw-r--r-- root/root etc/udev/rules.d/60-persistent-input.rules -rw-r--r-- root/root etc/udev/rules.d/60-persistent-storage.rules +-rw-r--r-- root/root etc/udev/rules.d/61-persistent-storage-edd.rules +-rw-r--r-- root/root etc/udev/rules.d/80-drivers.rules -rw-r--r-- root/root etc/udev/rules.d/81-cdrom.rules +-rw-r--r-- root/root etc/udev/rules.d/95-udev-late.rules -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/libvolume_id.so.0 -> libvolume_id.so.0.66.0 --rwxr-xr-x root/root lib/libvolume_id.so.0.66.0 +lrwxrwxrwx root/root lib/libvolume_id.so.0 -> libvolume_id.so.0.80.0 +-rwxr-xr-x root/root lib/libvolume_id.so.0.80.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 @@ -31,7 +36,6 @@ lrwxrwxrwx root/root lib/udev/devices/stderr -> /proc/self/fd/2 lrwxrwxrwx root/root lib/udev/devices/stdin -> /proc/self/fd/0 lrwxrwxrwx root/root lib/udev/devices/stdout -> /proc/self/fd/1 crw-rw-rw- root/root lib/udev/devices/zero (1, 5) --rwxr-xr-x root/root lib/udev/dvb_helper -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/path_id @@ -39,7 +43,6 @@ crw-rw-rw- root/root lib/udev/devices/zero (1, 5) -rwxr-xr-x root/root lib/udev/usb_id -rwxr-xr-x root/root lib/udev/vol_id 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/udevcontrol -rwxr-xr-x root/root sbin/udevd @@ -52,8 +55,7 @@ drwxr-xr-x root/root usr/bin/ drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/libvolume_id.h drwxr-xr-x root/root usr/lib/ --rwxr-xr-x root/root usr/lib/libvolume_id.a -lrwxrwxrwx root/root usr/lib/libvolume_id.so -> /lib/libvolume_id.so.0.66.0 +lrwxrwxrwx root/root usr/lib/libvolume_id.so -> /lib/libvolume_id.so.0.80.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libvolume_id.pc drwxr-xr-x root/root usr/man/ @@ -62,7 +64,9 @@ drwxr-xr-x root/root usr/man/man7/ 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 lrwxrwxrwx root/root usr/man/man8/udevcontrol.8.gz -> udevd.8.gz -rw-r--r-- root/root usr/man/man8/udevd.8.gz diff --git a/udev/.md5sum b/udev/.md5sum index fc8e113..12a6949 100644 --- a/udev/.md5sum +++ b/udev/.md5sum @@ -1,7 +1,5 @@ c0da74341672681c9bd924439ea4e84d cdrom.rules -6c4a8bd7aef573838305e212ffb9bc6a cdsymlinks -ef01d7356869dc070029b8de9b6d4f7d crux.rules -7818c207e95af667657782ba9884a404 dvb_helper +cbb9848e6c3662c966edaed90ce90c3f cdsymlinks 40ab559668ab739473fa9f4a45ba28da start_udev -f4effef7807ce1dc91ab581686ef197b udev-096.tar.bz2 -766a7a7b32e552bfa4a05c1b995fb95e udev-rules-1814.tar.gz +39bbe5ddcd62d35cd56b184d6862c540 udev-115.tar.bz2 +49c72e712f38c18884bd11a9a3b7e968 udev-config-20070731.tar.bz2 diff --git a/udev/Pkgfile b/udev/Pkgfile index eab8d04..d6ef0ff 100644 --- a/udev/Pkgfile +++ b/udev/Pkgfile @@ -1,13 +1,13 @@ # Description: Userspace device management daemon # URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html -# Maintainer: Matt Housh, jaeger at morpheus dot net +# Maintainer: CRUX System Team, core-ports at crux dot nu name=udev -version=096 -release=4 -source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$name-$version.tar.bz2 - http://crux.nu/files/udev-rules-1814.tar.gz - start_udev cdrom.rules cdsymlinks crux.rules dvb_helper) +version=115 +release=1 +source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$name-$version.tar.bz2 \ + http://www.linuxfromscratch.org/lfs/downloads/development/udev-config-200707... \ + start_udev cdrom.rules cdsymlinks) build() { local extras="extras/ata_id \ @@ -21,8 +21,14 @@ build() { extras/volume_id" cd udev-$version - make EXTRAS="$extras" - make install DESTDIR=$PKG mandir="/usr/man" EXTRAS="$extras" + + make EXTRAS="$extras" + make install DESTDIR=$PKG mandir="/usr/man" EXTRAS="$extras" + + pushd $SRC/udev-config-20070731 + make DESTDIR=$PKG install + popd + mkdir -p $PKG/lib/{firmware,udev/devices/{pts,shm}} mknod -m 600 $PKG/lib/udev/devices/console c 5 1 mknod -m 666 $PKG/lib/udev/devices/null c 1 3 @@ -32,10 +38,11 @@ build() { ln -s /proc/self/fd/1 $PKG/lib/udev/devices/stdout ln -s /proc/self/fd/2 $PKG/lib/udev/devices/stderr ln -s /proc/kcore $PKG/lib/udev/devices/core - cp $SRC/udev-rules-1814/*.rules $PKG/etc/udev/rules.d/ install -m 0755 $SRC/start_udev $PKG/sbin install -m 0755 $SRC/cdsymlinks $PKG/lib/udev/ - install -m 0755 $SRC/dvb_helper $PKG/lib/udev/ - cat $SRC/cdrom.rules >> $PKG/etc/udev/rules.d/81-cdrom.rules - cp $SRC/crux.rules $PKG/etc/udev/rules.d/26-crux.rules + install -m 644 etc/udev/rules.d/[0-9]* $PKG/etc/udev/rules.d/ + install -m 644 $SRC/cdrom.rules $PKG/etc/udev/rules.d/81-cdrom.rules + + # Comment uucp lines in default rules + sed -i 's|.*uucp.*|#&|g' $PKG/etc/udev/rules.d/50-udev-default.rules } diff --git a/udev/cdsymlinks b/udev/cdsymlinks index 29840dd..0908ab0 100755 --- a/udev/cdsymlinks +++ b/udev/cdsymlinks @@ -4,9 +4,9 @@ for i in /dev/cdrom-* do if [ -L $i ] then - [ "$CD_NUM" = "" ] && ln -s $i /dev/cdrom - [ "$CD_NUM" = "" ] && CD_NUM="-1" - [ ! "$CD_NUM" = "" ] && CD_NUM="$((CD_NUM+1))" && ln -s $i /dev/cdrom$CD_NUM + [ "$CD_NUMBER" = "" ] && ln -s $i /dev/cdrom + [ "$CD_NUMBER" = "" ] && CD_NUMBER="-1" + [ ! "$CD_NUMBER" = "" ] && CD_NUMBER="$((CD_NUMBER+1))" && ln -s $i /dev/cdrom$CD_NUMBER fi done @@ -14,9 +14,9 @@ for i in /dev/cdrw-* do if [ -L $i ] then - [ "$CDRW_NUM" = "" ] && ln -s $i /dev/cdrw - [ "$CDRW_NUM" = "" ] && CDRW_NUM="-1" - [ ! "$CDRW_NUM" = "" ] && CDRW_NUM="$((CDRW_NUM+1))" && ln -s $i /dev/cdrw$CDRW_NUM + [ "$CDRW_NUMBER" = "" ] && ln -s $i /dev/cdrw + [ "$CDRW_NUMBER" = "" ] && CDRW_NUMBER="-1" + [ ! "$CDRW_NUMBER" = "" ] && CDRW_NUMBER="$((CDRW_NUMBER+1))" && ln -s $i /dev/cdrw$CDRW_NUMBER fi done @@ -24,9 +24,9 @@ for i in /dev/dvd-* do if [ -L $i ] then - [ "$DVD_NUM" = "" ] && ln -s $i /dev/dvd - [ "$DVD_NUM" = "" ] && DVD_NUM="-1" - [ ! "$DVD_NUM" = "" ] && DVD_NUM="$((DVD_NUM+1))" && ln -s $i /dev/dvd$DVD_NUM + [ "$DVD_NUMBER" = "" ] && ln -s $i /dev/dvd + [ "$DVD_NUMBER" = "" ] && DVD_NUMBER="-1" + [ ! "$DVD_NUMBER" = "" ] && DVD_NUMBER="$((DVD_NUMBER+1))" && ln -s $i /dev/dvd$DVD_NUMBER fi done @@ -34,8 +34,8 @@ for i in /dev/dvdrw-* do if [ -L $i ] then - [ "$DVDRW_NUM" = "" ] && ln -s $i /dev/dvdrw - [ "$DVDRW_NUM" = "" ] && DVDRW_NUM="-1" - [ ! "$DVDRW_NUM" = "" ] && DVDRW_NUM="$((DVDRW_NUM+1))" && ln -s $i /dev/dvdrw$DVDRW_NUM + [ "$DVDRW_NUMBER" = "" ] && ln -s $i /dev/dvdrw + [ "$DVDRW_NUMBER" = "" ] && DVDRW_NUMBER="-1" + [ ! "$DVDRW_NUMBER" = "" ] && DVDRW_NUMBER="$((DVDRW_NUMBER+1))" && ln -s $i /dev/dvdrw$DVDRW_NUMBER fi done diff --git a/udev/crux.rules b/udev/crux.rules deleted file mode 100644 index 414ff52..0000000 --- a/udev/crux.rules +++ /dev/null @@ -1,4 +0,0 @@ -# CRUX udev rules - -# DVB handling -KERNEL=="dvb*", PROGRAM="/lib/udev/dvb_helper %k", NAME="%c" diff --git a/udev/dvb_helper b/udev/dvb_helper deleted file mode 100755 index 62af242..0000000 --- a/udev/dvb_helper +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -# Helper script to name dvb devices; taken from Documentation/dvb/udev.txt - -/bin/echo $1 | \ - /bin/sed -e 's,dvb\([0-9]\)\.\([^0-9]*\)\([0-9]\),dvb/adapter\1/\2\3,'