Version bumped. No longer disable s390 persistent-net. Small improvements to rule and conf-file installation.

(Portage version: 2.1.3.7)

5 files changed, 464 insertions, 1 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 9ba8d0646ced..84cabb2fff64 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,14 @@
 # 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.337 2007/08/25 12:59:26 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.338 2007/08/26 11:36:02 zzam Exp $
+
+*udev-115 (26 Aug 2007)
+
+  26 Aug 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/udev-115-rules-update.diff, +files/udev.conf.post_114,
+  +udev-115.ebuild:
+  Version bumped. No longer disable s390 persistent-net. Small improvements to
+  rule and conf-file installation.
 
   25 Aug 2007; Matthias Schwarzott <zzam@gentoo.org> udev-114-r2.ebuild:
   Now warn about unappropriate kernel version with just using uname -r, and no
diff --git a/sys-fs/udev/files/digest-udev-115 b/sys-fs/udev/files/digest-udev-115
new file mode 100644
index 000000000000..c03b0b400104
--- /dev/null
+++ b/sys-fs/udev/files/digest-udev-115
@@ -0,0 +1,3 @@
+MD5 39bbe5ddcd62d35cd56b184d6862c540 udev-115.tar.bz2 198893
+RMD160 bf72a4e20b9ba50a5b0c3da09f77e67ec819b9fa udev-115.tar.bz2 198893
+SHA256 e35bb5662d2ad692a24adc5bb1d10b065e4657bcb68f20c8ef98d892bfc8dc93 udev-115.tar.bz2 198893
diff --git a/sys-fs/udev/files/udev-115-rules-update.diff b/sys-fs/udev/files/udev-115-rules-update.diff
new file mode 100644
index 000000000000..2dcb192b12ce
--- /dev/null
+++ b/sys-fs/udev/files/udev-115-rules-update.diff
@@ -0,0 +1,117 @@
+diff --git a/etc/udev/gentoo/05-udev-early.rules b/etc/udev/gentoo/05-udev-early.rules
+index ee349dc..fc15e2b 100644
+--- a/etc/udev/gentoo/05-udev-early.rules
++++ b/etc/udev/gentoo/05-udev-early.rules
+@@ -1,9 +1,8 @@
+-# ignore these events until someone needs them
+-SUBSYSTEM=="drivers",	OPTIONS="ignore_device"
+-SUBSYSTEM=="module",	OPTIONS="ignore_device"
++# do not edit this file, it will be overwritten on update
+ 
+ # sysfs is populated after the event is sent
+-ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
+ ACTION=="add", KERNEL=="[0-9]*:[0-9]*", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"
++ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus"
+ ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
+ ACTION=="add", SUBSYSTEM=="net", ENV{PHYSDEVDRIVER}=="?*", WAIT_FOR_SYSFS="device/driver"
++
+diff --git a/etc/udev/gentoo/50-udev.rules b/etc/udev/gentoo/50-udev.rules
+index dd32971..9e06029 100644
+--- a/etc/udev/gentoo/50-udev.rules
++++ b/etc/udev/gentoo/50-udev.rules
+@@ -1,13 +1,9 @@
++# do not edit this file, it will be overwritten on update
++
+ # /etc/udev/rules/50-udev.rules:  device naming rules for udev
+ #
+ # Gentoo specific rules
+ #
+-# There are a number of modifiers that are allowed to be used in some of the
+-# fields.  See the udev man page for a full description of them.
+-#
+-# Try not to modify this file, if you wish to change things, create a new rule
+-# file that can be run before this one.
+-#
+ 
+ # Net devices can have arbitrary names, even
+ # ones set by the user. Not try to match normal
+diff --git a/etc/udev/gentoo/80-hotplug.rules b/etc/udev/gentoo/80-drivers.rules
+similarity index 70%
+rename from etc/udev/gentoo/80-hotplug.rules
+rename to etc/udev/gentoo/80-drivers.rules
+index 0637dbc..df6c880 100644
+--- a/etc/udev/gentoo/80-hotplug.rules
++++ b/etc/udev/gentoo/80-drivers.rules
+@@ -1,22 +1,12 @@
+-# /etc/udev/rules/80-hotplug.rules:  module loading rules for udev
+-#
+-# Gentoo specific rules
+-#
+-# There are a number of modifiers that are allowed to be used in some of the
+-# fields.  See the udev man page for a full description of them.
+-#
+-# Try not to modify this file, if you wish to change things, create a new rule
+-# file that can be run before this one.
+-#
+-
+-# Module autoloading
+-ACTION!="add", GOTO="hotplug_load_end"
++# do not edit this file, it will be overwritten on update
++
++ACTION!="add", GOTO="drivers_end"
+ 
+ # check if the device has already been claimed by a driver
+-ENV{DRIVER}=="?*", SUBSYSTEM!="input", GOTO="hotplug_load_end"
++ENV{DRIVER}=="?*", SUBSYSTEM!="input", GOTO="drivers_end"
+ 
+ # this driver is broken and should not be loaded automatically
+-SUBSYSTEM=="platform", ENV{MODALIAS}=="i82365", GOTO="hotplug_load_end"
++SUBSYSTEM=="platform", ENV{MODALIAS}=="i82365", GOTO="drivers_end"
+ 
+ # Autoload modules that lack aliases but have them defined in autoload modules
+ ENV{MODALIAS}=="?*", RUN{ignore_error}+="modprobe.sh $env{MODALIAS}"
+@@ -50,5 +40,5 @@ SUBSYSTEM!="scsi_device", GOTO="hotplug_scsi_end"
+ 	ATTRS{type}=="1", RUN+="modprobe.sh st"
+ LABEL="hotplug_scsi_end"
+ 
+-LABEL="hotplug_load_end"
++LABEL="drivers_end"
+ 
+diff --git a/etc/udev/gentoo/90-network.rules b/etc/udev/gentoo/90-network.rules
+new file mode 100644
+index 0000000..50903af
+--- /dev/null
++++ b/etc/udev/gentoo/90-network.rules
+@@ -0,0 +1,8 @@
++# do not edit this file, it will be overwritten on update
++
++# /etc/udev/rules/90-network.rules:  triggering network init-scripts
++
++# Activate our network if we can
++SUBSYSTEM=="net", ACTION=="add",    RUN+="net.sh %k start"
++SUBSYSTEM=="net", ACTION=="remove", RUN+="net.sh %k stop"
++
+diff --git a/etc/udev/gentoo/95-udev-late.rules b/etc/udev/gentoo/95-udev-late.rules
+deleted file mode 100644
+index 40ada28..0000000
+--- a/etc/udev/gentoo/95-udev-late.rules
++++ /dev/null
+@@ -1,18 +0,0 @@
+-# /etc/udev/rules/95-udev-late.rules:  device naming rules for udev
+-#
+-# Gentoo specific rules
+-#
+-# There are a number of modifiers that are allowed to be used in some of the
+-# fields.  See the udev man page for a full description of them.
+-#
+-# Try not to modify this file, if you wish to change things, create a new rule
+-# file that can be run before this one.
+-#
+-
+-# Activate our network if we can
+-SUBSYSTEM=="net", ACTION=="add",    RUN+="net.sh %k start"
+-SUBSYSTEM=="net", ACTION=="remove", RUN+="net.sh %k stop"
+-
+-# event to be catched by udevmonitor
+-RUN+="socket:/org/kernel/udev/monitor"
+-
diff --git a/sys-fs/udev/files/udev.conf.post_114 b/sys-fs/udev/files/udev.conf.post_114
new file mode 100644
index 000000000000..485bb9d0f149
--- /dev/null
+++ b/sys-fs/udev/files/udev.conf.post_114
@@ -0,0 +1,11 @@
+# The maximum size reserved for the tmpfs mounted on /dev
+tmpfs_size="10M"
+
+# Implictly blacklist the modules listed in modules.autoload
+# so that udev (with coldplugging) does not load them
+# but /etc/init.d/modules will do later.
+# This can guarantee correct load order needed for
+# some subsystems (like alsa, v4l, dvb, ...).
+# It should be generally safe.
+implicitly_blacklist_modules_autoload="yes"
+
diff --git a/sys-fs/udev/udev-115.ebuild b/sys-fs/udev/udev-115.ebuild
new file mode 100644
index 000000000000..304240b1ca3f
--- /dev/null
+++ b/sys-fs/udev/udev-115.ebuild
@@ -0,0 +1,324 @@
+# 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-115.ebuild,v 1.1 2007/08/26 11:36: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
+	!<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"
+
+	myconf=
+	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 \
+			extras/root_link"
+
+	use selinux && myconf="${myconf} USE_SELINUX=true"
+
+	# comparing kernel version without linux-info.eclass to not pull
+	# virtual/linux-sources
+	local KV=$(uname -r)
+	local KV_MAJOR=${KV%%.*}
+	local x=${KV#*.}
+	local KV_MINOR=${x%%.*}
+	x=${KV#*.*.}
+	local KV_MICRO=${x%%-*}
+
+	local ok=0
+	if [[ "${KV_MAJOR}" == 2 ]] && [[ "${KV_MINOR}" == 6 ]] && [[ "${KV_MICRO}" -ge 15 ]]; then
+		ok=1
+	fi
+
+	if [[ "$ok" = "0" ]]; then
+		ewarn
+		ewarn "${P} does not support Linux kernel before version 2.6.15!"
+		ewarn "If you want to use udev you need to update"
+		ewarn "to kernel >=2.6.15!"
+		ewarn
+		ebeep
+	fi
+}
+
+sed_helper_dir() {
+	sed -e "s#/lib/udev#${udev_helper_dir}#" -i "$@"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+
+	# patches go here...
+	EPATCH_OPTS="-p1" epatch "${FILESDIR}/${PN}-114-root-link-2.diff"
+	epatch "${FILESDIR}/${P}-rules-update.diff"
+
+	# We already have that rule in 50-udev.rules
+	sed -i extras/cdrom_id/Makefile -e '/60-cdrom_id.rules/d'
+
+	# 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}" != "423964bc802105edc672e170f733ef28" ]
+	then
+		echo
+		eerror "gentoo/udev.rules has been updated, please validate!"
+		die "gentoo/udev.rules has been updated, please validate!"
+	fi
+
+	sed_helper_dir \
+		etc/udev/gentoo/50-udev.rules \
+		extras/rule_generator/write_*_rules \
+		udev_rules_parse.c \
+		udev_rules.c
+
+	# Use correct multilib dir
+	sed -i extras/volume_id/lib/Makefile \
+		-e "/ =/s-/lib-/$(get_libdir)-"
+}
+
+src_compile() {
+	filter-flags -fprefetch-loop-arrays
+
+	# Not everyone has full $CHOST-{ld,ar,etc...} yet
+	local mycross=""
+	type -p ${CHOST}-ar && mycross=${CHOST}-
+
+	emake \
+		EXTRAS="${extras}" \
+		libudevdir=${udev_helper_dir} \
+		CROSS_COMPILE=${mycross} \
+		OPTFLAGS="" \
+		${myconf} || die
+}
+
+src_install() {
+	into /
+	emake \
+		DESTDIR="${D}" \
+		libudevdir=${udev_helper_dir} \
+		EXTRAS="${extras}" \
+		${myconf} \
+		install || die
+
+	# make install does not install this
+	dosbin udevstart	|| die "Required binary not installed properly"
+	doman udevstart.8
+
+	exeinto "${udev_helper_dir}"
+	newexe "${FILESDIR}"/net-104-r10.sh net.sh	|| die "Required binary not installed properly"
+	newexe "${FILESDIR}"/modprobe-114.sh modprobe.sh	|| die "Required binary not installed properly"
+	newexe "${FILESDIR}"/move_tmp_persistent_rules-112-r1.sh move_tmp_persistent_rules.sh \
+		|| die "Required binary 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
+
+	# vol_id library (needed by mount and HAL)
+	into /
+	dolib extras/volume_id/lib/*.so*
+	into /usr
+	dolib extras/volume_id/lib/*.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
+	cat "${FILESDIR}"/udev.conf.post_114 >> "${D}"/etc/udev/udev.conf
+
+
+	# Now installing rules
+	cd etc/udev
+	insinto /etc/udev/rules.d/
+
+	# For now use our own file - not default upstream one
+	rm "${D}"/etc/udev/rules.d/50-udev-default.rules
+
+	# Our rules files
+	mv gentoo/80-hotplug.rules gentoo/80-drivers.rules
+	doins gentoo/??-*.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-114-r1.sh udev-start.sh
+	newins "${FILESDIR}"/udev-stop-111-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}
+	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() {
+	# 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 "<sys-fs/udev-104-r5"; then
+		rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev
+		rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net
+	fi
+
+	if has_version "<sys-fs/udev-106-r5"; then
+		if [[ -e "${ROOT}"/etc/udev/rules.d/95-net.rules ]]; then
+			rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules
+		fi
+	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
+		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 has_version "<sys-fs/udev-113" &&
+		[[ -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
+
+	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
+
+	einfo
+	einfo "For more information on udev on Gentoo, writing udev rules, and"
+	einfo "         fixing known issues visit:"
+	einfo "         http://www.gentoo.org/doc/en/udev-guide.xml"
+}