Rules update. Adds rule to create usbfs like nodes for kernel 2.6.22. Try to keep nodes /dev/net/tun and /dev/ppp after module unload.

(Portage version: 2.1.3_rc7)

4 files changed, 357 insertions, 1 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 488353829d57..e910e25e71f1 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,13 @@
 # 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.313 2007/06/27 09:58:08 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.314 2007/07/10 21:16:20 zzam Exp $
+
+*udev-113-r1 (10 Jul 2007)
+
+  10 Jul 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/udev-113-r1-rules.diff, +udev-113-r1.ebuild:
+  Rules update. Adds rule to create usbfs like nodes for kernel 2.6.22. Try to
+  keep nodes /dev/net/tun and /dev/ppp after module unload.
 
 *udev-113 (27 Jun 2007)
 
diff --git a/sys-fs/udev/files/digest-udev-113-r1 b/sys-fs/udev/files/digest-udev-113-r1
new file mode 100644
index 000000000000..2f51cd4d0a51
--- /dev/null
+++ b/sys-fs/udev/files/digest-udev-113-r1
@@ -0,0 +1,3 @@
+MD5 cb9a227206b9d85ae8cfc88fc51c1710 udev-113.tar.bz2 195555
+RMD160 02175d9714027716b7a97f49e61625979fd0c43c udev-113.tar.bz2 195555
+SHA256 38da4049b76b58ddbc6ead6fa84cb241d94cc38ad4ee7aefd99ae2c57a73a2d4 udev-113.tar.bz2 195555
diff --git a/sys-fs/udev/files/udev-113-r1-rules.diff b/sys-fs/udev/files/udev-113-r1-rules.diff
new file mode 100644
index 000000000000..91f9a835becf
--- /dev/null
+++ b/sys-fs/udev/files/udev-113-r1-rules.diff
@@ -0,0 +1,38 @@
+diff --git a/etc/udev/gentoo/50-udev.rules b/etc/udev/gentoo/50-udev.rules
+index 57f2387..b2f69e2 100644
+--- a/etc/udev/gentoo/50-udev.rules
++++ b/etc/udev/gentoo/50-udev.rules
+@@ -129,7 +129,8 @@ KERNEL=="dnrtmsg",	NAME="netlink/%k"
+ KERNEL=="tap*",		NAME="netlink/%k"
+ 
+ # network devices
+-KERNEL=="tun",		NAME="net/%k",	MODE="0600"
++KERNEL=="tun",		NAME="net/%k",	MODE="0660", OPTIONS+="ignore_remove"
++KERNEL=="ppp",		MODE="0600", OPTIONS+="ignore_remove"
+ 
+ # ramdisk devices
+ KERNEL=="ram[0-9]*",	NAME="rd/%n", SYMLINK+="%k"
+@@ -240,15 +241,18 @@ KERNEL=="issm*",	NAME="infiniband/%k"
+ 
+ 
+ # usbfs-like device nodes
++# the way to go up to kernel 2.6.21 (and above if setting USB_DEVICE_CLASS=y)
+ SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="usb", MODE="0664"
++# starting from kernel 2.6.22 use this rule
++SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", \
++	NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", GROUP="usb", MODE="0644" 
+ 
+-
+-# Setting timeout for tape-devices to 900 seconds
++# Setting timeout for tape-devices (type 1) to 900 seconds
++# and 60 seconds for device types 0, 7 and 14
+ # if you need timeouts for other devices add a similar rule
+ # with correct type-value, or open a bug on bugs.gentoo.org.
+-ACTION=="add", SUBSYSTEM=="scsi" , ATTRS{type}=="1", \
+-	RUN+="/bin/sh -c 'echo 900 > /sys$$DEVPATH/timeout'"
+-
++SUBSYSTEM=="scsi", KERNEL=="[0-9]*:[0-9]*", ACTION=="add", ATTR{type}=="0|7|14", ATTR{timeout}="60"
++SUBSYSTEM=="scsi", KERNEL=="[0-9]*:[0-9]*", ACTION=="add", ATTR{type}=="1", ATTR{timeout}="900"
+ 
+ # Module autoloading
+ ACTION!="add", GOTO="hotplug_no_add_event"
diff --git a/sys-fs/udev/udev-113-r1.ebuild b/sys-fs/udev/udev-113-r1.ebuild
new file mode 100644
index 000000000000..e0600ecb1de8
--- /dev/null
+++ b/sys-fs/udev/udev-113-r1.ebuild
@@ -0,0 +1,308 @@
+# 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-113-r1.ebuild,v 1.1 2007/07/10 21:16:20 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"
+
+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"
+}
+
+sed_helper_dir() {
+	sed -e "s#/lib/udev#${udev_helper_dir}#" -i "$@"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+
+	# patches go here...
+	epatch ${FILESDIR}/${PN}-104-peristent-net-disable-xen.patch
+	EPATCH_OPTS="-p1" epatch ${FILESDIR}/${PN}-110-root-link-1.diff
+	epatch ${FILESDIR}/${PN}-113-r1-rules.diff
+
+	# this is now installed by sys-fs/device-mapper
+	rm etc/udev/gentoo/64-device-mapper.rules
+
+	# 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}" != "289e10d87dd153b0082d126c5e129f21" ]
+	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_utils_run.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-111-r1.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
+
+	# 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
+	# Use upstream's persistent rules for devices
+	doins etc/udev/rules.d/60-*.rules
+
+	# our udev hooks into the rc system
+	insinto /$(get_libdir)/rcscripts/addons
+	newins "${FILESDIR}"/udev-start-111-r3.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/*
+
+	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
+
+	# 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
+
+	if has_version "<sys-fs/udev-113" &&
+		[[ -f "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules ]] &&
+		has_version sys-fs/device-mapper
+	then
+		# change mtime to definitely keep the file
+		touch "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules
+	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"
+}