diff options
author | Greg Kroah-Hartman <gregkh@gentoo.org> | 2004-11-18 22:03:35 +0000 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@gentoo.org> | 2004-11-18 22:03:35 +0000 |
commit | 63b58d2c3ad09218005dee120c02d8b847186a3a (patch) | |
tree | 8c0516425058e142621ece74b445b5a62b8ee689 /sys-fs | |
parent | amd64 compatibility, closing bug #69830 (Manifest recommit) (diff) | |
download | gentoo-2-63b58d2c3ad09218005dee120c02d8b847186a3a.tar.gz gentoo-2-63b58d2c3ad09218005dee120c02d8b847186a3a.tar.bz2 gentoo-2-63b58d2c3ad09218005dee120c02d8b847186a3a.zip |
046 release
Diffstat (limited to 'sys-fs')
-rw-r--r-- | sys-fs/udev/ChangeLog | 13 | ||||
-rw-r--r-- | sys-fs/udev/Manifest | 3 | ||||
-rw-r--r-- | sys-fs/udev/files/digest-udev-046 | 1 | ||||
-rw-r--r-- | sys-fs/udev/files/udev.conf.post_046 | 31 | ||||
-rw-r--r-- | sys-fs/udev/udev-046.ebuild | 153 |
5 files changed, 200 insertions, 1 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 1183dd6509d5..b7673c34c106 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for sys-fs/udev # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.84 2004/11/18 19:26:27 gregkh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.85 2004/11/18 22:03:35 gregkh Exp $ + +*udev-046 (18 Nov 2004) + + 18 Nov 2004; Greg Kroah-Hartman <gregkh@gentoo.org> + +files/udev.conf.post_046, +udev-046.ebuild: + 046 release + + Note: If you rely on the output of udevinfo, please run udevstart + after upgrading, or just reboot. This isn't really a big deal, as + I don't know of many tools that do rely on this (HAL might, don't + remember) but it's a good idea. 18 Nov 2004; Greg Kroah-Hartman <gregkh@gentoo.org> udev-045.ebuild: mark 045 stable on x86 diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index f44c176cddb1..eea559220863 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -21,6 +21,7 @@ MD5 1be28133b4b566a7815a4210c4ad9ab7 udev-042.ebuild 3586 MD5 eeba77e94b809595362130307b8fda5d udev-043.ebuild 3597 MD5 4895712d0631b6e784384010e40a7ecb udev-044.ebuild 3552 MD5 cc87cb8f74e9b07f59a4231f4e4836b1 udev-045.ebuild 3626 +MD5 249f171aff6c41730efb213858936662 udev-046.ebuild 3627 MD5 3f3fd84a95d1fabbf66be0cba8057a29 files/digest-udev-032 61 MD5 882b525738c554bce2449356cd1fb9c5 files/digest-udev-024-r1 61 MD5 63c1b792a1470ccaa74195f5debacd2f files/digest-udev-025-r1 61 @@ -50,3 +51,5 @@ MD5 cd839ae6d648dfcaa93ae36c53d7e365 files/digest-udev-042 61 MD5 34ef6b0a15a8c5a92bc6c7abdb1e6021 files/digest-udev-043 61 MD5 1bb7bad6e00af55cffe1f0b500c8aecd files/digest-udev-044 61 MD5 c104f1a0b8423e8f410aaa2fb7b6c745 files/digest-udev-045 61 +MD5 eeb6eada92bd749f7c59ef6ecfed9944 files/udev.conf.post_046 1186 +MD5 a16a9eb4125f3a1ec8002d4876c3c7e2 files/digest-udev-046 61 diff --git a/sys-fs/udev/files/digest-udev-046 b/sys-fs/udev/files/digest-udev-046 new file mode 100644 index 000000000000..d77a2b52f2ee --- /dev/null +++ b/sys-fs/udev/files/digest-udev-046 @@ -0,0 +1 @@ +MD5 51d6b9722c1097ed4d28d2e46af4d9a3 udev-046.tar.bz2 359290 diff --git a/sys-fs/udev/files/udev.conf.post_046 b/sys-fs/udev/files/udev.conf.post_046 new file mode 100644 index 000000000000..37d3239ade3b --- /dev/null +++ b/sys-fs/udev/files/udev.conf.post_046 @@ -0,0 +1,31 @@ +# /etc/udev/udev.conf: main config file for udev +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/files/udev.conf.post_046,v 1.1 2004/11/18 22:03:35 gregkh Exp $ +# +# This file can be used to override some of udev's default values +# for where it looks for files, and where it places device nodes. + + +# udev_root - where in the filesystem to place the device nodes +udev_root="/dev/" + +# udev_db - The name and location of the udev database. +# NOTE: this should be somewhere that is writable before +# / is mounted rw, like /dev ... +udev_db="/dev/.udevdb" + +# udev_rules - The name and location of the udev rules file +udev_rules="/etc/udev/rules.d/" + +# udev_permissions - The name and location of the udev permission file +udev_permissions="/etc/udev/permissions.d/" + +# default_mode - set the default mode for all nodes that have no +# explicit match in the permissions file +# NOTE: do not set to anything else if you are not +# sure you have everything needed for normal +# user to function in the permissions file! +default_mode="0660" + +# udev_log - set to "yes" if you want logging +udev_log="no" + diff --git a/sys-fs/udev/udev-046.ebuild b/sys-fs/udev/udev-046.ebuild new file mode 100644 index 000000000000..7c043e7d25ff --- /dev/null +++ b/sys-fs/udev/udev-046.ebuild @@ -0,0 +1,153 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-046.ebuild,v 1.1 2004/11/18 22:03:35 gregkh Exp $ + +inherit eutils + +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="~arm ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="static selinux" + +DEPEND="virtual/libc + sys-apps/hotplug-base" +RDEPEND="${DEPEND} + >=sys-apps/baselayout-1.8.6.12-r3" +# We need some changes for devfs type layout +PROVIDE="virtual/dev-manager" + +if use static +then + USE_KLIBC=true +else + USE_KLIBC=false +fi +export USE_KLIBC + + +pkg_setup() { + [ "${USE_KLIBC}" = "true" ] && check_KV + + return 0 +} + +src_unpack() { + unpack ${A} + + cd ${S} + + # patches go here... + # epatch ${FILESDIR}/${P}-udev_add_c-gcc295-compat.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 ...) + if [ "`md5sum < "${S}/etc/udev/udev.rules.gentoo"`" != \ + "66caa522b82290d8f4a7f89f1160b8e4 -" ] + then + echo + eerror "udev.rules.gentoo has been updated, please validate!" + die "udev.rules.gentoo has been updated, please validate!" + fi +} + +src_compile() { + local myconf= + local extras="extras/scsi_id extras/volume_id" + + if (use selinux) + then + myconf="${myconf} USE_SELINUX=true" + fi + + # Do not work with emake + make EXTRAS="${extras}" \ + udevdir="/dev/" \ + ${myconf} || die +} + +src_install() { + dobin udevinfo + dobin udevtest + into / + dosbin udev + dosbin udevd + dosbin udevsend + dosbin wait_for_sysfs + dosbin extras/scsi_id/scsi_id + dosbin extras/volume_id/udev_volume_id + dosym /sbin/udev /sbin/udevstart + + exeinto /etc/udev/scripts + doexe extras/ide-devfs.sh + doexe extras/scsi-devfs.sh + doexe extras/cdsymlinks.sh + + insinto /etc/udev + newins ${FILESDIR}/udev.conf.post_046 udev.conf + doins extras/cdsymlinks.conf + + # For devfs style layout + insinto /etc/udev/rules.d/ + newins etc/udev/udev.rules.gentoo 50-udev.rules + + # Our own custom udev.permissions + insinto /etc/udev/permissions.d/ + newins etc/udev/udev.permissions.gentoo 50-udev.permissions + 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 + dosym ../../../sbin/wait_for_sysfs /etc/hotplug.d/default/05-wait_for_sysfs.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 etc/dev.d/net/hotplug.dev + + doman *.8 + doman extras/scsi_id/scsi_id.8 + + dodoc COPYING ChangeLog FAQ HOWTO-udev_for_dev README TODO + dodoc docs/{overview,udev-OLS2003.pdf,udev_vs_devfs,RFC-dev.d} + newdoc extras/volume_id/README README_volume_id +} + +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 [ -f "${ROOT}/etc/hotplug.d/default/udev.hotplug" ] + then + rm -f ${ROOT}/etc/hotplug.d/default/udev.hotplug + fi +} + +pkg_postinst() { + if [ "${ROOT}" = "/" -a -n "`pidof udevd`" ] + then + killall -15 udevd &>/dev/null + sleep 1 + killall -9 udevd &>/dev/null + fi + + ewarn "Note: If you are upgrading from a version of udev prior to 046" + ewarn " and 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." +} |