From e4b585e46d96253d60cc559472c358efcd4236d8 Mon Sep 17 00:00:00 2001 From: Matthias Schwarzott Date: Fri, 19 Jan 2007 15:34:01 +0000 Subject: [PATCH] Version bumped, Bug #161801. Added depend to libselinux, Bug #156704. Moved scsi-rules to all other rules inside 50-udev.rules, removing 40-scsi-hotplug.rules in pkg_postinst, Added rule for loading st/osst tape module, setting timeout of tape-like scsi-devices to large value (900s), inspired by redhat-rules. Added wait-rule for "device/driver" to work around race in persistence-net. Added raw usb-devices for use by libusb to group usb with group write permission, Bug #150223. Removed installation of /sbin/udev as it no longer exists and /sbin/rc also does not seem to need it any longer. Package-Manager: portage-2.1.2-r1 --- sys-fs/udev/ChangeLog | 16 +- sys-fs/udev/Manifest | 30 +- sys-fs/udev/files/05-udev-early.rules-104 | 9 + sys-fs/udev/files/digest-udev-104 | 3 + sys-fs/udev/files/udev.rules-104 | 304 ++++++++++++++++++++ sys-fs/udev/udev-104.ebuild | 330 ++++++++++++++++++++++ 6 files changed, 684 insertions(+), 8 deletions(-) create mode 100644 sys-fs/udev/files/05-udev-early.rules-104 create mode 100644 sys-fs/udev/files/digest-udev-104 create mode 100644 sys-fs/udev/files/udev.rules-104 create mode 100644 sys-fs/udev/udev-104.ebuild diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 56fef5bc8d9c..9935e78b760b 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,20 @@ # 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.225 2007/01/16 16:49:32 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.226 2007/01/19 15:34:01 zzam Exp $ + +*udev-104 (19 Jan 2007) + + 19 Jan 2007; Matthias Schwarzott + +files/05-udev-early.rules-104, +files/udev.rules-104, +udev-104.ebuild: + Version bumped, Bug #161801. Added depend to libselinux, Bug #156704. Moved + scsi-rules to all other rules inside 50-udev.rules, removing + 40-scsi-hotplug.rules in pkg_postinst, Added rule for loading st/osst tape + module, setting timeout of tape-like scsi-devices to large value (900s), + inspired by redhat-rules. Added wait-rule for "device/driver" to work around + race in persistence-net. Added raw usb-devices for use by libusb to group + usb with group write permission, Bug #150223. Removed installation of + /sbin/udev as it no longer exists and /sbin/rc also does not seem to need it + any longer. *udev-103-r3 (16 Jan 2007) diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 36c2b6519efa..1239a66f6d1c 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -9,6 +9,10 @@ AUX 05-udev-early.rules-079 385 RMD160 04de1f937d47a2d42eeec879851a1a00d847cecc MD5 c5e955ffa18f2f4526a67c00dbe8b870 files/05-udev-early.rules-079 385 RMD160 04de1f937d47a2d42eeec879851a1a00d847cecc files/05-udev-early.rules-079 385 SHA256 c50db994a4a40d6b7aa466944c2ab14a00a6269a2b9f0ae26b1049cf6881b682 files/05-udev-early.rules-079 385 +AUX 05-udev-early.rules-104 449 RMD160 8c10d29743ad7e5f68816a9a8807fe5a795b6505 SHA1 ac3b0b510261b1a3524c563a1ba3b84662cb7194 SHA256 4389d9de4eb5c847c0d0a7c0187d88c2030d62e1b629e8b62a8fe9a53272ea84 +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 40-scsi-hotplug.rules 338 RMD160 43039de65d94b23ea2e3842d48987c74c5788f20 SHA1 588916e77490f6d8915dc23d265afd3f9096d3e2 SHA256 7e7867e1dbc889846e26f20870e2c9a685872f3dabdf6c8ac0911837857eac86 MD5 ba9e173c0295e66741c7baec47fe2ae8 files/40-scsi-hotplug.rules 338 RMD160 43039de65d94b23ea2e3842d48987c74c5788f20 files/40-scsi-hotplug.rules 338 @@ -189,6 +193,10 @@ AUX udev.rules-103-r3 9666 RMD160 1435925f11e525aa2085679ba8e39ca637069fb5 SHA1 MD5 a631d9d668f8143b10e5c71f8b5d57d3 files/udev.rules-103-r3 9666 RMD160 1435925f11e525aa2085679ba8e39ca637069fb5 files/udev.rules-103-r3 9666 SHA256 4de595e2bc92e874ad18de3bc30157cca3f7d5b93155a5c99d9c8b5e57613bc1 files/udev.rules-103-r3 9666 +AUX udev.rules-104 10799 RMD160 d3d158e92f71215b2b847f480b23650b4873e7e3 SHA1 e66b6984058d2271a35f452e8a92febb81388f25 SHA256 5265c20933afefa05f3033375fcc538dcc3699b58d44e21f81320c7a434212cd +MD5 69437fb27fe4e3894b551a73b34a5d0c files/udev.rules-104 10799 +RMD160 d3d158e92f71215b2b847f480b23650b4873e7e3 files/udev.rules-104 10799 +SHA256 5265c20933afefa05f3033375fcc538dcc3699b58d44e21f81320c7a434212cd files/udev.rules-104 10799 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 @@ -202,6 +210,7 @@ DIST udev-098.tar.bz2 195723 RMD160 29a05c64d49397d345d25f75c916525fede346aa SHA DIST udev-099.tar.bz2 197429 RMD160 c323d1f63010d70470872f8b9710cf9ed179643d SHA1 811bdc648704bc3b9f296a086ce4b7708d69c2ec SHA256 58a18e38ce9f28886b5b67784cff58ebb96a912bd32d6c32760e189881853bfa DIST udev-100.tar.bz2 197628 RMD160 110903eda55348131ca412c4f4a9d539e5a35bdb SHA1 9c7cdca01db5e842761b2578fc59ab86b8609bb0 SHA256 ca1f83735bd9fc70b534c846e4214394f0297f6a32d1d9252e08ad796d0d94b6 DIST udev-103.tar.bz2 200027 RMD160 3b00a83ad8c538109ee030e2e471422272c7d071 SHA1 015372f585beeba05217ad6568178820b2713571 SHA256 047f5e2895f707117ab726cedd89fd35e8c9105530af54a8038fe81cf61c4e3f +DIST udev-104.tar.bz2 187574 RMD160 269aeb9a0b2043d18c274fde749d2e0d30398b73 SHA1 53a8019f2be429be914e0283bfbcb91083fbbd9a SHA256 ec0e7bd0c322dce6149d5f94185aa477659f5030a3d684ff5428124eca684ea1 EBUILD udev-079-r2.ebuild 7523 RMD160 bc3a75a2205cbe092ec431eaf474cb1f4959d4fe SHA1 b10bb23e64edc1a43b890f06c3f71a4e7c85ba9e SHA256 14a34689b36d1be9ffd953eedf20ee906b8638b0967b7148b4d0023d765da90f MD5 3a6af6ceddbbd1a93002a240a8e6b930 udev-079-r2.ebuild 7523 RMD160 bc3a75a2205cbe092ec431eaf474cb1f4959d4fe udev-079-r2.ebuild 7523 @@ -262,10 +271,14 @@ EBUILD udev-103.ebuild 11287 RMD160 bff5f34ad8de812ef7a13612b059ecb14da37421 SHA MD5 740ea843e67f766c34a4b13feb82d9de udev-103.ebuild 11287 RMD160 bff5f34ad8de812ef7a13612b059ecb14da37421 udev-103.ebuild 11287 SHA256 f650d8df92004190e77a7d96ed437cbaee53fc2504858e63491d417854444c9b udev-103.ebuild 11287 -MISC ChangeLog 40416 RMD160 2c26b802cbe00564d6021eabb7d58aaf0ef69f5a SHA1 945bc3beb461a192899a3a9172b0e76767d4f214 SHA256 f23315f98eff52faf54accb4eee341c2888ecd8bd9b202a0f62c5fc910bfc360 -MD5 c89a91cfc5fdae4d8e2f9dae7a33a9bb ChangeLog 40416 -RMD160 2c26b802cbe00564d6021eabb7d58aaf0ef69f5a ChangeLog 40416 -SHA256 f23315f98eff52faf54accb4eee341c2888ecd8bd9b202a0f62c5fc910bfc360 ChangeLog 40416 +EBUILD udev-104.ebuild 11586 RMD160 ed25ad6cca9210449692df71ea15fa32e4a056b0 SHA1 a16a692f816c598613124343ff781e210f6cb1a4 SHA256 25ba578398480720394cc7aa2082cb36971a52c4c51ce25dd7f09e2045b33531 +MD5 700e0b32b06653e6b719413574629586 udev-104.ebuild 11586 +RMD160 ed25ad6cca9210449692df71ea15fa32e4a056b0 udev-104.ebuild 11586 +SHA256 25ba578398480720394cc7aa2082cb36971a52c4c51ce25dd7f09e2045b33531 udev-104.ebuild 11586 +MISC ChangeLog 41183 RMD160 ab8fbf52b57003f40127182826186602d8a7556f SHA1 d144f2b5f8bc51d07030b31567d216e4bb1259b8 SHA256 d60f97ae6e3421c9b5d9725146c0d59a2adb1fa391af883c7df704dafc531897 +MD5 bc85c4ebbe3516e4c6b45a774463d9bf ChangeLog 41183 +RMD160 ab8fbf52b57003f40127182826186602d8a7556f ChangeLog 41183 +SHA256 d60f97ae6e3421c9b5d9725146c0d59a2adb1fa391af883c7df704dafc531897 ChangeLog 41183 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447 @@ -315,10 +328,13 @@ SHA256 7638db47ed884246551e3d27d9be0fd088c0db9a7e92c3359efa901a87742a28 files/di MD5 0a038fef39f2c8ccb4a613719e0f817b files/digest-udev-103-r3 229 RMD160 fd217b32f070097ae37ba5ee5a96a84faab5edef files/digest-udev-103-r3 229 SHA256 7638db47ed884246551e3d27d9be0fd088c0db9a7e92c3359efa901a87742a28 files/digest-udev-103-r3 229 +MD5 834e944e237e0d9501aac75e61c50eb1 files/digest-udev-104 229 +RMD160 7fd47bd560da91a9953657f31d6cd2383d2032cb files/digest-udev-104 229 +SHA256 36aae1151cda7c7f51bfb8204b7cef8301f80ea336086802f1a8c495a7eb7749 files/digest-udev-104 229 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFrQIst2vP6XvVdOcRArF1AJ9F/mOV1fWU2Jirp8n3LS17Y+YZRgCfXBw5 -EBSf1cSzLeEDfqI1Gp2Jueg= -=eHaQ +iD8DBQFFsOT0t2vP6XvVdOcRAsQfAJ0VVLcnSBl6BYWqcH9UeFRDBMpYDgCg0vxD +e+8Jwryd7ZxnJDRfAeX+dpQ= +=NY/W -----END PGP SIGNATURE----- diff --git a/sys-fs/udev/files/05-udev-early.rules-104 b/sys-fs/udev/files/05-udev-early.rules-104 new file mode 100644 index 000000000000..e746f6c01161 --- /dev/null +++ b/sys-fs/udev/files/05-udev-early.rules-104 @@ -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", WAIT_FOR_SYSFS="device/driver" diff --git a/sys-fs/udev/files/digest-udev-104 b/sys-fs/udev/files/digest-udev-104 new file mode 100644 index 000000000000..1d88fbeee74a --- /dev/null +++ b/sys-fs/udev/files/digest-udev-104 @@ -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.rules-104 b/sys-fs/udev/files/udev.rules-104 new file mode 100644 index 000000000000..79428bd66411 --- /dev/null +++ b/sys-fs/udev/files/udev.rules-104 @@ -0,0 +1,304 @@ +# /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 +SYSFS{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", \ + RUN+="/sbin/modprobe st" + +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.ebuild b/sys-fs/udev/udev-104.ebuild new file mode 100644 index 000000000000..6741de011546 --- /dev/null +++ b/sys-fs/udev/udev-104.ebuild @@ -0,0 +1,330 @@ +# 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.ebuild,v 1.1 2007/01/19 15:34:01 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 + + # 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 50-udev.rules + newins ${FILESDIR}/05-udev-early.rules-104 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-099.sh udev-start.sh + doins "${FILESDIR}"/udev-stop.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 '