Apply patch from udev-105 to let vol_id properly detect raid partitions. Added code to udev-stop script to save persistent-{cd,net} rules created at boot while root-device was read-only to /etc/udev/rules.d, to make it really persistent over multiple boots.

Package-Manager: portage-2.1.2-r7

6 files changed, 482 insertions, 9 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index a564860112ae..a3b40bb77a98 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,16 @@
 # 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.240 2007/01/31 10:30:32 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.241 2007/02/03 22:42:00 zzam Exp $
+
+*udev-104-r8 (03 Feb 2007)
+
+  03 Feb 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/udev-stop-104-r8.sh, +files/udev-105-vol_id-fix.patch,
+  +udev-104-r8.ebuild:
+  Apply patch from udev-105 to let vol_id properly detect raid partitions.
+  Added code to udev-stop script to save persistent-{cd,net} rules created at
+  boot while root-device was read-only to /etc/udev/rules.d, to make it really
+  persistent over multiple boots.
 
 *udev-104-r7 (31 Jan 2007)
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 1878a2770760..481e90f7a698 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -49,6 +49,10 @@ AUX udev-104-peristent-net-disable-xen.patch 1027 RMD160 326cfdb0529348013e9b50e
 MD5 88882c2d651f3ede4c105478ee37f977 files/udev-104-peristent-net-disable-xen.patch 1027
 RMD160 326cfdb0529348013e9b50edd1cf878808d980d1 files/udev-104-peristent-net-disable-xen.patch 1027
 SHA256 07ae5cb9ead44ebb032c0322cd93b19d9eba7e43704c3ec55d29ac21f5e24ab0 files/udev-104-peristent-net-disable-xen.patch 1027
+AUX udev-105-vol_id-fix.patch 1915 RMD160 662666e3f66aa2c8d360e0271e2211d59eda0658 SHA1 476169645dc943e19f1ae076df8b7de5f34b51ea SHA256 87ce8a679e7555fa48fec826ca1860e349683488af42953b1f74897cc6166d90
+MD5 e8f743323be363683df7fd4c42482d44 files/udev-105-vol_id-fix.patch 1915
+RMD160 662666e3f66aa2c8d360e0271e2211d59eda0658 files/udev-105-vol_id-fix.patch 1915
+SHA256 87ce8a679e7555fa48fec826ca1860e349683488af42953b1f74897cc6166d90 files/udev-105-vol_id-fix.patch 1915
 AUX udev-parisc-path_id-again.patch 524 RMD160 d305615a2f5ae0ab6b468400e95ad3332a2bcb38 SHA1 574d12600292d5cd1acb3b1be2bc24d337581a88 SHA256 a1b40d1bf3f8a7e0d6787d310218b44916c79a4f94a39287bc00f8ae058b67ff
 MD5 2f18f7560f7667fa98179c6084396453 files/udev-parisc-path_id-again.patch 524
 RMD160 d305615a2f5ae0ab6b468400e95ad3332a2bcb38 files/udev-parisc-path_id-again.patch 524
@@ -105,6 +109,10 @@ AUX udev-stop-104-r3.sh 2713 RMD160 2d4a447ab761912450d61e6b5a0be82606bddaca SHA
 MD5 e96140f8cf487251013ebefb25bc9f11 files/udev-stop-104-r3.sh 2713
 RMD160 2d4a447ab761912450d61e6b5a0be82606bddaca files/udev-stop-104-r3.sh 2713
 SHA256 1b7d1f6ff17bc985bad0a53741b0955e35e100d45d943bef806325ad48117f41 files/udev-stop-104-r3.sh 2713
+AUX udev-stop-104-r8.sh 3202 RMD160 3f52744956f6fbee8c70320e2e32542d8511e976 SHA1 344dea9dc9d21e332f6903ff66f1322615ca9770 SHA256 82169e891de6a952a46124f9a3c9cebb2982613173b3b259e4e37ee5b7d74a09
+MD5 ca852c634997ff81c700b0c76aa0bda5 files/udev-stop-104-r8.sh 3202
+RMD160 3f52744956f6fbee8c70320e2e32542d8511e976 files/udev-stop-104-r8.sh 3202
+SHA256 82169e891de6a952a46124f9a3c9cebb2982613173b3b259e4e37ee5b7d74a09 files/udev-stop-104-r8.sh 3202
 AUX udev-stop.sh 2158 RMD160 0293fc9cd5de85b17624d38bd2c22a48c9722453 SHA1 6d918052006403d0fe1ab34041e36581cdeddcd4 SHA256 bb4fad16e3b58707565d9bb6652c94d917378dc0c462fd660957e17860313429
 MD5 b73dfbd0300c444f047f77914ca1c956 files/udev-stop.sh 2158
 RMD160 0293fc9cd5de85b17624d38bd2c22a48c9722453 files/udev-stop.sh 2158
@@ -275,10 +283,14 @@ EBUILD udev-104-r7.ebuild 9122 RMD160 3d9b5faab992e144d396dfab8cdf2f5ba5243072 S
 MD5 a17c1395903b210e61d2804af83a6e9d udev-104-r7.ebuild 9122
 RMD160 3d9b5faab992e144d396dfab8cdf2f5ba5243072 udev-104-r7.ebuild 9122
 SHA256 40a963367e7c7485292bdb1e6a1baa61c1616ffd58a795df6a83c5754cf5e7c9 udev-104-r7.ebuild 9122
-MISC ChangeLog 44921 RMD160 7194aa55b89598565299c504532e5f1edf405245 SHA1 e46a6336f7dcb185b87ae36b6d495be513488f7b SHA256 b4649514cd2b3b34c0734aafeb2a8993ae6c3be1164098823345c84fc8981dae
-MD5 a1aa45948ad3117993b5a431f62ca63d ChangeLog 44921
-RMD160 7194aa55b89598565299c504532e5f1edf405245 ChangeLog 44921
-SHA256 b4649514cd2b3b34c0734aafeb2a8993ae6c3be1164098823345c84fc8981dae ChangeLog 44921
+EBUILD udev-104-r8.ebuild 9169 RMD160 c0f961377cff35fcfa9dbb08c3345a656a95325b SHA1 7d9857c43082303c870197edfc708aefa6367562 SHA256 fb02be56950be8a9ca9f98ef64146ee5ba19a8758b1b57a1150fb1d11fed4c5f
+MD5 32a3078aaafe9403e66e12f4fea1d565 udev-104-r8.ebuild 9169
+RMD160 c0f961377cff35fcfa9dbb08c3345a656a95325b udev-104-r8.ebuild 9169
+SHA256 fb02be56950be8a9ca9f98ef64146ee5ba19a8758b1b57a1150fb1d11fed4c5f udev-104-r8.ebuild 9169
+MISC ChangeLog 45356 RMD160 156964abe142fc4d2bcafa36dd7864e5785a2ff6 SHA1 b04167c7b91a7297dca645a9e1241b4134f31bed SHA256 a5296d954918f59b7171d2e11f1e88731728cea7ee6e77aeae1b45a9c03f7c53
+MD5 7868005cdb776c7105b5289d1bffb818 ChangeLog 45356
+RMD160 156964abe142fc4d2bcafa36dd7864e5785a2ff6 ChangeLog 45356
+SHA256 a5296d954918f59b7171d2e11f1e88731728cea7ee6e77aeae1b45a9c03f7c53 ChangeLog 45356
 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884
 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447
 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447
@@ -328,10 +340,13 @@ SHA256 36aae1151cda7c7f51bfb8204b7cef8301f80ea336086802f1a8c495a7eb7749 files/di
 MD5 834e944e237e0d9501aac75e61c50eb1 files/digest-udev-104-r7 229
 RMD160 7fd47bd560da91a9953657f31d6cd2383d2032cb files/digest-udev-104-r7 229
 SHA256 36aae1151cda7c7f51bfb8204b7cef8301f80ea336086802f1a8c495a7eb7749 files/digest-udev-104-r7 229
+MD5 834e944e237e0d9501aac75e61c50eb1 files/digest-udev-104-r8 229
+RMD160 7fd47bd560da91a9953657f31d6cd2383d2032cb files/digest-udev-104-r8 229
+SHA256 36aae1151cda7c7f51bfb8204b7cef8301f80ea336086802f1a8c495a7eb7749 files/digest-udev-104-r8 229
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFwG/Ut2vP6XvVdOcRAtIaAJ45yAuGLW7jJSCABgvI/gP+F1Pc5ACgyytc
-f6iuU0BdpNtBiDc+Ec/636w=
-=1R6v
+iD8DBQFFxQ/At2vP6XvVdOcRAigBAKDCi1xZxV79z02uU2mLH01tLP0TXQCgmmSt
+OWD26b4L5z5OpMAXkZRKBXw=
+=JFp1
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/files/digest-udev-104-r8 b/sys-fs/udev/files/digest-udev-104-r8
new file mode 100644
index 000000000000..1d88fbeee74a
--- /dev/null
+++ b/sys-fs/udev/files/digest-udev-104-r8
@@ -0,0 +1,3 @@
+MD5 9bcfc782d40db2b406a9c1172defda8f udev-104.tar.bz2 187574
+RMD160 269aeb9a0b2043d18c274fde749d2e0d30398b73 udev-104.tar.bz2 187574
+SHA256 ec0e7bd0c322dce6149d5f94185aa477659f5030a3d684ff5428124eca684ea1 udev-104.tar.bz2 187574
diff --git a/sys-fs/udev/files/udev-105-vol_id-fix.patch b/sys-fs/udev/files/udev-105-vol_id-fix.patch
new file mode 100644
index 000000000000..843f324eb218
--- /dev/null
+++ b/sys-fs/udev/files/udev-105-vol_id-fix.patch
@@ -0,0 +1,55 @@
+volume_id: really fix endianess bug in linux_raid detection
+
+Seems we find the md signature in cpu-order on the disk. Let's
+look for both endian encodings ...
+
+Thanks to Michael Prokop for his help finding the bug.
+
+---
+commit ac77e95948edc199cdd690de38f08e4d1e615840
+tree 640db7d14b7ee0745cf9abc7f01ba93625ccf473
+parent 273bebdba66cd5543dc1b076447e3275c81c221c
+author Kay Sievers <kay.sievers@vrfy.org> Sa, 03 Feb 2007 01:12:34 +0100
+committer Kay Sievers <kay.sievers@vrfy.org> Sa, 03 Feb 2007 01:12:34 +0100
+
+ extras/volume_id/lib/Makefile     |    2 +-
+ extras/volume_id/lib/linux_raid.c |    6 ++++--
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile
+index a3e947c..5ad9f2e 100644
+--- a/extras/volume_id/lib/Makefile
++++ b/extras/volume_id/lib/Makefile
+@@ -13,7 +13,7 @@ INSTALL_DATA  = ${INSTALL} -m 644
+ INSTALL_LIB = ${INSTALL} -m 755
+ 
+ SHLIB_CUR = 0
+-SHLIB_REV = 74
++SHLIB_REV = 75
+ SHLIB_AGE = 0
+ SHLIB = libvolume_id.so.$(SHLIB_CUR).$(SHLIB_REV).$(SHLIB_AGE)
+ 
+diff --git a/extras/volume_id/lib/linux_raid.c b/extras/volume_id/lib/linux_raid.c
+index b8a819f..a9c5d61 100644
+--- a/extras/volume_id/lib/linux_raid.c
++++ b/extras/volume_id/lib/linux_raid.c
+@@ -46,7 +46,8 @@ static struct mdp_super_block {
+ } PACKED *mdp;
+ 
+ #define MD_RESERVED_BYTES		0x10000
+-#define MD_MAGIC			"\xa9\x2b\x4e\xfc"
++#define MD_MAGIC			"\xfc\x4e\x2b\xa9"
++#define MD_MAGIC_SWAP			"\xa9\x2b\x4e\xfc"
+ 
+ int volume_id_probe_linux_raid(struct volume_id *id, uint64_t off, uint64_t size)
+ {
+@@ -65,7 +66,8 @@ int volume_id_probe_linux_raid(struct volume_id *id, uint64_t off, uint64_t size
+ 		return -1;
+ 	mdp = (struct mdp_super_block *) buf;
+ 
+-	if (memcmp(mdp->md_magic, MD_MAGIC, 4) != 0)
++	if ((memcmp(mdp->md_magic, MD_MAGIC, 4) != 0) &&
++	    (memcmp(mdp->md_magic, MD_MAGIC_SWAP, 4) != 0))
+ 		return -1;
+ 
+ 	memcpy(uuid, &mdp->set_uuid0, 4);
diff --git a/sys-fs/udev/files/udev-stop-104-r8.sh b/sys-fs/udev/files/udev-stop-104-r8.sh
new file mode 100755
index 000000000000..13a9f746a765
--- /dev/null
+++ b/sys-fs/udev/files/udev-stop-104-r8.sh
@@ -0,0 +1,114 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+udev_version() {
+	# Version number copied in by ebuild
+	local version=@@UDEV_VERSION@@
+	version=${version##0}
+
+	echo "${version}"
+}
+
+# store persistent-rules that got created while booting
+# when / was still read-only
+store_persistent_rules() {
+	local type base tmp_rules real_rules
+
+	for type in cd net; do
+		base=70-persistent-${type}.rules
+		tmp_rules=/dev/.udev/tmp-rules--${base}
+		real_rules=/etc/udev/rules.d/${base}
+
+		if [[ -f ${tmp_rules} ]]; then
+			einfo "Saving udev persistent ${type} rules to /etc/udev/rules.d"
+			cat ${tmp_rules} >> ${real_rules}
+			rm ${tmp_rules}
+		fi
+	done
+}
+
+main() {
+	store_persistent_rules
+
+	if [[ -e /dev/.devfsd || ! -e /dev/.udev || ! -z ${CDBOOT} || \
+	   ${RC_DEVICE_TARBALL} != "yes" ]] || \
+	   ! touch /lib/udev/state/devices.tar.bz2 2>/dev/null
+	then
+		return 0
+	fi
+		
+	ebegin "Saving device nodes"
+	# Handle our temp files
+	save_tmp_base=/tmp/udev.savedevices."$$"
+	devices_udev="${save_tmp_base}"/devices.udev
+	devices_real="${save_tmp_base}"/devices.real
+	devices_totar="${save_tmp_base}"/devices.totar
+	device_tarball="${save_tmp_base}"/devices
+	
+	rm -rf "${save_tmp_base}"
+	mkdir "${save_tmp_base}"
+	touch "${devices_udev}" "${devices_real}" \
+		"${devices_totar}" "${device_tarball}"
+	
+	if [[ ! ( -f ${devices_udev} && -f ${devices_real} && \
+		  -f ${devices_totar} && -f ${device_tarball} ) ]] ; then
+		eend 1 "Could not create temporary files!"
+	else
+		cd /dev
+		# Find all devices
+		find . -xdev -type b -or -type c -or -type l | cut -d/ -f2- > \
+			"${devices_real}"
+		# Figure out what udev created
+		eval $(grep '^[[:space:]]*udev_db=' /etc/udev/udev.conf)
+		if [[ -d ${udev_db} ]]; then
+			# New udev_db is clear text ...
+			udevinfo=$(cat "${udev_db}"/*)
+		else
+			# if no udev_db
+			if [[ $(udev_version) -ge "104" ]]; then
+				udevinfo=$(udevinfo --export-db)
+			else
+				# Old one is not ...
+				udevinfo=$(udevinfo -d)
+			fi
+		fi
+		# This basically strips 'S:' and 'N:' from the db output, and then
+		# print all the nodes/symlinks udev created ...
+		echo "${udevinfo}" | gawk '
+			/^(N|S):.+/ {
+				sub(/^(N|S):/, "")
+				split($0, nodes)
+				for (x in nodes)
+					print nodes[x]
+			}' > "${devices_udev}"
+		# These ones we also do not want in there
+		for x in MAKEDEV core fd initctl pts shm stderr stdin stdout; do
+			echo "${x}" >> "${devices_udev}"
+		done
+		if [[ -d /lib/udev/devices ]]; then
+			cd /lib/udev/devices
+			find . -xdev -type b -or -type c -or -type l | cut -d/ -f2- >> "${devices_udev}"
+		fi
+		cd /dev
+		fgrep -x -v -f "${devices_udev}" < "${devices_real}" | \
+		  grep -v ^\\.udev > "${devices_totar}"
+
+		# Now only tarball those not created by udev if we have any
+		if [[ -s ${devices_totar} ]]; then
+			# we dont want to descend into mounted filesystems (e.g. devpts)
+			# looking up username may involve NIS/network, and net may be down
+			tar --one-file-system --numeric-owner -jcpf "${device_tarball}" -T "${devices_totar}"
+			mv -f "${device_tarball}" /lib/udev/state/devices.tar.bz2
+		else
+			rm -f /lib/udev/state/devices.tar.bz2
+		fi
+		eend 0
+	fi
+
+	rm -rf "${save_tmp_base}"
+}
+
+main
+
+
+# vim:ts=4
diff --git a/sys-fs/udev/udev-104-r8.ebuild b/sys-fs/udev/udev-104-r8.ebuild
new file mode 100644
index 000000000000..0075711f01c7
--- /dev/null
+++ b/sys-fs/udev/udev-104-r8.ebuild
@@ -0,0 +1,276 @@
+# 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-104-r8.ebuild,v 1.1 2007/02/03 22:42:00 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.11.14"
+# 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}/${P}-netif-rename-busywait.patch
+	epatch ${FILESDIR}/${PN}-104-peristent-net-disable-xen.patch
+	epatch ${FILESDIR}/${PN}-105-vol_id-fix.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/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
+
+	# 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"
+	doexe ${FILESDIR}/net.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-104-r7 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"
+
+	# 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-104-r5.sh udev-start.sh
+	newins "${FILESDIR}"/udev-stop-104-r8.sh udev-stop.sh
+
+	# Insert udev-version number into udev-rcscript addon
+	sed -e "s/@@UDEV_VERSION@@/${PV}/" \
+		-i "${D}"/lib/rcscripts/addons/udev-start.sh \
+		-i "${D}"/lib/rcscripts/addons/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
+
+}
+
+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
+		if [[ -n $(pidof udevd) ]] ; then
+			killall -15 udevd &>/dev/null
+			sleep 1
+			killall -9 udevd &>/dev/null
+		fi
+		/sbin/udevd --daemon
+	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 "<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
+
+	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"
+}