diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2007-05-12 09:57:44 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2007-05-12 09:57:44 +0000 |
| commit | c00b9e232def8cd8d44ade4983e44f5683a35e56 (patch) | |
| tree | 96516c04a29e2773bd41e50aa96cbddfdef4aeef /sys-fs/udev | |
| parent | Revbump. (diff) | |
| download | gentoo-2-c00b9e232def8cd8d44ade4983e44f5683a35e56.tar.gz gentoo-2-c00b9e232def8cd8d44ade4983e44f5683a35e56.tar.bz2 gentoo-2-c00b9e232def8cd8d44ade4983e44f5683a35e56.zip | |
Second stage of cleanup: Removed all ebuilds between latest stable, and latest ~ARCH version.
(Portage version: 2.1.2.7)
Diffstat (limited to 'sys-fs/udev')
43 files changed, 22 insertions, 4947 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 99b353a51740..99817e1a6975 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,25 @@ # 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.305 2007/05/12 09:39:02 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.306 2007/05/12 09:57:44 zzam Exp $ + + 12 May 2007; Matthias Schwarzott <zzam@gentoo.org> + -files/udev-stop-105.sh, -files/udev.rules-106-r3, + -files/udev.rules-106-r5, -files/udev-106-floppy-devices-no-umask.diff, + -files/udev-start-106-r2.sh, -files/udev-106-remove-dasd-rules.patch, + -files/udev.rules-107-r1, -files/udev-107-usbcd-by-id.patch, + -files/udev-start-107.sh, -files/udev-108-cleanup-early-rules.diff, + -files/udev-108-persistent-joystick.diff, -files/udev-start-108-r1.sh, + -files/udev-stop-108-r1.sh, -files/udev-109-respect-CFLAGS.diff, + -files/64-device-mapper.rules, -files/64-device-mapper.rules-107, + -files/64-device-mapper.rules-107-r1, + -files/udev-110-makefile-depend.diff, -files/udev-start-110.sh, + -files/blacklist, udev-104-r12.ebuild, -udev-106-r4.ebuild, + -udev-106-r5.ebuild, -udev-107.ebuild, -udev-107-r1.ebuild, + -udev-108.ebuild, -udev-108-r1.ebuild, -udev-109.ebuild, + -udev-109-r1.ebuild, -udev-110.ebuild, -udev-110-r1.ebuild, + udev-111.ebuild: + Second stage of cleanup: Removed all ebuilds between latest stable, and + latest ~ARCH version. 12 May 2007; Matthias Schwarzott <zzam@gentoo.org> -files/udev.rules-018, -files/udev-021-udev_add_c-gcc295-compat.patch, diff --git a/sys-fs/udev/files/64-device-mapper.rules b/sys-fs/udev/files/64-device-mapper.rules deleted file mode 100644 index 7c00e25ac627..000000000000 --- a/sys-fs/udev/files/64-device-mapper.rules +++ /dev/null @@ -1,28 +0,0 @@ -# device mapper links hook into "change" events, when the dm table -# becomes available; some table-types must be ignored - -KERNEL=="device-mapper", NAME="mapper/control" - -KERNEL=="dm-*", ACTION=="add|change", GOTO="device_mapper_do" -GOTO="device_mapper_end" -LABEL="device_mapper_do" - -# lookup device name -# use dmsetup, until devmap_name is provided by sys-fs/device-mapper -PROGRAM=="/sbin/dmsetup -j %M -m %m --noopencount --noheadings -c -o name info", - ENV{ID_DM_NAME}="%c" - -# do not do anything if dmsetup does not provide a name -ENV{ID_DM_NAME}=="", NAME="", OPTIONS="ignore_device" - -# use queried name -ENV{ID_DM_NAME}=="?*", NAME="mapper/$env{ID_DM_NAME}" - -PROGRAM!="/sbin/dmsetup status -j %M -m %m", GOTO="device_mapper_end" -RESULT=="|*snapshot*|*error*", GOTO="device_mapper_end" - -IMPORT{program}="vol_id --export $tempnode" -ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}" -ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}" - -LABEL="device_mapper_end" diff --git a/sys-fs/udev/files/64-device-mapper.rules-107 b/sys-fs/udev/files/64-device-mapper.rules-107 deleted file mode 100644 index ad75792c5e04..000000000000 --- a/sys-fs/udev/files/64-device-mapper.rules-107 +++ /dev/null @@ -1,28 +0,0 @@ -# device mapper links hook into "change" events, when the dm table -# becomes available; some table-types must be ignored - -KERNEL=="device-mapper", NAME="mapper/control" - -KERNEL=="dm-*", ACTION=="add|change", GOTO="device_mapper_do" -GOTO="device_mapper_end" -LABEL="device_mapper_do" - -# lookup device name -# use dmsetup, until devmap_name is provided by sys-fs/device-mapper -PROGRAM=="/sbin/dmsetup -j %M -m %m --noopencount --noheadings -c -o name info", - ENV{ID_DM_NAME}="%c" - -# do not do anything if dmsetup does not provide a name -ENV{ID_DM_NAME}=="", NAME="", OPTIONS="ignore_device" - -# use queried name -ENV{ID_DM_NAME}=="?*", NAME="mapper/$env{ID_DM_NAME}" - -PROGRAM!="/sbin/dmsetup status -j %M -m %m", GOTO="device_mapper_end" -RESULT=="|*snapshot*|*error*", GOTO="device_mapper_end" - -IMPORT{program}="vol_id --export $tempnode" -ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}", OPTIONS="link_priority=50" -ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}", OPTIONS="link_priority=50" - -LABEL="device_mapper_end" diff --git a/sys-fs/udev/files/64-device-mapper.rules-107-r1 b/sys-fs/udev/files/64-device-mapper.rules-107-r1 deleted file mode 100644 index 1100c1b7bdc2..000000000000 --- a/sys-fs/udev/files/64-device-mapper.rules-107-r1 +++ /dev/null @@ -1,31 +0,0 @@ -# device mapper links hook into "change" events, when the dm table -# becomes available; some table-types must be ignored - -KERNEL=="device-mapper", NAME="mapper/control" - -KERNEL=="dm-*", ACTION=="add|change", GOTO="device_mapper_do" -GOTO="device_mapper_end" -LABEL="device_mapper_do" - -# lookup device name -# use dmsetup, until devmap_name is provided by sys-fs/device-mapper -PROGRAM=="/sbin/dmsetup -j %M -m %m --noopencount --noheadings -c -o name info", - ENV{ID_DM_NAME}="%c" - -# do not do anything if dmsetup does not provide a name -ENV{ID_DM_NAME}=="", NAME="", OPTIONS="ignore_device" - -# ignore luks crypt devices while not fully up -ENV{ID_DM_NAME}=="temporary-cryptsetup-*", NAME="", OPTIONS="ignore_device" - -# use queried name -ENV{ID_DM_NAME}=="?*", NAME="mapper/$env{ID_DM_NAME}" - -PROGRAM!="/sbin/dmsetup status -j %M -m %m", GOTO="device_mapper_end" -RESULT=="|*snapshot*|*error*", GOTO="device_mapper_end" - -IMPORT{program}="vol_id --export $tempnode" -ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}", OPTIONS="link_priority=50" -ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}", OPTIONS="link_priority=50" - -LABEL="device_mapper_end" diff --git a/sys-fs/udev/files/blacklist b/sys-fs/udev/files/blacklist deleted file mode 100644 index cd31163cde14..000000000000 --- a/sys-fs/udev/files/blacklist +++ /dev/null @@ -1,20 +0,0 @@ -# This file lists modules which will not be loaded by udev, -# not at coldplugging and not on hotplug events. - -# Add your own entries to this file -# in the format "blacklist <name of module>" - -# Some examples: -# evbug is a debug tool and should be loaded explicitly -blacklist evbug - -# You probably want this to not get the console beep loud on every tab :) -#blacklist pcspkr - -# these drivers are very simple, the HID drivers are usually preferred -#blacklist usbmouse -#blacklist usbkbd - -# Sometimes loading a framebuffer driver at boot gets the console black -#install pci:v*d*sv*sd*bc03sc*i* /bin/true - diff --git a/sys-fs/udev/files/digest-udev-106-r4 b/sys-fs/udev/files/digest-udev-106-r4 deleted file mode 100644 index 7bc700ae9207..000000000000 --- a/sys-fs/udev/files/digest-udev-106-r4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 320ccd2d0f4540d10e021bafa14f8985 udev-106.tar.bz2 188557 -RMD160 2a01d06746b143c53d01b8c6aa97e635c062e9d3 udev-106.tar.bz2 188557 -SHA256 544a7372468459e8a631ffdf9cace29bc77365b9a6dab4189c6ba813da002156 udev-106.tar.bz2 188557 diff --git a/sys-fs/udev/files/digest-udev-106-r5 b/sys-fs/udev/files/digest-udev-106-r5 deleted file mode 100644 index 7bc700ae9207..000000000000 --- a/sys-fs/udev/files/digest-udev-106-r5 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 320ccd2d0f4540d10e021bafa14f8985 udev-106.tar.bz2 188557 -RMD160 2a01d06746b143c53d01b8c6aa97e635c062e9d3 udev-106.tar.bz2 188557 -SHA256 544a7372468459e8a631ffdf9cace29bc77365b9a6dab4189c6ba813da002156 udev-106.tar.bz2 188557 diff --git a/sys-fs/udev/files/digest-udev-107 b/sys-fs/udev/files/digest-udev-107 deleted file mode 100644 index 991f2f0e4cf1..000000000000 --- a/sys-fs/udev/files/digest-udev-107 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 b90dcb9d6d164fa34fe6632c506ce867 udev-107.tar.bz2 189101 -RMD160 ebc2722e0306aea3f3c0cd828861a61021609ac7 udev-107.tar.bz2 189101 -SHA256 49c45315ba640547939b2e2949f9478af2279a3296e97328ee8f6a4b08f2eae9 udev-107.tar.bz2 189101 diff --git a/sys-fs/udev/files/digest-udev-107-r1 b/sys-fs/udev/files/digest-udev-107-r1 deleted file mode 100644 index 991f2f0e4cf1..000000000000 --- a/sys-fs/udev/files/digest-udev-107-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 b90dcb9d6d164fa34fe6632c506ce867 udev-107.tar.bz2 189101 -RMD160 ebc2722e0306aea3f3c0cd828861a61021609ac7 udev-107.tar.bz2 189101 -SHA256 49c45315ba640547939b2e2949f9478af2279a3296e97328ee8f6a4b08f2eae9 udev-107.tar.bz2 189101 diff --git a/sys-fs/udev/files/digest-udev-108 b/sys-fs/udev/files/digest-udev-108 deleted file mode 100644 index 38c2b79089e7..000000000000 --- a/sys-fs/udev/files/digest-udev-108 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 67935abde67b23e7c6e86e0be77c5e4b udev-108.tar.bz2 187460 -RMD160 cfc3885bdbb1a3611118c8503efe3ffe472b0f2d udev-108.tar.bz2 187460 -SHA256 0956fd6e7388cbb9c3431db302e52f8ee03d7fad8a159359597878058d8632ec udev-108.tar.bz2 187460 diff --git a/sys-fs/udev/files/digest-udev-108-r1 b/sys-fs/udev/files/digest-udev-108-r1 deleted file mode 100644 index 38c2b79089e7..000000000000 --- a/sys-fs/udev/files/digest-udev-108-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 67935abde67b23e7c6e86e0be77c5e4b udev-108.tar.bz2 187460 -RMD160 cfc3885bdbb1a3611118c8503efe3ffe472b0f2d udev-108.tar.bz2 187460 -SHA256 0956fd6e7388cbb9c3431db302e52f8ee03d7fad8a159359597878058d8632ec udev-108.tar.bz2 187460 diff --git a/sys-fs/udev/files/digest-udev-109 b/sys-fs/udev/files/digest-udev-109 deleted file mode 100644 index 6a196fcc2437..000000000000 --- a/sys-fs/udev/files/digest-udev-109 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 6fd1ed31f48d7e99c549a132974a34c0 udev-109.tar.bz2 188252 -RMD160 8700365b2ea744e19f0133615a652ca85726d890 udev-109.tar.bz2 188252 -SHA256 d16886d1d1791331f6cf949338b3c5aaf9f57c5a5b141531efa61c8b881b3330 udev-109.tar.bz2 188252 diff --git a/sys-fs/udev/files/digest-udev-109-r1 b/sys-fs/udev/files/digest-udev-109-r1 deleted file mode 100644 index 6a196fcc2437..000000000000 --- a/sys-fs/udev/files/digest-udev-109-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 6fd1ed31f48d7e99c549a132974a34c0 udev-109.tar.bz2 188252 -RMD160 8700365b2ea744e19f0133615a652ca85726d890 udev-109.tar.bz2 188252 -SHA256 d16886d1d1791331f6cf949338b3c5aaf9f57c5a5b141531efa61c8b881b3330 udev-109.tar.bz2 188252 diff --git a/sys-fs/udev/files/digest-udev-110 b/sys-fs/udev/files/digest-udev-110 deleted file mode 100644 index 47649e311d1c..000000000000 --- a/sys-fs/udev/files/digest-udev-110 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 34c703949f7c22745f52ef5a56d5910c udev-110.tar.bz2 188708 -RMD160 6ad83cfa386a7eedb79fc642eca438071a396580 udev-110.tar.bz2 188708 -SHA256 14532a4a563ad99c4631b5c3a1b4950337c3137d91a87825d6ae24b953f652ca udev-110.tar.bz2 188708 diff --git a/sys-fs/udev/files/digest-udev-110-r1 b/sys-fs/udev/files/digest-udev-110-r1 deleted file mode 100644 index 47649e311d1c..000000000000 --- a/sys-fs/udev/files/digest-udev-110-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 34c703949f7c22745f52ef5a56d5910c udev-110.tar.bz2 188708 -RMD160 6ad83cfa386a7eedb79fc642eca438071a396580 udev-110.tar.bz2 188708 -SHA256 14532a4a563ad99c4631b5c3a1b4950337c3137d91a87825d6ae24b953f652ca udev-110.tar.bz2 188708 diff --git a/sys-fs/udev/files/udev-106-floppy-devices-no-umask.diff b/sys-fs/udev/files/udev-106-floppy-devices-no-umask.diff deleted file mode 100644 index 8f8f2d292030..000000000000 --- a/sys-fs/udev/files/udev-106-floppy-devices-no-umask.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/extras/floppy/create_floppy_devices.c b/extras/floppy/create_floppy_devices.c -index 7b61ef0..187324e 100644 ---- a/extras/floppy/create_floppy_devices.c -+++ b/extras/floppy/create_floppy_devices.c -@@ -155,6 +155,8 @@ int main(int argc, char **argv) - if (type == 0) - return 0; - -+ umask(0); -+ - selinux_init(); - - i = 0; diff --git a/sys-fs/udev/files/udev-106-remove-dasd-rules.patch b/sys-fs/udev/files/udev-106-remove-dasd-rules.patch deleted file mode 100644 index e30647bf7406..000000000000 --- a/sys-fs/udev/files/udev-106-remove-dasd-rules.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ru udev-106-orig/etc/udev/rules.d/60-persistent-storage.rules udev-106/etc/udev/rules.d/60-persistent-storage.rules ---- udev-106-orig/etc/udev/rules.d/60-persistent-storage.rules 2007-03-19 17:52:04.801779688 +0100 -+++ udev-106/etc/udev/rules.d/60-persistent-storage.rules 2007-03-19 17:53:45.356742824 +0100 -@@ -33,9 +33,8 @@ - KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="usb_id -x" - KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="scsi_id -g -x -s %p -d $tempnode" - KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="scsi_id -g -x -a -s %p -d $tempnode" --KERNEL=="dasd*[!0-9]", IMPORT{program}="dasd_id --export $tempnode" --KERNEL=="sd*[!0-9]|sr*|dasd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}" --KERNEL=="sd*[0-9]|dasd*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n" -+KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}" -+KERNEL=="sd*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n" - - KERNEL=="mmcblk[0-9]", ATTR{name}=="?*", ATTR{serial}=="?*", ENV{ID_NAME}="$attr{name}", ENV{ID_SERIAL}="$attr{serial}", SYMLINK+="disk/by-id/mmc-$env{ID_NAME}_$env{ID_SERIAL}" - KERNEL=="mmcblk[0-9]p[0-9]", ATTR{name}=="?*", ATTR{serial}=="?*", ENV{ID_NAME}="$attr{name}", ENV{ID_SERIAL}="$attr{serial}", SYMLINK+="disk/by-id/mmc-$env{ID_NAME}_$env{ID_SERIAL}-part%n" diff --git a/sys-fs/udev/files/udev-107-usbcd-by-id.patch b/sys-fs/udev/files/udev-107-usbcd-by-id.patch deleted file mode 100644 index 4edfbf4214f9..000000000000 --- a/sys-fs/udev/files/udev-107-usbcd-by-id.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/extras/rule_generator/write_cd_rules b/extras/rule_generator/write_cd_rules -index 1dbe6b7..bd951c5 100644 ---- a/extras/rule_generator/write_cd_rules -+++ b/extras/rule_generator/write_cd_rules -@@ -53,7 +53,15 @@ fi - if [ "$1" ]; then - METHOD="$1" - else -- METHOD='by-path' -+ case "$ID_BUS" in -+ usb|ieee1394) -+ METHOD='by-id' -+ ;; -+ -+ *) -+ METHOD='by-path' -+ ;; -+ esac - fi - - case "$METHOD" in diff --git a/sys-fs/udev/files/udev-108-cleanup-early-rules.diff b/sys-fs/udev/files/udev-108-cleanup-early-rules.diff deleted file mode 100644 index ee6e26883f71..000000000000 --- a/sys-fs/udev/files/udev-108-cleanup-early-rules.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff -r -ru udev-108-orig/etc/udev/gentoo/05-udev-early.rules udev-108/etc/udev/gentoo/05-udev-early.rules ---- udev-108-orig/etc/udev/gentoo/05-udev-early.rules 2007-04-11 09:32:13.007423206 +0200 -+++ udev-108/etc/udev/gentoo/05-udev-early.rules 2007-04-11 09:32:30.587306470 +0200 -@@ -7,7 +7,3 @@ - ACTION=="add", KERNEL=="[0-9]*:[0-9]*", 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" -- --# Set IN_HOTPLUG for compatibility with init-scripts called from udev --ENV{IN_HOTPLUG}="1" -- diff --git a/sys-fs/udev/files/udev-108-persistent-joystick.diff b/sys-fs/udev/files/udev-108-persistent-joystick.diff deleted file mode 100644 index 091b2e0795b1..000000000000 --- a/sys-fs/udev/files/udev-108-persistent-joystick.diff +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/etc/udev/rules.d/60-persistent-input.rules b/etc/udev/rules.d/60-persistent-input.rules -index 623eb7d..503e61e 100644 ---- a/etc/udev/rules.d/60-persistent-input.rules -+++ b/etc/udev/rules.d/60-persistent-input.rules -@@ -18,12 +18,12 @@ ATTRS{modalias}=="input:*-*a[068],*|input:*-*a*,[68],*m*", ATTRS{modalias}!="inp - ENV{ID_CLASS}=="?*", ENV{ID_SERIAL}=="", ENV{ID_SERIAL}="noserial" - - # by-id links --KERNEL=="mouse*", ENV{ID_BUS}=="?*", ENV{ID_CLASS}=="?*", SYMLINK+="input/by-id/$env{ID_BUS}-$env{ID_SERIAL}-$env{ID_CLASS}" -+KERNEL=="mouse*|js*", ENV{ID_BUS}=="?*", ENV{ID_CLASS}=="?*", SYMLINK+="input/by-id/$env{ID_BUS}-$env{ID_SERIAL}-$env{ID_CLASS}" - KERNEL=="event*", ENV{ID_BUS}=="?*", ENV{ID_CLASS}=="?*", SYMLINK+="input/by-id/$env{ID_BUS}-$env{ID_SERIAL}-event-$env{ID_CLASS}" - - # by-path - IMPORT{program}="path_id %p" --ENV{ID_PATH}=="?*", KERNEL=="mouse*", SYMLINK+="input/by-path/$env{ID_PATH}-$env{ID_CLASS}" -+ENV{ID_PATH}=="?*", KERNEL=="mouse*|js*", SYMLINK+="input/by-path/$env{ID_PATH}-$env{ID_CLASS}" - ENV{ID_PATH}=="?*", KERNEL=="event*", SYMLINK+="input/by-path/$env{ID_PATH}-event-$env{ID_CLASS}" - - LABEL="persistent_input_end" diff --git a/sys-fs/udev/files/udev-109-respect-CFLAGS.diff b/sys-fs/udev/files/udev-109-respect-CFLAGS.diff deleted file mode 100644 index 292362244625..000000000000 --- a/sys-fs/udev/files/udev-109-respect-CFLAGS.diff +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/Makefile b/Makefile -index a7a2cbf..072ae7f 100644 ---- a/Makefile -+++ b/Makefile -@@ -113,13 +113,13 @@ LD = $(CROSS_COMPILE)gcc - AR = $(CROSS_COMPILE)ar - RANLIB = $(CROSS_COMPILE)ranlib - --CFLAGS = -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -+CFLAGS += -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 - WARNINGS = -Wstrict-prototypes -Wsign-compare -Wshadow \ - -Wchar-subscripts -Wmissing-declarations -Wnested-externs \ - -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes - CFLAGS += $(WARNINGS) - --LDFLAGS = -Wl,-warn-common -+LDFLAGS += -Wl,-warn-common - - OPTFLAGS = -Os - CFLAGS += $(OPTFLAGS) diff --git a/sys-fs/udev/files/udev-110-makefile-depend.diff b/sys-fs/udev/files/udev-110-makefile-depend.diff deleted file mode 100644 index 8b7cb295f07e..000000000000 --- a/sys-fs/udev/files/udev-110-makefile-depend.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile -index fafcc52..5618b96 100644 ---- a/extras/volume_id/lib/Makefile -+++ b/extras/volume_id/lib/Makefile -@@ -69,7 +69,7 @@ all: libvolume_id.a $(SHLIB) libvolume_id.pc - .shlib: - $(Q) mkdir .shlib - --.shlib/%.o: %.c -+.shlib/%.o: %.c .shlib - $(E) " CC " $@ - $(Q) $(CC) -c $(CFLAGS) -fPIC $< -o $@ - diff --git a/sys-fs/udev/files/udev-start-106-r2.sh b/sys-fs/udev/files/udev-start-106-r2.sh deleted file mode 100644 index f20b8d19be40..000000000000 --- a/sys-fs/udev/files/udev-start-106-r2.sh +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -populate_udev() { - # populate /dev with devices already found by the kernel - - # tell modprobe.sh to be verbose to $CONSOLE - echo CONSOLE=${CONSOLE} > /dev/.udev_populate - - if get_bootparam "nocoldplug" ; then - RC_COLDPLUG="no" - ewarn "Skipping udev coldplug as requested in kernel cmdline" - fi - - if [ $(get_KV) -gt $(KV_to_int '2.6.14') ] ; then - ebegin "Populating /dev with existing devices through uevents" - local opts= - [ ${RC_COLDPLUG} != "yes" ] && 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 $? - - rm -f /dev/.udev_populate - return 0 -} - -seed_dev() { - # Seed /dev with some things that we know we need - ebegin "Seeding /dev with needed nodes" - - # if /dev/console is missing on root-partition, - # kernel could not open it and we need to do that for - # udevd (Bug #151414) - [ ! -c /dev/console ] && mknod /dev/console c 5 1 - - # creating /dev/tty1 as it is used by bootsplash - # (to allow us to write to $CONSOLE before udev has - # created it) - [ ! -c /dev/tty1 ] && mknod /dev/tty1 c 4 1 - - # udevd will dup its stdin/stdout/stderr to /dev/null - # and we do not want a file which gets buffered in ram - [ ! -c /dev/null ] && mknod /dev/null c 1 3 - - # copy over any persistant things - if [ -d /lib/udev/devices ] ; then - cp --preserve=all --recursive --update /lib/udev/devices/* /dev 2>/dev/null - 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 /dev/shm - eend 0 -} - -main() { - # check if /dev/console exists outside tmpfs - [ -c /dev/console ] ; local need_redirect=$? - - # 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 - if grep -Eq "[[:space:]]+tmpfs$" /proc/filesystems ; then - mntcmd="tmpfs" - else - mntcmd="ramfs" - fi - # many video drivers require exec access in /dev #92921 - try mount -n -t "${mntcmd}" -o exec,nosuid,mode=0755 udev /dev - fi - eend $? - - # Create a file so that our rc system knows it's still in sysinit. - # Existance means init scripts will not directly run. - # rc will remove the file when done with sysinit. - touch /dev/.rcsysinit - - # Selinux lovin; /selinux should be mounted by selinux-patched init - if [ -x /sbin/restorecon ] && [ -c /selinux/null ] ; then - restorecon /dev > /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" - if [ ${need_redirect} -eq 1 ]; then - # we need to open fds 0 1 2 to solve Bug #151414 - /sbin/udevd --daemon </dev/console >/dev/console 2>/dev/console - else - /sbin/udevd --daemon - fi - 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-start-107.sh b/sys-fs/udev/files/udev-start-107.sh deleted file mode 100644 index e1964de3c7a2..000000000000 --- a/sys-fs/udev/files/udev-start-107.sh +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -populate_udev() { - # populate /dev with devices already found by the kernel - - # tell modprobe.sh to be verbose to $CONSOLE - echo CONSOLE=${CONSOLE} > /dev/.udev_populate - - if get_bootparam "nocoldplug" ; then - RC_COLDPLUG="no" - ewarn "Skipping udev coldplug as requested in kernel cmdline" - fi - - if [ $(get_KV) -gt $(KV_to_int '2.6.14') ] ; then - ebegin "Populating /dev with existing devices through uevents" - local opts= - [ "${RC_COLDPLUG}" != "yes" ] && 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 $? - - rm -f /dev/.udev_populate - return 0 -} - -seed_dev() { - # Seed /dev with some things that we know we need - ebegin "Seeding /dev with needed nodes" - - # creating /dev/console and /dev/tty1 to be able to write - # to $CONSOLE with/without bootsplash before udevd creates it - [ ! -c /dev/console ] && mknod /dev/console c 5 1 - [ ! -c /dev/tty1 ] && mknod /dev/tty1 c 4 1 - - # udevd will dup its stdin/stdout/stderr to /dev/null - # and we do not want a file which gets buffered in ram - [ ! -c /dev/null ] && mknod /dev/null c 1 3 - - # copy over any persistant things - if [ -d /lib/udev/devices ] ; then - cp --preserve=all --recursive --update /lib/udev/devices/* /dev 2>/dev/null - 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 /dev/shm - eend 0 -} - -unpack_device_tarball() { - # 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 -} - -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 - if grep -Eq "[[:space:]]+tmpfs$" /proc/filesystems ; then - mntcmd="tmpfs" - else - mntcmd="ramfs" - fi - # many video drivers require exec access in /dev #92921 - try mount -n -t "${mntcmd}" -o exec,nosuid,mode=0755 udev /dev - fi - eend $? - - # Create a file so that our rc system knows it's still in sysinit. - # Existance means init scripts will not directly run. - # rc will remove the file when done with sysinit. - touch /dev/.rcsysinit - - # Selinux lovin; /selinux should be mounted by selinux-patched init - if [ -x /sbin/restorecon ] && [ -c /selinux/null ] ; then - restorecon /dev > /selinux/null - fi - - unpack_device_tarball - 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/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-start-108-r1.sh b/sys-fs/udev/files/udev-start-108-r1.sh deleted file mode 100644 index 677dc722270f..000000000000 --- a/sys-fs/udev/files/udev-start-108-r1.sh +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -tmpfs_size="10M" - -[ -e /etc/udev/udev.conf ] && . /etc/udev/udev.conf - -populate_udev() { - # populate /dev with devices already found by the kernel - - # tell modprobe.sh to be verbose to $CONSOLE - echo CONSOLE=${CONSOLE} > /dev/.udev_populate - - if get_bootparam "nocoldplug" ; then - RC_COLDPLUG="no" - ewarn "Skipping udev coldplug as requested in kernel cmdline" - fi - - if [ $(get_KV) -gt $(KV_to_int '2.6.14') ] ; then - ebegin "Populating /dev with existing devices through uevents" - local opts= - [ "${RC_COLDPLUG}" != "yes" ] && 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 $? - - rm -f /dev/.udev_populate - return 0 -} - -seed_dev() { - # Seed /dev with some things that we know we need - ebegin "Seeding /dev with needed nodes" - - # creating /dev/console and /dev/tty1 to be able to write - # to $CONSOLE with/without bootsplash before udevd creates it - [ ! -c /dev/console ] && mknod /dev/console c 5 1 - [ ! -c /dev/tty1 ] && mknod /dev/tty1 c 4 1 - - # udevd will dup its stdin/stdout/stderr to /dev/null - # and we do not want a file which gets buffered in ram - [ ! -c /dev/null ] && mknod /dev/null c 1 3 - - # copy over any persistant things - if [ -d /lib/udev/devices ] ; then - cp --preserve=all --recursive --update /lib/udev/devices/* /dev 2>/dev/null - 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 /dev/shm - eend 0 -} - -unpack_device_tarball() { - # 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 -} - -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 - mntopts="exec,nosuid,mode=0755,size=${tmpfs_size}" - if grep -Eq "[[:space:]]+tmpfs$" /proc/filesystems ; then - mntcmd="tmpfs" - else - mntcmd="ramfs" - fi - # many video drivers require exec access in /dev #92921 - try mount -n -t "${mntcmd}" -o "${mntopts}" udev /dev - fi - eend $? - - # Create a file so that our rc system knows it's still in sysinit. - # Existance means init scripts will not directly run. - # rc will remove the file when done with sysinit. - touch /dev/.rcsysinit - - # Selinux lovin; /selinux should be mounted by selinux-patched init - if [ -x /sbin/restorecon ] && [ -c /selinux/null ] ; then - restorecon /dev > /selinux/null - fi - - unpack_device_tarball - 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/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-start-110.sh b/sys-fs/udev/files/udev-start-110.sh deleted file mode 100644 index 1b6479496905..000000000000 --- a/sys-fs/udev/files/udev-start-110.sh +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -tmpfs_size="10M" - -[ -e /etc/udev/udev.conf ] && . /etc/udev/udev.conf - -populate_udev() { - # populate /dev with devices already found by the kernel - - # tell modprobe.sh to be verbose to $CONSOLE - - echo export CONSOLE=${CONSOLE} > /dev/.udev_populate - echo export TERM=${TERM} >> /dev/.udev_populate - - if get_bootparam "nocoldplug" ; then - RC_COLDPLUG="no" - ewarn "Skipping udev coldplug as requested in kernel cmdline" - fi - - if [ $(get_KV) -gt $(KV_to_int '2.6.14') ] ; then - ebegin "Populating /dev with existing devices through uevents" - local opts= - [ "${RC_COLDPLUG}" != "yes" ] && 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 $? - - rm -f /dev/.udev_populate - return 0 -} - -seed_dev() { - # Seed /dev with some things that we know we need - ebegin "Seeding /dev with needed nodes" - - # creating /dev/console and /dev/tty1 to be able to write - # to $CONSOLE with/without bootsplash before udevd creates it - [ ! -c /dev/console ] && mknod /dev/console c 5 1 - [ ! -c /dev/tty1 ] && mknod /dev/tty1 c 4 1 - - # udevd will dup its stdin/stdout/stderr to /dev/null - # and we do not want a file which gets buffered in ram - [ ! -c /dev/null ] && mknod /dev/null c 1 3 - - # copy over any persistant things - if [ -d /lib/udev/devices ] ; then - cp --preserve=all --recursive --update /lib/udev/devices/* /dev 2>/dev/null - 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 /dev/shm - eend 0 -} - -unpack_device_tarball() { - # 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 -} - -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 - mntopts="exec,nosuid,mode=0755,size=${tmpfs_size}" - if grep -Eq "[[:space:]]+tmpfs$" /proc/filesystems ; then - mntcmd="tmpfs" - else - mntcmd="ramfs" - fi - # many video drivers require exec access in /dev #92921 - try mount -n -t "${mntcmd}" -o "${mntopts}" udev /dev - fi - eend $? - - # Create a file so that our rc system knows it's still in sysinit. - # Existance means init scripts will not directly run. - # rc will remove the file when done with sysinit. - touch /dev/.rcsysinit - - # Selinux lovin; /selinux should be mounted by selinux-patched init - if [ -x /sbin/restorecon ] && [ -c /selinux/null ] ; then - restorecon /dev > /selinux/null - fi - - unpack_device_tarball - 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 - - # Only do this for baselayout-1* - if [ ! -e /lib/librc.so ]; then - - # Create nodes that udev can't - ebegin "Finalizing udev configuration" - [ -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 - fi -} - -main - -# vim:ts=4 diff --git a/sys-fs/udev/files/udev-stop-105.sh b/sys-fs/udev/files/udev-stop-105.sh deleted file mode 100755 index a476762a9292..000000000000 --- a/sys-fs/udev/files/udev-stop-105.sh +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# store persistent-rules that got created while booting -# when / was still read-only -store_persistent_rules() { - local type base tmp_rules real_rules - - for type in cd net; do - base=70-persistent-${type}.rules - tmp_rules=/dev/.udev/tmp-rules--${base} - real_rules=/etc/udev/rules.d/${base} - - if [ -f ${tmp_rules} ]; then - einfo "Saving udev persistent ${type} rules to /etc/udev/rules.d" - cat ${tmp_rules} >> ${real_rules} - rm ${tmp_rules} - fi - done -} - -create_device_tarball() { - if [ -e /dev/.devfsd ] || [ ! -e /dev/.udev ] || [ ! -z "${CDBOOT}" ] || \ - [ "${RC_DEVICE_TARBALL}" != "yes" ] || \ - ! touch /lib/udev/state/devices.tar.bz2 2>/dev/null - then - return 0 - fi - - ebegin "Saving device nodes" - # Handle our temp files - save_tmp_base=/tmp/udev.savedevices."$$" - devices_udev="${save_tmp_base}"/devices.udev - devices_real="${save_tmp_base}"/devices.real - devices_totar="${save_tmp_base}"/devices.totar - device_tarball="${save_tmp_base}"/devices - - rm -rf "${save_tmp_base}" - mkdir "${save_tmp_base}" - touch "${devices_udev}" "${devices_real}" \ - "${devices_totar}" "${device_tarball}" - - if [ -f ${devices_udev} ] && [ -f ${devices_real} ] && \ - [ -f ${devices_totar} ] && [ -f ${device_tarball} ] ; then - cd /dev - # Find all devices - find . -xdev -type b -or -type c -or -type l | cut -d/ -f2- > \ - "${devices_real}" - # Figure out what udev created - udevinfo=$(udevinfo --export-db) - - # This basically strips 'S:' and 'N:' from the db output, and then - # print all the nodes/symlinks udev created ... - echo "${udevinfo}" | gawk ' - /^(N|S):.+/ { - sub(/^(N|S):/, "") - split($0, nodes) - for (x in nodes) - print nodes[x] - }' > "${devices_udev}" - # These ones we also do not want in there - for x in MAKEDEV core fd initctl pts shm stderr stdin stdout; do - echo "${x}" >> "${devices_udev}" - done - if [ -d /lib/udev/devices ]; then - cd /lib/udev/devices - find . -xdev -type b -or -type c -or -type l | cut -d/ -f2- >> "${devices_udev}" - fi - cd /dev - fgrep -x -v -f "${devices_udev}" < "${devices_real}" | \ - grep -v ^\\.udev > "${devices_totar}" - - # Now only tarball those not created by udev if we have any - if [ -s ${devices_totar} ]; then - # we dont want to descend into mounted filesystems (e.g. devpts) - # looking up username may involve NIS/network, and net may be down - tar --one-file-system --numeric-owner -jcpf "${device_tarball}" -T "${devices_totar}" - mv -f "${device_tarball}" /lib/udev/state/devices.tar.bz2 - else - rm -f /lib/udev/state/devices.tar.bz2 - fi - eend 0 - else - eend 1 "Could not create temporary files!" - fi - - rm -rf "${save_tmp_base}" -} - -main() { - store_persistent_rules - create_device_tarball -} - -main - - -# vim:ts=4 diff --git a/sys-fs/udev/files/udev-stop-108-r1.sh b/sys-fs/udev/files/udev-stop-108-r1.sh deleted file mode 100755 index a38baf133146..000000000000 --- a/sys-fs/udev/files/udev-stop-108-r1.sh +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# store persistent-rules that got created while booting -# when / was still read-only -store_persistent_rules() { - local file dest - - for file in /dev/.udev/tmp-rules--*; do - dest=${file##*tmp-rules--} - [ "$dest" = '*' ] && break - type=${dest##70-persistent-} - type=${type%%.rules} - einfo "Saving udev persistent ${type} rules to /etc/udev/rules.d" - cat "$file" >> /etc/udev/rules.d/"$dest" - rm -f "$file" - done -} - -create_device_tarball() { - if [ -e /dev/.devfsd ] || [ ! -e /dev/.udev ] || [ ! -z "${CDBOOT}" ] || \ - [ "${RC_DEVICE_TARBALL}" != "yes" ] || \ - ! touch /lib/udev/state/devices.tar.bz2 2>/dev/null - then - return 0 - fi - - ebegin "Saving device nodes" - # Handle our temp files - save_tmp_base=/tmp/udev.savedevices."$$" - devices_udev="${save_tmp_base}"/devices.udev - devices_real="${save_tmp_base}"/devices.real - devices_totar="${save_tmp_base}"/devices.totar - device_tarball="${save_tmp_base}"/devices - - rm -rf "${save_tmp_base}" - mkdir "${save_tmp_base}" - touch "${devices_udev}" "${devices_real}" \ - "${devices_totar}" "${device_tarball}" - - if [ -f ${devices_udev} ] && [ -f ${devices_real} ] && \ - [ -f ${devices_totar} ] && [ -f ${device_tarball} ] ; then - cd /dev - # Find all devices - find . -xdev -type b -or -type c -or -type l | cut -d/ -f2- > \ - "${devices_real}" - # Figure out what udev created - udevinfo=$(udevinfo --export-db) - - # This basically strips 'S:' and 'N:' from the db output, and then - # print all the nodes/symlinks udev created ... - echo "${udevinfo}" | gawk ' - /^(N|S):.+/ { - sub(/^(N|S):/, "") - split($0, nodes) - for (x in nodes) - print nodes[x] - }' > "${devices_udev}" - # These ones we also do not want in there - for x in MAKEDEV core fd initctl pts shm stderr stdin stdout; do - echo "${x}" >> "${devices_udev}" - done - if [ -d /lib/udev/devices ]; then - cd /lib/udev/devices - find . -xdev -type b -or -type c -or -type l | cut -d/ -f2- >> "${devices_udev}" - fi - cd /dev - fgrep -x -v -f "${devices_udev}" < "${devices_real}" | \ - grep -v ^\\.udev > "${devices_totar}" - - # Now only tarball those not created by udev if we have any - if [ -s ${devices_totar} ]; then - # we dont want to descend into mounted filesystems (e.g. devpts) - # looking up username may involve NIS/network, and net may be down - tar --one-file-system --numeric-owner -jcpf "${device_tarball}" -T "${devices_totar}" - mv -f "${device_tarball}" /lib/udev/state/devices.tar.bz2 - else - rm -f /lib/udev/state/devices.tar.bz2 - fi - eend 0 - else - eend 1 "Could not create temporary files!" - fi - - rm -rf "${save_tmp_base}" -} - -main() { - store_persistent_rules - create_device_tarball -} - -main - - -# vim:ts=4 diff --git a/sys-fs/udev/files/udev.rules-106-r3 b/sys-fs/udev/files/udev.rules-106-r3 deleted file mode 100644 index 380029fb4c04..000000000000 --- a/sys-fs/udev/files/udev.rules-106-r3 +++ /dev/null @@ -1,320 +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. -# - -# Net devices can have arbitrary names, even -# ones set by the user. Not try to match normal -# rules on net devices (Bug #166652) -SUBSYSTEM=="net", GOTO="gentoo_device_rules_end" - -# 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="uucp", MODE="0660" -KERNEL=="ttyUSB[0-9]*", NAME="%k", SYMLINK="tts/USB%n", GROUP="uucp", MODE="0660" -KERNEL=="ippp0", NAME="%k", GROUP="uucp", MODE="0660" -KERNEL=="isdn*" NAME="%k", GROUP="uucp", MODE="0660" -KERNEL=="dcbri*", NAME="%k", GROUP="uucp", MODE="0660" -KERNEL=="ircomm*", NAME="%k", GROUP="uucp", MODE="0660" - -# 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" - -# assign cdrom-permission also to associated generic device (for cd-burning ...) -KERNEL=="sg[0-9]*", ACTION=="add", ATTRS{type}=="4|5", 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="uucp", MODE="0660" -KERNEL=="capi*", NAME="capi/%n", GROUP="uucp", MODE="0660" - -# 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 -# lookup device name and create device in /dev/mapper -# use dmsetup, until devmap_name is provided by sys-fs/device-mapper -ACTION=="add|change", SUBSYSTEM=="block", KERNEL=="dm-*", \ - PROGRAM="/sbin/dmsetup -j %M -m %m --noopencount --noheadings -c -o name info", \ - NAME="mapper/%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/%k", SYMLINK+="%k", GROUP="floppy" -KERNEL=="fd[0-9]*", ACTION=="add", ATTRS{cmos}=="*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0660 -G floppy $root/floppy/%k" -KERNEL=="fd[0-9]*", ACTION=="remove", RUN+="/bin/sh -c 'rm -f $root/floppy/%k?*'" - -# 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 -SUBSYSTEM=="raw", 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" - - -# 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'" - - -# Module autoloading -ACTION!="add", GOTO="hotplug_no_add_event" - -# check if the device has already been claimed by a driver -ENV{DRIVER}=="?*", SUBSYSTEM!="input", GOTO="hotplug_load_end" - -# this driver is broken and should not be loaded automatically -SUBSYSTEM=="platform", ENV{MODALIAS}=="i82365", GOTO="hotplug_load_end" - -# Autoload modules that lack aliases but have them defined inutoload modules -ENV{MODALIAS}=="?*", RUN+="modprobe.sh $env{MODALIAS}" - -# /etc/modprobe.conf. -SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN+="/bin/sh -c 'while read id; do /lib/udev/modprobe.sh pnp:d$$id; done < /sys$devpath/id'" -# needed aliases are defined in /etc/modprobe.d/pnp-aliases - - -SUBSYSTEM=="i2o", RUN+="modprobe.sh i2o_block" -SUBSYSTEM=="mmc", RUN+="modprobe.sh mmc_block" - -# 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 - -# Load driver for scsi-device -SUBSYSTEM!="scsi_device", GOTO="hotplug_scsi_end" -ATTRS{type}=="?*", RUN+="modprobe.sh sg" -ATTRS{type}=="0|7|14", RUN+="modprobe.sh sd_mod" -ATTRS{type}=="4|5", RUN+="modprobe.sh sr_mod" -ATTRS{type}=="8", RUN+="modprobe.sh ch" - -ATTRS{type}=="1", ENV{ID_SCSI_TAPE_DRIVER}="st" -ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \ - ATTRS{model}!="ADR*", ENV{ID_SCSI_TAPE_DRIVER}="osst" -ENV{ID_SCSI_TAPE_DRIVER}=="?*", RUN+="modprobe.sh $env{ID_SCSI_TAPE_DRIVER}" -LABEL="hotplug_scsi_end" - - -SUBSYSTEM=="ide", ATTR{media}=="tape", RUN+="modprobe.sh ide-scsi" - -LABEL="hotplug_load_end" - - -# Load firmware -SUBSYSTEM=="firmware", RUN+="firmware.sh" - -LABEL="hotplug_no_add_event" - -LABEL="gentoo_device_rules_end" - -# 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/files/udev.rules-106-r5 b/sys-fs/udev/files/udev.rules-106-r5 deleted file mode 100644 index 28a09427d624..000000000000 --- a/sys-fs/udev/files/udev.rules-106-r5 +++ /dev/null @@ -1,309 +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. -# - -# Net devices can have arbitrary names, even -# ones set by the user. Not try to match normal -# rules on net devices (Bug #166652) -SUBSYSTEM=="net", GOTO="gentoo_device_rules_end" - -# 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="uucp", MODE="0660" -KERNEL=="ttyUSB[0-9]*", NAME="%k", SYMLINK="tts/USB%n", GROUP="uucp", MODE="0660" -KERNEL=="ippp0", NAME="%k", GROUP="uucp", MODE="0660" -KERNEL=="isdn*" NAME="%k", GROUP="uucp", MODE="0660" -KERNEL=="dcbri*", NAME="%k", GROUP="uucp", MODE="0660" -KERNEL=="ircomm*", NAME="%k", GROUP="uucp", MODE="0660" - -# 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" - -# assign cdrom-permission also to associated generic device (for cd-burning ...) -KERNEL=="sg[0-9]*", ACTION=="add", ATTRS{type}=="4|5", 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="uucp", MODE="0660" -KERNEL=="capi*", NAME="capi/%n", GROUP="uucp", MODE="0660" - -# cpu devices -KERNEL=="cpu[0-9]*", NAME="cpu/%n/cpuid" -KERNEL=="msr[0-9]*", NAME="cpu/%n/msr" -KERNEL=="microcode", NAME="cpu/microcode" - -# fb devices -KERNEL=="fb[0-9]*", NAME="fb/%n", SYMLINK+="%k", GROUP="video" - -# floppy devices -KERNEL=="fd[0-9]*", NAME="floppy/%k", SYMLINK+="%k", GROUP="floppy" -KERNEL=="fd[0-9]*", ACTION=="add", ATTRS{cmos}=="*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0660 -G floppy $root/floppy/%k" -KERNEL=="fd[0-9]*", ACTION=="remove", RUN+="/bin/sh -c 'rm -f $root/floppy/%k?*'" - -# 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 -SUBSYSTEM=="raw", 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" - - -# 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'" - - -# Module autoloading -ACTION!="add", GOTO="hotplug_no_add_event" - -# check if the device has already been claimed by a driver -ENV{DRIVER}=="?*", SUBSYSTEM!="input", GOTO="hotplug_load_end" - -# this driver is broken and should not be loaded automatically -SUBSYSTEM=="platform", ENV{MODALIAS}=="i82365", GOTO="hotplug_load_end" - -# Autoload modules that lack aliases but have them defined inutoload modules -ENV{MODALIAS}=="?*", RUN+="modprobe.sh $env{MODALIAS}" - -# /etc/modprobe.conf. -SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN+="/bin/sh -c 'while read id; do /lib/udev/modprobe.sh pnp:d$$id; done < /sys$devpath/id'" -# needed aliases are defined in /etc/modprobe.d/pnp-aliases - - -SUBSYSTEM=="i2o", RUN+="modprobe.sh i2o_block" -SUBSYSTEM=="mmc", RUN+="modprobe.sh mmc_block" - -# 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 - -# Load driver for scsi-device -SUBSYSTEM!="scsi_device", GOTO="hotplug_scsi_end" -ATTRS{type}=="?*", RUN+="modprobe.sh sg" -ATTRS{type}=="0|7|14", RUN+="modprobe.sh sd_mod" -ATTRS{type}=="4|5", RUN+="modprobe.sh sr_mod" -ATTRS{type}=="8", RUN+="modprobe.sh ch" - -ATTRS{type}=="1", ENV{ID_SCSI_TAPE_DRIVER}="st" -ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \ - ATTRS{model}!="ADR*", ENV{ID_SCSI_TAPE_DRIVER}="osst" -ENV{ID_SCSI_TAPE_DRIVER}=="?*", RUN+="modprobe.sh $env{ID_SCSI_TAPE_DRIVER}" -LABEL="hotplug_scsi_end" - - -SUBSYSTEM=="ide", ATTR{media}=="tape", RUN+="modprobe.sh ide-scsi" - -LABEL="hotplug_load_end" - - -# Load firmware -SUBSYSTEM=="firmware", RUN+="firmware.sh" - -LABEL="hotplug_no_add_event" - -LABEL="gentoo_device_rules_end" - -# 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}" diff --git a/sys-fs/udev/files/udev.rules-107-r1 b/sys-fs/udev/files/udev.rules-107-r1 deleted file mode 100644 index 28875536a098..000000000000 --- a/sys-fs/udev/files/udev.rules-107-r1 +++ /dev/null @@ -1,302 +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. -# - -# Net devices can have arbitrary names, even -# ones set by the user. Not try to match normal -# rules on net devices (Bug #166652) -SUBSYSTEM=="net", GOTO="gentoo_device_rules_end" - -# 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="uucp", MODE="0660" -KERNEL=="ttyUSB[0-9]*", NAME="%k", SYMLINK="tts/USB%n", GROUP="uucp", MODE="0660" -KERNEL=="ippp0", NAME="%k", GROUP="uucp", MODE="0660" -KERNEL=="isdn*" NAME="%k", GROUP="uucp", MODE="0660" -KERNEL=="dcbri*", NAME="%k", GROUP="uucp", MODE="0660" -KERNEL=="ircomm*", NAME="%k", GROUP="uucp", MODE="0660" - -# 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" - -# assign cdrom-permission also to associated generic device (for cd-burning ...) -KERNEL=="sg[0-9]*", ACTION=="add", ATTRS{type}=="4|5", 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="uucp", MODE="0660" -KERNEL=="capi*", NAME="capi/%n", GROUP="uucp", MODE="0660" - -# cpu devices -KERNEL=="cpu[0-9]*", NAME="cpu/%n/cpuid" -KERNEL=="msr[0-9]*", NAME="cpu/%n/msr" -KERNEL=="microcode", NAME="cpu/microcode" - -# fb devices -KERNEL=="fb[0-9]*", NAME="fb/%n", SYMLINK+="%k", GROUP="video" - -# floppy devices -KERNEL=="fd[0-9]*", NAME="floppy/%k", SYMLINK+="%k", GROUP="floppy" -KERNEL=="fd[0-9]*", ACTION=="add", ATTRS{cmos}=="*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0660 -G floppy $root/floppy/%k" -KERNEL=="fd[0-9]*", ACTION=="remove", RUN+="/bin/sh -c 'rm -f $root/floppy/%k?*'" - -# 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="0664" -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 -SUBSYSTEM=="raw", 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" - - -# 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'" - - -# Module autoloading -ACTION!="add", GOTO="hotplug_no_add_event" - -# check if the device has already been claimed by a driver -ENV{DRIVER}=="?*", SUBSYSTEM!="input", GOTO="hotplug_load_end" - -# this driver is broken and should not be loaded automatically -SUBSYSTEM=="platform", ENV{MODALIAS}=="i82365", GOTO="hotplug_load_end" - -# Autoload modules that lack aliases but have them defined inutoload modules -ENV{MODALIAS}=="?*", RUN+="modprobe.sh $env{MODALIAS}" - -# /etc/modprobe.conf. -SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN+="/bin/sh -c 'while read id; do /lib/udev/modprobe.sh pnp:d$$id; done < /sys$devpath/id'" -# needed aliases are defined in /etc/modprobe.d/pnp-aliases - - -SUBSYSTEM=="i2o", RUN+="modprobe.sh i2o_block" -SUBSYSTEM=="mmc", RUN+="modprobe.sh mmc_block" - -# 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 - -# Load driver for scsi-device -SUBSYSTEM!="scsi_device", GOTO="hotplug_scsi_end" -ATTRS{type}=="?*", RUN+="modprobe.sh sg" -ATTRS{type}=="0|7|14", RUN+="modprobe.sh sd_mod" -ATTRS{type}=="4|5", RUN+="modprobe.sh sr_mod" -ATTRS{type}=="8", RUN+="modprobe.sh ch" - -ATTRS{type}=="1", ENV{ID_SCSI_TAPE_DRIVER}="st" -ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \ - ATTRS{model}!="ADR*", ENV{ID_SCSI_TAPE_DRIVER}="osst" -ENV{ID_SCSI_TAPE_DRIVER}=="?*", RUN+="modprobe.sh $env{ID_SCSI_TAPE_DRIVER}" -LABEL="hotplug_scsi_end" - - -SUBSYSTEM=="ide", ATTR{media}=="tape", RUN+="modprobe.sh ide-scsi" - -LABEL="hotplug_load_end" - - -# Load firmware -SUBSYSTEM=="firmware", RUN+="firmware.sh" - -LABEL="hotplug_no_add_event" - -LABEL="gentoo_device_rules_end" diff --git a/sys-fs/udev/udev-104-r12.ebuild b/sys-fs/udev/udev-104-r12.ebuild index d5818071a57e..9cfbdb72ff14 100644 --- a/sys-fs/udev/udev-104-r12.ebuild +++ b/sys-fs/udev/udev-104-r12.ebuild @@ -1,6 +1,6 @@ # 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-r12.ebuild,v 1.12 2007/05/11 04:25:15 kumba Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-104-r12.ebuild,v 1.13 2007/05/12 09:57:44 zzam Exp $ inherit eutils flag-o-matic multilib toolchain-funcs @@ -26,7 +26,6 @@ src_unpack() { cd "${S}" # patches go here... - #epatch ${FILESDIR}/${P}-udev_volume_id.patch epatch ${FILESDIR}/${P}-netif-rename-busywait.patch epatch ${FILESDIR}/${PN}-104-peristent-net-disable-xen.patch epatch ${FILESDIR}/${PN}-104-persistent-net-fix-name-dups.patch diff --git a/sys-fs/udev/udev-106-r4.ebuild b/sys-fs/udev/udev-106-r4.ebuild deleted file mode 100644 index e90aeca82b1c..000000000000 --- a/sys-fs/udev/udev-106-r4.ebuild +++ /dev/null @@ -1,295 +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-106-r4.ebuild,v 1.2 2007/03/27 20:44:50 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" - -DEPEND="selinux? ( sys-libs/libselinux )" -RDEPEND="!sys-apps/coldplug" -RDEPEND="${DEPEND} ${RDEPEND} - >=sys-apps/baselayout-1.12.5" -# 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}/${PN}-104-peristent-net-disable-xen.patch - epatch ${FILESDIR}/${P}-floppy-devices-no-umask.diff - - # 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 - - # Delete the rule for device-mapper control device, as we have our own - sed -ie '/device-mapper/d' etc/udev/suse/64-device-mapper.rules - - # 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 - keepdir /lib/udev/devices - - # create symlinks for these utilities to /sbin - # where multipath-tools expect them to be (Bug #168588) - dosym ../lib/udev/vol_id /sbin/vol_id - dosym ../lib/udev/scsi_id /sbin/scsi_id - - # 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" - newexe ${FILESDIR}/net-104-r10.sh net.sh || die "Required binary not installed properly" - newexe ${FILESDIR}/modprobe-105.sh modprobe.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-106-r3 50-udev.rules - newins ${FILESDIR}/05-udev-early.rules-104-r5 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" - # Use suse's persistent device-mapper rules - doins ./etc/udev/suse/64-device-mapper.rules - - # scsi_id configuration - insinto /etc - doins extras/scsi_id/scsi_id.config - - # set up the /etc/dev.d directory tree - keepdir /etc/dev.d - - # 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 - dosym udevd.8 /usr/share/man/man8/udevcontrol.8 - - # our udev hooks into the rc system - insinto /$(get_libdir)/rcscripts/addons - newins "${FILESDIR}"/udev-start-106-r2.sh udev-start.sh - newins "${FILESDIR}"/udev-stop-105.sh 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 - - insinto /etc/modprobe.d - doins ${FILESDIR}/blacklist ${FILESDIR}/pnp-aliases - - if use s390; then - # s390 does not has persistent mac addresses - # and we only have persistence rules for mac. - # For now just remove the rules file. - rm ${D}/etc/udev/rules.d/75-persistent-net-generator.rules - fi - -} - -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 -} - -pkg_postinst() { - if [[ ${ROOT} == "/" ]] ; then - # check if root of init-process is identical to ours - if [ -r /proc/1/root -a /proc/1/root/ -ef /proc/self/root/ ]; then - einfo "restarting udevd now." - if [[ -n $(pidof udevd) ]] ; then - killall -15 udevd &>/dev/null - sleep 1 - killall -9 udevd &>/dev/null - fi - /sbin/udevd --daemon - fi - fi - - # people want reminders, I'll give them reminders. Odds are they will - # just ignore them anyway... - - if [[ ${coldplug_stale} == "1" ]] ; then - ewarn "A stale coldplug init script found. You should run:" - ewarn - ewarn " rc-update del coldplug" - ewarn " rm -f /etc/init.d/coldplug" - ewarn - ewarn "udev now provides its own coldplug functionality." - fi - - # delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules - if has_version "=sys-fs/udev-103-r3"; then - if [[ -e "${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules" ]] - then - ewarn "Deleting stray 40-scsi-hotplug.rules" - ewarn "installed by sys-fs/udev-103-r3" - rm -f ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules - fi - fi - - # Removing some device-nodes we thought we need some time ago - if [[ -d "${ROOT}"/lib/udev/devices ]]; then - rm -f "${ROOT}"/lib/udev/devices/{null,zero,console,urandom} - fi - - # Removing some old file - if has_version "<sys-fs/udev-104-r5"; then - rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev - rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net - fi - - einfo - einfo "For more information on udev on Gentoo, writing udev rules, and" - einfo " fixing known issues visit:" - einfo " http://www.gentoo.org/doc/en/udev-guide.xml" -} diff --git a/sys-fs/udev/udev-106-r5.ebuild b/sys-fs/udev/udev-106-r5.ebuild deleted file mode 100644 index bc48757801cc..000000000000 --- a/sys-fs/udev/udev-106-r5.ebuild +++ /dev/null @@ -1,296 +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-106-r5.ebuild,v 1.4 2007/04/07 14:59:51 vapier 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" - -DEPEND="selinux? ( sys-libs/libselinux )" -RDEPEND="!sys-apps/coldplug" -RDEPEND="${DEPEND} ${RDEPEND} - >=sys-apps/baselayout-1.12.5" -# 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}/${PN}-104-peristent-net-disable-xen.patch - epatch ${FILESDIR}/${P}-floppy-devices-no-umask.diff - epatch ${FILESDIR}/${P}-remove-dasd-rules.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/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/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 - keepdir /lib/udev/devices - - # create symlinks for these utilities to /sbin - # where multipath-tools expect them to be (Bug #168588) - dosym ../lib/udev/vol_id /sbin/vol_id - dosym ../lib/udev/scsi_id /sbin/scsi_id - - # 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" - newexe ${FILESDIR}/net-104-r10.sh net.sh || die "Required binary not installed properly" - newexe ${FILESDIR}/modprobe-105.sh modprobe.sh || die "Required binary not installed properly" - doexe extras/eventrecorder.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-106-r5 50-udev.rules - newins ${FILESDIR}/05-udev-early.rules-106-r5 05-udev-early.rules - doins ${FILESDIR}/95-udev-late.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" - # Special rules for device-mapper - doins ${FILESDIR}/64-device-mapper.rules - - # scsi_id configuration - insinto /etc - doins extras/scsi_id/scsi_id.config - - # set up the /etc/dev.d directory tree - keepdir /etc/dev.d - - # 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/cdrom_id/cdrom_id.8 - # create a extra symlink for udevcontrol - dosym udevd.8 /usr/share/man/man8/udevcontrol.8 - - # our udev hooks into the rc system - insinto /$(get_libdir)/rcscripts/addons - newins "${FILESDIR}"/udev-start-106-r2.sh udev-start.sh - newins "${FILESDIR}"/udev-stop-105.sh 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 - - insinto /etc/modprobe.d - doins ${FILESDIR}/blacklist ${FILESDIR}/pnp-aliases - - if use s390; then - # s390 does not has persistent mac addresses - # and we only have persistence rules for mac. - # For now just remove the rules file. - rm ${D}/etc/udev/rules.d/75-persistent-net-generator.rules - fi - -} - -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 -} - -pkg_postinst() { - if [[ ${ROOT} == "/" ]] ; then - # check if root of init-process is identical to ours - if [ -r /proc/1/root -a /proc/1/root/ -ef /proc/self/root/ ]; then - einfo "restarting udevd now." - if [[ -n $(pidof udevd) ]] ; then - killall -15 udevd &>/dev/null - sleep 1 - killall -9 udevd &>/dev/null - fi - /sbin/udevd --daemon - fi - fi - - # people want reminders, I'll give them reminders. Odds are they will - # just ignore them anyway... - - if [[ ${coldplug_stale} == "1" ]] ; then - ewarn "A stale coldplug init script found. You should run:" - ewarn - ewarn " rc-update del coldplug" - ewarn " rm -f /etc/init.d/coldplug" - ewarn - ewarn "udev now provides its own coldplug functionality." - fi - - # delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules - if has_version "=sys-fs/udev-103-r3"; then - if [[ -e "${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules" ]] - then - ewarn "Deleting stray 40-scsi-hotplug.rules" - ewarn "installed by sys-fs/udev-103-r3" - rm -f ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules - fi - fi - - # Removing some device-nodes we thought we need some time ago - if [[ -d "${ROOT}"/lib/udev/devices ]]; then - rm -f "${ROOT}"/lib/udev/devices/{null,zero,console,urandom} - fi - - # Removing some old file - if has_version "<sys-fs/udev-104-r5"; then - rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev - rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net - fi - - if has_version "<sys-fs/udev-106-r5"; then - if [[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]; then - rm -f ${ROOT}/etc/udev/rules.d/95-net.rules - fi - fi - - einfo - einfo "For more information on udev on Gentoo, writing udev rules, and" - einfo " fixing known issues visit:" - einfo " http://www.gentoo.org/doc/en/udev-guide.xml" -} diff --git a/sys-fs/udev/udev-107-r1.ebuild b/sys-fs/udev/udev-107-r1.ebuild deleted file mode 100644 index 8c5af1889e97..000000000000 --- a/sys-fs/udev/udev-107-r1.ebuild +++ /dev/null @@ -1,292 +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-107-r1.ebuild,v 1.2 2007/04/07 14:59:51 vapier 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" - -DEPEND="selinux? ( sys-libs/libselinux )" -RDEPEND="!sys-apps/coldplug" -RDEPEND="${DEPEND} ${RDEPEND} - >=sys-apps/baselayout-1.12.5" -# 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}/${PN}-104-peristent-net-disable-xen.patch - epatch ${FILESDIR}/udev-107-usbcd-by-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}" != "34b1f1695b339d0d9e7b9db27f87e938" ] - 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/edd_id \ - extras/firmware \ - extras/floppy \ - extras/path_id \ - 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/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/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 - keepdir /lib/udev/devices - - # create symlinks for these utilities to /sbin - # where multipath-tools expect them to be (Bug #168588) - dosym ../lib/udev/vol_id /sbin/vol_id - dosym ../lib/udev/scsi_id /sbin/scsi_id - - # 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" - newexe ${FILESDIR}/net-104-r10.sh net.sh || die "Required binary not installed properly" - newexe ${FILESDIR}/modprobe-105.sh modprobe.sh || die "Required binary not installed properly" - doexe extras/eventrecorder.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-107-r1 50-udev.rules - newins ${FILESDIR}/05-udev-early.rules-106-r5 05-udev-early.rules - doins ${FILESDIR}/95-udev-late.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" - # Special rules for device-mapper - newins ${FILESDIR}/64-device-mapper.rules-107-r1 64-device-mapper.rules - - # scsi_id configuration - insinto /etc - doins extras/scsi_id/scsi_id.config - - # set up the /etc/dev.d directory tree - keepdir /etc/dev.d - - # 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/cdrom_id/cdrom_id.8 - # create a extra symlink for udevcontrol - dosym udevd.8 /usr/share/man/man8/udevcontrol.8 - - # our udev hooks into the rc system - insinto /$(get_libdir)/rcscripts/addons - newins "${FILESDIR}"/udev-start-107.sh udev-start.sh - newins "${FILESDIR}"/udev-stop-105.sh 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 - - insinto /etc/modprobe.d - doins ${FILESDIR}/blacklist ${FILESDIR}/pnp-aliases - - if use s390; then - # s390 does not has persistent mac addresses - # and we only have persistence rules for mac. - # For now just remove the rules file. - rm ${D}/etc/udev/rules.d/75-persistent-net-generator.rules - fi - -} - -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 -} - -pkg_postinst() { - if [[ ${ROOT} == "/" ]] ; then - # check if root of init-process is identical to ours - if [ -r /proc/1/root -a /proc/1/root/ -ef /proc/self/root/ ]; then - einfo "restarting udevd now." - if [[ -n $(pidof udevd) ]] ; then - killall -15 udevd &>/dev/null - sleep 1 - killall -9 udevd &>/dev/null - fi - /sbin/udevd --daemon - fi - fi - - # people want reminders, I'll give them reminders. Odds are they will - # just ignore them anyway... - - if [[ ${coldplug_stale} == "1" ]] ; then - ewarn "A stale coldplug init script found. You should run:" - ewarn - ewarn " rc-update del coldplug" - ewarn " rm -f /etc/init.d/coldplug" - ewarn - ewarn "udev now provides its own coldplug functionality." - fi - - # delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules - if has_version "=sys-fs/udev-103-r3"; then - if [[ -e "${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules" ]] - then - ewarn "Deleting stray 40-scsi-hotplug.rules" - ewarn "installed by sys-fs/udev-103-r3" - rm -f ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules - fi - fi - - # Removing some device-nodes we thought we need some time ago - if [[ -d "${ROOT}"/lib/udev/devices ]]; then - rm -f "${ROOT}"/lib/udev/devices/{null,zero,console,urandom} - fi - - # Removing some old file - if has_version "<sys-fs/udev-104-r5"; then - rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev - rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net - fi - - if has_version "<sys-fs/udev-106-r5"; then - if [[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]; then - rm -f ${ROOT}/etc/udev/rules.d/95-net.rules - fi - fi - - einfo - einfo "For more information on udev on Gentoo, writing udev rules, and" - einfo " fixing known issues visit:" - einfo " http://www.gentoo.org/doc/en/udev-guide.xml" -} diff --git a/sys-fs/udev/udev-107.ebuild b/sys-fs/udev/udev-107.ebuild deleted file mode 100644 index 04890a2b4cd1..000000000000 --- a/sys-fs/udev/udev-107.ebuild +++ /dev/null @@ -1,292 +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-107.ebuild,v 1.3 2007/04/07 14:59:51 vapier 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" - -DEPEND="selinux? ( sys-libs/libselinux )" -RDEPEND="!sys-apps/coldplug" -RDEPEND="${DEPEND} ${RDEPEND} - >=sys-apps/baselayout-1.12.5" -# 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}/${PN}-104-peristent-net-disable-xen.patch - epatch ${FILESDIR}/udev-107-usbcd-by-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}" != "34b1f1695b339d0d9e7b9db27f87e938" ] - 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/edd_id \ - extras/firmware \ - extras/floppy \ - extras/path_id \ - 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/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/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 - keepdir /lib/udev/devices - - # create symlinks for these utilities to /sbin - # where multipath-tools expect them to be (Bug #168588) - dosym ../lib/udev/vol_id /sbin/vol_id - dosym ../lib/udev/scsi_id /sbin/scsi_id - - # 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" - newexe ${FILESDIR}/net-104-r10.sh net.sh || die "Required binary not installed properly" - newexe ${FILESDIR}/modprobe-105.sh modprobe.sh || die "Required binary not installed properly" - doexe extras/eventrecorder.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-106-r5 50-udev.rules - newins ${FILESDIR}/05-udev-early.rules-106-r5 05-udev-early.rules - doins ${FILESDIR}/95-udev-late.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" - # Special rules for device-mapper - newins ${FILESDIR}/64-device-mapper.rules-107 64-device-mapper.rules - - # scsi_id configuration - insinto /etc - doins extras/scsi_id/scsi_id.config - - # set up the /etc/dev.d directory tree - keepdir /etc/dev.d - - # 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/cdrom_id/cdrom_id.8 - # create a extra symlink for udevcontrol - dosym udevd.8 /usr/share/man/man8/udevcontrol.8 - - # our udev hooks into the rc system - insinto /$(get_libdir)/rcscripts/addons - newins "${FILESDIR}"/udev-start-107.sh udev-start.sh - newins "${FILESDIR}"/udev-stop-105.sh 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 - - insinto /etc/modprobe.d - doins ${FILESDIR}/blacklist ${FILESDIR}/pnp-aliases - - if use s390; then - # s390 does not has persistent mac addresses - # and we only have persistence rules for mac. - # For now just remove the rules file. - rm ${D}/etc/udev/rules.d/75-persistent-net-generator.rules - fi - -} - -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 -} - -pkg_postinst() { - if [[ ${ROOT} == "/" ]] ; then - # check if root of init-process is identical to ours - if [ -r /proc/1/root -a /proc/1/root/ -ef /proc/self/root/ ]; then - einfo "restarting udevd now." - if [[ -n $(pidof udevd) ]] ; then - killall -15 udevd &>/dev/null - sleep 1 - killall -9 udevd &>/dev/null - fi - /sbin/udevd --daemon - fi - fi - - # people want reminders, I'll give them reminders. Odds are they will - # just ignore them anyway... - - if [[ ${coldplug_stale} == "1" ]] ; then - ewarn "A stale coldplug init script found. You should run:" - ewarn - ewarn " rc-update del coldplug" - ewarn " rm -f /etc/init.d/coldplug" - ewarn - ewarn "udev now provides its own coldplug functionality." - fi - - # delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules - if has_version "=sys-fs/udev-103-r3"; then - if [[ -e "${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules" ]] - then - ewarn "Deleting stray 40-scsi-hotplug.rules" - ewarn "installed by sys-fs/udev-103-r3" - rm -f ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules - fi - fi - - # Removing some device-nodes we thought we need some time ago - if [[ -d "${ROOT}"/lib/udev/devices ]]; then - rm -f "${ROOT}"/lib/udev/devices/{null,zero,console,urandom} - fi - - # Removing some old file - if has_version "<sys-fs/udev-104-r5"; then - rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev - rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net - fi - - if has_version "<sys-fs/udev-106-r5"; then - if [[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]; then - rm -f ${ROOT}/etc/udev/rules.d/95-net.rules - fi - fi - - einfo - einfo "For more information on udev on Gentoo, writing udev rules, and" - einfo " fixing known issues visit:" - einfo " http://www.gentoo.org/doc/en/udev-guide.xml" -} diff --git a/sys-fs/udev/udev-108-r1.ebuild b/sys-fs/udev/udev-108-r1.ebuild deleted file mode 100644 index bf0f9799adc8..000000000000 --- a/sys-fs/udev/udev-108-r1.ebuild +++ /dev/null @@ -1,303 +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-108-r1.ebuild,v 1.1 2007/04/23 20:18:22 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" - -DEPEND="selinux? ( sys-libs/libselinux )" -RDEPEND="!sys-apps/coldplug" -RDEPEND="${DEPEND} ${RDEPEND} - >=sys-apps/baselayout-1.12.5" -# 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}/${PN}-104-peristent-net-disable-xen.patch - epatch ${FILESDIR}/${PN}-108-cleanup-early-rules.diff - epatch ${FILESDIR}/${PN}-108-persistent-joystick.diff - - cd "${S}/etc/udev/gentoo" - mv udev.rules 50-udev.rules - cd "${S}" - - # 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/50-udev.rules"` - MD5=${MD5/ -/} - if [ "${MD5}" != "db0c266c3f407b6e4d1959b31f753e9a" ] - 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/edd_id \ - extras/firmware \ - extras/floppy \ - extras/path_id \ - 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/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/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 - keepdir /lib/udev/devices - - # create symlinks for these utilities to /sbin - # where multipath-tools expect them to be (Bug #168588) - dosym ../lib/udev/vol_id /sbin/vol_id - dosym ../lib/udev/scsi_id /sbin/scsi_id - - # 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" - newexe ${FILESDIR}/net-104-r10.sh net.sh || die "Required binary not installed properly" - newexe ${FILESDIR}/modprobe-105.sh modprobe.sh || die "Required binary not installed properly" - doexe extras/eventrecorder.sh || die "Required binary not installed properly" - - # Our udev config file - insinto /etc/udev - newins ${FILESDIR}/udev.conf.post_108 udev.conf - - # Our rules files - insinto /etc/udev/rules.d/ - doins etc/udev/gentoo/??-*.rules - #newins ${FILESDIR}/udev.rules-107-r1 50-udev.rules - #newins ${FILESDIR}/05-udev-early.rules-106-r5 05-udev-early.rules - #doins ${FILESDIR}/95-udev-late.rules - # Special rules for device-mapper - #newins ${FILESDIR}/64-device-mapper.rules-107-r1 64-device-mapper.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 - - # 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/cdrom_id/cdrom_id.8 - # create a extra symlink for udevcontrol - dosym udevd.8 /usr/share/man/man8/udevcontrol.8 - - # our udev hooks into the rc system - insinto /$(get_libdir)/rcscripts/addons - newins "${FILESDIR}"/udev-start-108-r1.sh udev-start.sh - newins "${FILESDIR}"/udev-stop-108-r1.sh 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 - - insinto /etc/modprobe.d - doins ${FILESDIR}/blacklist ${FILESDIR}/pnp-aliases - - if use s390; then - # s390 does not has persistent mac addresses - # and we only have persistence rules for mac. - # For now just remove the rules file. - rm ${D}/etc/udev/rules.d/75-persistent-net-generator.rules - fi - -} - -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 -} - -pkg_postinst() { - if [[ ${ROOT} == "/" ]] ; then - # check if root of init-process is identical to ours - if [ -r /proc/1/root -a /proc/1/root/ -ef /proc/self/root/ ]; then - einfo "restarting udevd now." - if [[ -n $(pidof udevd) ]] ; then - killall -15 udevd &>/dev/null - sleep 1 - killall -9 udevd &>/dev/null - fi - /sbin/udevd --daemon - fi - fi - - # people want reminders, I'll give them reminders. Odds are they will - # just ignore them anyway... - - if [[ ${coldplug_stale} == "1" ]] ; then - ewarn "A stale coldplug init script found. You should run:" - ewarn - ewarn " rc-update del coldplug" - ewarn " rm -f /etc/init.d/coldplug" - ewarn - ewarn "udev now provides its own coldplug functionality." - fi - - # delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules - if has_version "=sys-fs/udev-103-r3"; then - if [[ -e "${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules" ]] - then - ewarn "Deleting stray 40-scsi-hotplug.rules" - ewarn "installed by sys-fs/udev-103-r3" - rm -f ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules - fi - fi - - # Removing some device-nodes we thought we need some time ago - if [[ -d "${ROOT}"/lib/udev/devices ]]; then - rm -f "${ROOT}"/lib/udev/devices/{null,zero,console,urandom} - fi - - # Removing some old file - if has_version "<sys-fs/udev-104-r5"; then - rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev - rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net - fi - - if has_version "<sys-fs/udev-106-r5"; then - if [[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]; then - rm -f ${ROOT}/etc/udev/rules.d/95-net.rules - fi - fi - - # Try to remove /etc/dev.d as that is obsolete - if [[ -d "${ROOT}"/etc/dev.d ]]; then - rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/default "${ROOT}"/etc/dev.d - if [[ -d "${ROOT}"/etc/dev.d ]]; then - ewarn "You still have the directory /etc/dev.d on your system." - ewarn "This is no longer used by udev and can be removed." - fi - fi - - einfo - einfo "For more information on udev on Gentoo, writing udev rules, and" - einfo " fixing known issues visit:" - einfo " http://www.gentoo.org/doc/en/udev-guide.xml" -} diff --git a/sys-fs/udev/udev-108.ebuild b/sys-fs/udev/udev-108.ebuild deleted file mode 100644 index 234a8f223b6d..000000000000 --- a/sys-fs/udev/udev-108.ebuild +++ /dev/null @@ -1,292 +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-108.ebuild,v 1.2 2007/04/07 14:59:51 vapier 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" - -DEPEND="selinux? ( sys-libs/libselinux )" -RDEPEND="!sys-apps/coldplug" -RDEPEND="${DEPEND} ${RDEPEND} - >=sys-apps/baselayout-1.12.5" -# 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}/${PN}-104-peristent-net-disable-xen.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}" != "db0c266c3f407b6e4d1959b31f753e9a" ] - 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/edd_id \ - extras/firmware \ - extras/floppy \ - extras/path_id \ - 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/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/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 - keepdir /lib/udev/devices - - # create symlinks for these utilities to /sbin - # where multipath-tools expect them to be (Bug #168588) - dosym ../lib/udev/vol_id /sbin/vol_id - dosym ../lib/udev/scsi_id /sbin/scsi_id - - # 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" - newexe ${FILESDIR}/net-104-r10.sh net.sh || die "Required binary not installed properly" - newexe ${FILESDIR}/modprobe-105.sh modprobe.sh || die "Required binary not installed properly" - doexe extras/eventrecorder.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/ - doins etc/udev/gentoo/??-*.rules - newins etc/udev/gentoo/udev.rules 50-udev.rules - #newins ${FILESDIR}/udev.rules-107-r1 50-udev.rules - #newins ${FILESDIR}/05-udev-early.rules-106-r5 05-udev-early.rules - #doins ${FILESDIR}/95-udev-late.rules - # Special rules for device-mapper - #newins ${FILESDIR}/64-device-mapper.rules-107-r1 64-device-mapper.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 - keepdir /etc/dev.d - - # 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/cdrom_id/cdrom_id.8 - # create a extra symlink for udevcontrol - dosym udevd.8 /usr/share/man/man8/udevcontrol.8 - - # our udev hooks into the rc system - insinto /$(get_libdir)/rcscripts/addons - newins "${FILESDIR}"/udev-start-107.sh udev-start.sh - newins "${FILESDIR}"/udev-stop-105.sh 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 - - insinto /etc/modprobe.d - doins ${FILESDIR}/blacklist ${FILESDIR}/pnp-aliases - - if use s390; then - # s390 does not has persistent mac addresses - # and we only have persistence rules for mac. - # For now just remove the rules file. - rm ${D}/etc/udev/rules.d/75-persistent-net-generator.rules - fi - -} - -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 -} - -pkg_postinst() { - if [[ ${ROOT} == "/" ]] ; then - # check if root of init-process is identical to ours - if [ -r /proc/1/root -a /proc/1/root/ -ef /proc/self/root/ ]; then - einfo "restarting udevd now." - if [[ -n $(pidof udevd) ]] ; then - killall -15 udevd &>/dev/null - sleep 1 - killall -9 udevd &>/dev/null - fi - /sbin/udevd --daemon - fi - fi - - # people want reminders, I'll give them reminders. Odds are they will - # just ignore them anyway... - - if [[ ${coldplug_stale} == "1" ]] ; then - ewarn "A stale coldplug init script found. You should run:" - ewarn - ewarn " rc-update del coldplug" - ewarn " rm -f /etc/init.d/coldplug" - ewarn - ewarn "udev now provides its own coldplug functionality." - fi - - # delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules - if has_version "=sys-fs/udev-103-r3"; then - if [[ -e "${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules" ]] - then - ewarn "Deleting stray 40-scsi-hotplug.rules" - ewarn "installed by sys-fs/udev-103-r3" - rm -f ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules - fi - fi - - # Removing some device-nodes we thought we need some time ago - if [[ -d "${ROOT}"/lib/udev/devices ]]; then - rm -f "${ROOT}"/lib/udev/devices/{null,zero,console,urandom} - fi - - # Removing some old file - if has_version "<sys-fs/udev-104-r5"; then - rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev - rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net - fi - - if has_version "<sys-fs/udev-106-r5"; then - if [[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]; then - rm -f ${ROOT}/etc/udev/rules.d/95-net.rules - fi - fi - - einfo - einfo "For more information on udev on Gentoo, writing udev rules, and" - einfo " fixing known issues visit:" - einfo " http://www.gentoo.org/doc/en/udev-guide.xml" -} diff --git a/sys-fs/udev/udev-109-r1.ebuild b/sys-fs/udev/udev-109-r1.ebuild deleted file mode 100644 index 2698c8b76b17..000000000000 --- a/sys-fs/udev/udev-109-r1.ebuild +++ /dev/null @@ -1,298 +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-109-r1.ebuild,v 1.1 2007/04/25 14:42:08 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" - -DEPEND="selinux? ( sys-libs/libselinux )" -RDEPEND="!sys-apps/coldplug" -RDEPEND="${DEPEND} ${RDEPEND} - >=sys-apps/baselayout-1.12.5" -# 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}/${PN}-104-peristent-net-disable-xen.patch - - epatch ${FILESDIR}/${P}-respect-CFLAGS.diff - - # 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/50-udev.rules"` - MD5=${MD5/ -/} - if [ "${MD5}" != "db0c266c3f407b6e4d1959b31f753e9a" ] - 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/edd_id \ - extras/firmware \ - extras/floppy \ - extras/path_id \ - 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)" - emake \ - 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/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/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 - keepdir /lib/udev/devices - - # create symlinks for these utilities to /sbin - # where multipath-tools expect them to be (Bug #168588) - dosym ../lib/udev/vol_id /sbin/vol_id - dosym ../lib/udev/scsi_id /sbin/scsi_id - - # 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" - newexe ${FILESDIR}/net-104-r10.sh net.sh || die "Required binary not installed properly" - newexe ${FILESDIR}/modprobe-105.sh modprobe.sh || die "Required binary not installed properly" - doexe extras/eventrecorder.sh || die "Required binary not installed properly" - - # Our udev config file - insinto /etc/udev - newins ${FILESDIR}/udev.conf.post_108 udev.conf - - # Our rules files - insinto /etc/udev/rules.d/ - doins etc/udev/gentoo/??-*.rules - #newins ${FILESDIR}/udev.rules-107-r1 50-udev.rules - #newins ${FILESDIR}/05-udev-early.rules-106-r5 05-udev-early.rules - #doins ${FILESDIR}/95-udev-late.rules - # Special rules for device-mapper - #newins ${FILESDIR}/64-device-mapper.rules-107-r1 64-device-mapper.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 - - # 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/cdrom_id/cdrom_id.8 - # create a extra symlink for udevcontrol - dosym udevd.8 /usr/share/man/man8/udevcontrol.8 - - # our udev hooks into the rc system - insinto /$(get_libdir)/rcscripts/addons - newins "${FILESDIR}"/udev-start-108-r1.sh udev-start.sh - newins "${FILESDIR}"/udev-stop-108-r1.sh 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 - - insinto /etc/modprobe.d - doins ${FILESDIR}/blacklist ${FILESDIR}/pnp-aliases - - if use s390; then - # s390 does not has persistent mac addresses - # and we only have persistence rules for mac. - # For now just remove the rules file. - rm ${D}/etc/udev/rules.d/75-persistent-net-generator.rules - fi - -} - -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 -} - -pkg_postinst() { - if [[ ${ROOT} == "/" ]] ; then - # check if root of init-process is identical to ours - if [ -r /proc/1/root -a /proc/1/root/ -ef /proc/self/root/ ]; then - einfo "restarting udevd now." - if [[ -n $(pidof udevd) ]] ; then - killall -15 udevd &>/dev/null - sleep 1 - killall -9 udevd &>/dev/null - fi - /sbin/udevd --daemon - fi - fi - - # people want reminders, I'll give them reminders. Odds are they will - # just ignore them anyway... - - if [[ ${coldplug_stale} == "1" ]] ; then - ewarn "A stale coldplug init script found. You should run:" - ewarn - ewarn " rc-update del coldplug" - ewarn " rm -f /etc/init.d/coldplug" - ewarn - ewarn "udev now provides its own coldplug functionality." - fi - - # delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules - if has_version "=sys-fs/udev-103-r3"; then - if [[ -e "${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules" ]] - then - ewarn "Deleting stray 40-scsi-hotplug.rules" - ewarn "installed by sys-fs/udev-103-r3" - rm -f ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules - fi - fi - - # Removing some device-nodes we thought we need some time ago - if [[ -d "${ROOT}"/lib/udev/devices ]]; then - rm -f "${ROOT}"/lib/udev/devices/{null,zero,console,urandom} - fi - - # Removing some old file - if has_version "<sys-fs/udev-104-r5"; then - rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev - rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net - fi - - if has_version "<sys-fs/udev-106-r5"; then - if [[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]; then - rm -f ${ROOT}/etc/udev/rules.d/95-net.rules - fi - fi - - # Try to remove /etc/dev.d as that is obsolete - if [[ -d "${ROOT}"/etc/dev.d ]]; then - rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/default "${ROOT}"/etc/dev.d - if [[ -d "${ROOT}"/etc/dev.d ]]; then - ewarn "You still have the directory /etc/dev.d on your system." - ewarn "This is no longer used by udev and can be removed." - fi - fi - - einfo - einfo "For more information on udev on Gentoo, writing udev rules, and" - einfo " fixing known issues visit:" - einfo " http://www.gentoo.org/doc/en/udev-guide.xml" -} diff --git a/sys-fs/udev/udev-109.ebuild b/sys-fs/udev/udev-109.ebuild deleted file mode 100644 index d4c01f2891d4..000000000000 --- a/sys-fs/udev/udev-109.ebuild +++ /dev/null @@ -1,297 +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-109.ebuild,v 1.1 2007/04/24 06:41:46 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" - -DEPEND="selinux? ( sys-libs/libselinux )" -RDEPEND="!sys-apps/coldplug" -RDEPEND="${DEPEND} ${RDEPEND} - >=sys-apps/baselayout-1.12.5" -# 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}/${PN}-104-peristent-net-disable-xen.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/50-udev.rules"` - MD5=${MD5/ -/} - if [ "${MD5}" != "db0c266c3f407b6e4d1959b31f753e9a" ] - 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/edd_id \ - extras/firmware \ - extras/floppy \ - extras/path_id \ - 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/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/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 - keepdir /lib/udev/devices - - # create symlinks for these utilities to /sbin - # where multipath-tools expect them to be (Bug #168588) - dosym ../lib/udev/vol_id /sbin/vol_id - dosym ../lib/udev/scsi_id /sbin/scsi_id - - # 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" - newexe ${FILESDIR}/net-104-r10.sh net.sh || die "Required binary not installed properly" - newexe ${FILESDIR}/modprobe-105.sh modprobe.sh || die "Required binary not installed properly" - doexe extras/eventrecorder.sh || die "Required binary not installed properly" - - # Our udev config file - insinto /etc/udev - newins ${FILESDIR}/udev.conf.post_108 udev.conf - - # Our rules files - insinto /etc/udev/rules.d/ - doins etc/udev/gentoo/??-*.rules - #newins ${FILESDIR}/udev.rules-107-r1 50-udev.rules - #newins ${FILESDIR}/05-udev-early.rules-106-r5 05-udev-early.rules - #doins ${FILESDIR}/95-udev-late.rules - # Special rules for device-mapper - #newins ${FILESDIR}/64-device-mapper.rules-107-r1 64-device-mapper.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 - - # 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/cdrom_id/cdrom_id.8 - # create a extra symlink for udevcontrol - dosym udevd.8 /usr/share/man/man8/udevcontrol.8 - - # our udev hooks into the rc system - insinto /$(get_libdir)/rcscripts/addons - newins "${FILESDIR}"/udev-start-108-r1.sh udev-start.sh - newins "${FILESDIR}"/udev-stop-108-r1.sh 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 - - insinto /etc/modprobe.d - doins ${FILESDIR}/blacklist ${FILESDIR}/pnp-aliases - - if use s390; then - # s390 does not has persistent mac addresses - # and we only have persistence rules for mac. - # For now just remove the rules file. - rm ${D}/etc/udev/rules.d/75-persistent-net-generator.rules - fi - -} - -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 -} - -pkg_postinst() { - if [[ ${ROOT} == "/" ]] ; then - # check if root of init-process is identical to ours - if [ -r /proc/1/root -a /proc/1/root/ -ef /proc/self/root/ ]; then - einfo "restarting udevd now." - if [[ -n $(pidof udevd) ]] ; then - killall -15 udevd &>/dev/null - sleep 1 - killall -9 udevd &>/dev/null - fi - /sbin/udevd --daemon - fi - fi - - # people want reminders, I'll give them reminders. Odds are they will - # just ignore them anyway... - - if [[ ${coldplug_stale} == "1" ]] ; then - ewarn "A stale coldplug init script found. You should run:" - ewarn - ewarn " rc-update del coldplug" - ewarn " rm -f /etc/init.d/coldplug" - ewarn - ewarn "udev now provides its own coldplug functionality." - fi - - # delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules - if has_version "=sys-fs/udev-103-r3"; then - if [[ -e "${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules" ]] - then - ewarn "Deleting stray 40-scsi-hotplug.rules" - ewarn "installed by sys-fs/udev-103-r3" - rm -f ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules - fi - fi - - # Removing some device-nodes we thought we need some time ago - if [[ -d "${ROOT}"/lib/udev/devices ]]; then - rm -f "${ROOT}"/lib/udev/devices/{null,zero,console,urandom} - fi - - # Removing some old file - if has_version "<sys-fs/udev-104-r5"; then - rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev - rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net - fi - - if has_version "<sys-fs/udev-106-r5"; then - if [[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]; then - rm -f ${ROOT}/etc/udev/rules.d/95-net.rules - fi - fi - - # Try to remove /etc/dev.d as that is obsolete - if [[ -d "${ROOT}"/etc/dev.d ]]; then - rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/default "${ROOT}"/etc/dev.d - if [[ -d "${ROOT}"/etc/dev.d ]]; then - ewarn "You still have the directory /etc/dev.d on your system." - ewarn "This is no longer used by udev and can be removed." - fi - fi - - einfo - einfo "For more information on udev on Gentoo, writing udev rules, and" - einfo " fixing known issues visit:" - einfo " http://www.gentoo.org/doc/en/udev-guide.xml" -} diff --git a/sys-fs/udev/udev-110-r1.ebuild b/sys-fs/udev/udev-110-r1.ebuild deleted file mode 100644 index 22c7f7eaf937..000000000000 --- a/sys-fs/udev/udev-110-r1.ebuild +++ /dev/null @@ -1,301 +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-110-r1.ebuild,v 1.1 2007/05/04 14:14:51 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" - -DEPEND="selinux? ( sys-libs/libselinux )" -RDEPEND="!sys-apps/coldplug" -RDEPEND="${DEPEND} ${RDEPEND} - >=sys-apps/baselayout-1.12.5" -# 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}/${PN}-104-peristent-net-disable-xen.patch - EPATCH_OPTS="-p1" epatch ${FILESDIR}/${PN}-110-root-link-1.diff - epatch ${FILESDIR}/${P}-makefile-depend.diff - - # 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/50-udev.rules"` - MD5=${MD5/ -/} - if [ "${MD5}" != "04a8f3303a2b172affbed26973745f26" ] - 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/edd_id \ - extras/firmware \ - extras/floppy \ - extras/path_id \ - extras/scsi_id \ - extras/usb_id \ - extras/volume_id \ - extras/rule_generator \ - extras/root_link" - - 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)" - emake \ - EXTRAS="${extras}" \ - udevdir="/dev/" \ - CROSS_COMPILE=${mycross} \ - OPTFLAGS="" \ - ${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/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/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" - doexe extras/root_link/get_dir_major_minor || die "Required helper not installed properly" - keepdir /lib/udev/state - keepdir /lib/udev/devices - - # create symlinks for these utilities to /sbin - # where multipath-tools expect them to be (Bug #168588) - dosym ../lib/udev/vol_id /sbin/vol_id - dosym ../lib/udev/scsi_id /sbin/scsi_id - - # 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" - newexe ${FILESDIR}/net-104-r10.sh net.sh || die "Required binary not installed properly" - newexe ${FILESDIR}/modprobe-105.sh modprobe.sh || die "Required binary not installed properly" - - # Our udev config file - insinto /etc/udev - newins ${FILESDIR}/udev.conf.post_108 udev.conf - - # Our rules files - insinto /etc/udev/rules.d/ - doins etc/udev/gentoo/??-*.rules - #newins ${FILESDIR}/udev.rules-107-r1 50-udev.rules - #newins ${FILESDIR}/05-udev-early.rules-106-r5 05-udev-early.rules - #doins ${FILESDIR}/95-udev-late.rules - # Special rules for device-mapper - #newins ${FILESDIR}/64-device-mapper.rules-107-r1 64-device-mapper.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 - - # 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/cdrom_id/cdrom_id.8 - # create a extra symlink for udevcontrol - dosym udevd.8 /usr/share/man/man8/udevcontrol.8 - - # our udev hooks into the rc system - insinto /$(get_libdir)/rcscripts/addons - newins "${FILESDIR}"/udev-start-110-r1.sh udev-start.sh - newins "${FILESDIR}"/udev-stop-110-r1.sh 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 - - insinto /etc/modprobe.d - newins ${FILESDIR}/blacklist-110 blacklist - doins ${FILESDIR}/pnp-aliases - - if use s390; then - # s390 does not has persistent mac addresses - # and we only have persistence rules for mac. - # For now just remove the rules file. - rm ${D}/etc/udev/rules.d/75-persistent-net-generator.rules - fi - -} - -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 -} - -pkg_postinst() { - if [[ ${ROOT} == "/" ]] ; then - # check if root of init-process is identical to ours - if [ -r /proc/1/root -a /proc/1/root/ -ef /proc/self/root/ ]; then - einfo "restarting udevd now." - if [[ -n $(pidof udevd) ]] ; then - killall -15 udevd &>/dev/null - sleep 1 - killall -9 udevd &>/dev/null - fi - /sbin/udevd --daemon - fi - fi - - # people want reminders, I'll give them reminders. Odds are they will - # just ignore them anyway... - - if [[ ${coldplug_stale} == "1" ]] ; then - ewarn "A stale coldplug init script found. You should run:" - ewarn - ewarn " rc-update del coldplug" - ewarn " rm -f /etc/init.d/coldplug" - ewarn - ewarn "udev now provides its own coldplug functionality." - fi - - # delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules - if has_version "=sys-fs/udev-103-r3"; then - if [[ -e "${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules" ]] - then - ewarn "Deleting stray 40-scsi-hotplug.rules" - ewarn "installed by sys-fs/udev-103-r3" - rm -f ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules - fi - fi - - # Removing some device-nodes we thought we need some time ago - if [[ -d "${ROOT}"/lib/udev/devices ]]; then - rm -f "${ROOT}"/lib/udev/devices/{null,zero,console,urandom} - fi - - # Removing some old file - if has_version "<sys-fs/udev-104-r5"; then - rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev - rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net - fi - - if has_version "<sys-fs/udev-106-r5"; then - if [[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]; then - rm -f ${ROOT}/etc/udev/rules.d/95-net.rules - fi - fi - - # Try to remove /etc/dev.d as that is obsolete - if [[ -d "${ROOT}"/etc/dev.d ]]; then - rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/default "${ROOT}"/etc/dev.d - if [[ -d "${ROOT}"/etc/dev.d ]]; then - ewarn "You still have the directory /etc/dev.d on your system." - ewarn "This is no longer used by udev and can be removed." - fi - fi - - einfo - einfo "For more information on udev on Gentoo, writing udev rules, and" - einfo " fixing known issues visit:" - einfo " http://www.gentoo.org/doc/en/udev-guide.xml" -} diff --git a/sys-fs/udev/udev-110.ebuild b/sys-fs/udev/udev-110.ebuild deleted file mode 100644 index 884018c7e562..000000000000 --- a/sys-fs/udev/udev-110.ebuild +++ /dev/null @@ -1,299 +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-110.ebuild,v 1.2 2007/05/04 07:05:24 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" - -DEPEND="selinux? ( sys-libs/libselinux )" -RDEPEND="!sys-apps/coldplug" -RDEPEND="${DEPEND} ${RDEPEND} - >=sys-apps/baselayout-1.12.5" -# 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}/${PN}-104-peristent-net-disable-xen.patch - - epatch ${FILESDIR}/${P}-makefile-depend.diff - - # 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/50-udev.rules"` - MD5=${MD5/ -/} - if [ "${MD5}" != "04a8f3303a2b172affbed26973745f26" ] - 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/edd_id \ - extras/firmware \ - extras/floppy \ - extras/path_id \ - 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)" - emake \ - EXTRAS="${extras}" \ - udevdir="/dev/" \ - CROSS_COMPILE=${mycross} \ - OPTFLAGS="" \ - ${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/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/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 - keepdir /lib/udev/devices - - # create symlinks for these utilities to /sbin - # where multipath-tools expect them to be (Bug #168588) - dosym ../lib/udev/vol_id /sbin/vol_id - dosym ../lib/udev/scsi_id /sbin/scsi_id - - # 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" - newexe ${FILESDIR}/net-104-r10.sh net.sh || die "Required binary not installed properly" - newexe ${FILESDIR}/modprobe-105.sh modprobe.sh || die "Required binary not installed properly" - - # Our udev config file - insinto /etc/udev - newins ${FILESDIR}/udev.conf.post_108 udev.conf - - # Our rules files - insinto /etc/udev/rules.d/ - doins etc/udev/gentoo/??-*.rules - #newins ${FILESDIR}/udev.rules-107-r1 50-udev.rules - #newins ${FILESDIR}/05-udev-early.rules-106-r5 05-udev-early.rules - #doins ${FILESDIR}/95-udev-late.rules - # Special rules for device-mapper - #newins ${FILESDIR}/64-device-mapper.rules-107-r1 64-device-mapper.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 - - # 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/cdrom_id/cdrom_id.8 - # create a extra symlink for udevcontrol - dosym udevd.8 /usr/share/man/man8/udevcontrol.8 - - # our udev hooks into the rc system - insinto /$(get_libdir)/rcscripts/addons - newins "${FILESDIR}"/udev-start-110.sh udev-start.sh - newins "${FILESDIR}"/udev-stop-108-r1.sh 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 - - insinto /etc/modprobe.d - newins ${FILESDIR}/blacklist-110 blacklist - doins ${FILESDIR}/pnp-aliases - - if use s390; then - # s390 does not has persistent mac addresses - # and we only have persistence rules for mac. - # For now just remove the rules file. - rm ${D}/etc/udev/rules.d/75-persistent-net-generator.rules - fi - -} - -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 -} - -pkg_postinst() { - if [[ ${ROOT} == "/" ]] ; then - # check if root of init-process is identical to ours - if [ -r /proc/1/root -a /proc/1/root/ -ef /proc/self/root/ ]; then - einfo "restarting udevd now." - if [[ -n $(pidof udevd) ]] ; then - killall -15 udevd &>/dev/null - sleep 1 - killall -9 udevd &>/dev/null - fi - /sbin/udevd --daemon - fi - fi - - # people want reminders, I'll give them reminders. Odds are they will - # just ignore them anyway... - - if [[ ${coldplug_stale} == "1" ]] ; then - ewarn "A stale coldplug init script found. You should run:" - ewarn - ewarn " rc-update del coldplug" - ewarn " rm -f /etc/init.d/coldplug" - ewarn - ewarn "udev now provides its own coldplug functionality." - fi - - # delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules - if has_version "=sys-fs/udev-103-r3"; then - if [[ -e "${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules" ]] - then - ewarn "Deleting stray 40-scsi-hotplug.rules" - ewarn "installed by sys-fs/udev-103-r3" - rm -f ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules - fi - fi - - # Removing some device-nodes we thought we need some time ago - if [[ -d "${ROOT}"/lib/udev/devices ]]; then - rm -f "${ROOT}"/lib/udev/devices/{null,zero,console,urandom} - fi - - # Removing some old file - if has_version "<sys-fs/udev-104-r5"; then - rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev - rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net - fi - - if has_version "<sys-fs/udev-106-r5"; then - if [[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]; then - rm -f ${ROOT}/etc/udev/rules.d/95-net.rules - fi - fi - - # Try to remove /etc/dev.d as that is obsolete - if [[ -d "${ROOT}"/etc/dev.d ]]; then - rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/default "${ROOT}"/etc/dev.d - if [[ -d "${ROOT}"/etc/dev.d ]]; then - ewarn "You still have the directory /etc/dev.d on your system." - ewarn "This is no longer used by udev and can be removed." - fi - fi - - einfo - einfo "For more information on udev on Gentoo, writing udev rules, and" - einfo " fixing known issues visit:" - einfo " http://www.gentoo.org/doc/en/udev-guide.xml" -} diff --git a/sys-fs/udev/udev-111.ebuild b/sys-fs/udev/udev-111.ebuild index 52c2f0304277..ef263162c197 100644 --- a/sys-fs/udev/udev-111.ebuild +++ b/sys-fs/udev/udev-111.ebuild @@ -1,6 +1,6 @@ # 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-111.ebuild,v 1.1 2007/05/10 20:35:04 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-111.ebuild,v 1.2 2007/05/12 09:57:44 zzam Exp $ inherit eutils flag-o-matic multilib toolchain-funcs @@ -26,7 +26,6 @@ src_unpack() { cd "${S}" # patches go here... - #epatch ${FILESDIR}/${P}-udev_volume_id.patch epatch ${FILESDIR}/${PN}-104-peristent-net-disable-xen.patch EPATCH_OPTS="-p1" epatch ${FILESDIR}/${PN}-110-root-link-1.diff |