From 80935558a8819e234780801a3f995e8a445d5adc Mon Sep 17 00:00:00 2001 From: Matthias Schwarzott Date: Mon, 12 Feb 2007 13:29:25 +0000 Subject: [PATCH] Removed check for a wrong file when looking for already used device-names, solving Bug #166486. Package-Manager: portage-2.1.2-r9 --- sys-fs/udev/ChangeLog | 9 +- sys-fs/udev/Manifest | 27 +- sys-fs/udev/files/digest-udev-104-r11 | 3 + ...dev-104-persistent-net-fix-name-dups.patch | 11 + sys-fs/udev/udev-104-r11.ebuild | 279 ++++++++++++++++++ 5 files changed, 320 insertions(+), 9 deletions(-) create mode 100644 sys-fs/udev/files/digest-udev-104-r11 create mode 100644 sys-fs/udev/files/udev-104-persistent-net-fix-name-dups.patch create mode 100644 sys-fs/udev/udev-104-r11.ebuild diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 57213ee427b2..fbaceef833ce 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.257 2007/02/12 12:51:34 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.258 2007/02/12 13:29:25 zzam Exp $ + +*udev-104-r11 (12 Feb 2007) + + 12 Feb 2007; Matthias Schwarzott + +files/udev-104-persistent-net-fix-name-dups.patch, +udev-104-r11.ebuild: + Removed check for a wrong file when looking for already used device-names, + solving Bug #166486. 12 Feb 2007; Gustavo Zacarias udev-104-r10.ebuild: Stable on sparc wrt #159871 diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 601fee08b9cd..077bd2777140 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -57,6 +57,10 @@ AUX udev-104-peristent-net-disable-xen.patch 1027 RMD160 326cfdb0529348013e9b50e MD5 88882c2d651f3ede4c105478ee37f977 files/udev-104-peristent-net-disable-xen.patch 1027 RMD160 326cfdb0529348013e9b50edd1cf878808d980d1 files/udev-104-peristent-net-disable-xen.patch 1027 SHA256 07ae5cb9ead44ebb032c0322cd93b19d9eba7e43704c3ec55d29ac21f5e24ab0 files/udev-104-peristent-net-disable-xen.patch 1027 +AUX udev-104-persistent-net-fix-name-dups.patch 573 RMD160 49e11cd8b88676aca12c6b62381031f0fcea6de0 SHA1 bc0db37772f40bdcedbbba8dbf2e25c4a5157708 SHA256 82565a21d776f064500b69bc4fc2f4c7484b7fedc1b2777f5f8f52564904d0f4 +MD5 060d576c341759a9b2dbe87ca8150b53 files/udev-104-persistent-net-fix-name-dups.patch 573 +RMD160 49e11cd8b88676aca12c6b62381031f0fcea6de0 files/udev-104-persistent-net-fix-name-dups.patch 573 +SHA256 82565a21d776f064500b69bc4fc2f4c7484b7fedc1b2777f5f8f52564904d0f4 files/udev-104-persistent-net-fix-name-dups.patch 573 AUX udev-105-unlink-db-files.patch 1211 RMD160 c7be0503126afaa2ba9cd072d399886d5a5dbe61 SHA1 246c1ee2e798bd512c8438757aed47d7d5c87069 SHA256 49f6d4f3073e092a71ac25ce86f084bcd242b4263cb1f82163da12fc5f1e3e97 MD5 dafe1ab36969b6c6d3f1dd072266fd64 files/udev-105-unlink-db-files.patch 1211 RMD160 c7be0503126afaa2ba9cd072d399886d5a5dbe61 files/udev-105-unlink-db-files.patch 1211 @@ -287,14 +291,18 @@ EBUILD udev-104-r10.ebuild 9314 RMD160 f99963c8f8abcc0e64214a01c765d449dd445ae6 MD5 9fc921a37774efc7e4fd3e5475348357 udev-104-r10.ebuild 9314 RMD160 f99963c8f8abcc0e64214a01c765d449dd445ae6 udev-104-r10.ebuild 9314 SHA256 81c0e15cb14efee179279862a6bd60671e78fdc3203e6d38dcce739f1046bf2b udev-104-r10.ebuild 9314 +EBUILD udev-104-r11.ebuild 9383 RMD160 e3c281fc1441f15edb3ab9b9e9b1bbef1fce0e22 SHA1 3ed868fe29f51596cfd7da68239b673f67db4d17 SHA256 0782916d2faf021ff70d674f146a555febd7e939b1312d5ed5264d0af70238f0 +MD5 4cea2def81a4160c500ada4eff301ccd udev-104-r11.ebuild 9383 +RMD160 e3c281fc1441f15edb3ab9b9e9b1bbef1fce0e22 udev-104-r11.ebuild 9383 +SHA256 0782916d2faf021ff70d674f146a555febd7e939b1312d5ed5264d0af70238f0 udev-104-r11.ebuild 9383 EBUILD udev-104-r9.ebuild 9216 RMD160 d022e7088ec4526f76fed85971ee66779b6ae547 SHA1 4ce45df8be208cd15575ef919f1961aaa5f8d275 SHA256 546534c95123130045723adb5fda371697713c95a016349eb99ae3b5a7d5831b MD5 d5f8b36e305c0d8c7647b5aae1b619ed udev-104-r9.ebuild 9216 RMD160 d022e7088ec4526f76fed85971ee66779b6ae547 udev-104-r9.ebuild 9216 SHA256 546534c95123130045723adb5fda371697713c95a016349eb99ae3b5a7d5831b udev-104-r9.ebuild 9216 -MISC ChangeLog 47829 RMD160 6ad4027bbeb9d9516c18b8974e2c8fb03464e6da SHA1 ec17d79ce6185b4cbcf836f9bea1536150437f49 SHA256 145fbc48924d9d5e3e6a577c78db2eb1e8c7508f4bc3bf06984c91d31d7884ec -MD5 d803a7c2ed032df9fd869f03f7b3367c ChangeLog 47829 -RMD160 6ad4027bbeb9d9516c18b8974e2c8fb03464e6da ChangeLog 47829 -SHA256 145fbc48924d9d5e3e6a577c78db2eb1e8c7508f4bc3bf06984c91d31d7884ec ChangeLog 47829 +MISC ChangeLog 48084 RMD160 32e2e8c1bc2464e636b9cb01ccb35fa847ebdcf9 SHA1 f1bc54ea8b9b1fa5bcaa14fb6a45450c3f6080c1 SHA256 6f701a164ea00de38ad120edf01df3e9cf8672def65b344cc336486cbf14e0a5 +MD5 0d7263f2882bc8ce6332d7e62ce35068 ChangeLog 48084 +RMD160 32e2e8c1bc2464e636b9cb01ccb35fa847ebdcf9 ChangeLog 48084 +SHA256 6f701a164ea00de38ad120edf01df3e9cf8672def65b344cc336486cbf14e0a5 ChangeLog 48084 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447 @@ -338,13 +346,16 @@ SHA256 7638db47ed884246551e3d27d9be0fd088c0db9a7e92c3359efa901a87742a28 files/di MD5 834e944e237e0d9501aac75e61c50eb1 files/digest-udev-104-r10 229 RMD160 7fd47bd560da91a9953657f31d6cd2383d2032cb files/digest-udev-104-r10 229 SHA256 36aae1151cda7c7f51bfb8204b7cef8301f80ea336086802f1a8c495a7eb7749 files/digest-udev-104-r10 229 +MD5 834e944e237e0d9501aac75e61c50eb1 files/digest-udev-104-r11 229 +RMD160 7fd47bd560da91a9953657f31d6cd2383d2032cb files/digest-udev-104-r11 229 +SHA256 36aae1151cda7c7f51bfb8204b7cef8301f80ea336086802f1a8c495a7eb7749 files/digest-udev-104-r11 229 MD5 834e944e237e0d9501aac75e61c50eb1 files/digest-udev-104-r9 229 RMD160 7fd47bd560da91a9953657f31d6cd2383d2032cb files/digest-udev-104-r9 229 SHA256 36aae1151cda7c7f51bfb8204b7cef8301f80ea336086802f1a8c495a7eb7749 files/digest-udev-104-r9 229 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux) +Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFF0GLdKRy60XGEcJIRAvwkAJ4g4C9k27yONXXeIiYujFmgn4t3HgCeNmP/ -EvKOxkWKF2kCo+SHszZk1oc= -=Y50o +iD8DBQFF0Gu8t2vP6XvVdOcRAl1uAKCKZBO37tDmqa9Atzal4k37rfGeqgCgt8Yr +VVpVpsbyJyAgI0ei5enxRGs= +=6UGd -----END PGP SIGNATURE----- diff --git a/sys-fs/udev/files/digest-udev-104-r11 b/sys-fs/udev/files/digest-udev-104-r11 new file mode 100644 index 000000000000..1d88fbeee74a --- /dev/null +++ b/sys-fs/udev/files/digest-udev-104-r11 @@ -0,0 +1,3 @@ +MD5 9bcfc782d40db2b406a9c1172defda8f udev-104.tar.bz2 187574 +RMD160 269aeb9a0b2043d18c274fde749d2e0d30398b73 udev-104.tar.bz2 187574 +SHA256 ec0e7bd0c322dce6149d5f94185aa477659f5030a3d684ff5428124eca684ea1 udev-104.tar.bz2 187574 diff --git a/sys-fs/udev/files/udev-104-persistent-net-fix-name-dups.patch b/sys-fs/udev/files/udev-104-persistent-net-fix-name-dups.patch new file mode 100644 index 000000000000..cd5d415013dc --- /dev/null +++ b/sys-fs/udev/files/udev-104-persistent-net-fix-name-dups.patch @@ -0,0 +1,11 @@ +diff -ru udev-104-orig/extras/rule_generator/rule_generator.functions udev-104/extras/rule_generator/rule_generator.functions +--- udev-104-orig/extras/rule_generator/rule_generator.functions 2007-01-15 14:56:11.000000000 +0100 ++++ udev-104/extras/rule_generator/rule_generator.functions 2007-02-12 13:17:39.000000000 +0100 +@@ -92,7 +92,6 @@ + local linkre="$2" + local match="$3" + +- [ -e $RULES_FILE ] || return + local search='.*[[:space:],]'"$key"'"\('"$linkre"'\)"[[:space:]]*\(,.*\|\\\|\)$' + echo $(sed -n -e "${match}s/${search}/\1/p" $RO_RULES_FILE $RULES_FILE) + } diff --git a/sys-fs/udev/udev-104-r11.ebuild b/sys-fs/udev/udev-104-r11.ebuild new file mode 100644 index 000000000000..030c2d70e0fa --- /dev/null +++ b/sys-fs/udev/udev-104-r11.ebuild @@ -0,0 +1,279 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-104-r11.ebuild,v 1.1 2007/02/12 13:29:25 zzam Exp $ + +inherit eutils flag-o-matic multilib toolchain-funcs + +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="selinux? ( sys-libs/libselinux )" +RDEPEND="!sys-apps/coldplug" +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 + epatch ${FILESDIR}/${P}-netif-rename-busywait.patch + epatch ${FILESDIR}/${PN}-104-peristent-net-disable-xen.patch + epatch ${FILESDIR}/${PN}-104-persistent-net-fix-name-dups.patch + epatch ${FILESDIR}/${PN}-105-vol_id-fix.patch + epatch ${FILESDIR}/${PN}-105-unlink-db-files.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}" != "295a9b7bdc8bdb239f8860d14af761b0" ] + 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/ata_id \ + extras/cdrom_id \ + extras/dasd_id \ + extras/edd_id \ + extras/firmware \ + extras/floppy \ + extras/path_id \ + extras/run_directory \ + extras/scsi_id \ + extras/usb_id \ + extras/volume_id \ + extras/rule_generator" + + 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_COMPILE=${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 || die "Required binary not installed properly" + dobin udevtest || die "Required binary not installed properly" + dobin udevmonitor || die "Required binary not installed properly" + into / + dosbin udevd || die "Required binary not installed properly" + dosbin udevstart || die "Required binary not installed properly" + dosbin udevtrigger || die "Required binary not installed properly" + dosbin udevcontrol || die "Required binary not installed properly" + dosbin udevsettle || die "Required binary not installed properly" + + # Helpers + exeinto /lib/udev + doexe extras/run_directory/udev_run_devd || die "Required helper not installed properly" + doexe extras/run_directory/udev_run_hotplugd || die "Required helper not installed properly" + doexe extras/ata_id/ata_id || die "Required helper not installed properly" + doexe extras/volume_id/vol_id || die "Required helper not installed properly" + doexe extras/scsi_id/scsi_id || die "Required helper not installed properly" + doexe extras/usb_id/usb_id || die "Required helper not installed properly" + doexe extras/path_id/path_id || die "Required helper not installed properly" + doexe extras/cdrom_id/cdrom_id || die "Required helper not installed properly" + doexe extras/dasd_id/dasd_id || die "Required helper not installed properly" + doexe extras/edd_id/edd_id || die "Required helper not installed properly" + doexe extras/rule_generator/write_cd_rules || die "Required helper not installed properly" + doexe extras/rule_generator/write_net_rules || die "Required helper not installed properly" + doexe extras/rule_generator/rule_generator.functions || die "Required helper not installed properly" + keepdir /lib/udev/state + keepdir /lib/udev/devices + + # 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 || die "Required binary not installed properly" + doexe extras/firmware/firmware.sh || die "Required binary not installed properly" + newexe ${FILESDIR}/net-104-r10.sh net.sh || die "Required binary not installed properly" + doexe ${FILESDIR}/modprobe.sh || die "Required binary not installed properly" + doexe ${FILESDIR}/seq_node.sh || die "Required binary not installed properly" + + # 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-104-r10 50-udev.rules + newins ${FILESDIR}/05-udev-early.rules-104-r5 05-udev-early.rules + doins ${FILESDIR}/95-net.rules + # Use upstream's persistent rules for devices + doins etc/udev/rules.d/60-*.rules + doins extras/rule_generator/75-*.rules || die "rules not installed properly" + + # scsi_id configuration + insinto /etc + doins extras/scsi_id/scsi_id.config + + # set up the /etc/dev.d directory tree + keepdir /etc/dev.d + + # 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 + # create a extra symlink for udevcontrol + dosym udevd.8 /usr/share/man/man8/udevcontrol.8 + + # our udev hooks into the rc system + insinto /lib/rcscripts/addons + newins "${FILESDIR}"/udev-start-104-r10.sh udev-start.sh + newins "${FILESDIR}"/udev-stop-104-r8.sh udev-stop.sh + + # Insert udev-version number into udev-rcscript addon + sed -e "s/@@UDEV_VERSION@@/${PV}/" \ + -i "${D}"/lib/rcscripts/addons/udev-start.sh \ + -i "${D}"/lib/rcscripts/addons/udev-stop.sh + + # needed to compile latest Hal + insinto /usr/include + doins extras/volume_id/lib/libvolume_id.h + + 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 + +} + +pkg_preinst() { + 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" -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 + + # 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 + + # is there a stale coldplug initscript? (CONFIG_PROTECT leaves it behind) + coldplug_stale="" + if [ -f "${ROOT}/etc/init.d/coldplug" ] + then + coldplug_stale="1" + fi +} + +pkg_postinst() { + if [[ ${ROOT} == "/" ]] ; then + if [[ -n $(pidof udevd) ]] ; then + killall -15 udevd &>/dev/null + sleep 1 + killall -9 udevd &>/dev/null + fi + /sbin/udevd --daemon + fi + + # people want reminders, I'll give them reminders. Odds are they will + # just ignore them anyway... + + if [[ ${coldplug_stale} == "1" ]] ; then + ewarn "A stale coldplug init script found. You should run:" + ewarn + ewarn " rc-update del coldplug" + ewarn " rm -f /etc/init.d/coldplug" + ewarn + ewarn "udev now provides its own coldplug functionality." + fi + + # delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules + if has_version "=sys-fs/udev-103-r3"; then + if [[ -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 + fi + + # Removing some device-nodes we thought we need some time ago + if [[ -d "${ROOT}"/lib/udev/devices ]]; then + rm -f "${ROOT}"/lib/udev/devices/{null,zero,console,urandom} + fi + + # Removing some old file + if has_version "