From 760a246b52969de1dc5841aa5159f851e799543a Mon Sep 17 00:00:00 2001 From: Matthias Schwarzott Date: Tue, 24 Apr 2007 06:41:46 +0000 Subject: [PATCH] Version bumped. Package-Manager: portage-2.1.2.4 --- sys-fs/udev/ChangeLog | 7 +- sys-fs/udev/Manifest | 22 ++- sys-fs/udev/files/digest-udev-109 | 3 + sys-fs/udev/udev-109.ebuild | 297 ++++++++++++++++++++++++++++++ 4 files changed, 321 insertions(+), 8 deletions(-) create mode 100644 sys-fs/udev/files/digest-udev-109 create mode 100644 sys-fs/udev/udev-109.ebuild diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index ffc0a1e45208..5b8cd5f6c0ce 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,11 @@ # 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.295 2007/04/23 20:18:22 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.296 2007/04/24 06:41:46 zzam Exp $ + +*udev-109 (24 Apr 2007) + + 24 Apr 2007; Matthias Schwarzott +udev-109.ebuild: + Version bumped. *udev-108-r1 (23 Apr 2007) diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index c144b69013ed..4f7c5a0cfa52 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -326,6 +326,7 @@ DIST udev-104.tar.bz2 187574 RMD160 269aeb9a0b2043d18c274fde749d2e0d30398b73 SHA DIST udev-106.tar.bz2 188557 RMD160 2a01d06746b143c53d01b8c6aa97e635c062e9d3 SHA1 8d2a596c506e1ba5a099e57982eb9aff17058d91 SHA256 544a7372468459e8a631ffdf9cace29bc77365b9a6dab4189c6ba813da002156 DIST udev-107.tar.bz2 189101 RMD160 ebc2722e0306aea3f3c0cd828861a61021609ac7 SHA1 78c208e2e446824dd967b7b9b36684578799aee8 SHA256 49c45315ba640547939b2e2949f9478af2279a3296e97328ee8f6a4b08f2eae9 DIST udev-108.tar.bz2 187460 RMD160 cfc3885bdbb1a3611118c8503efe3ffe472b0f2d SHA1 4f1746dcfe51436a43b32c4db9af04f018a62bab SHA256 0956fd6e7388cbb9c3431db302e52f8ee03d7fad8a159359597878058d8632ec +DIST udev-109.tar.bz2 188252 RMD160 8700365b2ea744e19f0133615a652ca85726d890 SHA1 d2fe21ecec90824518feb3e7c5fb3ee050b7790c SHA256 d16886d1d1791331f6cf949338b3c5aaf9f57c5a5b141531efa61c8b881b3330 EBUILD udev-079-r2.ebuild 7538 RMD160 855d8af681bf6ca8e38dcc3881b1c468d599bdfb SHA1 c4271b48dea89ca9a0e9860e9ede29a54a04275e SHA256 b972caef4241ca892aa25387dc56264a81b52c51821588b834a6f013c2984d1c MD5 b5b0e32721933ece54da4280b05386c5 udev-079-r2.ebuild 7538 RMD160 855d8af681bf6ca8e38dcc3881b1c468d599bdfb udev-079-r2.ebuild 7538 @@ -406,10 +407,14 @@ EBUILD udev-108.ebuild 9608 RMD160 d7e60ea554e963d2a66aa1cba8796f4458782b3f SHA1 MD5 821fd4c4b7db717688987e169c936ddf udev-108.ebuild 9608 RMD160 d7e60ea554e963d2a66aa1cba8796f4458782b3f udev-108.ebuild 9608 SHA256 3b39e71f420ada07465a7891ffd8a019bfb6db322479265e1a7b5e0924118a1e udev-108.ebuild 9608 -MISC ChangeLog 56743 RMD160 e6a1ad01925f711c4b1e72da17c73207aeb25457 SHA1 60bbea9215be720d306ff42773765b81384fe0be SHA256 a72facce49105a54b16fe86b7a89025f1305470856d475eaa4ce437641974405 -MD5 30571338c61dc79ae52fcff89c20b6a8 ChangeLog 56743 -RMD160 e6a1ad01925f711c4b1e72da17c73207aeb25457 ChangeLog 56743 -SHA256 a72facce49105a54b16fe86b7a89025f1305470856d475eaa4ce437641974405 ChangeLog 56743 +EBUILD udev-109.ebuild 9854 RMD160 a75a5676d1f25dc7d9c85f7f83d31861c335884c SHA1 28b2658232e1d5b4d9c28a7260a679b0191bf00a SHA256 c71970cc99f0033209198bfbc6707f96f86fc216d27ffe64991b2248767cc390 +MD5 4edd51d72db2d07d5aeceee955996ad0 udev-109.ebuild 9854 +RMD160 a75a5676d1f25dc7d9c85f7f83d31861c335884c udev-109.ebuild 9854 +SHA256 c71970cc99f0033209198bfbc6707f96f86fc216d27ffe64991b2248767cc390 udev-109.ebuild 9854 +MISC ChangeLog 56858 RMD160 fade067f62ce54d04d8491a8aaef1ff29093feff SHA1 bba53cf690a970f0093962d06914800651a6d88d SHA256 ac7443ced02efe29178625e4f86d50f0547b1d4979a3ef028d1136a9d3bbb6e7 +MD5 f87ee8e21725b3c80877f16261fdea8d ChangeLog 56858 +RMD160 fade067f62ce54d04d8491a8aaef1ff29093feff ChangeLog 56858 +SHA256 ac7443ced02efe29178625e4f86d50f0547b1d4979a3ef028d1136a9d3bbb6e7 ChangeLog 56858 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447 @@ -474,10 +479,13 @@ SHA256 ff79035ff80988aa331bbc8d5146584c9462b49ceea58433682c944c28a341c6 files/di MD5 afb0581941a81d478429e9bbe0dd3e3c files/digest-udev-108-r1 229 RMD160 8909ec163d6e565d6b80cee19a97e4102374f89a files/digest-udev-108-r1 229 SHA256 ff79035ff80988aa331bbc8d5146584c9462b49ceea58433682c944c28a341c6 files/digest-udev-108-r1 229 +MD5 06dd85951af811c5b41062e59a3e0d29 files/digest-udev-109 229 +RMD160 b69604bc7ad0380706666cdfd0c540092cecca03 files/digest-udev-109 229 +SHA256 8dea85fc9892209ba9075aea974823c58c2bacc7f34c52861e4a00f9f89e5f98 files/digest-udev-109 229 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGLRSYt2vP6XvVdOcRAozaAJ9LWTJkyTNCWlnJsOwcgVje17LehwCfWrco -LhFZUquC3kfQv9tn5wENLT8= -=Oedq +iD8DBQFGLaaxt2vP6XvVdOcRApEAAKCJ0GnHls5uHrF0sZi0Ae1aF8zIUQCdH98b +OwGegTYnmSdmHNxFlhwBPfI= +=ycvJ -----END PGP SIGNATURE----- diff --git a/sys-fs/udev/files/digest-udev-109 b/sys-fs/udev/files/digest-udev-109 new file mode 100644 index 000000000000..6a196fcc2437 --- /dev/null +++ b/sys-fs/udev/files/digest-udev-109 @@ -0,0 +1,3 @@ +MD5 6fd1ed31f48d7e99c549a132974a34c0 udev-109.tar.bz2 188252 +RMD160 8700365b2ea744e19f0133615a652ca85726d890 udev-109.tar.bz2 188252 +SHA256 d16886d1d1791331f6cf949338b3c5aaf9f57c5a5b141531efa61c8b881b3330 udev-109.tar.bz2 188252 diff --git a/sys-fs/udev/udev-109.ebuild b/sys-fs/udev/udev-109.ebuild new file mode 100644 index 000000000000..d4c01f2891d4 --- /dev/null +++ b/sys-fs/udev/udev-109.ebuild @@ -0,0 +1,297 @@ +# 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-109.ebuild,v 1.1 2007/04/24 06:41:46 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.12.5" +# 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}/${PN}-104-peristent-net-disable-xen.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/50-udev.rules"` + MD5=${MD5/ -/} + if [ "${MD5}" != "db0c266c3f407b6e4d1959b31f753e9a" ] + 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/edd_id \ + extras/firmware \ + extras/floppy \ + extras/path_id \ + 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/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/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 + + # create symlinks for these utilities to /sbin + # where multipath-tools expect them to be (Bug #168588) + dosym ../lib/udev/vol_id /sbin/vol_id + dosym ../lib/udev/scsi_id /sbin/scsi_id + + # 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" + newexe ${FILESDIR}/modprobe-105.sh modprobe.sh || die "Required binary not installed properly" + doexe extras/eventrecorder.sh || die "Required binary not installed properly" + + # Our udev config file + insinto /etc/udev + newins ${FILESDIR}/udev.conf.post_108 udev.conf + + # Our rules files + insinto /etc/udev/rules.d/ + doins etc/udev/gentoo/??-*.rules + #newins ${FILESDIR}/udev.rules-107-r1 50-udev.rules + #newins ${FILESDIR}/05-udev-early.rules-106-r5 05-udev-early.rules + #doins ${FILESDIR}/95-udev-late.rules + # Special rules for device-mapper + #newins ${FILESDIR}/64-device-mapper.rules-107-r1 64-device-mapper.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 + + # 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/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 /$(get_libdir)/rcscripts/addons + newins "${FILESDIR}"/udev-start-108-r1.sh udev-start.sh + newins "${FILESDIR}"/udev-stop-108-r1.sh 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 + + insinto /etc/modprobe.d + doins ${FILESDIR}/blacklist ${FILESDIR}/pnp-aliases + + if use s390; then + # s390 does not has persistent mac addresses + # and we only have persistence rules for mac. + # For now just remove the rules file. + rm ${D}/etc/udev/rules.d/75-persistent-net-generator.rules + fi + +} + +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 + # check if root of init-process is identical to ours + if [ -r /proc/1/root -a /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 + + # 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 "