diff options
| -rw-r--r-- | sys-fs/udev/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-fs/udev/Manifest | 10 | ||||
| -rw-r--r-- | sys-fs/udev/udev-132.ebuild | 359 |
3 files changed, 373 insertions, 5 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 4f659931f99b..41dd4f9ee9d5 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,13 @@ # 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.415 2008/11/06 09:13:10 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.416 2008/11/14 16:49:02 zzam Exp $ + +*udev-132 (14 Nov 2008) + + 14 Nov 2008; Matthias Schwarzott <zzam@gentoo.org> +udev-132.ebuild: + Version bumped. Changed minimal version for reliable operation to Kernel + 2.6.19. Improved code to restart udevd and moved it to an extra function, + see Bug #129204 for this. 06 Nov 2008; Matthias Schwarzott <zzam@gentoo.org> -files/udev-start-122.sh, diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 0c83d143b8ff..f08f8b07674d 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -40,6 +40,7 @@ DIST udev-122.tar.bz2 207332 RMD160 0e6737d26eb245b3438c1f26e2350de8cc780aee SHA DIST udev-124.tar.bz2 208381 RMD160 3a7affb0f11087fdb5d016d13add32b0442d13df SHA1 5b5426d8b9dc2e7a7b7602ba9fb8fca62e96d8ee SHA256 a497914660d9d9db9863dead25395fc944e934e8a7bef4a639f5b31d057a5542 DIST udev-125.tar.bz2 205296 RMD160 c1571c3824860a166c830d47784f72630129825e SHA1 ade3719e8289c015c02c983d78242d6bd48e564e SHA256 7a029083f832c947fcde2b1092ba3b7265192040e3a126db410571acb661e5f0 DIST udev-130.tar.bz2 442846 RMD160 6b941866b224396792a34db9aa2da0d44dace509 SHA1 da55d4064bd89d4cc3672a3ec304d82a12f0e39c SHA256 bbb64eb268ebc3d7c3bad74774daa2ed0ef887956ae6fb8f6f80717a7c957478 +DIST udev-132.tar.bz2 444104 RMD160 21a6a1e771bd550e5bca3f58f0150bdb5321a969 SHA1 d923b37db3f95e5056a7e3de0f790180c3756242 SHA256 7da5372ff3153eaaee4df369bc70f7b60b2750a429ce6b880230ba614b550814 EBUILD udev-114.ebuild 9031 RMD160 1b7e45d1a384c52a336727a17e6fbd087855fb34 SHA1 207b330f01cb9970eee14b4c39b7bf2d5b9ce181 SHA256 f45fda83e1308079b9d932586b07acf2d7bf65527f8b414c8d43738fd0c129e5 EBUILD udev-115-r1.ebuild 10108 RMD160 86ec04530480872e2ac1fbb2fa37fa2819639752 SHA1 1021b13461ac7625f97a60634982416c2a8dddc4 SHA256 765135b405bd90ee6c527c0be00e87c12400121e30261de9ba6d3e4a3c50f872 EBUILD udev-119.ebuild 10145 RMD160 7b978b270ce5d39443310b7da58aa5ff4bdd02f9 SHA1 fdd10d47bb62517d78f0e7d811903203b4cc3d8e SHA256 2998cfa7681f16132aaad0a8a033e83418c4e418430cabf5ebf1d8631fcc58bd @@ -48,12 +49,13 @@ EBUILD udev-124-r1.ebuild 10735 RMD160 614726833a426384a30ae404248395a6c49e53c7 EBUILD udev-125-r2.ebuild 10732 RMD160 58b821e085c1fc3f28772b9ab3e72adfa268a1cf SHA1 d88144b2b150f4eda308a37a8cc06d760ef1cc20 SHA256 fb7efdc754565d7ae3e6e5922aa9919cd23c37ca23b0174493c743b180a91bdf EBUILD udev-130-r1.ebuild 9544 RMD160 9bb3e52fe62d0f6e87ca6993cfb23823a66f0c9a SHA1 234d67af61d1217d956e150427a1ded1acb46c22 SHA256 3b4f71c6911717532e9c76e089bce20685ab56b0e75bd608e791b067c35e44ca EBUILD udev-130-r2.ebuild 9720 RMD160 ceb64d4d62fda93a312aa40c36aa00b4996e15ed SHA1 2beca11b16189870b74e8eb38f5a1bc0dd1fb51b SHA256 fcbaef2c162d60ee6f740f91800869fd7655c07f2e16317a5f21142293cd42b5 -MISC ChangeLog 84885 RMD160 e7f0f1a3fbad70f078de66abb4fc96238e1a8146 SHA1 136de9402ae0edca1cda3ee796788a8ebfbf06b1 SHA256 595bac9f368e03457bdc64591592943275cbf239d914bade43262fc8120c6c8f +EBUILD udev-132.ebuild 10151 RMD160 0e29e9393a8a23f3bb2a2def974ec13636e7be20 SHA1 b74b00386210061b61d38108863e52b7ee604703 SHA256 ac8bf418a8b80955f3583d95256533325b2989dd546a4f9e65cad8fb69a4f079 +MISC ChangeLog 85161 RMD160 c8719d9db19951de591cc58617150b4136b297ab SHA1 c86a643092d23afd64bd3757a90320d158b1584c SHA256 a6ee28b9ed1493580aea29556cc8a983c9b2d8d67ad1666b3d0618d8e45fb7e3 MISC metadata.xml 225 RMD160 9459d2b2027607874431067a9100c48a0a128ffa SHA1 d9fad1caa18dd065595932b9e5d6c18098f3dfad SHA256 dd3c55c5a5c97678030df2554192894d849cdd4845d6fec1c8259d7bf263cd46 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkkStS8ACgkQt2vP6XvVdOeQ9wCgiR7+9Z+M7s8HHfcH/yrrprEc -zjwAnRnLO9SsFMa2A+qinhXkicM1XB6X -=VNG7 +iEYEARECAAYFAkkdrAQACgkQt2vP6XvVdOd17ACg1jsrOHg6ZuwHSgwSNqwVqYI0 +D5sAnRnGIWElNv/N8V/iWdH2i7MntCMb +=WOam -----END PGP SIGNATURE----- diff --git a/sys-fs/udev/udev-132.ebuild b/sys-fs/udev/udev-132.ebuild new file mode 100644 index 000000000000..49abc4d0157f --- /dev/null +++ b/sys-fs/udev/udev-132.ebuild @@ -0,0 +1,359 @@ +# 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-132.ebuild,v 1.1 2008/11/14 16:49:03 zzam Exp $ + +inherit eutils flag-o-matic multilib toolchain-funcs versionator autotools + +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 + !<sys-fs/device-mapper-1.02.19-r1" +RDEPEND="${DEPEND} ${RDEPEND} + >=sys-apps/baselayout-1.12.5" +# We need the lib/rcscripts/addon support +PROVIDE="virtual/dev-manager" + +pkg_setup() { + udev_helper_dir="/$(get_libdir)/udev" + + # comparing kernel version without linux-info.eclass to not pull + # virtual/linux-sources + + local KV=$(uname -r) + local KV_MAJOR=$(get_major_version ${KV}) + local KV_MINOR=$(get_version_component_range 2 ${KV}) + local KV_MICRO=$(get_version_component_range 3 ${KV}) + + local min_micro=15 min_micro_reliable=19 + + local ok=0 + if [[ ${KV_MAJOR} == 2 && ${KV_MINOR} == 6 ]] + then + if [[ ${KV_MICRO} -ge ${min_micro_reliable} ]]; then + ok=2 + elif [[ ${KV_MICRO} -ge ${min_micro} ]]; then + ok=1 + fi + fi + + if [[ ${ok} -lt 1 ]] + then + ewarn + ewarn "${P} does not support Linux kernel before version 2.6.${min_micro}!" + fi + if [[ ${ok} -lt 2 ]]; then + ewarn "If you want to use udev reliable you should update" + ewarn "to at least kernel version 2.6.${min_micro_reliable}!" + ewarn + ebeep + fi +} + +sed_helper_dir() { + sed -e "s#/lib/udev#${udev_helper_dir}#" -i "$@" +} + +src_unpack() { + unpack ${A} + + cd "${S}" + + # patches go here... + + # 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} != da85d0a38ca61adc8714856a503bc8e8 ]] + then + echo + eerror "50-udev-default.rules has been updated, please validate!" + die "50-udev-default.rules has been updated, please validate!" + fi + + sed_helper_dir \ + rules/rules.d/50-udev-default.rules \ + extras/rule_generator/write_*_rules \ + udev/udev-util.c \ + udev/udev-rules.c \ + udev/udevd.c \ + $(find -name "Makefile.*") || die "sed failed" + + # fix version of volume_id lib + sed -e 's/-version-info/-version-number/' -i extras/volume_id/lib/Makefile.am + + eautoreconf +} + +src_compile() { + filter-flags -fprefetch-loop-arrays + + econf \ + --prefix=/usr \ + --sysconfdir=/etc \ + --exec-prefix= \ + --with-libdir-name=$(get_libdir) \ + --disable-logging \ + $(use_with selinux) + + emake || die "compiling udev failed" +} + +src_install() { + into / + emake DESTDIR="${D}" install || die "make install failed" + + exeinto "${udev_helper_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" + newexe "${FILESDIR}"/shell-compat-118-r3.sh shell-compat.sh \ + || die "shell-compat.sh not installed properly" + + keepdir "${udev_helper_dir}"/state + keepdir "${udev_helper_dir}"/devices + + # create symlinks for these utilities to /sbin + # where multipath-tools expect them to be (Bug #168588) + dosym "..${udev_helper_dir}/vol_id" /sbin/vol_id + dosym "..${udev_helper_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_helper_dir}"/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-126.sh udev-start.sh + newins "${FILESDIR}"/udev-stop-126.sh udev-stop.sh + + # The udev-post init-script + newinitd "${FILESDIR}"/udev-postmount-130-r2.initd udev-postmount + + # init-script for >openrc-0.3.0 + # TODO: Add message that users REALLY, REALLY + # need to add this to sysinit runlevel + # Bug #240984 + newinitd "${FILESDIR}/udev.initd" udev + + 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 README TODO || die "failed installing docs" + + 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=$? +} + +# See Bug #129204 for a discussion about restarting udevd +restart_udevd() { + # 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 /dev/.udev exists + [[ -e /dev/.udev ]] || return + + elog + elog "restarting udevd now." + elog + + killall -15 udevd &>/dev/null + sleep 1 + killall -9 udevd &>/dev/null + + /sbin/udevd --daemon +} + +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." + + restart_udevd + + 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." + + 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" +} |