Add missing pieces to kernel-compat rules. Add patch to not warn about usage of PHYSDEV* in rules doing WAIT_FOR.

Package-Manager: portage-2.1.6_rc1/cvs/Linux 2.6.27-gentoo-r1 i686

5 files changed, 129 insertions, 7 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index f83331feb933..64a309f3bb5b 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.419 2008/11/23 20:05:19 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.420 2008/11/25 18:57:00 zzam Exp $
+
+  25 Nov 2008; Matthias Schwarzott <zzam@gentoo.org>
+  +files/udev-133-rules-update.diff,
+  +files/udev-133-silence-physdev-warnings.diff, udev-133.ebuild:
+  Add missing pieces to kernel-compat rules. Add patch to not warn about
+  usage of PHYSDEV* in rules doing WAIT_FOR.
 
   23 Nov 2008; Matthias Schwarzott <zzam@gentoo.org>
   +files/udev-start-133.sh, +files/udev.confd, udev-133.ebuild:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index dcf0b8645dff..84fa9be62c32 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -17,6 +17,8 @@ AUX udev-122-rules-update.diff 586 RMD160 5b9d086ac57ae282b5cd30eda375fc736b2c1a
 AUX udev-124-cdrom-autoclose-bug.diff 1381 RMD160 7e1ee6fa9f59f2528df7c4b3deb1d8c12332b14b SHA1 04daf04b28f2963d98c2826962de625b4ba4b03e SHA256 260a1bd5ad54c8c484a55a503c7b602518070dcc40c2887bb5ec84a5231bedf9
 AUX udev-125-cdrom-autoclose-bug.diff 1369 RMD160 52eb8c8dd8160431bc533e921490efb374ae7f10 SHA1 5b0fc1f809b2ba1ced47eb05c6673734a6c98c85 SHA256 81512746419ec4cd8a76e9a470c2a94201d7747ff09bb3b5ed7de2d588a83081
 AUX udev-125-rules-update.diff 577 RMD160 13aad3db2819980996f2b36267b1b4b4fe48e943 SHA1 862386a818aed8dc283caef1cea0bd6567634531 SHA256 223b6d5196e24cc608e45ff9a589cfadac2944e1d89b32c80fdf101f381ce6c6
+AUX udev-133-rules-update.diff 2310 RMD160 92359598dfe12f83a8fbeccef910fb7f14af1470 SHA1 d9eba00002ca66297b861cf4c13539f069a295d7 SHA256 f377673736e59ba4b026489bff8e37b710c4fe11dbed7d8bb0ae323141327126
+AUX udev-133-silence-physdev-warnings.diff 1441 RMD160 261062f671d8a070c6ca0f5a656ca74303e1a178 SHA1 f90ee4a4cb71213b9f7abf69a1d848adb6cec7ac SHA256 8397e6b91433f2de7ce786275b5450a0c3a0384178e46c508e80c8e97cd22dc5
 AUX udev-postmount-130-r2.initd 541 RMD160 88bcdfee21d301385d1a6ef59303825042efd335 SHA1 b89322e2c5a24492593ee8165d042b7039214adf SHA256 00dc2047e16505a89c38571ea50c4ba453ffdee4b9aebe81ca41572f9d62e30e
 AUX udev-postmount-initd-111-r2 508 RMD160 e1f42197fe3003ec4691b768a921029ce085becb SHA1 7ceb08150d429bd6b5cef88d76847575c6e89f22 SHA256 607deb133ab4be0d2fcb16346e86b3d8ae00bd62d2cbc1329458f278a1b1ff5c
 AUX udev-start-113-r2.sh 6515 RMD160 2ecaa37fd9e498e60f8cd5978cb4f7930594cf99 SHA1 670bb1845ed70442fe598a5580101be75e2402c9 SHA256 438bc31605c8d2e50bebedd7fbff1410845738372ab3bc03d6f5ed1427ddd046
@@ -53,13 +55,13 @@ EBUILD udev-125-r2.ebuild 10732 RMD160 58b821e085c1fc3f28772b9ab3e72adfa268a1cf
 EBUILD udev-130-r1.ebuild 9544 RMD160 9bb3e52fe62d0f6e87ca6993cfb23823a66f0c9a SHA1 234d67af61d1217d956e150427a1ded1acb46c22 SHA256 3b4f71c6911717532e9c76e089bce20685ab56b0e75bd608e791b067c35e44ca
 EBUILD udev-130-r2.ebuild 9720 RMD160 ceb64d4d62fda93a312aa40c36aa00b4996e15ed SHA1 2beca11b16189870b74e8eb38f5a1bc0dd1fb51b SHA256 fcbaef2c162d60ee6f740f91800869fd7655c07f2e16317a5f21142293cd42b5
 EBUILD udev-132.ebuild 10151 RMD160 0e29e9393a8a23f3bb2a2def974ec13636e7be20 SHA1 b74b00386210061b61d38108863e52b7ee604703 SHA256 ac8bf418a8b80955f3583d95256533325b2989dd546a4f9e65cad8fb69a4f079
-EBUILD udev-133.ebuild 12363 RMD160 dba965237b760987167741c3cc954b8e4c2a9de3 SHA1 3c09f5cd1556cf5cdebd90cf087a2897634b4e1c SHA256 f365356dc0a0df183bd0484581ede6a098093f5af866b4ac528698601031dcee
-MISC ChangeLog 86023 RMD160 f92aff6c4f155589921cd893e19feabf4af6ca86 SHA1 f2bd1ccbc3fbd7316d267dd804c08db838eb5df6 SHA256 b0838973415f720cf9db4dac52131915ef62b14ee382b3dd15f39728cd28d892
+EBUILD udev-133.ebuild 12465 RMD160 925831e3879ef3e55b74e9a404ff0f94207c2155 SHA1 6bc1c9ef448ad8bc32b3fc8d3586168c828b16fd SHA256 a6a6631476aef34144854915ae0ce3792709c0c2ae4865835ea28554aac2ed0e
+MISC ChangeLog 86298 RMD160 5a87769ee07e096ba67cdf0aa988d6d4d3322ea4 SHA1 28a58daa538d70deb3a89978d16863b5230f3102 SHA256 848a18823ef716cd7f8880aa30473dadd0e870583d838d7e611487bd5c323dfb
 MISC metadata.xml 225 RMD160 9459d2b2027607874431067a9100c48a0a128ffa SHA1 d9fad1caa18dd065595932b9e5d6c18098f3dfad SHA256 dd3c55c5a5c97678030df2554192894d849cdd4845d6fec1c8259d7bf263cd46
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkpt4UACgkQt2vP6XvVdOco/wCgzAdb3maflYALYsstoqezlSdw
-zBEAoIggAyN2bouMirK8dhvrEqMUPDA2
-=13A3
+iEYEARECAAYFAkksSocACgkQt2vP6XvVdOelHwCg5CIZap/WuhoYLzKs6COQhRBL
+IYQAoK/On4fkCKBHh7Yg4lhovbxrTxkH
+=7AcW
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/files/udev-133-rules-update.diff b/sys-fs/udev/files/udev-133-rules-update.diff
new file mode 100644
index 000000000000..2861a83225f6
--- /dev/null
+++ b/sys-fs/udev/files/udev-133-rules-update.diff
@@ -0,0 +1,70 @@
+diff --git a/rules/gentoo/30-kernel-compat.rules b/rules/gentoo/30-kernel-compat.rules
+index 1f767df..d07e7fa 100644
+--- 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/sys-fs/udev/files/udev-133-silence-physdev-warnings.diff b/sys-fs/udev/files/udev-133-silence-physdev-warnings.diff
new file mode 100644
index 000000000000..1ae1c56b79b2
--- /dev/null
+++ b/sys-fs/udev/files/udev-133-silence-physdev-warnings.diff
@@ -0,0 +1,42 @@
+commit ae2d346642aee4fab33c88708627bcf5b0cb317d
+Author: Kay Sievers <kay.sievers@vrfy.org>
+Date:   Mon Nov 24 21:24:04 2008 +0100
+
+    silence PHYSDEV* warning for WAIT_FOR* rules
+
+diff --git a/udev/udev-rules.c b/udev/udev-rules.c
+index df9fc78..afd2e88 100644
+--- a/udev/udev-rules.c
++++ b/udev/udev-rules.c
+@@ -1135,6 +1135,7 @@ static int add_rule(struct udev_rules *rules, char *line,
+ 	char *linepos;
+ 	char *attr;
+ 	int physdev = 0;
++	int waitfor = 0;
+ 	struct rule_tmp rule_tmp;
+ 
+ 	memset(&rule_tmp, 0x00, sizeof(struct rule_tmp));
+@@ -1395,6 +1396,7 @@ static int add_rule(struct udev_rules *rules, char *line,
+ 		if (strcasecmp(key, "WAIT_FOR") == 0 || strcasecmp(key, "WAIT_FOR_SYSFS") == 0) {
+ 			rule_add_key(&rule_tmp, TK_M_WAITFOR, 0, value, NULL);
+ 			valid = 1;
++			waitfor = 1;
+ 			continue;
+ 		}
+ 
+@@ -1544,11 +1546,11 @@ static int add_rule(struct udev_rules *rules, char *line,
+ 		err(rules->udev, "unknown key '%s' in %s:%u\n", key, filename, lineno);
+ 	}
+ 
+-	if (physdev)
+-		err(rules->udev, "PHYSDEV* values are deprecated and not available on recent kernels, \n"
+-		    "please fix it in %s:%u", filename, lineno);
++	if (physdev && !waitfor)
++		err(rules->udev, "PHYSDEV* values are deprecated and not available on recent kernels, "
++		    "please fix it in %s:%u\n", filename, lineno);
+ 
+-	/* skip line if not any valid key was found */
++	/* skip line if no valid key was found */
+ 	if (!valid)
+ 		goto invalid;
+ 
diff --git a/sys-fs/udev/udev-133.ebuild b/sys-fs/udev/udev-133.ebuild
index 8e34b8a5ac58..c8d4217812ef 100644
--- a/sys-fs/udev/udev-133.ebuild
+++ b/sys-fs/udev/udev-133.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-133.ebuild,v 1.3 2008/11/23 20:05:19 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-133.ebuild,v 1.4 2008/11/25 18:57:00 zzam Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -70,6 +70,8 @@ src_unpack() {
 	cd "${S}"
 
 	# patches go here...
+	epatch "${FILESDIR}/${P}-silence-physdev-warnings.diff"
+	epatch "${FILESDIR}/${P}-rules-update.diff"
 
 	# Make sure there is no sudden changes to upstream rules file
 	# (more for my own needs than anything else ...)