From: Matthias Schwarzott Date: Wed, 14 Mar 2007 15:33:02 +0000 (+0000) Subject: Now really use new rules file, that should already be in udev-106-r3. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=488a27f81035299bebe9179dec73474dbbbe6525;p=gentoo.git Now really use new rules file, that should already be in udev-106-r3. Package-Manager: portage-2.1.2.2 --- diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index dcf321db1760..d574c9c24e08 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.283 2007/03/14 13:47:37 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.284 2007/03/14 15:33:02 zzam Exp $ + +*udev-106-r4 (14 Mar 2007) + + 14 Mar 2007; Matthias Schwarzott +udev-106-r4.ebuild: + Now really use new rules file, that should already be in udev-106-r3. 14 Mar 2007; Roy Marples files/modprobe-105.sh: Remove bashisms from modprobe.sh diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 412a2fa4777b..14593070c641 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 05-udev-early.rules-078 288 RMD160 e4d07ee5080618ba60c9cfb544d438f2eb11cab6 SHA1 fbdeedb8b7a638c9d930f1e405aa83e55d9d2eec SHA256 63602afdbefafa4eb0b3301685e47dec5cc206b66765e733f9bcc6afe2a5d31b MD5 17c291f5c6e624792d02dd304fb8177e files/05-udev-early.rules-078 288 RMD160 e4d07ee5080618ba60c9cfb544d438f2eb11cab6 files/05-udev-early.rules-078 288 @@ -374,14 +377,18 @@ EBUILD udev-106-r3.ebuild 9920 RMD160 2370d7ea7702ab183be32bb9bdb52d04ff7dc82f S MD5 a6938515bfec02762d5d227e557b8aff udev-106-r3.ebuild 9920 RMD160 2370d7ea7702ab183be32bb9bdb52d04ff7dc82f udev-106-r3.ebuild 9920 SHA256 45882a7f4b7ac4f093f9937885fb94a802687575e0820189c136c7bbde3998bc udev-106-r3.ebuild 9920 +EBUILD udev-106-r4.ebuild 9920 RMD160 231724604dc98cb6652bc4a80a7ecc20a0554b8b SHA1 913fee68cec058ca88cce276012a66c072e7f60e SHA256 526d39735bb166d191207cf2ad1775b324dee69fa18b764a1e7e1db2b70b0c88 +MD5 9aeee7fb6c115aa908add98f9980f262 udev-106-r4.ebuild 9920 +RMD160 231724604dc98cb6652bc4a80a7ecc20a0554b8b udev-106-r4.ebuild 9920 +SHA256 526d39735bb166d191207cf2ad1775b324dee69fa18b764a1e7e1db2b70b0c88 udev-106-r4.ebuild 9920 EBUILD udev-106.ebuild 9197 RMD160 f41a2a34de78690fb114d8d48bea4e4c928724fd SHA1 c1ce96d49de3d27ea90c594ba07c0da4b559dff2 SHA256 bfb6ea516560a111c00cbd3abf3f8a4a86fa64e8215a66bac9897f24531e29eb MD5 e58b973d172923d98c751ec0b29181a5 udev-106.ebuild 9197 RMD160 f41a2a34de78690fb114d8d48bea4e4c928724fd udev-106.ebuild 9197 SHA256 bfb6ea516560a111c00cbd3abf3f8a4a86fa64e8215a66bac9897f24531e29eb udev-106.ebuild 9197 -MISC ChangeLog 53004 RMD160 6f5962424d644f47d8b32db2cff87e40e36fdf5c SHA1 38c1a8d1c4ef22bff113a128bf7232f8f48efe1a SHA256 f3151f233b25fccb1b46ee663a1af108954b67a686abc989b4b46c0db8f28a81 -MD5 3aac2f1b374a578cfcf00f9c874e395a ChangeLog 53004 -RMD160 6f5962424d644f47d8b32db2cff87e40e36fdf5c ChangeLog 53004 -SHA256 f3151f233b25fccb1b46ee663a1af108954b67a686abc989b4b46c0db8f28a81 ChangeLog 53004 +MISC ChangeLog 53175 RMD160 01959e5a69d8989ac9fad397235b5d87b081fc12 SHA1 bb59e4ba1bde04a618308de9c1763e53c6808cb2 SHA256 bdb4ab1f723bb507df13c33f78e2bf6c6961cde519ad79cbede8823e25913ee9 +MD5 191218bc8d4b41d4dead06b74c5c7f18 ChangeLog 53175 +RMD160 01959e5a69d8989ac9fad397235b5d87b081fc12 ChangeLog 53175 +SHA256 bdb4ab1f723bb507df13c33f78e2bf6c6961cde519ad79cbede8823e25913ee9 ChangeLog 53175 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447 @@ -449,3 +456,13 @@ SHA256 6d6620b896b3c0eee107f7a7bdee0a648b198ec04d17599162e78d3743f2dd63 files/di MD5 973c082873a5b1e461964c9db1753eab files/digest-udev-106-r3 229 RMD160 08bf8737aba13167f8f7c38148b937b767a086e1 files/digest-udev-106-r3 229 SHA256 6d6620b896b3c0eee107f7a7bdee0a648b198ec04d17599162e78d3743f2dd63 files/digest-udev-106-r3 229 +MD5 973c082873a5b1e461964c9db1753eab files/digest-udev-106-r4 229 +RMD160 08bf8737aba13167f8f7c38148b937b767a086e1 files/digest-udev-106-r4 229 +SHA256 6d6620b896b3c0eee107f7a7bdee0a648b198ec04d17599162e78d3743f2dd63 files/digest-udev-106-r4 229 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.3 (GNU/Linux) + +iD8DBQFF+BW5t2vP6XvVdOcRAvb/AKDmPNSEPmjU+vivYWf5w+8LBT+1igCePOpk +TLYEmQqR0VZorpRgMvMtOuc= +=WN+s +-----END PGP SIGNATURE----- diff --git a/sys-fs/udev/files/digest-udev-106-r4 b/sys-fs/udev/files/digest-udev-106-r4 new file mode 100644 index 000000000000..7bc700ae9207 --- /dev/null +++ b/sys-fs/udev/files/digest-udev-106-r4 @@ -0,0 +1,3 @@ +MD5 320ccd2d0f4540d10e021bafa14f8985 udev-106.tar.bz2 188557 +RMD160 2a01d06746b143c53d01b8c6aa97e635c062e9d3 udev-106.tar.bz2 188557 +SHA256 544a7372468459e8a631ffdf9cace29bc77365b9a6dab4189c6ba813da002156 udev-106.tar.bz2 188557 diff --git a/sys-fs/udev/udev-106-r4.ebuild b/sys-fs/udev/udev-106-r4.ebuild new file mode 100644 index 000000000000..9a10dd2ff48a --- /dev/null +++ b/sys-fs/udev/udev-106-r4.ebuild @@ -0,0 +1,295 @@ +# 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-106-r4.ebuild,v 1.1 2007/03/14 15:33:02 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 + epatch ${FILESDIR}/${P}-floppy-devices-no-umask.diff + + # 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 + + # Delete the rule for device-mapper control device, as we have our own + sed -ie '/device-mapper/d' etc/udev/suse/64-device-mapper.rules + + # 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 + + # 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 ${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-106-r3 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" + # Use suse's persistent device-mapper rules + doins ./etc/udev/suse/64-device-mapper.rules + + # 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-106-r2.sh udev-start.sh + newins "${FILESDIR}"/udev-stop-105.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 "