From 241b90f8039e3e9cf8acb1c8c1e8310541344f7a Mon Sep 17 00:00:00 2001 From: Matthias Schwarzott Date: Wed, 7 Jul 2010 21:46:57 +0000 Subject: [PATCH] Version bumped. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- sys-fs/udev/ChangeLog | 8 +- sys-fs/udev/Manifest | 11 +- sys-fs/udev/files/udev-159-path_id.patch | 19 + sys-fs/udev/udev-159.ebuild | 557 +++++++++++++++++++++++ 4 files changed, 590 insertions(+), 5 deletions(-) create mode 100644 sys-fs/udev/files/udev-159-path_id.patch create mode 100644 sys-fs/udev/udev-159.ebuild diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index d2fc16825537..4be9dc99c16e 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.541 2010/06/24 18:40:53 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.542 2010/07/07 21:46:57 zzam Exp $ + +*udev-159 (07 Jul 2010) + + 07 Jul 2010; Matthias Schwarzott +udev-159.ebuild, + +files/udev-159-path_id.patch: + Version bumped. *udev-158 (24 Jun 2010) diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index eb5d8008ad29..e7605886c7d0 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -69,6 +69,7 @@ AUX udev-141-remove-devfs-names.diff 557 RMD160 c8dbcb0dcc815d78b9f33a6b49290cf2 AUX udev-146-printer-usb_device-permission.diff 1419 RMD160 64afbfbf7d8756112ad830d6bc95d7c6c07e1a58 SHA1 4e6140ef8a6bf639384f1105158adaacf31196dd SHA256 b6b4dc88433703a18d07bc90d74afe7a20786ef7350e89d56f31e5ee5ace8238 AUX udev-150-fix-missing-firmware-timeout.diff 1065 RMD160 79a9fa2321d9d9fc6cf0399ecf326dc5f975719c SHA1 379bdb522edc45a9d9ed748be84f9087bee5b438 SHA256 863f394783ac282a3d83eb84ff0ed0f5dd7982e1b40d10e1081c567f38825371 AUX udev-151-readd-hd-rules.diff 2759 RMD160 5a3e52ce6442ef14f5f89faa36f98ddeb06fda00 SHA1 d954725615e963ba2854c0e4c0a424450e89280e SHA256 47eb3b3dd8c8c3199148aa083a47b2cbd29953b647b6ed06391424a353e6d39c +AUX udev-159-path_id.patch 944 RMD160 333e37c6eecd22e075fe6c764d1f2ba9a984bb2d SHA1 bc02857518110e3cd205740f68fd93516815810b SHA256 a145d19190cafa5a5e8007c52660610c6033dd4b9f395e0e140fa050af4672c2 AUX udev-postmount-initd-111-r2 508 RMD160 e1f42197fe3003ec4691b768a921029ce085becb SHA1 7ceb08150d429bd6b5cef88d76847575c6e89f22 SHA256 607deb133ab4be0d2fcb16346e86b3d8ae00bd62d2cbc1329458f278a1b1ff5c AUX udev-start-113-r2.sh 6515 RMD160 2ecaa37fd9e498e60f8cd5978cb4f7930594cf99 SHA1 670bb1845ed70442fe598a5580101be75e2402c9 SHA256 438bc31605c8d2e50bebedd7fbff1410845738372ab3bc03d6f5ed1427ddd046 AUX udev-start-114-r1.sh 6218 RMD160 a7348ac44768096b3da712a9be0ef4bf9af6ec17 SHA1 6dfcb9aed5e066d21bebee03d29137722db19b56 SHA256 a639a6f1093f05da197c3fc548c31f7078b2f0023f66f3caade0721c60819268 @@ -106,6 +107,7 @@ DIST udev-154.tar.bz2 532687 RMD160 154fbec374171b73de0c942c92245e859d9ef18f SHA DIST udev-156.tar.bz2 533910 RMD160 475f1d7a2ec91baeced954245c93273cee3275f4 SHA1 82be4dee6d47ca6b5488223f491b01ac43068084 SHA256 fb265933691a0bfe00d542e26ed4e3467b24386328da832a0c7073124cbd309c DIST udev-157.tar.bz2 535440 RMD160 04e6a6873699df1a0807547517ca4314c377649c SHA1 15b958077466b7be3fb4e8d1d8431b5fa44cbcd2 SHA256 4eca83f6afa72f378b058b2c18604bea79a5c6d3beb07640cf905299654a2e14 DIST udev-158.tar.bz2 538272 RMD160 ddefa72ffcf800f635bde1002d551c215eb14dc9 SHA1 b8651e3a8195707894ffe47fa1f2ca6cd1aed448 SHA256 48448845c9a6f274efb0781f2d9132f953dc456a695799e3d5a44d920a5dab03 +DIST udev-159.tar.bz2 541578 RMD160 a2d8c558565106e286ff05ba0c23de0730260856 SHA1 b15364df803c21888d5425a1924249b93f3a80b7 SHA256 317f3e078272e6d8627eedc924ddd84ed1145306f5f63ae3491fc83faf43b748 EBUILD udev-114.ebuild 9053 RMD160 71cf9942c2680b37cde18fb1e6b45661863add68 SHA1 a61fd58682ed8e206468f15f35c718a838f6b2c7 SHA256 fa7bf704f3406c70bc55e1e9c9995d487266707d3c93e9ea7c44844e9fbee493 EBUILD udev-115-r1.ebuild 10130 RMD160 499b32c67f89eca774a1335b00e1c067747d453a SHA1 93ebcd32a7e1a10409464fed8e23e1bd3e8a6d24 SHA256 ce4c791c230e3430783efc180da8dce72104f337660690f8df0f90c4e37496aa EBUILD udev-119.ebuild 10169 RMD160 e9e0b3b4d9487fb77495ff08e12a70cea5762a85 SHA1 709baaadef461a85ed4a876e04a4e3c11a72b994 SHA256 5c14efe9fcea0afa44aab6fb2579f69e02d083914170265cd2942df9b9d18842 @@ -132,13 +134,14 @@ EBUILD udev-154.ebuild 15889 RMD160 697cc8a260a83bba68d77b6d46fd6b380a806a5a SHA EBUILD udev-156.ebuild 15886 RMD160 06acadc8d696d8594c071748b6f600871abc0e8c SHA1 4b7425c7eee4c73500b56c4387b8c7130ae810cb SHA256 1906da673744035808d8fdd7bfbdce17180262706f021227660d37e2028a40e7 EBUILD udev-157.ebuild 15936 RMD160 ad89e68ac859e9d896c4a1f08987e76a89a6a697 SHA1 b3d7ef96646e8f1a6f38551a9924111949229fe1 SHA256 8b130b868487d48b968822a1a60ff31b1ab396031eb5cdd03069a05feb067e90 EBUILD udev-158.ebuild 15936 RMD160 5e4df10b5076478fd8f2e5a4990a3c867ff994ba SHA1 1045fa413e5c9f2145e82a99278e006010a2d961 SHA256 2cfe61010e2bbbbc3993ff8048851e7ecf81f726cbd4898adf93b703249d5485 +EBUILD udev-159.ebuild 15982 RMD160 87a9190ac33f2b792fa374f4e9a946ce61a0ae7e SHA1 8a1a323dbd87f232a79de52ec7e614b1b3699087 SHA256 3386dda998637c10fce3d146f9f42813ea55aa17774bc1c18d0b91d2b3b41d9f EBUILD udev-9999.ebuild 15869 RMD160 c5d5079e1935460848592b1f63785366686a2ab3 SHA1 7b55bd18a73ef5a7c0182b72a8e0fc4e052b49fc SHA256 cadbe64fb41488a69dd8416ff806ad58f91f4cafca59e5237d067e0361e1649b -MISC ChangeLog 110978 RMD160 fb5d1abc7b38605b4fd3e9d40d96c62418fc544e SHA1 53c473ee5503b4823f6b964a7c92511c0e6c6751 SHA256 43718c876025a573a4792cbac7defb3dc283d7047d9e816bdf45827afeb9f087 +MISC ChangeLog 111126 RMD160 5916be2ac220259b494878ddba3416579db35c8a SHA1 da39d9633264cdbca5f1b9137e6c365106d7c9bc SHA256 14d07dc1b96284e4143841f0360e85314bd5532f1f7d0024757b599afffdf2c4 MISC metadata.xml 502 RMD160 f353faee03dd5920d1f7d65c123d93e018c7be53 SHA1 02c5eb9fd660e69127fa84487e0d70b85ee1d3cc SHA256 ca6a239a7be7949fdf1461eb524ca9234a0fd2aee9fc7eeb758a2347b6031664 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkwjplgACgkQt2vP6XvVdOeBjgCfbHS8aaxUsR7Wq6h5ioUz1h8K -lVIAoIcG6hl7PqytxGf2XFiRAWn7vN9/ -=gYe4 +iEYEARECAAYFAkw09dYACgkQt2vP6XvVdOexzQCfSW06W5aJ6mE33d6FidtzB7dM +4r8Ani5KGXash/E0cAHucuisFFXXuBWf +=Rvn6 -----END PGP SIGNATURE----- diff --git a/sys-fs/udev/files/udev-159-path_id.patch b/sys-fs/udev/files/udev-159-path_id.patch new file mode 100644 index 000000000000..ea5570d0c7f5 --- /dev/null +++ b/sys-fs/udev/files/udev-159-path_id.patch @@ -0,0 +1,19 @@ +commit 847b4f84c671e98f29f22d8e3e0d70a231d71a7b +Author: Harald Hoyer +Date: Wed Jul 7 10:57:09 2010 +0200 + + 60-persistent-storage-tape: s/path_id.sh/path_id/ + +diff --git a/rules/rules.d/60-persistent-storage-tape.rules b/rules/rules.d/60-persistent-storage-tape.rules +index 338da5f..d9df35a 100644 +--- a/rules/rules.d/60-persistent-storage-tape.rules ++++ b/rules/rules.d/60-persistent-storage-tape.rules +@@ -17,7 +17,7 @@ KERNEL=="st*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="tape/by-id/$env{ID_BUS}-$en + KERNEL=="nst*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}-nst" + + # by-path (parent device path) +-KERNEL=="st*[0-9]|nst*[0-9]", IMPORT{program}="path_id.sh %p" ++KERNEL=="st*[0-9]|nst*[0-9]", IMPORT{program}="path_id %p" + KERNEL=="st*[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="tape/by-path/$env{ID_PATH}" + KERNEL=="nst*[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="tape/by-path/$env{ID_PATH}" + diff --git a/sys-fs/udev/udev-159.ebuild b/sys-fs/udev/udev-159.ebuild new file mode 100644 index 000000000000..eedf531d14f7 --- /dev/null +++ b/sys-fs/udev/udev-159.ebuild @@ -0,0 +1,557 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-159.ebuild,v 1.1 2010/07/07 21:46:57 zzam Exp $ + +EAPI="1" + +inherit eutils flag-o-matic multilib toolchain-funcs linux-info + +#PATCHSET=${P}-gentoo-patchset-v1 + +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git" + EGIT_BRANCH="master" + inherit git autotools +else + # please update testsys-tarball whenever udev-xxx/test/sys/ is changed + SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2 + test? ( mirror://gentoo/${PN}-151-testsys.tar.bz2 )" + [[ -n "${PATCHSET}" ]] && SRC_URI="${SRC_URI} mirror://gentoo/${PATCHSET}.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" +KEYWORDS="-alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 -sh ~sparc ~x86" +IUSE="selinux extras test" + +COMMON_DEPEND="selinux? ( sys-libs/libselinux ) + extras? ( + sys-apps/acl + >=sys-apps/usbutils-0.82 + virtual/libusb:0 + sys-apps/pciutils + dev-libs/glib:2 + ) + >=sys-apps/util-linux-2.16 + >=sys-libs/glibc-2.9" + +DEPEND="${COMMON_DEPEND} + extras? ( dev-util/gperf ) + >=sys-kernel/linux-headers-2.6.29 + test? ( app-text/tree )" + +RDEPEND="${COMMON_DEPEND} + !sys-apps/coldplug + !=sys-apps/baselayout-1.12.5" + +if [[ ${PV} == "9999" ]]; then + # for documentation processing with xsltproc + DEPEND="${DEPEND} + app-text/docbook-xsl-stylesheets + app-text/docbook-xml-dtd + dev-util/gtk-doc" +fi + +# required kernel options +CONFIG_CHECK="~INOTIFY_USER ~SIGNALFD ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 + ~!IDE" + +# We need the lib/rcscripts/addon support +PROVIDE="virtual/dev-manager" + +udev_check_KV() { + local ok=0 + if [[ ${KV_MAJOR} == 2 && ${KV_MINOR} == 6 ]] + then + if kernel_is -ge 2 6 ${KV_PATCH_reliable} ; then + ok=2 + elif kernel_is -ge 2 6 ${KV_PATCH_min} ; then + ok=1 + fi + fi + return $ok +} + +pkg_setup() { + linux-info_pkg_setup + + udev_libexec_dir="/$(get_libdir)/udev" + + # udev requires signalfd introduced in kernel 2.6.25, + # but a glibc compiled against >=linux-headers-2.6.27 uses the + # new signalfd syscall introduced in kernel 2.6.27 without falling back + # to the old one. So we just depend on 2.6.27 here, see Bug #281312. + KV_PATCH_min=25 + KV_PATCH_reliable=27 + KV_min=2.6.${KV_PATCH_min} + KV_reliable=2.6.${KV_PATCH_reliable} + + # always print kernel version requirements + ewarn + ewarn "${P} does not support Linux kernel before version ${KV_min}!" + if [[ ${KV_PATCH_min} != ${KV_PATCH_reliable} ]]; then + ewarn "For a reliable udev, use at least kernel ${KV_reliable}" + fi + + echo + # We don't care about the secondary revision of the kernel. + # 2.6.30.4 -> 2.6.30 is all we check + udev_check_KV + case "$?" in + 2) einfo "Your kernel version (${KV_FULL}) is new enough to run ${P} reliably." ;; + 1) ewarn "Your kernel version (${KV_FULL}) is new enough to run ${P}," + ewarn "but it may be unreliable in some cases." + ebeep ;; + 0) eerror "Your kernel version (${KV_FULL}) is too old to run ${P}" + ebeep ;; + esac + echo + + KV_FULL_SRC=${KV_FULL} + get_running_version + udev_check_KV + if [[ "$?" = "0" ]]; then + eerror + eerror "udev cannot be restarted after emerging," + eerror "as your running kernel version (${KV_FULL}) is too old." + eerror "You really need to use a newer kernel after a reboot!" + NO_RESTART=1 + ebeep + fi +} + +sed_libexec_dir() { + sed -e "s#/lib/udev#${udev_libexec_dir}#" -i "$@" +} + +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + git_src_unpack + else + unpack ${A} + + if use test; then + mv "${WORKDIR}"/test/sys "${S}"/test/ + fi + fi + + cd "${S}" + + # patches go here... + + epatch "${FILESDIR}/udev-159-path_id.patch" + + # backport some patches + if [[ -n "${PATCHSET}" ]]; then + EPATCH_SOURCE="${WORKDIR}/${PATCHSET}" EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" epatch + fi + + # change rules back to group uucp instead of dialout for now + sed -e 's/GROUP="dialout"/GROUP="uucp"/' \ + -i rules/{rules.d,arch}/*.rules \ + || die "failed to change group dialout to uucp" + + if [[ ${PV} != 9999 ]]; then + # Make sure there is no sudden changes to upstream rules file + # (more for my own needs than anything else ...) + MD5=$(md5sum < "${S}/rules/rules.d/50-udev-default.rules") + MD5=${MD5/ -/} + if [[ ${MD5} != 61eda71c840620ff70386715d8010438 ]] + then + echo + eerror "50-udev-default.rules has been updated, please validate!" + eerror "md5sum: ${MD5}" + die "50-udev-default.rules has been updated, please validate!" + fi + fi + + sed_libexec_dir \ + rules/rules.d/50-udev-default.rules \ + rules/rules.d/78-sound-card.rules \ + extras/rule_generator/write_*_rules \ + || die "sed failed" + + if [[ ${PV} == 9999 ]]; then + gtkdocize --copy + eautoreconf + fi +} + +src_compile() { + filter-flags -fprefetch-loop-arrays + + econf \ + --prefix=/usr \ + --sysconfdir=/etc \ + --sbindir=/sbin \ + --libdir=/usr/$(get_libdir) \ + --with-rootlibdir=/$(get_libdir) \ + --libexecdir="${udev_libexec_dir}" \ + --enable-logging \ + --enable-static \ + $(use_with selinux) \ + $(use_enable extras) \ + --disable-introspection + # we don't have gobject-introspection in portage tree + + emake || die "compiling udev failed" +} + +src_install() { + local scriptdir="${FILESDIR}/156" + + into / + emake DESTDIR="${D}" install || die "make install failed" + + exeinto "${udev_libexec_dir}" + newexe "${FILESDIR}"/net-130-r1.sh net.sh || die "net.sh not installed properly" + newexe "${FILESDIR}"/move_tmp_persistent_rules-112-r1.sh move_tmp_persistent_rules.sh \ + || die "move_tmp_persistent_rules.sh not installed properly" + newexe "${FILESDIR}"/write_root_link_rule-125 write_root_link_rule \ + || die "write_root_link_rule not installed properly" + + doexe "${scriptdir}"/shell-compat-KV.sh \ + || die "shell-compat.sh not installed properly" + doexe "${scriptdir}"/shell-compat-addon.sh \ + || die "shell-compat.sh not installed properly" + + keepdir "${udev_libexec_dir}"/state + keepdir "${udev_libexec_dir}"/devices + + # create symlinks for these utilities to /sbin + # where multipath-tools expect them to be (Bug #168588) + dosym "..${udev_libexec_dir}/scsi_id" /sbin/scsi_id + + # Add gentoo stuff to udev.conf + echo "# If you need to change mount-options, do it in /etc/fstab" \ + >> "${D}"/etc/udev/udev.conf + + # let the dir exist at least + keepdir /etc/udev/rules.d + + # Now installing rules + cd "${S}"/rules + insinto "${udev_libexec_dir}"/rules.d/ + + # Our rules files + doins "${scriptdir}"/??-*.rules + + # support older kernels + doins misc/30-kernel-compat.rules + + # Adding arch specific rules + if [[ -f arch/40-${ARCH}.rules ]] + then + doins "arch/40-${ARCH}.rules" + fi + cd "${S}" + + # our udev hooks into the rc system + insinto /$(get_libdir)/rcscripts/addons + doins "${scriptdir}"/udev-start.sh \ + || die "udev-start.sh not installed properly" + doins "${scriptdir}"/udev-stop.sh \ + || die "udev-stop.sh not installed properly" + + local init + # udev-postmount and init-scripts for >=openrc-0.3.1, Bug #240984 + for init in udev udev-mount udev-dev-tarball udev-postmount; do + newinitd "${scriptdir}/${init}.initd" "${init}" \ + || die "initscript ${init} not installed properly" + done + + # insert minimum kernel versions + sed -e "s/%KV_MIN%/${KV_min}/" \ + -e "s/%KV_MIN_RELIABLE%/${KV_reliable}/" \ + -i "${D}"/etc/init.d/udev-mount + + # config file for init-script and start-addon + newconfd "${scriptdir}/udev.confd" udev \ + || die "config file not installed properly" + + insinto /etc/modprobe.d + newins "${FILESDIR}"/blacklist-146 blacklist.conf + newins "${FILESDIR}"/pnp-aliases pnp-aliases.conf + + # convert /lib/udev to real used dir + sed_libexec_dir \ + "${D}/$(get_libdir)"/rcscripts/addons/*.sh \ + "${D}/${udev_libexec_dir}"/write_root_link_rule \ + "${D}"/etc/conf.d/udev \ + "${D}"/etc/init.d/udev* \ + "${D}"/etc/modprobe.d/* + + # documentation + dodoc ChangeLog README TODO || die "failed installing docs" + + # keep doc in just one directory, Bug #281137 + rm -rf "${D}/usr/share/doc/${PN}" + if use extras; then + dodoc extras/keymap/README.keymap.txt || die "failed installing docs" + fi +} + +pkg_preinst() { + # moving old files to support newer modprobe, 12 May 2009 + local f dir=${ROOT}/etc/modprobe.d/ + for f in pnp-aliases blacklist; do + if [[ -f $dir/$f && ! -f $dir/$f.conf ]] + then + elog "Moving $dir/$f to $f.conf" + mv -f "$dir/$f" "$dir/$f.conf" + fi + done + + 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 && + ! -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 + + has_version "=${CATEGORY}/${PN}-103-r3" + previous_equal_to_103_r3=$? + + has_version "<${CATEGORY}/${PN}-104-r5" + previous_less_than_104_r5=$? + + has_version "<${CATEGORY}/${PN}-106-r5" + previous_less_than_106_r5=$? + + has_version "<${CATEGORY}/${PN}-113" + previous_less_than_113=$? +} + +# 19 Nov 2008 +fix_old_persistent_net_rules() { + local rules=${ROOT}/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 + [[ ${ROOT} = / ]] || 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" + ebeep + fi +} + +postinst_init_scripts() { + # FIXME: we may need some code that detects if this is a system bootstrap + # and auto-enables udev then + # + # FIXME: inconsistent handling of init-scripts here + # * udev is added to sysinit in openrc-ebuild + # * we add udev-postmount to default in here + # + + # migration to >=openrc-0.4 + if [[ -e "${ROOT}"/etc/runlevels/sysinit && ! -e "${ROOT}"/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 "${ROOT}"/etc/runlevels/default/udev-postmount ]] && return + + local enable_postmount=0 + [[ -e "${ROOT}"/etc/runlevels/sysinit/udev ]] && enable_postmount=1 + [[ "${ROOT}" = "/" && -d /dev/.udev/ ]] && enable_postmount=1 + + if [[ ${enable_postmount} = 1 ]] + then + local initd=udev-postmount + + if [[ -e ${ROOT}/etc/init.d/${initd} ]] && \ + [[ ! -e ${ROOT}/etc/runlevels/default/${initd} ]] + then + ln -snf /etc/init.d/${initd} "${ROOT}"/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 + + restart_udevd + + postinst_init_scripts + + # people want reminders, I'll give them reminders. Odds are they will + # just ignore them anyway... + + # delete 40-scsi-hotplug.rules, it is integrated in 50-udev.rules, 19 Jan 2007 + if [[ $previous_equal_to_103_r3 = 0 ]] && + [[ -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 + + # Removing some device-nodes we thought we need some time ago, 25 Jan 2007 + if [[ -d ${ROOT}/lib/udev/devices ]] + then + rm -f "${ROOT}"/lib/udev/devices/{null,zero,console,urandom} + fi + + # Removing some old file, 29 Jan 2007 + if [[ $previous_less_than_104_r5 = 0 ]] + then + rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev + rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net 2>/dev/null + fi + + # 19 Mar 2007 + if [[ $previous_less_than_106_r5 = 0 ]] && + [[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]] + then + rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules + fi + + # Try to remove /etc/dev.d as that is obsolete, 23 Apr 2007 + if [[ -d ${ROOT}/etc/dev.d ]] + then + rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/default "${ROOT}"/etc/dev.d 2>/dev/null + if [[ -d ${ROOT}/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 [[ $previous_less_than_113 = 0 ]] && + [[ -f ${ROOT}/etc/udev/rules.d/64-device-mapper.rules ]] && + ! has_version sys-fs/device-mapper + then + rm -f "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules + einfo "Removed unneeded file 64-device-mapper.rules" + fi + + # requested in bug #275974, added 2009/09/05 + ewarn + ewarn "If after the udev update removable devices or CD/DVD drives" + ewarn "stop working, try re-emerging HAL before filling a bug report" + + # requested in Bug #225033: + elog + elog "persistent-net does assigning fixed names to network devices." + elog "If you have problems with the persistent-net rules," + elog "just delete the rules file" + elog "\trm ${ROOT}etc/udev/rules.d/70-persistent-net.rules" + elog "and 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." + + 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