From 8ec94fbcdd5fafadc592965fdf27945ad0a5779c Mon Sep 17 00:00:00 2001 From: Matthias Schwarzott Date: Thu, 22 Mar 2007 10:51:13 +0000 Subject: [PATCH] Do not install run_directory, it is marked as strongly deprecated. No need for /dev/console redirect fix, Bug #151414. Do not call dmsetup from udev-start, as rules already do this. Use by-id method for usb and firewire cdrom persistence. Use higher priority for device-mapper persistent symlinks to overwrite symlinks of multipath base devices. Package-Manager: portage-2.1.2.2 --- sys-fs/udev/ChangeLog | 13 +- sys-fs/udev/Manifest | 42 ++- sys-fs/udev/files/64-device-mapper.rules-107 | 28 ++ sys-fs/udev/files/digest-udev-107 | 3 + sys-fs/udev/files/udev-107-usbcd-by-id.patch | 21 ++ sys-fs/udev/files/udev-start-107.sh | 144 +++++++++ sys-fs/udev/udev-106-r5.ebuild | 4 +- sys-fs/udev/udev-107.ebuild | 292 +++++++++++++++++++ 8 files changed, 533 insertions(+), 14 deletions(-) create mode 100644 sys-fs/udev/files/64-device-mapper.rules-107 create mode 100644 sys-fs/udev/files/digest-udev-107 create mode 100644 sys-fs/udev/files/udev-107-usbcd-by-id.patch create mode 100644 sys-fs/udev/files/udev-start-107.sh create mode 100644 sys-fs/udev/udev-107.ebuild diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 77d6c66a4f43..6cf5221d8f79 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,17 @@ # 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.289 2007/03/21 13:51:45 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.290 2007/03/22 10:51:13 zzam Exp $ + +*udev-107 (22 Mar 2007) + + 22 Mar 2007; Matthias Schwarzott + +files/64-device-mapper.rules-107, +files/udev-107-usbcd-by-id.patch, + +files/udev-start-107.sh, udev-106-r5.ebuild, +udev-107.ebuild: + Do not install run_directory, it is marked as strongly deprecated. No need + for /dev/console redirect fix, Bug #151414. Do not call dmsetup from + udev-start, as rules already do this. Use by-id method for usb and firewire + cdrom persistence. Use higher priority for device-mapper persistent symlinks + to overwrite symlinks of multipath base devices. 21 Mar 2007; Chris Gianelloni udev-104-r12.ebuild: Stable on alpha wrt bug #159871. diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index cd5038b2330b..e8a19bd08487 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -21,6 +21,10 @@ AUX 64-device-mapper.rules 1084 RMD160 db46f92b7d4f798b0339e5d933015a854fb0180f MD5 72c3089a3cdac3c23b79d0f94a6b2e33 files/64-device-mapper.rules 1084 RMD160 db46f92b7d4f798b0339e5d933015a854fb0180f files/64-device-mapper.rules 1084 SHA256 00348d3788dbf202c2b8e3cf8ae2091d6caa7684361b8b548c1d4833d0fb9c3a files/64-device-mapper.rules 1084 +AUX 64-device-mapper.rules-107 1140 RMD160 e4824e806636c7908782f188a636a6a47a66cc62 SHA1 4fcc8287e2cfce68f89d13e543dd7554daf55bd4 SHA256 d96f0a1025bfb06dbf48b47ed02a34dd29a5e2cb335a758e0e87c4bcab872216 +MD5 f0a523438f544390d1bfc73acb225710 files/64-device-mapper.rules-107 1140 +RMD160 e4824e806636c7908782f188a636a6a47a66cc62 files/64-device-mapper.rules-107 1140 +SHA256 d96f0a1025bfb06dbf48b47ed02a34dd29a5e2cb335a758e0e87c4bcab872216 files/64-device-mapper.rules-107 1140 AUX 95-net.rules 550 RMD160 8e10d27a37f15bbcd8367266693b58d7a9101370 SHA1 53cf6e38d817f1d885cd54f8c2d1674c83878609 SHA256 19c6783fdd8bfb4f66376fb4929cd9a1a554c8949a40364e2a5b36b2e31f7574 MD5 b9c490717a6a973b52edd7082a7b09f8 files/95-net.rules 550 RMD160 8e10d27a37f15bbcd8367266693b58d7a9101370 files/95-net.rules 550 @@ -101,6 +105,10 @@ AUX udev-106-remove-dasd-rules.patch 1479 RMD160 4e50a28f00ea2789fdfa0a2ba0b4949 MD5 8739da605899629d0e2a142c00ec5177 files/udev-106-remove-dasd-rules.patch 1479 RMD160 4e50a28f00ea2789fdfa0a2ba0b4949e07825528 files/udev-106-remove-dasd-rules.patch 1479 SHA256 7ad2064b1cbe80c0b048908d4e30bb01571509c78b789e943ee727e9a1e4b26d files/udev-106-remove-dasd-rules.patch 1479 +AUX udev-107-usbcd-by-id.patch 412 RMD160 64a0f6993914c5d5b22e16d2d1e450357e965edf SHA1 47a8a947646adda60d8b277d8e65a9daa1a8c97b SHA256 50a490ac1dcfd65a220e03513d7af4856ef03c4cb7c4137e1b2bb60ee858ece2 +MD5 821153b2aba1250766fa3c9530b85978 files/udev-107-usbcd-by-id.patch 412 +RMD160 64a0f6993914c5d5b22e16d2d1e450357e965edf files/udev-107-usbcd-by-id.patch 412 +SHA256 50a490ac1dcfd65a220e03513d7af4856ef03c4cb7c4137e1b2bb60ee858ece2 files/udev-107-usbcd-by-id.patch 412 AUX udev-parisc-path_id-again.patch 524 RMD160 d305615a2f5ae0ab6b468400e95ad3332a2bcb38 SHA1 574d12600292d5cd1acb3b1be2bc24d337581a88 SHA256 a1b40d1bf3f8a7e0d6787d310218b44916c79a4f94a39287bc00f8ae058b67ff MD5 2f18f7560f7667fa98179c6084396453 files/udev-parisc-path_id-again.patch 524 RMD160 d305615a2f5ae0ab6b468400e95ad3332a2bcb38 files/udev-parisc-path_id-again.patch 524 @@ -157,6 +165,10 @@ AUX udev-start-106-r2.sh 4208 RMD160 6c87a0bd179915dd14b6d243ea660d1da93e1271 SH MD5 62a0cecff5b72abddf907d0cb039abeb files/udev-start-106-r2.sh 4208 RMD160 6c87a0bd179915dd14b6d243ea660d1da93e1271 files/udev-start-106-r2.sh 4208 SHA256 66fab3510332fabbe617fe4263f69e5e25f791dfd70fe5ea692cbef6ca9d419e files/udev-start-106-r2.sh 4208 +AUX udev-start-107.sh 3818 RMD160 34d4d3e82f4f707c4778dbdba3c2a6da4b1aa0be SHA1 8719f929069c5817ff683d2f889fd904c202ada2 SHA256 dd14400f7c6ff2c9e8cf5d8c086bfceac7690f22a494421c5129ad15197304f8 +MD5 b717c10f0a42fb26f0d1d4161f7eb980 files/udev-start-107.sh 3818 +RMD160 34d4d3e82f4f707c4778dbdba3c2a6da4b1aa0be files/udev-start-107.sh 3818 +SHA256 dd14400f7c6ff2c9e8cf5d8c086bfceac7690f22a494421c5129ad15197304f8 files/udev-start-107.sh 3818 AUX udev-start.sh 2460 RMD160 97afa40bab5aed0106e3a3b065ae480ce329e11c SHA1 2558e3265c9bed383198e2f263e10016ad6f34a0 SHA256 0527b03ac666dd9e4c94811b10d499f04b3f6f8ae2f03e6460727c1b570d985d MD5 622f085dff7fb6138f3e2c992d569593 files/udev-start.sh 2460 RMD160 97afa40bab5aed0106e3a3b065ae480ce329e11c files/udev-start.sh 2460 @@ -284,6 +296,7 @@ DIST udev-100.tar.bz2 197628 RMD160 110903eda55348131ca412c4f4a9d539e5a35bdb SHA DIST udev-103.tar.bz2 200027 RMD160 3b00a83ad8c538109ee030e2e471422272c7d071 SHA1 015372f585beeba05217ad6568178820b2713571 SHA256 047f5e2895f707117ab726cedd89fd35e8c9105530af54a8038fe81cf61c4e3f DIST udev-104.tar.bz2 187574 RMD160 269aeb9a0b2043d18c274fde749d2e0d30398b73 SHA1 53a8019f2be429be914e0283bfbcb91083fbbd9a SHA256 ec0e7bd0c322dce6149d5f94185aa477659f5030a3d684ff5428124eca684ea1 DIST udev-106.tar.bz2 188557 RMD160 2a01d06746b143c53d01b8c6aa97e635c062e9d3 SHA1 8d2a596c506e1ba5a099e57982eb9aff17058d91 SHA256 544a7372468459e8a631ffdf9cace29bc77365b9a6dab4189c6ba813da002156 +DIST udev-107.tar.bz2 189101 RMD160 ebc2722e0306aea3f3c0cd828861a61021609ac7 SHA1 78c208e2e446824dd967b7b9b36684578799aee8 SHA256 49c45315ba640547939b2e2949f9478af2279a3296e97328ee8f6a4b08f2eae9 EBUILD udev-079-r2.ebuild 7523 RMD160 bc3a75a2205cbe092ec431eaf474cb1f4959d4fe SHA1 b10bb23e64edc1a43b890f06c3f71a4e7c85ba9e SHA256 14a34689b36d1be9ffd953eedf20ee906b8638b0967b7148b4d0023d765da90f MD5 3a6af6ceddbbd1a93002a240a8e6b930 udev-079-r2.ebuild 7523 RMD160 bc3a75a2205cbe092ec431eaf474cb1f4959d4fe udev-079-r2.ebuild 7523 @@ -344,14 +357,18 @@ EBUILD udev-106-r4.ebuild 9920 RMD160 231724604dc98cb6652bc4a80a7ecc20a0554b8b S MD5 9aeee7fb6c115aa908add98f9980f262 udev-106-r4.ebuild 9920 RMD160 231724604dc98cb6652bc4a80a7ecc20a0554b8b udev-106-r4.ebuild 9920 SHA256 526d39735bb166d191207cf2ad1775b324dee69fa18b764a1e7e1db2b70b0c88 udev-106-r4.ebuild 9920 -EBUILD udev-106-r5.ebuild 9852 RMD160 ee1a9f9153fd76bdf7b1c44147d51bea2c004978 SHA1 a12d99a176a2a0ac2b807a2c71ecff2fa588fe1f SHA256 59c57c0b06d6a8b94a0284fe37298f15767526ca466f383830b01042f970c1f9 -MD5 8b4f5bb8370a33f6a5abd96cc1b3995c udev-106-r5.ebuild 9852 -RMD160 ee1a9f9153fd76bdf7b1c44147d51bea2c004978 udev-106-r5.ebuild 9852 -SHA256 59c57c0b06d6a8b94a0284fe37298f15767526ca466f383830b01042f970c1f9 udev-106-r5.ebuild 9852 -MISC ChangeLog 54613 RMD160 744d85ac0a9e2f1939b0bec43b73c6d36286768b SHA1 bc74e5343337908815bfbfbaf4011306f5995afb SHA256 11184f4a00aa123c55e9f5f42c000d0b3e1c194a40d9053d23ba76983239bcef -MD5 af24ed44614e531fc810e46b227c3069 ChangeLog 54613 -RMD160 744d85ac0a9e2f1939b0bec43b73c6d36286768b ChangeLog 54613 -SHA256 11184f4a00aa123c55e9f5f42c000d0b3e1c194a40d9053d23ba76983239bcef ChangeLog 54613 +EBUILD udev-106-r5.ebuild 9843 RMD160 6871be520f9cb3ebb171e7e6d65d4e0d8a33b48a SHA1 bd914edad8efd1c73762683a1eb4267c1182a6d6 SHA256 aa0b4bfb4464f4bb7ab451b89c076131a2d2abbe505f32db12ea422611fb8714 +MD5 d25f6a9e2a24657055ceb764a88e5c4a udev-106-r5.ebuild 9843 +RMD160 6871be520f9cb3ebb171e7e6d65d4e0d8a33b48a udev-106-r5.ebuild 9843 +SHA256 aa0b4bfb4464f4bb7ab451b89c076131a2d2abbe505f32db12ea422611fb8714 udev-106-r5.ebuild 9843 +EBUILD udev-107.ebuild 9596 RMD160 08646b95f9e9bbedfc0874161ae07d9166d6d0a5 SHA1 590ad91f215b4441753b36dd4c8c3640e8f4770a SHA256 9a33ab9431d5511ee4607fb66607eb5ea7271581401d377cc51e46eca179c494 +MD5 07b715bf3887a38fb2f4b91190343b79 udev-107.ebuild 9596 +RMD160 08646b95f9e9bbedfc0874161ae07d9166d6d0a5 udev-107.ebuild 9596 +SHA256 9a33ab9431d5511ee4607fb66607eb5ea7271581401d377cc51e46eca179c494 udev-107.ebuild 9596 +MISC ChangeLog 55182 RMD160 8aedbf81123a3a7f30db27ec4e65c6a77aa7df6b SHA1 b1272d32e38065305e58f0cfbb238755a9d684d9 SHA256 e099377492d4ad5ca43c9f9dc62a3a134c9127fdca0ec92c7f4fc8b2630dc486 +MD5 524d216f7392d198f6f15a1b8ca93b7e ChangeLog 55182 +RMD160 8aedbf81123a3a7f30db27ec4e65c6a77aa7df6b ChangeLog 55182 +SHA256 e099377492d4ad5ca43c9f9dc62a3a134c9127fdca0ec92c7f4fc8b2630dc486 ChangeLog 55182 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447 @@ -404,10 +421,13 @@ SHA256 6d6620b896b3c0eee107f7a7bdee0a648b198ec04d17599162e78d3743f2dd63 files/di MD5 973c082873a5b1e461964c9db1753eab files/digest-udev-106-r5 229 RMD160 08bf8737aba13167f8f7c38148b937b767a086e1 files/digest-udev-106-r5 229 SHA256 6d6620b896b3c0eee107f7a7bdee0a648b198ec04d17599162e78d3743f2dd63 files/digest-udev-106-r5 229 +MD5 02958e61cd79b1f5d3b668dffbf13870 files/digest-udev-107 229 +RMD160 d1e532d066897e48d4f7968fada33b9657d35853 files/digest-udev-107 229 +SHA256 285db05bbcc252c4a94bf3e2040de2b66a7f0757c2b79cae350dc232d9a15976 files/digest-udev-107 229 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGATh3kT4lNIS36YERAgNwAJ9DmIUiSUSerYcSP7XH1y09msyYiACdGxvN -TtvNCnjftHvZz8YfPPp0o7o= -=j1lY +iD8DBQFGAl+qt2vP6XvVdOcRAoEGAJ9mYS72iaQ5HoMIDd1qldeLX1iuggCeM0Mm +RMyFcOFe4T+3Vz//M+ZRjp4= +=N8aO -----END PGP SIGNATURE----- diff --git a/sys-fs/udev/files/64-device-mapper.rules-107 b/sys-fs/udev/files/64-device-mapper.rules-107 new file mode 100644 index 000000000000..ad75792c5e04 --- /dev/null +++ b/sys-fs/udev/files/64-device-mapper.rules-107 @@ -0,0 +1,28 @@ +# 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/digest-udev-107 b/sys-fs/udev/files/digest-udev-107 new file mode 100644 index 000000000000..991f2f0e4cf1 --- /dev/null +++ b/sys-fs/udev/files/digest-udev-107 @@ -0,0 +1,3 @@ +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/udev-107-usbcd-by-id.patch b/sys-fs/udev/files/udev-107-usbcd-by-id.patch new file mode 100644 index 000000000000..4edfbf4214f9 --- /dev/null +++ b/sys-fs/udev/files/udev-107-usbcd-by-id.patch @@ -0,0 +1,21 @@ +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-start-107.sh b/sys-fs/udev/files/udev-start-107.sh new file mode 100644 index 000000000000..87094cf0d444 --- /dev/null +++ b/sys-fs/udev/files/udev-start-107.sh @@ -0,0 +1,144 @@ +# 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/udev-106-r5.ebuild b/sys-fs/udev/udev-106-r5.ebuild index 5dbd7c8e9fd8..322e0fdec681 100644 --- a/sys-fs/udev/udev-106-r5.ebuild +++ b/sys-fs/udev/udev-106-r5.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-106-r5.ebuild,v 1.1 2007/03/19 18:49:00 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-106-r5.ebuild,v 1.2 2007/03/22 10:51:13 zzam Exp $ inherit eutils flag-o-matic multilib toolchain-funcs @@ -288,7 +288,7 @@ pkg_postinst() { 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:" diff --git a/sys-fs/udev/udev-107.ebuild b/sys-fs/udev/udev-107.ebuild new file mode 100644 index 000000000000..0d3d5346987b --- /dev/null +++ b/sys-fs/udev/udev-107.ebuild @@ -0,0 +1,292 @@ +# 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.1 2007/03/22 10:51:13 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 ~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 /lib/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 "