diff options
| -rw-r--r-- | sys-fs/udev/ChangeLog | 12 | ||||
| -rw-r--r-- | sys-fs/udev/Manifest | 15 | ||||
| -rw-r--r-- | sys-fs/udev/files/digest-udev-089 | 3 | ||||
| -rw-r--r-- | sys-fs/udev/files/udev-start-089.sh | 176 | ||||
| -rw-r--r-- | sys-fs/udev/udev-089.ebuild | 251 |
5 files changed, 453 insertions, 4 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 9db7a9eabc24..8ecd46a53b16 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.185 2006/04/03 16:26:08 gregkh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.186 2006/04/03 16:58:50 gregkh Exp $ + +*udev-089 (03 Apr 2006) + + 03 Apr 2006; Greg Kroah-Hartman <gregkh@gentoo.org> + +files/udev-start-089.sh, +udev-089.ebuild: + 089 release + adds a new library (can 64 bit arches please verify that I didn't mess + something up here?) + adds "coldplug" functionality to udev by default, use the module blacklist + option to prevent things from being loaded if you don't like this. 03 Apr 2006; Greg Kroah-Hartman <gregkh@gentoo.org> udev-087.ebuild: mark 087 stable on x86 due to 2.6.16 being stable soon diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index d054e0ae332b..442a27483283 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -1,6 +1,6 @@ -MD5 53c722e138fbbd44932fd832c1809602 ChangeLog 33362 -RMD160 3eaa0e46f7609a52e89cdb21d11516c9092e5b10 ChangeLog 33362 -SHA256 f3df8698e3a66a511382e025ce9bd6529b0e3699edc5dc431dd42214c41a0317 ChangeLog 33362 +MD5 89528cdce1897abc946c6ade6e931290 ChangeLog 33743 +RMD160 bc427e84b7c294dd16c0ac8e9f68d5a336dee061 ChangeLog 33743 +SHA256 851a975c24892818df6b522648f4259b9e51ee2699e552abf0f714a96e51f42f ChangeLog 33743 MD5 17c291f5c6e624792d02dd304fb8177e files/05-udev-early.rules-078 288 RMD160 e4d07ee5080618ba60c9cfb544d438f2eb11cab6 files/05-udev-early.rules-078 288 SHA256 63602afdbefafa4eb0b3301685e47dec5cc206b66765e733f9bcc6afe2a5d31b files/05-udev-early.rules-078 288 @@ -70,6 +70,9 @@ SHA256 9ae4eb44bfe1919a0ee26c31a7a81cacca7eee3b3cb7ef6a0483c24019467edd files/di MD5 c8ec90a2827ce8897e34a140ec03e100 files/digest-udev-087 229 RMD160 5427cd59378b4ad0018502ffbd537d53186a508e files/digest-udev-087 229 SHA256 70ee083c84b52a4ca757cd6cc5ccae2905c9184d4f533fbdfe21b647760097d1 files/digest-udev-087 229 +MD5 9dc9ff90ebbc4e57f50f59de28f693ac files/digest-udev-089 229 +RMD160 f9e7142287acee4a3ff353c50ef5965538c59562 files/digest-udev-089 229 +SHA256 e12b90573d11e8ff79ac99338d536d3e1be647a4c6de7c664d166a7e9dcd6e3c files/digest-udev-089 229 MD5 f00e3e0d3382e93cbd0c64fcef99f826 files/udev-021-udev_add_c-gcc295-compat.patch 493 RMD160 b18937882d817963f5434551d60e8e54fc0dbf46 files/udev-021-udev_add_c-gcc295-compat.patch 493 SHA256 c6f5914cf44969e597ec97c17e43e5dfdcfb15e1f2afdccf686c55889032f38c files/udev-021-udev_add_c-gcc295-compat.patch 493 @@ -94,6 +97,9 @@ SHA256 1f83a3594b63ed2a298c6d45a8c0201fe54a48d3cb4f988fc129bb8e304998e9 files/ud MD5 14a2eadeef22ce407dcc3cfa046e487e files/udev-start-079.sh 4391 RMD160 9e887518ac6a58f9693c4b3a10c06713c68900bd files/udev-start-079.sh 4391 SHA256 3883ca94546f7b3b0c57e45489a70ec6bf2075c9d27c44999221d59cd89d35e7 files/udev-start-079.sh 4391 +MD5 34bffd3d9d7d1a29ec0ec99f5cfdbfd2 files/udev-start-089.sh 4388 +RMD160 ee1fe69ba1d99eef87ebc5e7b398f5995bcdceec files/udev-start-089.sh 4388 +SHA256 060e1ee196c00ada13cc92b5f6eeb8cb83f70793d8d16a055081f1a8bc4065e6 files/udev-start-089.sh 4388 MD5 622f085dff7fb6138f3e2c992d569593 files/udev-start.sh 2460 RMD160 97afa40bab5aed0106e3a3b065ae480ce329e11c files/udev-start.sh 2460 SHA256 0527b03ac666dd9e4c94811b10d499f04b3f6f8ae2f03e6460727c1b570d985d files/udev-start.sh 2460 @@ -217,3 +223,6 @@ SHA256 fe8d286ed7dd71982ae13dbe108fe9d9550e6f403ba33b0e1156cee145dc29d9 udev-086 MD5 e7544f756dd4201652fd3107116ad7e2 udev-087.ebuild 7513 RMD160 fb68fe3a6e667ca4508c9946fae1292665b9a7b9 udev-087.ebuild 7513 SHA256 fb3317cef4f8eaba41334d7dedfe3eb986041e01e05c297c6b250fdec808a478 udev-087.ebuild 7513 +MD5 ae2a7be36b256068dc8bc58a89aaa4db udev-089.ebuild 8083 +RMD160 196b9807d3d5fef00266b4e468e60cd26933ea6e udev-089.ebuild 8083 +SHA256 0f33947c382fab3859935aade622d57db9a144ba3f0f5fc3b25b341445404dff udev-089.ebuild 8083 diff --git a/sys-fs/udev/files/digest-udev-089 b/sys-fs/udev/files/digest-udev-089 new file mode 100644 index 000000000000..a03471825ef4 --- /dev/null +++ b/sys-fs/udev/files/digest-udev-089 @@ -0,0 +1,3 @@ +MD5 ed2d885527da9c5f72abd9a43cb1af98 udev-089.tar.bz2 191032 +RMD160 3e845904ce1c24b407c616f0cb024d758a7afbe2 udev-089.tar.bz2 191032 +SHA256 cee32e4392d0c3ea84838e98ead8ca2a031c332126e0ff5321b981135b7e76fd udev-089.tar.bz2 191032 diff --git a/sys-fs/udev/files/udev-start-089.sh b/sys-fs/udev/files/udev-start-089.sh new file mode 100644 index 000000000000..e571b9bb69dc --- /dev/null +++ b/sys-fs/udev/files/udev-start-089.sh @@ -0,0 +1,176 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +udev_version() { + local version=0 + + if [[ -x /sbin/udev ]] ; then + version=$(/sbin/udev -V) + # We need it without a leading '0', else bash do the wrong thing + version=${version##0} + # Older udev's will print nothing + [[ -z ${version} ]] && version=0 + fi + + echo "${version}" +} + +# This works for 2.6.15 kernels or greater +trigger_events() { + list="" + # if you want real coldplug (with all modules being loaded for all + # devices in the system), uncomment out the next line. + #list="$list $(echo /sys/bus/*/devices/*/uevent)" + list="$list $(echo /sys/class/*/*/uevent)" + list="$list $(echo /sys/block/*/uevent /sys/block/*/*/uevent)" + for i in $list; do + case "$i" in + */device/uevent) + # skip followed device symlinks + continue + ;; + */class/mem/*|*/class/tty/*) + first="$first $i" + ;; + */block/md*) + last="$last $i" + ;; + */*) + default="$default $i" + ;; + esac + done + + # trigger the sorted events + for i in $first $default $last; do + echo "add" > "$i" + done +} + +populate_udev() { + # populate /dev with devices already found by the kernel + if [ "$(get_KV)" -gt "$(KV_to_int '2.6.14')" ] ; then + ebegin "Populating /dev with existing devices through uevents" + udevtrigger + eend 0 + else + ebegin "Populating /dev with existing devices with udevstart" + /sbin/udevstart + eend 0 + fi + + # loop until everything is finished + # there's gotta be a better way... + ebegin "Letting udev process events" + loop=0 + while test -d /dev/.udev/queue; do + sleep 0.1; + test "$loop" -gt 300 && break + loop=$(($loop + 1)) + done + #einfo "loop = $loop" + eend 0 + + return 0 +} + +seed_dev() { + # Seed /dev with some things that we know we need + ebegin "Seeding /dev with needed nodes" + + # copy over any persistant things + cp --preserve=all --recursive --update /lib/udev/devices/* /dev + + # Not provided by sysfs but needed + ln -snf /proc/self/fd /dev/fd + ln -snf fd/0 /dev/stdin + ln -snf fd/1 /dev/stdout + ln -snf fd/2 /dev/stderr + [[ -e /proc/kcore ]] && ln -snf /proc/kcore /dev/core + + # Create problematic directories + mkdir -p /dev/{pts,shm} + eend 0 +} + + +main() { + # Setup temporary storage for /dev + ebegin "Mounting /dev for udev" + if [[ ${RC_USE_FSTAB} == "yes" ]] ; then + mntcmd=$(get_mount_fstab /dev) + else + unset mntcmd + fi + if [[ -n ${mntcmd} ]] ; then + try mount -n ${mntcmd} + else + if egrep -qs tmpfs /proc/filesystems ; then + mntcmd="tmpfs" + else + mntcmd="ramfs" + fi + # many video drivers require exec access in /dev #92921 + try mount -n -t ${mntcmd} udev /dev -o exec,nosuid,mode=0755 + 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) + ebegin "Setting up proper hotplug agent" + if [[ -e /proc/sys/kernel/hotplug ]] ; then + if [ "$(get_KV)" -gt "$(KV_to_int '2.6.14')" ] ; then + einfo " Using netlink for hotplug events..." + echo "" > /proc/sys/kernel/hotplug + elif [[ $(udev_version) -ge "48" ]] ; then + einfo " Setting /sbin/udevsend as hotplug agent ..." + echo "/sbin/udevsend" > /proc/sys/kernel/hotplug + elif [[ -x /sbin/hotplug ]] ; then + einfo " Using /sbin/hotplug as hotplug agent ..." + else + einfo " Setting /sbin/udev as hotplug agent ..." + echo "/sbin/udev" > /proc/sys/kernel/hotplug + fi + fi + eend 0 + + ebegin "Starting udevd" + /sbin/udevd --daemon + eend $? + + populate_udev + + # Create nodes that udev can't + ebegin "Finializing 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/udev-089.ebuild b/sys-fs/udev/udev-089.ebuild new file mode 100644 index 000000000000..229fe231d09e --- /dev/null +++ b/sys-fs/udev/udev-089.ebuild @@ -0,0 +1,251 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-089.ebuild,v 1.1 2006/04/03 16:58:50 gregkh Exp $ + +inherit eutils flag-o-matic + +DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" +HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" +SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="selinux" + +# still rely on hotplug (need to fix that), but now we implement coldplug + +DEPEND="sys-apps/hotplug-base" +RDEPEND="!<=sys-apps/coldplug-20040920" +RDEPEND="${DEPEND} ${RDEPEND} + >=sys-apps/baselayout-1.11.14" +# We need the lib/rcscripts/addon support +PROVIDE="virtual/dev-manager" + +src_unpack() { + unpack ${A} + + cd "${S}" + + # patches go here... + #epatch ${FILESDIR}/${P}-udev_volume_id.patch + + # No need to clutter the logs ... + sed -ie '/^DEBUG/ c\DEBUG = false' Makefile + # Do not use optimization flags from the package + sed -ie 's|$(OPTIMIZATION)||g' Makefile + + # Make sure there is no sudden changes to udev.rules.gentoo + # (more for my own needs than anything else ...) + MD5=`md5sum < "${S}/etc/udev/gentoo/udev.rules"` + MD5=${MD5/ -/} + if [ "${MD5}" != "590d3e6346938e3b608237973f4f1805" ] + 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/scsi_id extras/volume_id extras/ata_id extras/run_directory extras/usb_id extras/floppy extras/cdrom_id extras/firmware" + + 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=${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 + dobin udevtest + dobin udevmonitor + into / + dosbin udev + dosbin udevd + dosbin udevsend + dosbin udevtrigger +# dosbin udevstart + dosbin udevcontrol + dosbin extras/run_directory/udev_run_devd + dosbin extras/run_directory/udev_run_hotplugd + dosbin extras/ata_id/ata_id + dosbin extras/volume_id/vol_id + dosbin extras/scsi_id/scsi_id + dosbin extras/usb_id/usb_id + dosbin extras/cdrom_id/cdrom_id + dosbin extras/path_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 + doexe extras/firmware/firmware_helper + + # 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-084 50-udev.rules + newins ${FILESDIR}/05-udev-early.rules-079 05-udev-early.rules + + # scsi_id configuration + insinto /etc + doins extras/scsi_id/scsi_id.config + + # set up symlinks in /etc/hotplug.d/default + dodir /etc/hotplug.d/default + dosym ../../../sbin/udevsend /etc/hotplug.d/default/10-udev.hotplug + + # set up the /etc/dev.d directory tree + dodir /etc/dev.d/default + dodir /etc/dev.d/net + exeinto /etc/dev.d/net + doexe extras/run_directory/dev.d/net/hotplug.dev + + # all of the man pages + doman *.7 + doman *.8 + doman extras/ata_id/ata_id.8 + doman extras/edd_id/edd_id.8 + doman extras/scsi_id/scsi_id.8 + doman extras/volume_id/vol_id.8 + doman extras/dasd_id/dasd_id.8 + doman extras/cdrom_id/cdrom_id.8 + + # our udev hooks into the rc system + insinto /lib/rcscripts/addons + newins "${FILESDIR}"/udev-start-089.sh udev-start.sh + doins "${FILESDIR}"/udev-stop.sh + + 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 + + # Create some nodes that we know we need. + # set the time/date so we can see in /dev which ones we copied over + # in the udev-start.sh script + mkdir ${D}/lib/udev/devices + + mknod ${D}/lib/udev/devices/null c 1 3 + chmod 666 ${D}/lib/udev/devices/null + touch -t 200010220101 ${D}/lib/udev/devices/null + + mknod ${D}/lib/udev/devices/zero c 1 5 + chmod 666 ${D}/lib/udev/devices/zero + touch -t 200010220101 ${D}/lib/udev/devices/zero + + mknod ${D}/lib/udev/devices/console c 5 1 + chmod 600 ${D}/lib/udev/devices/console + chown root:tty ${D}/lib/udev/devices/console + touch -t 200010220101 ${D}/lib/udev/devices/console +} + +pkg_preinst() { + 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 +} + +pkg_postinst() { + if [ "${ROOT}" = "/" -a -n "`pidof udevd`" ] + then + killall -15 udevd &>/dev/null + sleep 1 + killall -9 udevd &>/dev/null + fi + /sbin/udevd --daemon + + # people want reminders, I'll give them reminders. Odds are they will + # just ignore them anyway... + if has_version '<sys-fs/udev-046' ; then + ewarn "Note: If you rely on the output of udevinfo for anything, please" + ewarn " either run 'udevstart' now, or reboot, in order to get a" + ewarn " up-to-date udev database." + ewarn + fi + if has_version '<sys-fs/udev-050' ; then + ewarn "Note: If you had written some custom permissions rules, please" + ewarn " realize that the permission rules are now part of the main" + ewarn " udev rules files and are not stand-alone anymore. This means" + ewarn " you need to rewrite them." + ewarn + fi + if has_version '<sys-fs/udev-059' ; then + ewarn "Note: If you are upgrading from a version of udev prior to 059" + ewarn " and you have written custom rules, and rely on the etc/dev.d/" + ewarn " functionality, or the etc/hotplug.d functionality, or just" + ewarn " want to write some very cool and power udev rules, please " + ewarn " read the RELEASE-NOTES file for details on what has changed" + ewarn " with this feature, and how to change your rules to work properly." + ewarn + elif has_version '<sys-fs/udev-057' ; then + ewarn "Note: If you have written custom rules, and rely on the etc/dev.d/" + ewarn " functionality, please read the RELEASE-NOTES file for details" + ewarn " on what has changed with this feature, and how to change your" + ewarn " rules to work properly." + ewarn + fi + if has_version '<sys-fs/udev-063' ; then + ewarn "Note: If you use the devfs-style names for your block devices" + ewarn " or use devfs-style names in /etc/inittab or /etc/securetty or" + ewarn " your GRUB or LILO kernel boot command line, you need to" + ewarn " change them back to LSB compliant names, as the devfs names are" + ewarn " now gone. If you wish to use some persistent names for your" + ewarn " block devices, look at the symlinks in /dev/disk/ for the names" + ewarn " you can use." + ewarn + 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" +} |