From ad64ad5d579087f2a5a356074804365039afd80d Mon Sep 17 00:00:00 2001 From: Matthias Schwarzott Date: Fri, 25 Jul 2008 21:43:24 +0000 Subject: Added missing cd command, thanks to Polynomial-C, Bug #232954. Hopefully this also fixes Bug #232923. Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.25-tuxonice-r6 i686 --- sys-fs/udev/ChangeLog | 8 +- sys-fs/udev/Manifest | 9 +- sys-fs/udev/udev-125-r1.ebuild | 377 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 389 insertions(+), 5 deletions(-) create mode 100644 sys-fs/udev/udev-125-r1.ebuild (limited to 'sys-fs') diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 8ffb543fb6ed..da3eaf6e6307 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.391 2008/07/25 11:36:45 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.392 2008/07/25 21:43:24 zzam Exp $ + +*udev-125-r1 (25 Jul 2008) + + 25 Jul 2008; Matthias Schwarzott +udev-125-r1.ebuild: + Added missing cd command, thanks to Polynomial-C, Bug #232954. Hopefully + this also fixes Bug #232923. *udev-125 (25 Jul 2008) diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 605137e1a3b0..f122722b5c2b 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -38,13 +38,14 @@ EBUILD udev-119.ebuild 10150 RMD160 dc6bdecc6c6dfdbcf8d2ef0fd1346995c234067a SHA EBUILD udev-122-r1.ebuild 10691 RMD160 64e56d50e767de48d77e8d0c7f88b2a04adbe211 SHA1 e7264e5edd79b0ee1b1d52cbaa4fc17697737a49 SHA256 c9ec083656534c838651de577a08a2ece6036bca6c5d817c1ff7a309cc007863 EBUILD udev-122.ebuild 10155 RMD160 0f97a0ecc6511abcdad038021f5667679f5cc59e SHA1 aa4e60829cfe22f645e99bab51182ef86d10f088 SHA256 665d1cbb8ff55156ee63c2a58bf79a06486068a144e1db67905456ffc17ebce7 EBUILD udev-124.ebuild 10693 RMD160 39379d2d1ac8f019826fdf0002deb55463ff0ab8 SHA1 a9e5ea6068d23e3c88ebc94d87c80fc7d73dcb95 SHA256 6e58a357d4ecb22978643b887dafc23729331c67c18784c25d3e6aec5dfd067f +EBUILD udev-125-r1.ebuild 10734 RMD160 825bb7b10ff5bd2734de1de258bc76705790c1ca SHA1 3cba87fc9f71f0432f48da8c0f5a8397a4a9fb7f SHA256 d384cbc89ba8f0ee2e8d5174bff34b8f977c21c1df2fa4c9e47a3a6f44a442d8 EBUILD udev-125.ebuild 10731 RMD160 56aab6549afc71d9efc24e4022edb45abca7ce9a SHA1 8ca985cfee11c4286bc642f120642687902b3126 SHA256 156f66c160deb9a7315fdb3b9646b7de93f838db4d29c6c028392ee1701622aa -MISC ChangeLog 80436 RMD160 2a5596535a9063eab269ab8a877da7ff259e005d SHA1 c9dd91e701a294b926f00ad3bd1a196f08d67871 SHA256 dac508c803d1e3510a19b5bc77b7d1b59760c967ee33e2a9fe1a4e40727bf121 +MISC ChangeLog 80645 RMD160 a7a0e61779b6e57fd4b3caa5637659d1a9b96d44 SHA1 74d961a705f0cb194de05c0dda59375f8ad92e2a SHA256 3a1a8474904830aa4ad432b07eaf2369dff1b7892bdecb98d251b4d29043b5ab MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkiJutcACgkQt2vP6XvVdOfd3gCg1ijv+sSWwmC7uOgN98Ua7lJU -9VwAoIv36yUlAsLjnzEI8/y2pmJkaGaf -=05SE +iEYEARECAAYFAkiKSQIACgkQt2vP6XvVdOfdOACgu+O9BokbENA2126+L4o2xQDN +CFwAoJ7cUODfejqoFzJ2/ihoynDe3pUL +=bRL+ -----END PGP SIGNATURE----- diff --git a/sys-fs/udev/udev-125-r1.ebuild b/sys-fs/udev/udev-125-r1.ebuild new file mode 100644 index 000000000000..5d49450382e3 --- /dev/null +++ b/sys-fs/udev/udev-125-r1.ebuild @@ -0,0 +1,377 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-125-r1.ebuild,v 1.1 2008/07/25 21:43:24 zzam Exp $ + +inherit eutils flag-o-matic multilib toolchain-funcs versionator + +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 + !/dev/null + dolib extras/volume_id/lib/*.so* || die "Failed installing libvolume_id.so" + into /usr + dolib extras/volume_id/lib/*.a || die "Failed installing libvolume_id.a" + + # handle static linking bug #4411 + rm -f "${D}/usr/$(get_libdir)/libvolume_id.so" + gen_usr_ldscript libvolume_id.so + + # Add gentoo stuff to udev.conf + echo "# If you need to change mount-options, do it in /etc/fstab" \ + >> "${D}"/etc/udev/udev.conf + + # Now installing rules + cd "${S}"/rules + insinto /etc/udev/rules.d/ + + # Our rules files + doins gentoo/??-*.rules + doins packages/40-alsa.rules + + # Adding arch specific rules + if [[ -f packages/40-${ARCH}.rules ]] + then + doins "packages/40-${ARCH}.rules" + fi + cd "${S}" + + # our udev hooks into the rc system + insinto /$(get_libdir)/rcscripts/addons + newins "${FILESDIR}"/udev-start-122-r1.sh udev-start.sh + newins "${FILESDIR}"/udev-stop-118-r2.sh udev-stop.sh + + # The udev-post init-script + newinitd "${FILESDIR}"/udev-postmount-initd-111-r2 udev-postmount + + insinto /etc/modprobe.d + newins "${FILESDIR}"/blacklist-110 blacklist + doins "${FILESDIR}"/pnp-aliases + + # convert /lib/udev to real used dir + sed_helper_dir \ + "${D}/$(get_libdir)"/rcscripts/addons/*.sh \ + "${D}"/etc/init.d/udev* \ + "${D}"/etc/modprobe.d/* + + # documentation + dodoc ChangeLog FAQ README TODO RELEASE-NOTES + dodoc docs/{overview,udev_vs_devfs} + + cd docs/writing_udev_rules + mv index.html writing_udev_rules.html + dohtml *.html + + cd "${S}" + + newdoc extras/volume_id/README README_volume_id + + echo "CONFIG_PROTECT_MASK=\"/etc/udev/rules.d\"" > 20udev + doenvd 20udev +} + +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 && + ! -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 + + 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=$? +} + +pkg_postinst() { + # 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 [[ $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 + if [[ -d ${ROOT}/lib/udev/devices ]] + then + rm -f "${ROOT}"/lib/udev/devices/{null,zero,console,urandom} + fi + + # Removing some old file + 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 + + 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 + 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 + 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 #225033: + elog + elog "persistent-net does assigning fixed names to network devices." + elog "If you have problems with persistent-net rules," + elog "just delete the rules file" + elog "\trm ${ROOT}etc/udev/rules.d/70-persistent-net.rules" + elog "and then trigger udev by either running" + elog "\tudevadm trigger --subsystem-match=net" + elog "or by rebooting." + elog + elog "This may number your devices in a different way than it is now." + + if [[ ${ROOT} == / ]] + then + # check if root of init-process is identical to ours + if [[ -r /proc/1/root && /proc/1/root/ -ef /proc/self/root/ ]] + then + einfo "restarting udevd now." + if [[ -n $(pidof udevd) ]] + then + killall -15 udevd &>/dev/null + sleep 1 + killall -9 udevd &>/dev/null + fi + /sbin/udevd --daemon + fi + fi + + ewarn "If you build an initramfs including udev, then please" + ewarn "make sure that the /sbin/udevadm binary gets included," + ewarn "as the helper apps udevinfo, udevtrigger, ... are now" + ewarn "only symlinks to udevadm." + + 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." + + 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" +} -- cgit v1.2.3-65-gdbad