Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4840a38577d2cbd0be49520ed6b41b2cd7f9818f
commit 4840a38577d2cbd0be49520ed6b41b2cd7f9818f Author: crazy <cr...@frugalware.org> Date: Mon Feb 22 16:16:21 2010 +0100 udev-151-3-x86_64 * release bump * this basically reverts : * http://git.kernel.org/?p=linux/hotplug/udev.git;a=commitdiff;h=ecf61aa7fdb5b7e9e19f06584caee9b5eb1c7350 * for 1.3 we have to see. * closes FS#4089 , FS#4113 diff --git a/source/base/udev/FrugalBuild b/source/base/udev/FrugalBuild index 30cd770..f00e898 100644 --- a/source/base/udev/FrugalBuild +++ b/source/base/udev/FrugalBuild @@ -3,7 +3,7 @@ pkgname=udev pkgver=151 -pkgrel=2 +pkgrel=3 pkgdesc="A userspace implementation of devfs" url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/"; backup=(etc/sysconfig/blacklist) @@ -16,8 +16,8 @@ conflicts=('devfsd' 'pcmcia-cs' 'hotplug') replaces=('hotplug' 'devicekit') up2date="lynx -dump '$url?C=M;O=D'|grep 'udev-.*tar.bz2 '|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" source=($url/$pkgname-$pkgver.tar.gz rc.udev blacklist \ - README.Frugalware 65-permissions.rules) -signatures=("${source[0]}.sign" '' '' '' '') + README.Frugalware 65-permissions.rules revert-ide-changes.patch) +signatures=("${source[0]}.sign" '' '' '' '' '') subpkgs=('libgudev') subdescs=('Libraries for adding libudev support to applications that use glib.') diff --git a/source/base/udev/revert-ide-changes.patch b/source/base/udev/revert-ide-changes.patch new file mode 100644 index 0000000..9d29bf3 --- /dev/null +++ b/source/base/udev/revert-ide-changes.patch @@ -0,0 +1,40 @@ +diff -Naur udev-151/rules/rules.d/50-udev-default.rules udev-151-p/rules/rules.d/50-udev-default.rules +--- udev-151/rules/rules.d/50-udev-default.rules 2010-01-21 14:21:42.000000000 +0100 ++++ udev-151-p/rules/rules.d/50-udev-default.rules 2010-02-19 21:17:23.000000000 +0100 +@@ -77,9 +77,11 @@ + + # floppy + SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy" ++KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitions" + + # cdrom + SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n", GROUP="cdrom" ++SUBSYSTEM=="block", KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="cdrom", GROUP="cdrom" + SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom" + KERNEL=="pktcdvd[0-9]*", GROUP="cdrom" + KERNEL=="pktcdvd", GROUP="cdrom" +diff -Naur udev-151/rules/rules.d/60-persistent-storage.rules udev-151-p/rules/rules.d/60-persistent-storage.rules +--- udev-151/rules/rules.d/60-persistent-storage.rules 2009-12-08 18:43:09.000000000 +0100 ++++ udev-151-p/rules/rules.d/60-persistent-storage.rules 2010-02-19 21:21:49.000000000 +0100 +@@ -12,12 +12,21 @@ + # skip rules for inappropriate block devices + KERNEL=="fd*|mtd*|nbd*|gnbd*|btibm*|dm-*|md*", GOTO="persistent_storage_end" + ++# never access non-cdrom removable ide devices, the drivers are causing event loops on open() ++KERNEL=="hd*[!0-9]", ATTR{removable}=="1", SUBSYSTEMS=="ide", ATTRS{media}=="disk|floppy", GOTO="persistent_storage_end" ++KERNEL=="hd*[0-9]", ATTRS{removable}=="1", GOTO="persistent_storage_end" ++ + # ignore partitions that span the entire disk + TEST=="whole_disk", GOTO="persistent_storage_end" + + # for partitions import parent information + ENV{DEVTYPE}=="partition", IMPORT{parent}="ID_*" + ++# by-id (hardware serial number) ++KERNEL=="hd*[!0-9]", IMPORT{program}="ata_id --export $tempnode" ++KERNEL=="hd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_SERIAL}" ++KERNEL=="hd*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_SERIAL}-part%n" ++ + # USB devices use their own serial number + KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="usb", IMPORT{program}="usb_id --export %p" + # ATA devices with their own "ata" kernel subsystem _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
