From: Matthias Schwarzott Date: Sat, 27 Jan 2007 11:26:59 +0000 (+0000) Subject: Deleted some buggy versions. Removed upgrade-warnings for ancient versions. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=41f7daa627fd2edc144a686ab3a526f9ffce638a;p=gentoo.git Deleted some buggy versions. Removed upgrade-warnings for ancient versions. Package-Manager: portage-2.1.2-r4 --- diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 64fcbc994d37..d5c22bb45f8c 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,12 @@ # 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.231 2007/01/26 13:59:20 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.232 2007/01/27 11:26:59 zzam Exp $ + + 27 Jan 2007; Matthias Schwarzott + -files/05-udev-early.rules-104, -files/udev.rules-104, + -files/udev-start-104.sh, -udev-104-r1.ebuild, -udev-104-r2.ebuild, + udev-104-r3.ebuild: + Deleted some buggy versions. Removed upgrade-warnings for ancient versions. 26 Jan 2007; Matthias Schwarzott udev-090-r1.ebuild, udev-094.ebuild, udev-096.ebuild, udev-096-r1.ebuild, udev-098.ebuild, diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 189deb19b746..4e028727b640 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -9,10 +9,6 @@ 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 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 @@ -97,10 +93,6 @@ AUX udev-start-104-r3.sh 3437 RMD160 a28f108e8ad1fd1f86b417928681e21dacf867ee SH MD5 c63851a617f4a96ae9587191a01629ed files/udev-start-104-r3.sh 3437 RMD160 a28f108e8ad1fd1f86b417928681e21dacf867ee files/udev-start-104-r3.sh 3437 SHA256 e276092d1637d0bf8f407ddfa0127115791338a4c3aabc0e2f0f9638ea72277e files/udev-start-104-r3.sh 3437 -AUX udev-start-104.sh 3425 RMD160 b47daeb07880b99c77d0c3d0b9274776c48cbb51 SHA1 fa047c0ad218695c524f3bbe6d5f4be1a50dc454 SHA256 20d84c412c429eda077f606f565ff81b611fc37da5873850e4133790e128ee92 -MD5 496fd5c03bf0ddf014cd3d6d9a0ea6e9 files/udev-start-104.sh 3425 -RMD160 b47daeb07880b99c77d0c3d0b9274776c48cbb51 files/udev-start-104.sh 3425 -SHA256 20d84c412c429eda077f606f565ff81b611fc37da5873850e4133790e128ee92 files/udev-start-104.sh 3425 AUX udev-start.sh 2460 RMD160 97afa40bab5aed0106e3a3b065ae480ce329e11c SHA1 2558e3265c9bed383198e2f263e10016ad6f34a0 SHA256 0527b03ac666dd9e4c94811b10d499f04b3f6f8ae2f03e6460727c1b570d985d MD5 622f085dff7fb6138f3e2c992d569593 files/udev-start.sh 2460 RMD160 97afa40bab5aed0106e3a3b065ae480ce329e11c files/udev-start.sh 2460 @@ -197,10 +189,6 @@ AUX udev.rules-098 10095 RMD160 9bac5d74ee0fc2f62da56854121f9adef9501eae SHA1 52 MD5 295a9b7bdc8bdb239f8860d14af761b0 files/udev.rules-098 10095 RMD160 9bac5d74ee0fc2f62da56854121f9adef9501eae files/udev.rules-098 10095 SHA256 211d8d7820f0bb474f0ffad172359fc3b9f5064422ee68af5961558df0e1dcac files/udev.rules-098 10095 -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-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 @@ -267,22 +255,14 @@ EBUILD udev-103.ebuild 11303 RMD160 4e15d036f5f87f88b4f87f5bbb79ff0d91eb5a21 SHA MD5 75fabfd452ae34fc7c5ab383d2b77f73 udev-103.ebuild 11303 RMD160 4e15d036f5f87f88b4f87f5bbb79ff0d91eb5a21 udev-103.ebuild 11303 SHA256 9c88cec683f3f46921579eb9ff79ad26e26c30c946c6d66c4cdddfb6e25c0fdd udev-103.ebuild 11303 -EBUILD udev-104-r1.ebuild 11746 RMD160 697090a2bdd3a097b05bd6d0bf21fe033a5fc0b2 SHA1 b1d7382f09ee64ea0e71a29f66141c715df4f453 SHA256 dcb1dd1364edcc8769efebf740ccaa3e75b4c313d0a1e370ad4a64ddcf268575 -MD5 c09912c7147014a54b8de606b3855996 udev-104-r1.ebuild 11746 -RMD160 697090a2bdd3a097b05bd6d0bf21fe033a5fc0b2 udev-104-r1.ebuild 11746 -SHA256 dcb1dd1364edcc8769efebf740ccaa3e75b4c313d0a1e370ad4a64ddcf268575 udev-104-r1.ebuild 11746 -EBUILD udev-104-r2.ebuild 11805 RMD160 083d5cbc0c181f8f368bcbf96e4b9eb99206d7a3 SHA1 59edc0bcd5ddf76fe56f10203827387ee3b433ea SHA256 24fa3e96eec49de457139c5d5d35885b84f9ddab41b300f27f1040c840f7af06 -MD5 4df372dddcf63a632cd1050f444f4849 udev-104-r2.ebuild 11805 -RMD160 083d5cbc0c181f8f368bcbf96e4b9eb99206d7a3 udev-104-r2.ebuild 11805 -SHA256 24fa3e96eec49de457139c5d5d35885b84f9ddab41b300f27f1040c840f7af06 udev-104-r2.ebuild 11805 -EBUILD udev-104-r3.ebuild 11003 RMD160 5252dcc69a16f79e0a1f3ac7135f8eafad914418 SHA1 163b482f923daf173662d129a7ca5b37414782cf SHA256 337fb0a7d6c9bcbf1ae7e7dbd1384652c7a96e0b7ab3e9175d0342929fc58cec -MD5 16ec155b44500c27a51d12789d1f8b1b udev-104-r3.ebuild 11003 -RMD160 5252dcc69a16f79e0a1f3ac7135f8eafad914418 udev-104-r3.ebuild 11003 -SHA256 337fb0a7d6c9bcbf1ae7e7dbd1384652c7a96e0b7ab3e9175d0342929fc58cec udev-104-r3.ebuild 11003 -MISC ChangeLog 42976 RMD160 7d592b6e1c8a4094d100f75a32cd032c8cb3e176 SHA1 befd5d73db95617617d2fd27d9770c04b89a59c8 SHA256 cb8bb89ca146c0e4892e42c8040d5422bdac7c604b012fddd6c5ade3146b132e -MD5 917790d529868b99f1aa611e1430df49 ChangeLog 42976 -RMD160 7d592b6e1c8a4094d100f75a32cd032c8cb3e176 ChangeLog 42976 -SHA256 cb8bb89ca146c0e4892e42c8040d5422bdac7c604b012fddd6c5ade3146b132e ChangeLog 42976 +EBUILD udev-104-r3.ebuild 9057 RMD160 3a55933e3f25376fdcd53f9000b0d9ea0582fb91 SHA1 587c71436b852a868c9c67ed1b3a0b8b5be99b16 SHA256 66ac1764bed0793e30a181c3ea1727d92b620e51919f489757c650121bcfc186 +MD5 bb6f5c01606c5291557739178dd00026 udev-104-r3.ebuild 9057 +RMD160 3a55933e3f25376fdcd53f9000b0d9ea0582fb91 udev-104-r3.ebuild 9057 +SHA256 66ac1764bed0793e30a181c3ea1727d92b620e51919f489757c650121bcfc186 udev-104-r3.ebuild 9057 +MISC ChangeLog 43257 RMD160 0710c823d2c97e84b637e70f2a45ee17c8e9f0df SHA1 7ff983a5cd971468f0f8a76dafcce0c072826704 SHA256 1790f9d9195425b87b8e5f7ef659028d2dd755731d708e954a24b88173c8be0b +MD5 dc7cbc133c808b441a293f1a2720da41 ChangeLog 43257 +RMD160 0710c823d2c97e84b637e70f2a45ee17c8e9f0df ChangeLog 43257 +SHA256 1790f9d9195425b87b8e5f7ef659028d2dd755731d708e954a24b88173c8be0b ChangeLog 43257 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447 @@ -323,19 +303,13 @@ SHA256 b3f9795c890f236bb5fea71fd0bb360921ad749c65c0f1163c0b9dc0f8ff098d files/di MD5 0a038fef39f2c8ccb4a613719e0f817b files/digest-udev-103 229 RMD160 fd217b32f070097ae37ba5ee5a96a84faab5edef files/digest-udev-103 229 SHA256 7638db47ed884246551e3d27d9be0fd088c0db9a7e92c3359efa901a87742a28 files/digest-udev-103 229 -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 MD5 834e944e237e0d9501aac75e61c50eb1 files/digest-udev-104-r3 229 RMD160 7fd47bd560da91a9953657f31d6cd2383d2032cb files/digest-udev-104-r3 229 SHA256 36aae1151cda7c7f51bfb8204b7cef8301f80ea336086802f1a8c495a7eb7749 files/digest-udev-104-r3 229 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFuglHt2vP6XvVdOcRAuzPAKDX7vLsRdqg5ReGPlZzK09611V4XgCbBhOn -IfVP1k06Gici4DSshWXjB3M= -=Ognp +iD8DBQFFuzcOt2vP6XvVdOcRAhEPAJ0bGqP4oHBb8rGQR1wyAdUJPdT+9ACgoeo6 +wccbuTLTi56xJ0HTtWAjLKI= +=UN4x -----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 deleted file mode 100644 index e746f6c01161..000000000000 --- a/sys-fs/udev/files/05-udev-early.rules-104 +++ /dev/null @@ -1,9 +0,0 @@ -# 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-r1 b/sys-fs/udev/files/digest-udev-104-r1 deleted file mode 100644 index 1d88fbeee74a..000000000000 --- a/sys-fs/udev/files/digest-udev-104-r1 +++ /dev/null @@ -1,3 +0,0 @@ -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/digest-udev-104-r2 b/sys-fs/udev/files/digest-udev-104-r2 deleted file mode 100644 index 1d88fbeee74a..000000000000 --- a/sys-fs/udev/files/digest-udev-104-r2 +++ /dev/null @@ -1,3 +0,0 @@ -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-start-104.sh b/sys-fs/udev/files/udev-start-104.sh deleted file mode 100644 index 86ffb79a0104..000000000000 --- a/sys-fs/udev/files/udev-start-104.sh +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -udev_version() { - # Version number copied in by ebuild - local version=@@UDEV_VERSION@@ - version=${version##0} - - echo "${version}" -} - -populate_udev() { - # populate /dev with devices already found by the kernel - if [ $(get_KV) -gt "$(KV_to_int '2.6.14')" ] ; then - ebegin "Populating /dev with existing devices through uevents" - local opts= - [[ ${RC_COLDPLUG} != "yes" && $(udev_version) -ge "96" ]] && \ - opts="--attr-match=dev" - /sbin/udevtrigger ${opts} - eend $? - else - ebegin "Populating /dev with existing devices with udevstart" - /sbin/udevstart - eend $? - fi - - # loop until everything is finished - # there's gotta be a better way... - ebegin "Letting udev process events" - /sbin/udevsettle --timeout=60 - eend $? - - return 0 -} - -seed_dev() { - # Seed /dev with some things that we know we need - ebegin "Seeding /dev with needed nodes" - - # copy over any persistant things - if [[ -d /lib/udev/devices ]] ; then - cp --preserve=all --recursive --update /lib/udev/devices/* /dev - fi - - # Not provided by sysfs but needed - ln -snf /proc/self/fd /dev/fd - ln -snf fd/0 /dev/stdin - ln -snf fd/1 /dev/stdout - ln -snf fd/2 /dev/stderr - [[ -e /proc/kcore ]] && ln -snf /proc/kcore /dev/core - - # Create problematic directories - mkdir -p /dev/{pts,shm} - eend 0 -} - -main() { - # Setup temporary storage for /dev - ebegin "Mounting /dev for udev" - if [[ ${RC_USE_FSTAB} == "yes" ]] ; then - mntcmd=$(get_mount_fstab /dev) - else - unset mntcmd - fi - if [[ -n ${mntcmd} ]] ; then - try mount -n ${mntcmd} - else - # This is bash only, but saves on using grep - if [[ $( /selinux/null - fi - - # Actually get udev rolling - if [[ ${RC_DEVICE_TARBALL} == "yes" && \ - -s /lib/udev/state/devices.tar.bz2 ]] ; then - ebegin "Populating /dev with saved device nodes" - try tar -jxpf /lib/udev/state/devices.tar.bz2 -C /dev - eend $? - fi - - seed_dev - - # Setup hotplugging (if possible) - if [[ -e /proc/sys/kernel/hotplug ]] ; then - ebegin "Setting up proper hotplug agent" - eindent - if [[ $(get_KV) -gt $(KV_to_int '2.6.14') ]] ; then - einfo "Using netlink for hotplug events..." - echo "" > /proc/sys/kernel/hotplug - else - einfo "Setting /sbin/udevsend as hotplug agent ..." - echo "/sbin/udevsend" > /proc/sys/kernel/hotplug - fi - eoutdent - eend 0 - fi - - ebegin "Starting udevd" - /sbin/udevd --daemon - eend $? - - populate_udev - - # Create nodes that udev can't - ebegin "Finalizing udev configuration" - [[ -x /sbin/dmsetup ]] && /sbin/dmsetup mknodes &>/dev/null - [[ -x /sbin/lvm ]] && \ - /sbin/lvm vgscan -P --mknodes --ignorelockingfailure &>/dev/null - # Running evms_activate on a LiveCD causes lots of headaches - [[ -z ${CDBOOT} ]] && [[ -x /sbin/evms_activate ]] && \ - /sbin/evms_activate -q &>/dev/null - eend 0 -} - -main - -# vim:ts=4 diff --git a/sys-fs/udev/files/udev.rules-104 b/sys-fs/udev/files/udev.rules-104 deleted file mode 100644 index 79428bd66411..000000000000 --- a/sys-fs/udev/files/udev.rules-104 +++ /dev/null @@ -1,304 +0,0 @@ -# /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-r1.ebuild b/sys-fs/udev/udev-104-r1.ebuild deleted file mode 100644 index acbda9cc805c..000000000000 --- a/sys-fs/udev/udev-104-r1.ebuild +++ /dev/null @@ -1,334 +0,0 @@ -# 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-r1.ebuild,v 1.2 2007/01/26 13:59:20 zzam Exp $ - -inherit eutils flag-o-matic multilib toolchain-funcs - -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-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 '/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 '