From 59cab172de7ecd940d5346424bfd3f0824ec12ef Mon Sep 17 00:00:00 2001 From: Matthias Schwarzott Date: Wed, 24 Jan 2007 17:09:00 +0000 Subject: [PATCH] Avoid warnings about wait_for_sysfs rule for persistent-net, Bug #163096. Added missing reaction on netif rename return code for success, Bug #158531. Removed duplicated old rule for scsi-module-loading. Consistent use of ENV for MODALIAS, Bug #163410. Package-Manager: portage-2.1.2-r3 --- sys-fs/udev/ChangeLog | 12 +- sys-fs/udev/Manifest | 33 +- sys-fs/udev/files/05-udev-early.rules-104-r2 | 9 + sys-fs/udev/files/digest-udev-104-r2 | 3 + .../udev-104-netif-rename-busywait.patch | 29 ++ sys-fs/udev/files/udev.rules-104-r2 | 302 ++++++++++++++++ sys-fs/udev/udev-104-r2.ebuild | 335 ++++++++++++++++++ 7 files changed, 715 insertions(+), 8 deletions(-) create mode 100644 sys-fs/udev/files/05-udev-early.rules-104-r2 create mode 100644 sys-fs/udev/files/digest-udev-104-r2 create mode 100644 sys-fs/udev/files/udev-104-netif-rename-busywait.patch create mode 100644 sys-fs/udev/files/udev.rules-104-r2 create mode 100644 sys-fs/udev/udev-104-r2.ebuild diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index b667cff1cef7..e3f93d6548a6 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.228 2007/01/22 20:19:49 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.229 2007/01/24 17:09:00 zzam Exp $ + +*udev-104-r2 (24 Jan 2007) + + 24 Jan 2007; Matthias Schwarzott + +files/05-udev-early.rules-104-r2, +files/udev.rules-104-r2, + +files/udev-104-netif-rename-busywait.patch, +udev-104-r2.ebuild: + Avoid warnings about wait_for_sysfs rule for persistent-net, Bug #163096. + Added missing reaction on netif rename return code for success, Bug #158531. + Removed duplicated old rule for scsi-module-loading. Consistent use of ENV + for MODALIAS, Bug #163410. 22 Jan 2007; Matthias Schwarzott -files/40-scsi-hotplug.rules, -files/udev.rules-103-r1, diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index a7dd29ffb05e..9a336c771a98 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -13,6 +13,10 @@ AUX 05-udev-early.rules-104 449 RMD160 8c10d29743ad7e5f68816a9a8807fe5a795b6505 MD5 448a45be21329c2d61408f6f7efb2ed3 files/05-udev-early.rules-104 449 RMD160 8c10d29743ad7e5f68816a9a8807fe5a795b6505 files/05-udev-early.rules-104 449 SHA256 4389d9de4eb5c847c0d0a7c0187d88c2030d62e1b629e8b62a8fe9a53272ea84 files/05-udev-early.rules-104 449 +AUX 05-udev-early.rules-104-r2 475 RMD160 1f9be2d13eba72c4feaeec0ca3449824ad70cfa7 SHA1 79b86e01aa6ed7ba8b147aa3c528ef21e30b6ae2 SHA256 769450ad37e8d7afc123b4e9c06ad1403d5e63ac9b73db52d357616e288522cd +MD5 241c3eab19b0e07b65b5b3a7345718a4 files/05-udev-early.rules-104-r2 475 +RMD160 1f9be2d13eba72c4feaeec0ca3449824ad70cfa7 files/05-udev-early.rules-104-r2 475 +SHA256 769450ad37e8d7afc123b4e9c06ad1403d5e63ac9b73db52d357616e288522cd files/05-udev-early.rules-104-r2 475 AUX 95-net.rules 550 RMD160 8e10d27a37f15bbcd8367266693b58d7a9101370 SHA1 53cf6e38d817f1d885cd54f8c2d1674c83878609 SHA256 19c6783fdd8bfb4f66376fb4929cd9a1a554c8949a40364e2a5b36b2e31f7574 MD5 b9c490717a6a973b52edd7082a7b09f8 files/95-net.rules 550 RMD160 8e10d27a37f15bbcd8367266693b58d7a9101370 files/95-net.rules 550 @@ -41,6 +45,10 @@ AUX udev-098-udevtrigger.patch 1370 RMD160 9b7cc44f1287db7a87b38cb41d1a4673b467c MD5 d6daa492b0148e89edb8f20f79291776 files/udev-098-udevtrigger.patch 1370 RMD160 9b7cc44f1287db7a87b38cb41d1a4673b467c138 files/udev-098-udevtrigger.patch 1370 SHA256 080979f744128a56047dd6df0ba81deda9728a39607bdb39ee400124fbb6e45d files/udev-098-udevtrigger.patch 1370 +AUX udev-104-netif-rename-busywait.patch 962 RMD160 d6e2ea0538c382fd06ee61ef6d0845651b7bfea1 SHA1 7b6c3f41c174f8e34d00374929ab1e77e44b8ba0 SHA256 32c65c4461d9a4d273464d4773c33ea38ab749a88914ca40008dbfe1c3fc58eb +MD5 9c9d0c355b1a927d6b16b14a82152598 files/udev-104-netif-rename-busywait.patch 962 +RMD160 d6e2ea0538c382fd06ee61ef6d0845651b7bfea1 files/udev-104-netif-rename-busywait.patch 962 +SHA256 32c65c4461d9a4d273464d4773c33ea38ab749a88914ca40008dbfe1c3fc58eb files/udev-104-netif-rename-busywait.patch 962 AUX udev-parisc-path_id-again.patch 524 RMD160 d305615a2f5ae0ab6b468400e95ad3332a2bcb38 SHA1 574d12600292d5cd1acb3b1be2bc24d337581a88 SHA256 a1b40d1bf3f8a7e0d6787d310218b44916c79a4f94a39287bc00f8ae058b67ff MD5 2f18f7560f7667fa98179c6084396453 files/udev-parisc-path_id-again.patch 524 RMD160 d305615a2f5ae0ab6b468400e95ad3332a2bcb38 files/udev-parisc-path_id-again.patch 524 @@ -185,6 +193,10 @@ AUX udev.rules-104 10799 RMD160 d3d158e92f71215b2b847f480b23650b4873e7e3 SHA1 e6 MD5 69437fb27fe4e3894b551a73b34a5d0c files/udev.rules-104 10799 RMD160 d3d158e92f71215b2b847f480b23650b4873e7e3 files/udev.rules-104 10799 SHA256 5265c20933afefa05f3033375fcc538dcc3699b58d44e21f81320c7a434212cd files/udev.rules-104 10799 +AUX udev.rules-104-r2 10710 RMD160 d376ae4567f4195643af3224ec01b207040e230f SHA1 2ec2ab887dab8fc21d9692c38e8c9c2d05dd8dc2 SHA256 ddeda96b7fbf3acf7b7bb79e01725b736f5e298f9e4e366e658f94212814098f +MD5 e745e2fcbd870a8fb39acbb50c02f376 files/udev.rules-104-r2 10710 +RMD160 d376ae4567f4195643af3224ec01b207040e230f files/udev.rules-104-r2 10710 +SHA256 ddeda96b7fbf3acf7b7bb79e01725b736f5e298f9e4e366e658f94212814098f files/udev.rules-104-r2 10710 AUX udev.rules.post_012 4184 RMD160 0fa81b4bafa732497b8e65cf658adf2cf32f3a0a SHA1 12300249d33f01c4fd1a8708a4733dafddb90ffe SHA256 3fc8785c40acb43d92a2f7b3c4e21cfa7b947fb5d2e87d1c109297ff34994100 MD5 7f23fbfcba51c7c4b8c29a8c08429996 files/udev.rules.post_012 4184 RMD160 0fa81b4bafa732497b8e65cf658adf2cf32f3a0a files/udev.rules.post_012 4184 @@ -251,10 +263,14 @@ EBUILD udev-104-r1.ebuild 11730 RMD160 522ae265254595e580254d9d34db9a4e282fca85 MD5 7d52051335103f5ae3c99868ee2f203c udev-104-r1.ebuild 11730 RMD160 522ae265254595e580254d9d34db9a4e282fca85 udev-104-r1.ebuild 11730 SHA256 1813cc52dff00998ee5d3198c21893d8966a9452c1968d5b3e489af2949b8df6 udev-104-r1.ebuild 11730 -MISC ChangeLog 41793 RMD160 dd25ffd77ff97fd7eb5ce158c73fd4f7bd8ba118 SHA1 78daac72ce1de712dac0ae99346047e80c935009 SHA256 abf03c828ad4762ccbed42e5ddddb665ee059e79fbdcfa8f695026254d26db3b -MD5 6ff95af92fbcbb26e75bdaf37d3e5b4c ChangeLog 41793 -RMD160 dd25ffd77ff97fd7eb5ce158c73fd4f7bd8ba118 ChangeLog 41793 -SHA256 abf03c828ad4762ccbed42e5ddddb665ee059e79fbdcfa8f695026254d26db3b ChangeLog 41793 +EBUILD udev-104-r2.ebuild 11789 RMD160 e4adbcb867864fbec9a0cb6bc2012831ab6d0182 SHA1 467ee737998de7684adfa8b27ec4f84aed2265a4 SHA256 393f30133d44d90832febb1eb77e4368313b2b199e5c435c94e5516e41c3752c +MD5 9452a475a1f4c37430a570aa550dbe21 udev-104-r2.ebuild 11789 +RMD160 e4adbcb867864fbec9a0cb6bc2012831ab6d0182 udev-104-r2.ebuild 11789 +SHA256 393f30133d44d90832febb1eb77e4368313b2b199e5c435c94e5516e41c3752c udev-104-r2.ebuild 11789 +MISC ChangeLog 42267 RMD160 5d7303fd76953fb7a8c48cec6080b69d1812f525 SHA1 be10c3839b72328d4a5022377ecf5758f45d4b30 SHA256 7f903bc061336fa63950f11785d9bc4e42dc127bcae68ebd43a6566d03833b1e +MD5 4dca09d244ef8645630f3f23a3314bf1 ChangeLog 42267 +RMD160 5d7303fd76953fb7a8c48cec6080b69d1812f525 ChangeLog 42267 +SHA256 7f903bc061336fa63950f11785d9bc4e42dc127bcae68ebd43a6566d03833b1e ChangeLog 42267 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447 @@ -298,10 +314,13 @@ SHA256 7638db47ed884246551e3d27d9be0fd088c0db9a7e92c3359efa901a87742a28 files/di MD5 834e944e237e0d9501aac75e61c50eb1 files/digest-udev-104-r1 229 RMD160 7fd47bd560da91a9953657f31d6cd2383d2032cb files/digest-udev-104-r1 229 SHA256 36aae1151cda7c7f51bfb8204b7cef8301f80ea336086802f1a8c495a7eb7749 files/digest-udev-104-r1 229 +MD5 834e944e237e0d9501aac75e61c50eb1 files/digest-udev-104-r2 229 +RMD160 7fd47bd560da91a9953657f31d6cd2383d2032cb files/digest-udev-104-r2 229 +SHA256 36aae1151cda7c7f51bfb8204b7cef8301f80ea336086802f1a8c495a7eb7749 files/digest-udev-104-r2 229 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFtRxwt2vP6XvVdOcRAjZFAJ4jfYOjUeo8+bkPsQqOnm8Xw/nE/QCgpicC -KdXKbqZRbug4Fzauq0dgh6Y= -=jm6P +iD8DBQFFt5K1t2vP6XvVdOcRAoU5AJ48VXGSe2V5djW2TnPaVGPWEGNi8wCggAgv +NHOeheFKajG9ygSIr79Qei4= +=D6HW -----END PGP SIGNATURE----- diff --git a/sys-fs/udev/files/05-udev-early.rules-104-r2 b/sys-fs/udev/files/05-udev-early.rules-104-r2 new file mode 100644 index 000000000000..74a842d03dce --- /dev/null +++ b/sys-fs/udev/files/05-udev-early.rules-104-r2 @@ -0,0 +1,9 @@ +# ignore these events until someone needs them +SUBSYSTEM=="drivers", OPTIONS="ignore_device" +SUBSYSTEM=="module", OPTIONS="ignore_device" + +# sysfs is populated after the event is sent +ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus" +ACTION=="add", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt" +ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address" +ACTION=="add", SUBSYSTEM=="net", ENV{PHYSDEVDRIVER}=="?*", WAIT_FOR_SYSFS="device/driver" diff --git a/sys-fs/udev/files/digest-udev-104-r2 b/sys-fs/udev/files/digest-udev-104-r2 new file mode 100644 index 000000000000..1d88fbeee74a --- /dev/null +++ b/sys-fs/udev/files/digest-udev-104-r2 @@ -0,0 +1,3 @@ +MD5 9bcfc782d40db2b406a9c1172defda8f udev-104.tar.bz2 187574 +RMD160 269aeb9a0b2043d18c274fde749d2e0d30398b73 udev-104.tar.bz2 187574 +SHA256 ec0e7bd0c322dce6149d5f94185aa477659f5030a3d684ff5428124eca684ea1 udev-104.tar.bz2 187574 diff --git a/sys-fs/udev/files/udev-104-netif-rename-busywait.patch b/sys-fs/udev/files/udev-104-netif-rename-busywait.patch new file mode 100644 index 000000000000..9aa899b3e070 --- /dev/null +++ b/sys-fs/udev/files/udev-104-netif-rename-busywait.patch @@ -0,0 +1,29 @@ +--- udev-104-orig/udev_device.c 2007-01-15 14:56:11.000000000 +0100 ++++ udev-git/udev_device.c 2007-01-24 17:59:07.000000000 +0100 +@@ -122,16 +122,17 @@ + strlcpy(ifr.ifr_newname, udev->name, IFNAMSIZ); + loop = 30 * 20; + while (loop--) { +- retval = ioctl(sk, SIOCSIFNAME, &ifr); +- if (retval != 0) { +- if (errno != EEXIST) { +- err("error changing net interface name %s to %s: %s", +- ifr.ifr_name, ifr.ifr_newname, strerror(errno)); +- break; +- } +- dbg("wait for netif '%s' to become free, loop=%i", udev->name, (30 * 20) - loop); +- usleep(1000 * 1000 / 20); ++ retval = ioctl(sk, SIOCSIFNAME, &ifr); ++ if (retval == 0) ++ break; ++ ++ if (errno != EEXIST) { ++ err("error changing net interface name %s to %s: %s", ++ ifr.ifr_name, ifr.ifr_newname, strerror(errno)); ++ break; + } ++ dbg("wait for netif '%s' to become free, loop=%i", udev->name, (30 * 20) - loop); ++ usleep(1000 * 1000 / 20); + } + } + diff --git a/sys-fs/udev/files/udev.rules-104-r2 b/sys-fs/udev/files/udev.rules-104-r2 new file mode 100644 index 000000000000..5198c80eb539 --- /dev/null +++ b/sys-fs/udev/files/udev.rules-104-r2 @@ -0,0 +1,302 @@ +# /etc/udev/rules/50-udev.rules: device naming rules for udev +# +# Gentoo specific rules +# +# There are a number of modifiers that are allowed to be used in some of the +# fields. See the udev man page for a full description of them. +# +# Try not to modify this file, if you wish to change things, create a new rule +# file that can be run before this one. +# + + +# console +KERNEL=="pty[pqrstuvwxyzabcdef][0123456789abcdef]", NAME="%k", GROUP="tty", OPTIONS="last_rule" +KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", NAME="%k", GROUP="tty", OPTIONS="last_rule" +KERNEL=="vcs*", NAME="%k", GROUP="tty", OPTIONS="last_rule" +KERNEL=="vcsa*", NAME="%k", GROUP="tty", OPTIONS="last_rule" +KERNEL=="tty", NAME="%k", GROUP="tty", MODE="0666", OPTIONS="last_rule" +KERNEL=="tty[0-9]", NAME="%k", GROUP="tty", OPTIONS="last_rule" +KERNEL=="tty[0-9][0-9]", NAME="%k", GROUP="tty", OPTIONS="last_rule" +KERNEL=="console", NAME="%k", GROUP="tty", MODE="0600" +KERNEL=="ptmx", NAME="%k", GROUP="tty", MODE="0666" + +# tty devices +KERNEL=="ttyS[0-9]*", NAME="%k", SYMLINK="tts/%n", GROUP="tty" +KERNEL=="ttyUSB[0-9]*", NAME="%k", SYMLINK="tts/USB%n", GROUP="tty", MODE="0660" +KERNEL=="ippp0", NAME="%k", GROUP="tty" +KERNEL=="isdn*" NAME="%k", GROUP="tty" +KERNEL=="dcbri*", NAME="%k", GROUP="tty" +KERNEL=="ircomm*", NAME="%k", GROUP="tty" + +# all block devices +SUBSYSTEM=="block", GROUP="disk" + +# cdrom symlinks and other good cdrom naming +KERNEL=="sr[0-9]*|hd[a-z]|pcd[0-9]*", ACTION=="add", IMPORT{program}="cdrom_id --export $tempnode" + +ENV{ID_CDROM}=="?*", GROUP="cdrom" +BUS=="scsi", KERNEL=="sg[0-9]*", ACTION=="add", DRIVERS=="sr", GROUP="cdrom" + +# disk devices +KERNEL=="sd*", NAME="%k", GROUP="disk" +KERNEL=="dasd*", NAME="%k", GROUP="disk" +KERNEL=="ataraid*", NAME="%k", GROUP="disk" + +# compaq smart array +KERNEL=="cciss*", NAME="%k" +KERNEL=="ida*", NAME="%k" + +# mylex +KERNEL=="rd*", NAME="%k" + +# dri devices +KERNEL=="card*", NAME="dri/card%n", GROUP="video" +KERNEL=="nvidia*", NAME="%k", GROUP="video" +KERNEL=="3dfx*", NAME="%k", GROUP="video" + +# alsa devices +SUBSYSTEM=="sound", GROUP="audio" +KERNEL=="controlC[0-9]*", NAME="snd/%k" +KERNEL=="hw[CD0-9]*", NAME="snd/%k" +KERNEL=="pcm[CD0-9cp]*", NAME="snd/%k" +KERNEL=="midiC[D0-9]*", NAME="snd/%k" +KERNEL=="timer", NAME="snd/%k" +KERNEL=="seq", NAME="snd/%k" + +# capi devices +KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20", GROUP="dialout" +KERNEL=="capi*", NAME="capi/%n", GROUP="dialout" + +# cpu devices +KERNEL=="cpu[0-9]*", NAME="cpu/%n/cpuid" +KERNEL=="msr[0-9]*", NAME="cpu/%n/msr" +KERNEL=="microcode", NAME="cpu/microcode" + +# dm devices (ignore them) +KERNEL=="dm-[0-9]*", OPTIONS="ignore_device" +# create a symlink named after the device map name +# note devmap_name comes with extras/multipath +#KERNEL=="dm-[0-9]*", PROGRAM="/sbin/devmap_name %M %m", NAME="%k", SYMLINK+="%c" +KERNEL=="device-mapper", NAME="mapper/control" + +# fb devices +KERNEL=="fb[0-9]*", NAME="fb/%n", SYMLINK+="%k", GROUP="video" + +# floppy devices +KERNEL=="fd[0-9]*", NAME="floppy/%n", SYMLINK+="%k", GROUP="floppy" + +# i2c devices +KERNEL=="i2c-[0-9]*", NAME="i2c/%n", SYMLINK+="%k" + +# input devices +KERNEL=="mice", NAME="input/%k", MODE="0644" +KERNEL=="mouse*", NAME="input/%k", MODE="0644" +KERNEL=="event*", NAME="input/%k", MODE="0600" +KERNEL=="js*", NAME="input/%k", MODE="664" +KERNEL=="ts*", NAME="input/%k", MODE="0600" + +# loop devices +KERNEL=="loop[0-9]*", NAME="loop/%n", SYMLINK+="%k", GROUP="disk" + +# md block devices +KERNEL=="md[0-9]*", NAME="md/%n", SYMLINK+="%k", GROUP="disk" + +# aoe char devices, +SUBSYSTEM=="aoe", KERNEL=="discover", NAME="etherd/%k", GROUP="disk", MODE="0220" +SUBSYSTEM=="aoe", KERNEL=="err", NAME="etherd/%k", GROUP="disk", MODE="0440" +SUBSYSTEM=="aoe", KERNEL=="interfaces", NAME="etherd/%k", GROUP="disk", MODE="0220" + +# misc devices +KERNEL=="agpgart", NAME="misc/%k", SYMLINK+="%k" +KERNEL=="psaux", NAME="misc/%k", SYMLINK+="%k" +KERNEL=="rtc", NAME="misc/%k", SYMLINK+="%k", MODE="0664" +KERNEL=="uinput", NAME="misc/%k", SYMLINK+="%k" +KERNEL=="inotify", NAME="misc/%k", SYMLINK+="%k", MODE="0666" + +# netlink devices +KERNEL=="route", NAME="netlink/%k" +KERNEL=="skip", NAME="netlink/%k" +KERNEL=="usersock", NAME="netlink/%k" +KERNEL=="fwmonitor", NAME="netlink/%k" +KERNEL=="tcpdiag", NAME="netlink/%k" +KERNEL=="nflog", NAME="netlink/%k" +KERNEL=="xfrm", NAME="netlink/%k" +KERNEL=="arpd", NAME="netlink/%k" +KERNEL=="route6", NAME="netlink/%k" +KERNEL=="ip6_fw", NAME="netlink/%k" +KERNEL=="dnrtmsg", NAME="netlink/%k" +KERNEL=="tap*", NAME="netlink/%k" + +# network devices +KERNEL=="tun", NAME="net/%k", MODE="0600" + +# ramdisk devices +KERNEL=="ram[0-9]*", NAME="rd/%n", SYMLINK+="%k" + +# IEEE1394 (firewire) devices (must be before raw devices below) +KERNEL=="raw1394", NAME="%k", GROUP="video" +KERNEL=="dv1394*", NAME="dv1394/%n", GROUP="video" +KERNEL=="video1394*", NAME="video1394/%n", GROUP="video" + +# raw devices +KERNEL=="raw[0-9]*", NAME="raw/%k", GROUP="disk" +KERNEL=="ram*", NAME="%k", GROUP="disk" + +# sound devices +KERNEL=="adsp", NAME="sound/%k", SYMLINK+="%k", GROUP="audio" +KERNEL=="adsp[0-9]*", NAME="sound/%k", SYMLINK+="%k", GROUP="audio" +KERNEL=="audio", NAME="sound/%k", SYMLINK+="%k", GROUP="audio" +KERNEL=="audio[0-9]*", NAME="sound/%k", SYMLINK+="%k", GROUP="audio" +KERNEL=="dsp", NAME="sound/%k", SYMLINK+="%k", GROUP="audio" +KERNEL=="dsp[0-9]*", NAME="sound/%k", SYMLINK+="%k", GROUP="audio" +KERNEL=="mixer", NAME="sound/%k", SYMLINK+="%k", GROUP="audio" +KERNEL=="mixer[0-9]*", NAME="sound/%k", SYMLINK+="%k", GROUP="audio" +KERNEL=="sequencer", NAME="sound/%k", SYMLINK+="%k", GROUP="audio" +KERNEL=="sequencer[0-9]*", NAME="sound/%k", SYMLINK+="%k", GROUP="audio" + +# memory devices +KERNEL=="random", NAME="%k", MODE="0666" +KERNEL=="urandom", NAME="%k", MODE="0444" +KERNEL=="mem", NAME="%k", MODE="0640" +KERNEL=="kmem", NAME="%k", MODE="0640" +KERNEL=="port", NAME="%k", MODE="0640" +KERNEL=="full", NAME="%k", MODE="0666" +KERNEL=="null", NAME="%k", MODE="0666" +KERNEL=="zero", NAME="%k", MODE="0666" + +# usb devices +KERNEL=="hiddev*", NAME="usb/%k" +KERNEL=="auer*", NAME="usb/%k" +KERNEL=="legousbtower*", NAME="usb/%k", GROUP="usb" +KERNEL=="dabusb*", NAME="usb/%k" +BUS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k", GROUP="lp" + +# v4l devices +KERNEL=="video[0-9]*", NAME="v4l/video%n", SYMLINK+="video%n", GROUP="video" +KERNEL=="radio[0-9]*", NAME="v4l/radio%n", SYMLINK+="radio%n", GROUP="video" +KERNEL=="vbi[0-9]*", NAME="v4l/vbi%n", SYMLINK+="vbi%n", GROUP="video" +KERNEL=="vtx[0-9]*", NAME="v4l/vtx%n", GROUP="video" + +# dvb devices +SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="video" + +# Asterisk Zaptel devices +KERNEL=="zapctl", NAME="zap/ctl" +KERNEL=="zaptimer", NAME="zap/timer" +KERNEL=="zapchannel", NAME="zap/channel" +KERNEL=="zappseudo", NAME="zap/pseudo" +KERNEL=="zap[0-9]*", NAME="zap/%n" + +# pilot/palm devices +KERNEL=="pilot", NAME="%k", GROUP="uucp" + +# jaz devices +KERNEL=="jaz*", NAME="%k", GROUP="disk" + +# zip devices +KERNEL=="pocketzip*", NAME="%k", GROUP="disk" +KERNEL=="zip*", NAME="%k", GROUP="disk" + +# ls120 devices +KERNEL=="ls120", NAME="%k", GROUP="disk" + +# lp devices +KERNEL=="lp*", NAME="%k", GROUP="lp" +KERNEL=="irlpt", NAME="%k", GROUP="lp" +KERNEL=="usblp", NAME="%k", GROUP="lp" +KERNEL=="lp*", NAME="%k", GROUP="lp" +KERNEL=="parport*", NAME="%k", GROUP="lp" + +# tape devices +KERNEL=="ht*", NAME="%k", GROUP="tape" +KERNEL=="nht*", NAME="%k", GROUP="tape" +KERNEL=="pt*", NAME="%k", GROUP="tape" +KERNEL=="npt*", NAME="%k", GROUP="tape" +KERNEL=="st*", NAME="%k", GROUP="tape" +KERNEL=="nst*", NAME="%k", GROUP="tape" +KERNEL=="osst*", NAME="%k", GROUP="tape" +KERNEL=="nosst*", NAME="%k", GROUP="tape" + +# diskonkey devices +KERNEL=="diskonkey*", NAME="%k", GROUP="disk" + +# rem_ide devices +KERNEL=="microdrive*", NAME="%k", GROUP="disk" + +# kbd devices +KERNEL=="kbd", NAME="%k", MODE="0664" + +# Sony Vaio Jogdial sonypi device +KERNEL=="sonypi", NAME="%k", MODE="0666" + +# packet devices +KERNEL=="pktcdvd", NAME="pktcdvd/control", GROUP="cdrw", MODE="0660" +KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/pktcdvd%n", GROUP="cdrw", MODE="0660" + +# infiniband devices +KERNEL=="umad*", NAME="infiniband/%k" +KERNEL=="issm*", NAME="infiniband/%k" + + +# usbfs-like device nodes +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" + + +# Module autoloading + +# Autoload modules that lack aliases but have them defined inutoload modules +ENV{MODALIAS}=="?*", ACTION=="add", RUN+="/sbin/modprobe $env{MODALIAS}" + +# /etc/modprobe.conf. +SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN+="/bin/sh -c 'while read id; do /sbin/modprobe pnp:d$$id; done < /sys$devpath/id'" +# If you have problems with some pnp modules being loaded, please enter the +# following aliases into the modprobe configuration files. These are needed by +# udev to autoload some modules +# alias pnp:dPNP0510 irtty-sir +# alias pnp:dPNP0511 irtty-sir +# alias pnp:dPNP0700 floppy +# alias pnp:dPNP0800 pcspkr +# alias pnp:dPNP0b00 rtc +# alias pnp:dPNP0303 atkbd +# alias pnp:dPNP0f13 psmouse +# alias pnp:dPNPb02f analog + + +# Parts taken from redhat-rules +# sd: 0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC +# sr: 4 TYPE_WORM, 5 TYPE_ROM +# st/osst: 1 TYPE_TAPE + +# Setting timeout for tape-devices to 900 seconds +# if you need timeouts for other devices add a similar rule +# with correct type-value, or open a bug on bugs.gentoo.org. +ACTION=="add", SUBSYSTEM=="scsi" , ATTRS{type}=="1", \ + RUN+="/bin/sh -c 'echo 900 > /sys$$DEVPATH/timeout'" + +# Load driver scsi-device +ACTION=="add", SUBSYSTEM=="scsi_device", RUN+="/sbin/modprobe sg" +ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="0|7|14", \ + RUN+="/sbin/modprobe sd_mod" +ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="4|5", \ + RUN+="/sbin/modprobe sr_mod" + +ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ENV{ID_SCSI_TAPE_DRIVER}="st" +ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \ + ATTRS{model}!="ADR*", ENV{ID_SCSI_TAPE_DRIVER}="osst" +ENV{ID_SCSI_TAPE_DRIVER}=="?*", RUN+="/sbin/modprobe $env{ID_SCSI_TAPE_DRIVER}" + + +# Load firmware +SUBSYSTEM=="firmware", ACTION=="add", RUN+="firmware.sh" + + +# be backward compatible for a while with the /etc/dev.d and /etc/hotplug.d/ systems +# run /etc/hotplug.d/ stuff only if we came from a hotplug event, not for udevstart +#ENV{UDEVD_EVENT}=="1", RUN+="udev_run_hotplugd $env{SUBSYSTEM}" + +# always run /etc/dev.d/ stuff for now. +RUN+="udev_run_devd $env{SUBSYSTEM}" + +# debugging monitor +RUN+="socket:/org/kernel/udev/monitor" diff --git a/sys-fs/udev/udev-104-r2.ebuild b/sys-fs/udev/udev-104-r2.ebuild new file mode 100644 index 000000000000..e48e624c461c --- /dev/null +++ b/sys-fs/udev/udev-104-r2.ebuild @@ -0,0 +1,335 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-104-r2.ebuild,v 1.1 2007/01/24 17:09:00 zzam Exp $ + +inherit eutils flag-o-matic multilib + +DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" +HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" +SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="selinux" + +# still rely on hotplug (need to fix that), but now we implement coldplug + +DEPEND="sys-apps/hotplug-base + selinux? ( sys-libs/libselinux )" +RDEPEND="!sys-apps/coldplug" +RDEPEND="${DEPEND} ${RDEPEND} + >=sys-apps/baselayout-1.11.14" +# We need the lib/rcscripts/addon support +PROVIDE="virtual/dev-manager" + +src_unpack() { + unpack ${A} + + cd "${S}" + + # patches go here... + #epatch ${FILESDIR}/${P}-udev_volume_id.patch + epatch ${FILESDIR}/${P}-netif-rename-busywait.patch + + # No need to clutter the logs ... + sed -ie '/^DEBUG/ c\DEBUG = false' Makefile + # Do not use optimization flags from the package + sed -ie 's|$(OPTIMIZATION)||g' Makefile + + # Make sure there is no sudden changes to udev.rules.gentoo + # (more for my own needs than anything else ...) + MD5=`md5sum < "${S}/etc/udev/gentoo/udev.rules"` + MD5=${MD5/ -/} + if [ "${MD5}" != "295a9b7bdc8bdb239f8860d14af761b0" ] + then + echo + eerror "gentoo/udev.rules has been updated, please validate!" + die "gentoo/udev.rules has been updated, please validate!" + fi +} + +src_compile() { + filter-flags -fprefetch-loop-arrays + local myconf= + local extras="extras/ata_id \ + extras/cdrom_id \ + extras/dasd_id \ + extras/edd_id \ + extras/firmware \ + extras/floppy \ + extras/path_id \ + extras/run_directory \ + extras/scsi_id \ + extras/usb_id \ + extras/volume_id \ + extras/rule_generator" + + use selinux && myconf="${myconf} USE_SELINUX=true" + + # Not everyone has full $CHOST-{ld,ar,etc...} yet + local mycross="" + type -p ${CHOST}-ar && mycross=${CHOST}- + + echo "get_libdir = $(get_libdir)" + # Do not work with emake + make \ + EXTRAS="${extras}" \ + udevdir="/dev/" \ + CROSS_COMPILE=${mycross} \ + ${myconf} || die +} + +src_install() { + # we install everything by "hand" and don't rely on the udev Makefile to do + # it for us (why? it's easier that way...) + dobin udevinfo || die "Required binary not installed properly" + dobin udevtest || die "Required binary not installed properly" + dobin udevmonitor || die "Required binary not installed properly" + into / + dosbin udevd || die "Required binary not installed properly" + dosbin udevstart || die "Required binary not installed properly" + dosbin udevtrigger || die "Required binary not installed properly" + dosbin udevcontrol || die "Required binary not installed properly" + dosbin udevsettle || die "Required binary not installed properly" + + # Helpers + exeinto /lib/udev + doexe extras/run_directory/udev_run_devd || die "Required helper not installed properly" + doexe extras/run_directory/udev_run_hotplugd || die "Required helper not installed properly" + doexe extras/ata_id/ata_id || die "Required helper not installed properly" + doexe extras/volume_id/vol_id || die "Required helper not installed properly" + doexe extras/scsi_id/scsi_id || die "Required helper not installed properly" + doexe extras/usb_id/usb_id || die "Required helper not installed properly" + doexe extras/path_id/path_id || die "Required helper not installed properly" + doexe extras/cdrom_id/cdrom_id || die "Required helper not installed properly" + doexe extras/dasd_id/dasd_id || die "Required helper not installed properly" + doexe extras/edd_id/edd_id || die "Required helper not installed properly" + doexe extras/rule_generator/write_cd_rules || die "Required helper not installed properly" + doexe extras/rule_generator/write_net_rules || die "Required helper not installed properly" + doexe extras/rule_generator/rule_generator.functions || die "Required helper not installed properly" + keepdir /lib/udev/state + + # vol_id library (needed by mount and HAL) + dolib extras/volume_id/lib/*.a extras/volume_id/lib/*.so* + # move the .a files to /usr/lib + dodir /usr/$(get_libdir) + mv -f "${D}"/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ + + # handle static linking bug #4411 + gen_usr_ldscript libvolume_id.so + + # save pkgconfig info + insinto /usr/$(get_libdir)/pkgconfig + doins extras/volume_id/lib/*.pc + + #exeinto /etc/udev/scripts + exeinto /lib/udev + #doexe extras/ide-devfs.sh + #doexe extras/scsi-devfs.sh + #doexe extras/raid-devfs.sh + doexe extras/floppy/create_floppy_devices || die "Required binary not installed properly" + doexe extras/firmware/firmware.sh || die "Required binary not installed properly" + doexe ${FILESDIR}/net.sh || die "Required binary not installed properly" + doexe ${FILESDIR}/seq_node.sh || die "Required binary not installed properly" + + # Our udev config file + insinto /etc/udev + newins ${FILESDIR}/udev.conf.post_081 udev.conf + + # Our rules files + insinto /etc/udev/rules.d/ + newins etc/udev/gentoo/udev.rules 50-udev.rules + newins ${FILESDIR}/udev.rules-104-r2 50-udev.rules + newins ${FILESDIR}/05-udev-early.rules-104-r2 05-udev-early.rules + doins ${FILESDIR}/95-net.rules + # Use upstream's persistent rules for devices + doins etc/udev/rules.d/60-*.rules + doins extras/rule_generator/75-*.rules || die "rules not installed properly" + + # scsi_id configuration + insinto /etc + doins extras/scsi_id/scsi_id.config + + # set up the /etc/dev.d directory tree + dodir /etc/dev.d/default + dodir /etc/dev.d/net + exeinto /etc/dev.d/net + doexe extras/run_directory/dev.d/net/hotplug.dev + + # all of the man pages + doman *.7 + doman *.8 + doman extras/ata_id/ata_id.8 + doman extras/edd_id/edd_id.8 + doman extras/scsi_id/scsi_id.8 + doman extras/volume_id/vol_id.8 + doman extras/dasd_id/dasd_id.8 + doman extras/cdrom_id/cdrom_id.8 + # create a extra symlink for udevcontrol + ln -s "${D}"/usr/share/man/man8/udevd.8.gz \ + "${D}"/usr/share/man/man8/udevcontrol.8.gz + + # our udev hooks into the rc system + insinto /lib/rcscripts/addons + newins "${FILESDIR}"/udev-start-104.sh udev-start.sh + doins "${FILESDIR}"/udev-stop.sh + + # Insert udev-version number into udev-rcscript addon + sed -e "s/@@UDEV_VERSION@@/${PV}/" \ + -i "${D}"/lib/rcscripts/addons/udev-start.sh + + # needed to compile latest Hal + insinto /usr/include + doins extras/volume_id/lib/libvolume_id.h + + dodoc ChangeLog FAQ README TODO RELEASE-NOTES + dodoc docs/{overview,udev_vs_devfs} + dodoc docs/writing_udev_rules/* + + newdoc extras/volume_id/README README_volume_id + +} + +pkg_preinst() { + if [[ -d ${ROOT}/lib/udev-state ]] ; then + mv -f "${ROOT}"/lib/udev-state/* "${D}"/lib/udev/state/ + rm -r "${ROOT}"/lib/udev-state + fi + + if [ -f "${ROOT}/etc/udev/udev.config" -a \ + ! -f "${ROOT}/etc/udev/udev.rules" ] + then + mv -f ${ROOT}/etc/udev/udev.config ${ROOT}/etc/udev/udev.rules + fi + + # delete the old udev.hotplug symlink if it is present + if [ -h "${ROOT}/etc/hotplug.d/default/udev.hotplug" ] + then + rm -f ${ROOT}/etc/hotplug.d/default/udev.hotplug + fi + + # delete the old wait_for_sysfs.hotplug symlink if it is present + if [ -h "${ROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug" ] + then + rm -f ${ROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug + fi + + # delete the old wait_for_sysfs.hotplug symlink if it is present + if [ -h "${ROOT}/etc/hotplug.d/default/10-udev.hotplug" ] + then + rm -f ${ROOT}/etc/hotplug.d/default/10-udev.hotplug + fi + + # is there a stale coldplug initscript? (CONFIG_PROTECT leaves it behind) + coldplug_stale="" + if [ -f "${ROOT}/etc/init.d/coldplug" ] + then + coldplug_stale="1" + fi + + # Create some nodes that we know we need. + # set the time/date so we can see in /dev which ones we copied over + # in the udev-start.sh script + mkdir -p ${ROOT}/lib/udev/devices + + if [ ! -e ${ROOT}/lib/udev/devices/null ] ; then + mknod ${ROOT}/lib/udev/devices/null c 1 3 + fi + chmod 666 ${ROOT}/lib/udev/devices/null + touch -t 200010220101 ${ROOT}/lib/udev/devices/null + + if [ ! -e ${ROOT}/lib/udev/devices/zero ] ; then + mknod ${ROOT}/lib/udev/devices/zero c 1 5 + fi + chmod 666 ${ROOT}/lib/udev/devices/zero + touch -t 200010220101 ${ROOT}/lib/udev/devices/zero + + if [ ! -e ${ROOT}/lib/udev/devices/console ] ; then + mknod ${ROOT}/lib/udev/devices/console c 5 1 + fi + chmod 600 ${ROOT}/lib/udev/devices/console + chown root:tty ${ROOT}/lib/udev/devices/console + touch -t 200010220101 ${ROOT}/lib/udev/devices/console + + if [ ! -e ${ROOT}/lib/udev/devices/urandom ] ; then + mknod ${ROOT}/lib/udev/devices/urandom c 1 9 + fi + chmod 666 ${ROOT}/lib/udev/devices/urandom + touch -t 200010220101 ${ROOT}/lib/udev/devices/urandom +} + +pkg_postinst() { + if [ "${ROOT}" = "/" -a -n "`pidof udevd`" ] + then + killall -15 udevd &>/dev/null + sleep 1 + killall -9 udevd &>/dev/null + fi + /sbin/udevd --daemon + + # people want reminders, I'll give them reminders. Odds are they will + # just ignore them anyway... + if has_version '