rules: Gentoo update

diff --git a/rules/gentoo/30-kernel-compat.rules b/rules/gentoo/30-kernel-compat.rules
index 1f767df8d8613e7380b30732f18fe15e092bd856..d07e7fa1c32d1ff34b4297dba18e3dac987206d9 100644 (file)
--- a/rules/gentoo/30-kernel-compat.rules
+++ b/rules/gentoo/30-kernel-compat.rules
@@ -1,9 +1,17 @@
 # do not edit this file, it will be overwritten on update
 
-ACTION!="add", GOTO="kernel_compat_end"
+ACTION!="add|change", GOTO="kernel_compat_end"
+
+#
+# rules to workaround bad sysfs timing
+#
+
+ACTION!="add", GOTO="kernel_compat_wait_end"
 
 # workarounds needed to synchronize with sysfs
+# needed for kernels < v2.6.18-rc1
 DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
+SUBSYSTEM=="scsi", KERNEL=="[0-9]*:[0-9]*",    WAIT_FOR_SYSFS="ioerr_cnt"
 
 # needed for kernels <2.6.16
 SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
@@ -11,13 +19,29 @@ SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
 # needed for kernels <2.6.17
 SUBSYSTEM=="net", ENV{PHYSDEVDRIVER}=="?*", WAIT_FOR_SYSFS="device/driver"
 
+LABEL="kernel_compat_wait_end"
 
+#
+# naming device rules
+#
 
+# old style usb sysfs devices
 # needed for kernels <2.6.22
 SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="usb", MODE="0664"
 
+# /sys/class/block will export this
+# needed for kernels <2.6.25-rc1
+SUBSYSTEM!="block", GOTO="block_devtype_end"
+ENV{DEVTYPE}!="?*", ATTR{range}=="?*", ENV{DEVTYPE}="disk"
+ENV{DEVTYPE}!="?*", ATTR{start}=="?*", ENV{DEVTYPE}="partition"
+LABEL="block_devtype_end"
 
 
+#
+# module loading rules
+#
+ACTION!="add", GOTO="kernel_compat_end"
+
 # this driver is broken and should not be loaded automatically
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=398962
 # needed for kernels <2.6.21
@@ -26,6 +50,11 @@ SUBSYSTEM=="platform", ENV{MODALIAS}=="i82365", ENV{MODALIAS}=""
 # No need for more code, as MODALIAS is present
 ENV{MODALIAS}=="?*", GOTO="kernel_compat_end"
 
+# needed for kernel <2.6.27-rc5
+# acpi will do on newer kernels
+SUBSYSTEM=="pnp", DRIVER!="?*", \
+  RUN{ignore_error}+="/bin/sh -c '/sbin/modprobe -a $$(while read id; do echo pnp:d$$id; done < /sys$devpath/id)'"
+
 # needed for kernels <2.6.22
 SUBSYSTEM!="scsi_device", GOTO="kernel_compat_end"
 
@@ -44,4 +73,3 @@ SUBSYSTEM!="scsi_device", GOTO="kernel_compat_end"
 
 LABEL="kernel_compat_end"
 
-

diff --git a/rules/gentoo/40-video.rules b/rules/gentoo/40-video.rules
deleted file mode 100644 (file)
index 2d5e534..0000000
--- a/rules/gentoo/40-video.rules
+++ /dev/null
@@ -1,24 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-# video4linux
-KERNEL=="video[0-9]*", NAME="v4l/video%n", SYMLINK+="%k", GROUP="video"
-KERNEL=="radio[0-9]*", NAME="v4l/radio%n", SYMLINK+="%k", GROUP="video"
-KERNEL=="vbi[0-9]*",   NAME="v4l/vbi%n", SYMLINK+="%k", GROUP="video"
-KERNEL=="vtx[0-9]*",   NAME="v4l/vtx%n", GROUP="video"
-
-SUBSYSTEM=="dvb", GROUP="video"
-
-# device node will be /dev/dri/card?
-KERNEL=="card*",       GROUP="video"
-KERNEL=="nvidia*",     GROUP="video"
-KERNEL=="3dfx*",       GROUP="video"
-
-# svgalib
-KERNEL=="svga*", GROUP="video"
-
-# Framebuffer
-KERNEL=="fb[0-9]*", GROUP="video"
-
-# IEEE1394 (firewire) devices
-KERNEL=="dv1394*|video1394*|raw1394*", GROUP="video"
-