From 12a89fe91075d2f8ac7b126d9c0a58e181f9524f Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Sun, 6 Nov 2011 05:50:39 +0000 Subject: [PATCH] version bump Package-Manager: portage-2.2.0_alpha72/cvs/Linux i686 --- sys-fs/udev/ChangeLog | 7 +- sys-fs/udev/Manifest | 11 +- sys-fs/udev/udev-174.ebuild | 435 ++++++++++++++++++++++++++++++++++++ 3 files changed, 448 insertions(+), 5 deletions(-) create mode 100644 sys-fs/udev/udev-174.ebuild diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index b0dd2345505c..31b668740056 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.606 2011/11/06 02:36:06 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.607 2011/11/06 05:50:39 williamh Exp $ + +*udev-174 (06 Nov 2011) + + 06 Nov 2011; William Hubbs +udev-174.ebuild: + version bump 06 Nov 2011; William Hubbs udev-9999.ebuild: fix dependencies for doc use flag in live ebuild. diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index eb7c6bd47e38..384ead86a447 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -113,7 +113,9 @@ DIST udev-164.tar.bz2 557126 RMD160 f169b21c955f96554b8c7af1fd174037e60dfe12 SHA DIST udev-171-gentoo-patchset-v1.tar.bz2 796 RMD160 ec60115b9a21866adc484430aa7d8400849e8710 SHA1 66936903026d49ab3b706f23d6713c2d0bfea7ba SHA256 9524e64068d67bb55ddad16dd36a27c3ef87323421254a5bfe2431693b1bc983 DIST udev-171-testsys.tar.bz2 155001 RMD160 c73d2e52bcca8cd84f9467f8e26ef6efaf5744c2 SHA1 c1ced44f6a1a21e9b0db4c538f605960e750149e SHA256 7383701b64701f58f16e0ddb19fe33b4eb53fac6fc6068bdcbff7e6325b79dcc DIST udev-171.tar.bz2 597937 RMD160 5b8f9f1e7ba353c58fef851f6f4e1f4c468540b4 SHA1 8b851f0e8681020b89a76a1e7a0273814fa2b24b SHA256 fed1e46074c1a16c828193ebd73b3940b7905cc7dcaeb0b3c720d4615210695e +DIST udev-174.tar.bz2 616536 RMD160 64f291dd5f798df67cbd41553fa1169c43156b82 SHA1 8817b03e72c2d49aa7c88e190a9ef6b8fe11a5be SHA256 832662179a5ff9782769b0feadd51aaaea6e603f91f6ef0ec8bb6aab0fb3ad1a DIST udev-gentoo-scripts-164-v2.tar.bz2 9504 RMD160 826fe14de7cd4d60688dbc2a35daa38377b2e706 SHA1 d27d615d48133dc4411cdc47e3edfed04a78b385 SHA256 5fff00a00da6f6bfc47e375d2a8da6679a4e1de152d9f30f16b4bc8c6d79a5ef +DIST udev-gentoo-scripts-5.tar.bz2 16254 RMD160 e2192a8c8e5aa8e073c3db97174d7232c9497e87 SHA1 fec2b8242033e601f13d26557470d136d2aca33a SHA256 0b40e0a066c734d74d032d19475a0450790bdcecde892a9978c5987c4d0aec77 DIST udev-gentoo-scripts-v4.tar.bz2 9927 RMD160 f409d6615f55068292f2f958e0515a66dfb2532a SHA1 ca84c3a7cd51b472b63ecdd12b9f25b4d4e38dba SHA256 2724814aa07c357b7191969877b418f84d9d6c6e87315357fbddbb97b1d3b4c4 EBUILD udev-114.ebuild 9021 RMD160 64b07c73985d287107db391785c626aa10ff5414 SHA1 a5754bfee36dd35e2abade6abedf0f31b7fd08d4 SHA256 0ae31d95d25a9553c2313c9e23eaf5542b309955b949fc8379ab50f20a3790d1 EBUILD udev-115-r1.ebuild 10098 RMD160 dbe906361bd6fb6eea0e6b9efec1727ba5c0fa5c SHA1 3f021a8b10e7e82ca82a0feb24f2ee3e276c0c2f SHA256 5eb4847f2ddff4db3065eacdc2c4c2fbae73024f52165caad1bb25f719f4f515 @@ -128,13 +130,14 @@ EBUILD udev-151-r4.ebuild 16852 RMD160 e0d2c7041c102e0e5979a1ed5c99d9f4d5820842 EBUILD udev-164-r2.ebuild 15294 RMD160 2d7299b463cb765a58ec0840c4c86607fbf37e64 SHA1 cb4060adb3235d261f027be37e56272ac8f4755b SHA256 3f1b289c9c9c2d6ee6cd63b8db530240dcc9532dbc3ff273c052679b3062724b EBUILD udev-171-r1.ebuild 15984 RMD160 2f687585ae93014dbeaaa61e440e0f708ecd2b04 SHA1 92b4eee4956b24677d9e8251b29c40c300cf059c SHA256 9cf4a54cc9e34bf48c5299142a625d056869fbabcd683a233053e6fd04305218 EBUILD udev-171-r2.ebuild 16413 RMD160 4b7e26ba462c959329d60488aa7f76efb0986297 SHA1 866171a1074b32653aafbd77bb2516c0b444a202 SHA256 3ee60a02912e42a16663be50adec46ec5ee8f26f10eb88609378e7272a05c376 +EBUILD udev-174.ebuild 11830 RMD160 823470a66356b6cdcd8453595355026a976bd685 SHA1 fa23256ba2c69a8e69991bdd3e9b53d2571d6d78 SHA256 f60cbea8b8e0844a2b040e8db2b4d708fc727102420c0336ed76ecececa2432b EBUILD udev-9999.ebuild 11840 RMD160 814e8a4d4b96c0ccf4d20def19eb14700828451d SHA1 deeb14affec1be4ba6ede9eb7107dd5aeb16fa40 SHA256 a46e490ed4a42d2e1c02447a2d99b12e98baf2f234d35e7adbe2b97c0109718c -MISC ChangeLog 124538 RMD160 54096dba55e23c6c12fd75614f4050baa98746f2 SHA1 9817ca6751bfd80b32177cfd54f9fbebb5e007e3 SHA256 436e94b8904f38ebc520f9994ff9b39ab4c1a0becfbeacf2b6a016f9d2076e72 +MISC ChangeLog 124648 RMD160 bb667862b7e6f71b90c4804aefa6c2f18bba74a1 SHA1 33792fa5101d41b29a0bb5ed4a1b22b2d53d1d64 SHA256 b0d9f05ee09990b304d0da0924eb88363df3fc6a4d9f13fcea150aaf3c5e5c2c MISC metadata.xml 1235 RMD160 36ff4665ed99aa392ff8003e9351bd620cc79424 SHA1 3fd0e915598c248b5c7d609b6a98a4cde8431b05 SHA256 dbbbd093a910a5cb541d7be160f749dc87fc699d72165c184965fa056d60f24b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk618qkACgkQblQW9DDEZTj2GQCgnOEx6Jb/PM+uBEDNRKHUT56M -79gAnjQMwtLvPiSdqjgZzB0MLMXZ65KL -=vIq+ +iEYEARECAAYFAk62IHQACgkQblQW9DDEZThaQACgmLjHiRMFSdehhmxdeKJ5HBft +XMkAnR26Ir+LBI8YTCxbqjuJ3HUU4MNE +=WYUX -----END PGP SIGNATURE----- diff --git a/sys-fs/udev/udev-174.ebuild b/sys-fs/udev/udev-174.ebuild new file mode 100644 index 000000000000..4a5a01f35286 --- /dev/null +++ b/sys-fs/udev/udev-174.ebuild @@ -0,0 +1,435 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-174.ebuild,v 1.1 2011/11/06 05:50:39 williamh Exp $ + +EAPI=4 + +KV_min=2.6.34 +#PATCHSET=${P}-gentoo-patchset-v1 +scriptversion=5 +scriptname=${PN}-gentoo-scripts +udev_rules_md5=a585b848976900cd15cf729e8ef11c61 + +EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git" + +[[ ${PV} == "9999" ]] && vcs="git-2 autotools" +inherit ${vcs} eutils flag-o-matic multilib toolchain-funcs linux-info systemd + +if [[ ${PV} != "9999" ]] +then + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux" + SRC_URI="http://people.freedesktop.org/~kay/${P}.tar.bz2" + if [[ -n "${PATCHSET}" ]] + then + SRC_URI="${SRC_URI} mirror://gentoo/${PATCHSET}.tar.bz2" + fi + scriptname="${scriptname}-${scriptversion}" + SRC_URI="${SRC_URI} mirror://gentoo/${scriptname}.tar.bz2" +fi + +DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" +HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" + +LICENSE="GPL-2" +SLOT="0" +IUSE="build selinux debug +rule_generator hwdb acl gudev introspection + keymap floppy edd doc" +[[ ${PV} == "9999" ]] && IUSE="${IUSE} test" + +RESTRICT="test? ( userpriv )" + +COMMON_DEPEND="selinux? ( sys-libs/libselinux ) + acl? ( sys-apps/acl dev-libs/glib:2 ) + gudev? ( dev-libs/glib:2 ) + introspection? ( dev-libs/gobject-introspection ) + >=sys-apps/util-linux-2.16 + >=sys-libs/glibc-2.10" + +DEPEND="${COMMON_DEPEND} + keymap? ( dev-util/gperf ) + dev-util/pkgconfig + virtual/os-headers + !> "${ED}"/etc/udev/udev.conf + + # Now install rules + insinto /lib/udev/rules.d/ + + # support older kernels + doins rules/misc/30-kernel-compat.rules + + # add arch specific rules + if [[ -f rules/arch/40-${ARCH}.rules ]] + then + doins "rules/arch/40-${ARCH}.rules" + fi + + cd "${WORKDIR}/${scriptname}" + doconfd conf.d/* + exeinto /lib/udev + doexe helpers/* + doinitd init.d/* + insinto /etc/modprobe.d + doins modprobe.d/* + insinto /lib/udev/rules.d + doins rules.d/* +} + +# 19 Nov 2008 +fix_old_persistent_net_rules() +{ + local rules=${EROOT}/etc/udev/rules.d/70-persistent-net.rules + [[ -f ${rules} ]] || return + + elog + elog "Updating persistent-net rules file" + + # Change ATTRS to ATTR matches, Bug #246927 + sed -i -e 's/ATTRS{/ATTR{/g' "${rules}" + + # Add KERNEL matches if missing, Bug #246849 + sed -ri \ + -e '/KERNEL/ ! { s/NAME="(eth|wlan|ath)([0-9]+)"/KERNEL=="\1*", NAME="\1\2"/}' \ + "${rules}" +} + +# See Bug #129204 for a discussion about restarting udevd +restart_udevd() +{ + if [[ ${NO_RESTART} = "1" ]] + then + ewarn "Not restarting udevd, as your kernel is too old!" + return + fi + + # need to merge to our system + [[ ${EROOT} = / ]] || return + + # check if root of init-process is identical to ours (not in chroot) + [[ -r /proc/1/root && /proc/1/root/ -ef /proc/self/root/ ]] || return + + # abort if there is no udevd running + [[ -n $(pidof udevd) ]] || return + + # abort if no /dev/.udev exists + [[ -e /dev/.udev ]] || return + + elog + elog "restarting udevd now." + + killall -15 udevd &>/dev/null + sleep 1 + killall -9 udevd &>/dev/null + + /sbin/udevd --daemon + sleep 3 + if [[ ! -n $(pidof udevd) ]] + then + eerror "FATAL: udev died, please check your kernel is" + eerror "new enough and configured correctly for ${P}." + eerror + eerror "Please have a look at this before rebooting." + eerror "If in doubt, please downgrade udev back to your old version" + fi +} + +postinst_init_scripts() +{ + local enable_postmount=false + + # FIXME: inconsistent handling of init-scripts here + # * udev is added to sysinit in openrc-ebuild + # * we add udev-postmount to default in here + # + + # If we are building stages, add udev to the sysinit runlevel automatically. + if use build + then + if [[ -x "${EROOT}"/etc/init.d/udev \ + && -d "${EROOT}"/etc/runlevels/sysinit ]] + then + ln -s "${EPREFIX}"/etc/init.d/udev "${EROOT}"/etc/runlevels/sysinit/udev + fi + enable_postmount=true + fi + + # migration to >=openrc-0.4 + if [[ -e "${EROOT}"/etc/runlevels/sysinit && ! -e "${EROOT}"/etc/runlevels/sysinit/udev ]] + then + ewarn + ewarn "You need to add the udev init script to the runlevel sysinit," + ewarn "else your system will not be able to boot" + ewarn "after updating to >=openrc-0.4.0" + ewarn "Run this to enable udev for >=openrc-0.4.0:" + ewarn "\trc-update add udev sysinit" + ewarn + fi + + # add udev-postmount to default runlevel instead of that ugly injecting + # like a hotplug event, 2009/10/15 + + # already enabled? + [[ -e "${EROOT}"/etc/runlevels/default/udev-postmount ]] && return + + [[ -e "${EROOT}"/etc/runlevels/sysinit/udev ]] && enable_postmount=true + [[ "${EROOT}" = "/" && -d /dev/.udev/ ]] && enable_postmount=true + + if $enable_postmount + then + local initd=udev-postmount + + if [[ -e ${EROOT}/etc/init.d/${initd} ]] && \ + [[ ! -e ${EROOT}/etc/runlevels/default/${initd} ]] + then + ln -snf "${EPREFIX}"/etc/init.d/${initd} "${EROOT}"/etc/runlevels/default/${initd} + elog "Auto-adding '${initd}' service to your default runlevel" + fi + else + elog "You should add the udev-postmount service to default runlevel." + elog "Run this to add it:" + elog "\trc-update add udev-postmount default" + fi +} + +pkg_postinst() +{ + fix_old_persistent_net_rules + + # "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766 + # So try to remove it here (will only work if empty). + rmdir "${EROOT}"/dev/loop 2>/dev/null + if [[ -d "${EROOT}"/dev/loop ]] + then + ewarn "Please make sure your remove /dev/loop," + ewarn "else losetup may be confused when looking for unused devices." + fi + + restart_udevd + + postinst_init_scripts + + # people want reminders, I'll give them reminders. Odds are they will + # just ignore them anyway... + + # Removing some device-nodes we thought we need some time ago, 25 Jan 2007 + if [[ -d ${EROOT}/lib/udev/devices ]] + then + rm -f "${EROOT}"/lib/udev/devices/{null,zero,console,urandom} + fi + + # Try to remove /etc/dev.d as that is obsolete, 23 Apr 2007 + if [[ -d ${EROOT}/etc/dev.d ]] + then + rmdir --ignore-fail-on-non-empty "${EROOT}"/etc/dev.d/default "${EROOT}"/etc/dev.d 2>/dev/null + if [[ -d ${EROOT}/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 + + # 64-device-mapper.rules now gets installed by sys-fs/device-mapper + # remove it if user don't has sys-fs/device-mapper installed, 27 Jun 2007 + if [[ -f ${EROOT}/etc/udev/rules.d/64-device-mapper.rules ]] && + ! has_version sys-fs/device-mapper + then + rm -f "${EROOT}"/etc/udev/rules.d/64-device-mapper.rules + einfo "Removed unneeded file 64-device-mapper.rules" + fi + + # requested in Bug #225033: + elog + elog "persistent-net assigns fixed names to network devices." + elog "If you have problems with the persistent-net rules," + elog "just delete the rules file" + elog "\trm ${EROOT}etc/udev/rules.d/70-persistent-net.rules" + elog "then reboot." + elog + elog "This may however number your devices in a different way than they are now." + + ewarn + ewarn "If you build an initramfs including udev, then please" + ewarn "make sure that the /sbin/udevadm binary gets included," + ewarn "and your scripts changed to use it,as it replaces the" + ewarn "old helper apps udevinfo, udevtrigger, ..." + + ewarn + ewarn "mount options for directory /dev are no longer" + ewarn "set in /etc/udev/udev.conf, but in /etc/fstab" + ewarn "as for other directories." + + ewarn + ewarn "If you use /dev/md/*, /dev/loop/* or /dev/rd/*," + ewarn "then please migrate over to using the device names" + ewarn "/dev/md*, /dev/loop* and /dev/ram*." + ewarn "The devfs-compat rules have been removed." + ewarn "For reference see Bug #269359." + + ewarn + ewarn "Rules for /dev/hd* devices have been removed" + ewarn "Please migrate to libata." + + ewarn + ewarn "action_modeswitch has been removed by upstream." + ewarn "Please use sys-apps/usb_modeswitch." + + elog + elog "For more information on udev on Gentoo, writing udev rules, and" + elog " fixing known issues visit:" + elog " http://www.gentoo.org/doc/en/udev-guide.xml" +} -- 2.26.2