diff options
author | Greg Kroah-Hartman <gregkh@gentoo.org> | 2006-03-02 02:35:05 +0000 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@gentoo.org> | 2006-03-02 02:35:05 +0000 |
commit | d512ec8bd06fe03ded7fa29f9169f065c3659c60 (patch) | |
tree | 6443b00b7a512360e42de33831db82a919c8f1aa /sys-fs | |
parent | ia64 love (diff) | |
download | gentoo-2-d512ec8bd06fe03ded7fa29f9169f065c3659c60.tar.gz gentoo-2-d512ec8bd06fe03ded7fa29f9169f065c3659c60.tar.bz2 gentoo-2-d512ec8bd06fe03ded7fa29f9169f065c3659c60.zip |
086 release
(Portage version: 2.1_pre5-r1)
Diffstat (limited to 'sys-fs')
-rw-r--r-- | sys-fs/udev/ChangeLog | 10 | ||||
-rw-r--r-- | sys-fs/udev/Manifest | 12 | ||||
-rw-r--r-- | sys-fs/udev/files/digest-udev-086 | 3 | ||||
-rw-r--r-- | sys-fs/udev/files/udev-start-079.sh | 3 | ||||
-rw-r--r-- | sys-fs/udev/udev-086.ebuild | 233 |
5 files changed, 254 insertions, 7 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 9ca192d7a9f4..a103cf488852 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,14 @@ # 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.181 2006/02/21 20:14:21 gregkh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.182 2006/03/02 02:35:04 gregkh Exp $ + +*udev-086 (02 Mar 2006) + + 02 Mar 2006; Greg Kroah-Hartman <gregkh@gentoo.org> + files/udev-start-079.sh, +udev-086.ebuild: + 086 release + fixed problem that /dev/.udev might be a file instead of a directory + Startup queue waiting problem fixed (people with fancy disk setups hit this.) *udev-085 (21 Feb 2006) diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 511266eaf1ba..282ab4161a88 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -64,6 +64,9 @@ SHA256 c16a5467da4eb2b8d6aff0491f3327b920ebd71050e16c2709dd7ffce72f6bce files/di MD5 b27ba4fcba5236a5c68c860743c4694d files/digest-udev-085 229 RMD160 22c98f721acd3ad31c9ae5a77365de0873521f0c files/digest-udev-085 229 SHA256 1a32443e32b098b00a8c817b84ea3c2ab79340351f697658742b568f23cb33dc files/digest-udev-085 229 +MD5 4d15c96b2d749dcec0c58ba559499b27 files/digest-udev-086 229 +RMD160 652b555411747832744578c3844fc1dddcc0c3bb files/digest-udev-086 229 +SHA256 9ae4eb44bfe1919a0ee26c31a7a81cacca7eee3b3cb7ef6a0483c24019467edd files/digest-udev-086 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 @@ -85,9 +88,9 @@ SHA256 2ffc94d324ce63e6a98ed6466fd8f01e0413e9a95c0ad46e4aa72018014b07b0 files/ud MD5 1e0a70ed330f1c72a042ad41ce79fcf1 files/udev-start-077.sh 2570 RMD160 c13c77bd79fed38e4dfd12fc0a61a47b876f2e49 files/udev-start-077.sh 2570 SHA256 1f83a3594b63ed2a298c6d45a8c0201fe54a48d3cb4f988fc129bb8e304998e9 files/udev-start-077.sh 2570 -MD5 79bd3a2b65c644e12f51ce6f9c841a6f files/udev-start-079.sh 4440 -RMD160 bda6188039687b0e4b3b803bca9008f76c4fedd3 files/udev-start-079.sh 4440 -SHA256 3756e15cde3f5d88adee3753687634c9d691b66242c6740074712c4024118d24 files/udev-start-079.sh 4440 +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 622f085dff7fb6138f3e2c992d569593 files/udev-start.sh 2460 RMD160 97afa40bab5aed0106e3a3b065ae480ce329e11c files/udev-start.sh 2460 SHA256 0527b03ac666dd9e4c94811b10d499f04b3f6f8ae2f03e6460727c1b570d985d files/udev-start.sh 2460 @@ -205,3 +208,6 @@ SHA256 2e148644a2a87a23c1fe942d16c020b1dd2cc71f08ff645d50f594a4d9f0bdd8 udev-084 MD5 372ac4356289cb89f2771c71056bf1c0 udev-085.ebuild 7514 RMD160 203ccb6717abcb3b0f28559dd9c561e337ce1c0c udev-085.ebuild 7514 SHA256 d2424fa2a3706c25cb958a7bc3be980940ea32dccf5d2816d0a134a50329520c udev-085.ebuild 7514 +MD5 372ac4356289cb89f2771c71056bf1c0 udev-086.ebuild 7514 +RMD160 203ccb6717abcb3b0f28559dd9c561e337ce1c0c udev-086.ebuild 7514 +SHA256 d2424fa2a3706c25cb958a7bc3be980940ea32dccf5d2816d0a134a50329520c udev-086.ebuild 7514 diff --git a/sys-fs/udev/files/digest-udev-086 b/sys-fs/udev/files/digest-udev-086 new file mode 100644 index 000000000000..e533670a14bd --- /dev/null +++ b/sys-fs/udev/files/digest-udev-086 @@ -0,0 +1,3 @@ +MD5 a9da78603d4394f960cb865df3f81934 udev-086.tar.bz2 191824 +RMD160 1cc8df74fc476b1123de52e24c2baa42a8b14305 udev-086.tar.bz2 191824 +SHA256 98cc9890100cfb5a656ccf5f21a5a8667fbc02f0e85d8a519089785695a1e59d udev-086.tar.bz2 191824 diff --git a/sys-fs/udev/files/udev-start-079.sh b/sys-fs/udev/files/udev-start-079.sh index 9e8fd7519254..e39ef8a42ceb 100644 --- a/sys-fs/udev/files/udev-start-079.sh +++ b/sys-fs/udev/files/udev-start-079.sh @@ -168,9 +168,6 @@ main() { [[ -z ${CDBOOT} ]] && [[ -x /sbin/evms_activate ]] && \ /sbin/evms_activate -q &>/dev/null eend 0 - - # Same thing as /dev/.devfsd - touch /dev/.udev } main diff --git a/sys-fs/udev/udev-086.ebuild b/sys-fs/udev/udev-086.ebuild new file mode 100644 index 000000000000..bc00f621cd21 --- /dev/null +++ b/sys-fs/udev/udev-086.ebuild @@ -0,0 +1,233 @@ +# 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-086.ebuild,v 1.1 2006/03/02 02:35:05 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" + +DEPEND="sys-apps/hotplug-base" +RDEPEND="${DEPEND} + >=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}- + + # 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 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 + dosbin extras/floppy/create_floppy_devices + dosbin extras/firmware/firmware_helper + + #exeinto /etc/udev/scripts + exeinto /lib/udev + #doexe extras/ide-devfs.sh + #doexe extras/scsi-devfs.sh + doexe extras/raid-devfs.sh + + # 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-079.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" +} |