summaryrefslogtreecommitdiff
path: root/sys-fs
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2011-03-19 11:06:20 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2011-03-19 11:06:20 +0000
commitd9f90f5e99f073255e6fc46a7c3fbe3e0fa56800 (patch)
tree07b520f0fceef5d9ad774c98378f73dbd1d4b503 /sys-fs
parentRemoved old (diff)
downloadhistorical-d9f90f5e99f073255e6fc46a7c3fbe3e0fa56800.tar.gz
historical-d9f90f5e99f073255e6fc46a7c3fbe3e0fa56800.tar.bz2
historical-d9f90f5e99f073255e6fc46a7c3fbe3e0fa56800.zip
Enable udev inside OpenVZ containers, Bug #346885. Disable v4lv1, so that udev compiles with linux-headers-2.6.38, Bug #359407.
Package-Manager: portage-2.1.9.44/cvs/Linux x86_64
Diffstat (limited to 'sys-fs')
-rw-r--r--sys-fs/udev/ChangeLog9
-rw-r--r--sys-fs/udev/Manifest15
-rw-r--r--sys-fs/udev/files/udev-164-remove-noopenvz.patch21
-rw-r--r--sys-fs/udev/files/udev-164-remove-v4l1.patch47
-rw-r--r--sys-fs/udev/udev-164-r2.ebuild537
5 files changed, 627 insertions, 2 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 8c83d80b579a..dd000b432ad5 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sys-fs/udev
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.564 2011/02/06 11:10:53 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.565 2011/03/19 11:06:20 zzam Exp $
+
+*udev-164-r2 (19 Mar 2011)
+
+ 19 Mar 2011; Matthias Schwarzott <zzam@gentoo.org> +udev-164-r2.ebuild,
+ +files/udev-164-remove-noopenvz.patch, +files/udev-164-remove-v4l1.patch:
+ Enable udev inside OpenVZ containers, Bug #346885. Disable v4lv1, so that
+ udev compiles with linux-headers-2.6.38, Bug #359407.
06 Feb 2011; Mart Raudsepp <leio@gentoo.org> udev-114.ebuild,
udev-115-r1.ebuild:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 194de5f7f13c..5fd43ee5652e 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX 136/shell-compat-KV.sh 1012 RMD160 5bc85047b4237d502f7b0ccc7181f9974c2b0898 SHA1 bbc58d6181f3fc8d623de1537eddcc1ede919202 SHA256 2393918bc65c69e1c19d7712292c945a4adfe45ce02b88ae7663167b8745cf8b
AUX 136/shell-compat-addon.sh 930 RMD160 c96a77a2085698e4ca3636994d1b6d07326e4b5f SHA1 d696a1ff942d31b493d385cff27bc9cbacd3fa47 SHA256 94b1fe1f5ba892c82798cec6f15b5c5c76e1902ef2d13701ddfbb54f19079af9
AUX 136/udev-dev-tarball.initd 2579 RMD160 b7feb34f854a3eb08d1203f1faabf9cecee3101c SHA1 10ecda997314851d86a175db8cbfcc6a343e9bb2 SHA256 a829fa3efb9d6aadb137cb8879b8bc2660ef6500b2dbb8d55db8edf52f332d60
@@ -78,6 +81,8 @@ AUX udev-124-netlink-owner-check.patch 1162 RMD160 420a22a2762930479df5c7b609931
AUX udev-141-remove-devfs-names.diff 557 RMD160 c8dbcb0dcc815d78b9f33a6b49290cf21f2b7eee SHA1 5167dc1227e2f07664fad66a24365af192c8ab14 SHA256 9d1d64b41a6ff423fb218a36c56cbdec2d79827741060f39aed2f8ce2d03693f
AUX udev-150-fix-missing-firmware-timeout.diff 1065 RMD160 79a9fa2321d9d9fc6cf0399ecf326dc5f975719c SHA1 379bdb522edc45a9d9ed748be84f9087bee5b438 SHA256 863f394783ac282a3d83eb84ff0ed0f5dd7982e1b40d10e1081c567f38825371
AUX udev-151-readd-hd-rules.diff 2759 RMD160 5a3e52ce6442ef14f5f89faa36f98ddeb06fda00 SHA1 d954725615e963ba2854c0e4c0a424450e89280e SHA256 47eb3b3dd8c8c3199148aa083a47b2cbd29953b647b6ed06391424a353e6d39c
+AUX udev-164-remove-noopenvz.patch 483 RMD160 c0a366f657dc8bdce0e89e9b4b512c0bd11bdebc SHA1 8c40719ccd73d79de8af91c285d76494df5ee9c7 SHA256 f7da7718a5d3b8bd2fc5e4b9ed0fda36869381eb4c49316b1ba014062abb2469
+AUX udev-164-remove-v4l1.patch 1263 RMD160 6fac54e8ef9810c57065f730e3fcacb0a47f9143 SHA1 491bdba9b141acff68b9cd18b65055d9f7f41b54 SHA256 df8a13ea471f40383438aa5133465f580841e5cd7a95aedc090d85f7389a6403
AUX udev-postmount-initd-111-r2 508 RMD160 e1f42197fe3003ec4691b768a921029ce085becb SHA1 7ceb08150d429bd6b5cef88d76847575c6e89f22 SHA256 607deb133ab4be0d2fcb16346e86b3d8ae00bd62d2cbc1329458f278a1b1ff5c
AUX udev-start-113-r2.sh 6515 RMD160 2ecaa37fd9e498e60f8cd5978cb4f7930594cf99 SHA1 670bb1845ed70442fe598a5580101be75e2402c9 SHA256 438bc31605c8d2e50bebedd7fbff1410845738372ab3bc03d6f5ed1427ddd046
AUX udev-start-114-r1.sh 6218 RMD160 a7348ac44768096b3da712a9be0ef4bf9af6ec17 SHA1 6dfcb9aed5e066d21bebee03d29137722db19b56 SHA256 a639a6f1093f05da197c3fc548c31f7078b2f0023f66f3caade0721c60819268
@@ -121,7 +126,15 @@ EBUILD udev-151-r4.ebuild 16818 RMD160 6bcd9aaf66b17006cc0b530e19b7a9f018a14239
EBUILD udev-162.ebuild 16011 RMD160 ae2acf58a16ee3834883ead2b11c535ef3664909 SHA1 a70f08516ef780f10c2c500b6fc3253d54b4ec7d SHA256 cc656960f29040db9dba06595d426940e0c38fa991d0060dc876585c2870ddc0
EBUILD udev-163.ebuild 16011 RMD160 12b78ea7ccc807bfe64e0bb1f24146b212f26ae1 SHA1 0c2e2f96bbdecf84e20f8d65092e239467f025cc SHA256 c31e77a7cfcd2d3ed8ed11e6b7d05c8204dfe9179720ded6f552317f639f2446
EBUILD udev-164-r1.ebuild 15002 RMD160 23fe6e9dc462772a1f15dc96c952c656c9dc1ace SHA1 8ec0967b86eb7656c3bcdd742be69b0071047281 SHA256 f6c241d7782f44043bcb5c4dc04631a1b7528b63884ab5c9a4a3460657a64144
+EBUILD udev-164-r2.ebuild 15136 RMD160 8249863c90d690e08857eb4745ce502b331902d4 SHA1 f4838658734242a94dfc247a67b75e0f41d727fc SHA256 1aa3e9355b662891e3dccae1201e09fddcd6ce3307a713d5637fba9726d9c65a
EBUILD udev-164.ebuild 16342 RMD160 c94222337e34fa88b87e96058b9400790e55c2eb SHA1 1b9c0fa7e81f6d8d0945248bf70e744f2dad321d SHA256 cd8fd341209d2a216d6053124d28108a3cce8651e9093b686a7b2305cb97f7e8
EBUILD udev-9999.ebuild 15906 RMD160 eccb13d05abc0f7d53952a57fc8307310424b08a SHA1 0a85ac5886c0cb5bbc48b777b898b53c3d41e458 SHA256 71baec39e758add66fd8adedea72df90af659f1a7369c8bca0b94ad53ae43a7d
-MISC ChangeLog 116499 RMD160 7bb718f54f0a2e3665d448062a02c765ca957d1f SHA1 1b5367d0166a84bdf4b08d1a8d92ad74a45292fd SHA256 91edd5b4b486d040882c621cd38e877bcb6cc3c22a68861cf78d5c9128d5e9d6
+MISC ChangeLog 116810 RMD160 04db39b7583bf2bc682d28cb97d408842c81cf63 SHA1 2cc5ae3b335168f275844b35135562706e0b8a74 SHA256 dbc44a0475fb88fa19d3de55027d3762ad6b81ed4a77c0d0033b6d119aaa82ff
MISC metadata.xml 502 RMD160 f353faee03dd5920d1f7d65c123d93e018c7be53 SHA1 02c5eb9fd660e69127fa84487e0d70b85ee1d3cc SHA256 ca6a239a7be7949fdf1461eb524ca9234a0fd2aee9fc7eeb758a2347b6031664
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2EjgMACgkQt2vP6XvVdOe2oACbB2DA2kibrozxhwz+qxF7facI
+/hQAoJFVoGdOdTGzJ6bU2LSrtUKZrFMP
+=QhMS
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/files/udev-164-remove-noopenvz.patch b/sys-fs/udev/files/udev-164-remove-noopenvz.patch
new file mode 100644
index 000000000000..66b3676247d4
--- /dev/null
+++ b/sys-fs/udev/files/udev-164-remove-noopenvz.patch
@@ -0,0 +1,21 @@
+commit 4f62b490427d4643e49b84610f4da916b14177c0
+Author: Matthias Schwarzott <zzam@gentoo.org>
+Date: Sat Mar 19 11:14:36 2011 +0100
+
+ initd: Remove noopenvz from init-script.
+
+ Bug #346885
+
+diff --git a/rc/openrc/udev b/rc/openrc/udev
+index 23fc39c..88a4a42 100644
+--- a/rc/openrc/udev
++++ b/rc/openrc/udev
+@@ -23,7 +23,7 @@ depend()
+ before checkfs fsck
+
+ # udev does not work inside vservers
+- keyword novserver nolxc noopenvz
++ keyword novserver nolxc
+ fi
+ }
+
diff --git a/sys-fs/udev/files/udev-164-remove-v4l1.patch b/sys-fs/udev/files/udev-164-remove-v4l1.patch
new file mode 100644
index 000000000000..288da53cb369
--- /dev/null
+++ b/sys-fs/udev/files/udev-164-remove-v4l1.patch
@@ -0,0 +1,47 @@
+Author: Kay Sievers <kay.sievers@vrfy.org>
+Date: Tue Feb 15 17:24:32 2011 +0100
+
+ v4l_id: kill the v4l1 ioctl
+
+ Recent kernels do not have v4l1 anymore.
+
+diff --git a/extras/v4l_id/v4l_id.c b/extras/v4l_id/v4l_id.c
+index d530a6d..21cb328 100644
+--- a/extras/v4l_id/v4l_id.c
++++ b/extras/v4l_id/v4l_id.c
+@@ -28,7 +28,6 @@
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/ioctl.h>
+-#include <linux/videodev.h>
+ #include <linux/videodev2.h>
+
+ int main (int argc, char *argv[])
+@@ -39,7 +38,6 @@ int main (int argc, char *argv[])
+ };
+ int fd;
+ char *device;
+- struct video_capability v1cap;
+ struct v4l2_capability v2cap;
+
+ while (1) {
+@@ -82,19 +80,6 @@ int main (int argc, char *argv[])
+ if ((v2cap.capabilities & V4L2_CAP_RADIO) > 0)
+ printf("radio:");
+ printf("\n");
+- } else if (ioctl (fd, VIDIOCGCAP, &v1cap) == 0) {
+- printf("ID_V4L_VERSION=1\n");
+- printf("ID_V4L_PRODUCT=%s\n", v1cap.name);
+- printf("ID_V4L_CAPABILITIES=:");
+- if ((v1cap.type & VID_TYPE_CAPTURE) > 0)
+- printf("capture:");
+- if ((v1cap.type & VID_TYPE_OVERLAY) > 0)
+- printf("video_overlay:");
+- if (v1cap.audios > 0)
+- printf("audio:");
+- if ((v1cap.type & VID_TYPE_TUNER) > 0)
+- printf("tuner:");
+- printf("\n");
+ }
+
+ close (fd);
diff --git a/sys-fs/udev/udev-164-r2.ebuild b/sys-fs/udev/udev-164-r2.ebuild
new file mode 100644
index 000000000000..1b2da5a5688d
--- /dev/null
+++ b/sys-fs/udev/udev-164-r2.ebuild
@@ -0,0 +1,537 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-164-r2.ebuild,v 1.1 2011/03/19 11:06:20 zzam Exp $
+
+EAPI="1"
+
+inherit eutils flag-o-matic multilib toolchain-funcs linux-info
+
+#PATCHSET=${P}-gentoo-patchset-v1
+scriptversion=164
+scriptname=${PN}-gentoo-scripts-${scriptversion}
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
+ EGIT_BRANCH="master"
+ inherit git autotools
+else
+ # please update testsys-tarball whenever udev-xxx/test/sys/ is changed
+ SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2
+ test? ( mirror://gentoo/${PN}-151-testsys.tar.bz2 )
+ mirror://gentoo/${scriptname}.tar.bz2"
+ [[ -n "${PATCHSET}" ]] && SRC_URI="${SRC_URI} mirror://gentoo/${PATCHSET}.tar.bz2"
+fi
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="selinux extras test"
+
+COMMON_DEPEND="selinux? ( sys-libs/libselinux )
+ extras? (
+ sys-apps/acl
+ >=sys-apps/usbutils-0.82
+ virtual/libusb:0
+ sys-apps/pciutils
+ dev-libs/glib:2
+ )
+ >=sys-apps/util-linux-2.16
+ >=sys-libs/glibc-2.9"
+
+DEPEND="${COMMON_DEPEND}
+ extras? (
+ dev-util/gperf
+ dev-util/pkgconfig
+ )
+ virtual/os-headers
+ !<sys-kernel/linux-headers-2.6.29
+ test? ( app-text/tree )"
+
+RDEPEND="${COMMON_DEPEND}
+ !sys-apps/coldplug
+ !<sys-fs/lvm2-2.02.45
+ !sys-fs/device-mapper
+ >=sys-apps/baselayout-1.12.5"
+
+if [[ ${PV} == "9999" ]]; then
+ # for documentation processing with xsltproc
+ DEPEND="${DEPEND}
+ app-text/docbook-xsl-stylesheets
+ app-text/docbook-xml-dtd
+ dev-util/gtk-doc"
+fi
+
+# required kernel options
+CONFIG_CHECK="~INOTIFY_USER ~SIGNALFD ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2
+ ~!IDE"
+
+# We need the lib/rcscripts/addon support
+PROVIDE="virtual/dev-manager"
+
+udev_check_KV() {
+ local ok=0
+ if [[ ${KV_MAJOR} == 2 && ${KV_MINOR} == 6 ]]
+ then
+ if kernel_is -ge 2 6 ${KV_PATCH_reliable} ; then
+ ok=2
+ elif kernel_is -ge 2 6 ${KV_PATCH_min} ; then
+ ok=1
+ fi
+ fi
+ return $ok
+}
+
+pkg_setup() {
+ linux-info_pkg_setup
+
+ udev_libexec_dir="/$(get_libdir)/udev"
+
+ # udev requires signalfd introduced in kernel 2.6.25,
+ # but a glibc compiled against >=linux-headers-2.6.27 uses the
+ # new signalfd syscall introduced in kernel 2.6.27 without falling back
+ # to the old one. So we just depend on 2.6.27 here, see Bug #281312.
+ KV_PATCH_min=25
+ KV_PATCH_reliable=27
+ KV_min=2.6.${KV_PATCH_min}
+ KV_reliable=2.6.${KV_PATCH_reliable}
+
+ # always print kernel version requirements
+ ewarn
+ ewarn "${P} does not support Linux kernel before version ${KV_min}!"
+ if [[ ${KV_PATCH_min} != ${KV_PATCH_reliable} ]]; then
+ ewarn "For a reliable udev, use at least kernel ${KV_reliable}"
+ fi
+
+ echo
+ # We don't care about the secondary revision of the kernel.
+ # 2.6.30.4 -> 2.6.30 is all we check
+ udev_check_KV
+ case "$?" in
+ 2) einfo "Your kernel version (${KV_FULL}) is new enough to run ${P} reliably." ;;
+ 1) ewarn "Your kernel version (${KV_FULL}) is new enough to run ${P},"
+ ewarn "but it may be unreliable in some cases."
+ ebeep ;;
+ 0) eerror "Your kernel version (${KV_FULL}) is too old to run ${P}"
+ ebeep ;;
+ esac
+ echo
+
+ KV_FULL_SRC=${KV_FULL}
+ get_running_version
+ udev_check_KV
+ if [[ "$?" = "0" ]]; then
+ eerror
+ eerror "udev cannot be restarted after emerging,"
+ eerror "as your running kernel version (${KV_FULL}) is too old."
+ eerror "You really need to use a newer kernel after a reboot!"
+ NO_RESTART=1
+ ebeep
+ fi
+}
+
+sed_libexec_dir() {
+ sed -e "s#/lib/udev#${udev_libexec_dir}#" -i "$@"
+}
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]] ; then
+ git_src_unpack
+ else
+ unpack ${A}
+
+ if use test; then
+ mv "${WORKDIR}"/test/sys "${S}"/test/
+ fi
+ fi
+
+ cd "${WORKDIR}/${scriptname}"
+ epatch "${FILESDIR}/udev-164-remove-noopenvz.patch"
+
+ cd "${S}"
+
+ # patches go here...
+ epatch "${FILESDIR}"/udev-164-remove-v4l1.patch
+
+ # backport some patches
+ if [[ -n "${PATCHSET}" ]]; then
+ EPATCH_SOURCE="${WORKDIR}/${PATCHSET}" EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" epatch
+ fi
+
+ # change rules back to group uucp instead of dialout for now
+ sed -e 's/GROUP="dialout"/GROUP="uucp"/' \
+ -i rules/{rules.d,arch}/*.rules \
+ || die "failed to change group dialout to uucp"
+
+ if [[ ${PV} != 9999 ]]; then
+ # Make sure there is no sudden changes to upstream rules file
+ # (more for my own needs than anything else ...)
+ MD5=$(md5sum < "${S}/rules/rules.d/50-udev-default.rules")
+ MD5=${MD5/ -/}
+ if [[ ${MD5} != f3c9ade42f70cec0459f9e58a99c632a ]]
+ then
+ echo
+ eerror "50-udev-default.rules has been updated, please validate!"
+ eerror "md5sum: ${MD5}"
+ die "50-udev-default.rules has been updated, please validate!"
+ fi
+ fi
+
+ sed_libexec_dir \
+ rules/rules.d/50-udev-default.rules \
+ rules/rules.d/78-sound-card.rules \
+ extras/rule_generator/write_*_rules \
+ || die "sed failed"
+
+ if [[ ${PV} == 9999 ]]; then
+ gtkdocize --copy
+ eautoreconf
+ fi
+
+ cd "${WORKDIR}/${scriptname}"
+ sed_libexec_dir \
+ helpers/* \
+ rc/*/*
+}
+
+src_compile() {
+ filter-flags -fprefetch-loop-arrays
+
+ econf \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --sbindir=/sbin \
+ --libdir=/usr/$(get_libdir) \
+ --with-rootlibdir=/$(get_libdir) \
+ --libexecdir="${udev_libexec_dir}" \
+ --enable-logging \
+ --enable-static \
+ $(use_with selinux) \
+ $(use_enable extras) \
+ --disable-introspection
+ # we don't have gobject-introspection in portage tree
+
+ emake || die "compiling udev failed"
+}
+
+src_install() {
+ emake -C "${WORKDIR}/${scriptname}" \
+ DESTDIR="${D}" LIBDIR="$(get_libdir)" \
+ KV_min="${KV_min}" KV_reliable="${KV_reliable}" \
+ install || die "make install failed"
+
+ into /
+ emake DESTDIR="${D}" install || die "make install failed"
+
+ exeinto "${udev_libexec_dir}"
+ keepdir "${udev_libexec_dir}"/state
+ keepdir "${udev_libexec_dir}"/devices
+
+ # create symlinks for these utilities to /sbin
+ # where multipath-tools expect them to be (Bug #168588)
+ dosym "..${udev_libexec_dir}/scsi_id" /sbin/scsi_id
+
+ # Add gentoo stuff to udev.conf
+ echo "# If you need to change mount-options, do it in /etc/fstab" \
+ >> "${D}"/etc/udev/udev.conf
+
+ # let the dir exist at least
+ keepdir /etc/udev/rules.d
+
+ # Now installing rules
+ cd "${S}"/rules
+ insinto "${udev_libexec_dir}"/rules.d/
+
+ # support older kernels
+ doins misc/30-kernel-compat.rules
+
+ # Adding arch specific rules
+ if [[ -f arch/40-${ARCH}.rules ]]
+ then
+ doins "arch/40-${ARCH}.rules"
+ fi
+ cd "${S}"
+
+ insinto /etc/modprobe.d
+ newins "${FILESDIR}"/blacklist-146 blacklist.conf
+ newins "${FILESDIR}"/pnp-aliases pnp-aliases.conf
+
+ # documentation
+ dodoc ChangeLog README TODO || die "failed installing docs"
+
+ # keep doc in just one directory, Bug #281137
+ rm -rf "${D}/usr/share/doc/${PN}"
+ if use extras; then
+ dodoc extras/keymap/README.keymap.txt || die "failed installing docs"
+ fi
+}
+
+pkg_preinst() {
+ # moving old files to support newer modprobe, 12 May 2009
+ local f dir=${ROOT}/etc/modprobe.d/
+ for f in pnp-aliases blacklist; do
+ if [[ -f $dir/$f && ! -f $dir/$f.conf ]]
+ then
+ elog "Moving $dir/$f to $f.conf"
+ mv -f "$dir/$f" "$dir/$f.conf"
+ fi
+ done
+
+ 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 &&
+ ! -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
+
+ has_version "=${CATEGORY}/${PN}-103-r3"
+ previous_equal_to_103_r3=$?
+
+ has_version "<${CATEGORY}/${PN}-104-r5"
+ previous_less_than_104_r5=$?
+
+ has_version "<${CATEGORY}/${PN}-106-r5"
+ previous_less_than_106_r5=$?
+
+ has_version "<${CATEGORY}/${PN}-113"
+ previous_less_than_113=$?
+}
+
+# 19 Nov 2008
+fix_old_persistent_net_rules() {
+ local rules=${ROOT}/etc/udev/rules.d/70-persistent-net.rules
+ [[ -f ${rules} ]] || return
+
+ elog
+ elog "Updating persistent-net rules file"
+
+ # Change ATTRS to ATTR matches, Bug #246927
+ sed -i -e 's/ATTRS{/ATTR{/g' "${rules}"
+
+ # Add KERNEL matches if missing, Bug #246849
+ sed -ri \
+ -e '/KERNEL/ ! { s/NAME="(eth|wlan|ath)([0-9]+)"/KERNEL=="\1*", NAME="\1\2"/}' \
+ "${rules}"
+}
+
+# See Bug #129204 for a discussion about restarting udevd
+restart_udevd() {
+ if [[ ${NO_RESTART} = "1" ]]; then
+ ewarn "Not restarting udevd, as your kernel is too old!"
+ return
+ fi
+
+ # need to merge to our system
+ [[ ${ROOT} = / ]] || return
+
+ # check if root of init-process is identical to ours (not in chroot)
+ [[ -r /proc/1/root && /proc/1/root/ -ef /proc/self/root/ ]] || return
+
+ # abort if there is no udevd running
+ [[ -n $(pidof udevd) ]] || return
+
+ # abort if no /dev/.udev exists
+ [[ -e /dev/.udev ]] || return
+
+ elog
+ elog "restarting udevd now."
+
+ killall -15 udevd &>/dev/null
+ sleep 1
+ killall -9 udevd &>/dev/null
+
+ /sbin/udevd --daemon
+ sleep 3
+ if [[ ! -n $(pidof udevd) ]]; then
+ eerror "FATAL: udev died, please check your kernel is"
+ eerror "new enough and configured correctly for ${P}."
+ eerror
+ eerror "Please have a look at this before rebooting."
+ eerror "If in doubt, please downgrade udev back to your old version"
+ ebeep
+ fi
+}
+
+postinst_init_scripts() {
+ # FIXME: we may need some code that detects if this is a system bootstrap
+ # and auto-enables udev then
+ #
+ # FIXME: inconsistent handling of init-scripts here
+ # * udev is added to sysinit in openrc-ebuild
+ # * we add udev-postmount to default in here
+ #
+
+ # migration to >=openrc-0.4
+ if [[ -e "${ROOT}"/etc/runlevels/sysinit && ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]]
+ then
+ ewarn
+ ewarn "You need to add the udev init script to the runlevel sysinit,"
+ ewarn "else your system will not be able to boot"
+ ewarn "after updating to >=openrc-0.4.0"
+ ewarn "Run this to enable udev for >=openrc-0.4.0:"
+ ewarn "\trc-update add udev sysinit"
+ ewarn
+ fi
+
+ # add udev-postmount to default runlevel instead of that ugly injecting
+ # like a hotplug event, 2009/10/15
+
+ # already enabled?
+ [[ -e "${ROOT}"/etc/runlevels/default/udev-postmount ]] && return
+
+ local enable_postmount=0
+ [[ -e "${ROOT}"/etc/runlevels/sysinit/udev ]] && enable_postmount=1
+ [[ "${ROOT}" = "/" && -d /dev/.udev/ ]] && enable_postmount=1
+
+ if [[ ${enable_postmount} = 1 ]]
+ then
+ local initd=udev-postmount
+
+ if [[ -e ${ROOT}/etc/init.d/${initd} ]] && \
+ [[ ! -e ${ROOT}/etc/runlevels/default/${initd} ]]
+ then
+ ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/default/${initd}
+ elog "Auto-adding '${initd}' service to your default runlevel"
+ fi
+ else
+ elog "You should add the udev-postmount service to default runlevel."
+ elog "Run this to add it:"
+ elog "\trc-update add udev-postmount default"
+ fi
+}
+
+pkg_postinst() {
+ fix_old_persistent_net_rules
+
+ # "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
+ # So try to remove it here (will only work if empty).
+ rmdir "${ROOT}"/dev/loop 2>/dev/null
+ if [[ -d "${ROOT}"/dev/loop ]]; then
+ ewarn "Please make sure your remove /dev/loop,"
+ ewarn "else losetup may be confused when looking for unused devices."
+ fi
+
+ restart_udevd
+
+ postinst_init_scripts
+
+ # people want reminders, I'll give them reminders. Odds are they will
+ # just ignore them anyway...
+
+ # delete 40-scsi-hotplug.rules, it is integrated in 50-udev.rules, 19 Jan 2007
+ if [[ $previous_equal_to_103_r3 = 0 ]] &&
+ [[ -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
+
+ # Removing some device-nodes we thought we need some time ago, 25 Jan 2007
+ if [[ -d ${ROOT}/lib/udev/devices ]]
+ then
+ rm -f "${ROOT}"/lib/udev/devices/{null,zero,console,urandom}
+ fi
+
+ # Removing some old file, 29 Jan 2007
+ if [[ $previous_less_than_104_r5 = 0 ]]
+ then
+ rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev
+ rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net 2>/dev/null
+ fi
+
+ # 19 Mar 2007
+ if [[ $previous_less_than_106_r5 = 0 ]] &&
+ [[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]
+ then
+ rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules
+ fi
+
+ # Try to remove /etc/dev.d as that is obsolete, 23 Apr 2007
+ if [[ -d ${ROOT}/etc/dev.d ]]
+ then
+ rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/default "${ROOT}"/etc/dev.d 2>/dev/null
+ 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, 27 Jun 2007
+ if [[ $previous_less_than_113 = 0 ]] &&
+ [[ -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
+
+ # requested in bug #275974, added 2009/09/05
+ ewarn
+ ewarn "If after the udev update removable devices or CD/DVD drives"
+ ewarn "stop working, try re-emerging HAL before filling a bug report"
+
+ # requested in Bug #225033:
+ elog
+ elog "persistent-net does assigning fixed names to network devices."
+ elog "If you have problems with the persistent-net rules,"
+ elog "just delete the rules file"
+ elog "\trm ${ROOT}etc/udev/rules.d/70-persistent-net.rules"
+ elog "and then reboot."
+ elog
+ elog "This may however number your devices in a different way than they are now."
+
+ ewarn
+ ewarn "If you build an initramfs including udev, then please"
+ ewarn "make sure that the /sbin/udevadm binary gets included,"
+ ewarn "and your scripts changed to use it,as it replaces the"
+ ewarn "old helper apps udevinfo, udevtrigger, ..."
+
+ ewarn
+ ewarn "mount options for directory /dev are no longer"
+ ewarn "set in /etc/udev/udev.conf, but in /etc/fstab"
+ ewarn "as for other directories."
+
+ ewarn
+ ewarn "If you use /dev/md/*, /dev/loop/* or /dev/rd/*,"
+ ewarn "then please migrate over to using the device names"
+ ewarn "/dev/md*, /dev/loop* and /dev/ram*."
+ ewarn "The devfs-compat rules have been removed."
+ ewarn "For reference see Bug #269359."
+
+ ewarn
+ ewarn "Rules for /dev/hd* devices have been removed"
+ ewarn "Please migrate to libata."
+
+ elog
+ elog "For more information on udev on Gentoo, writing udev rules, and"
+ elog " fixing known issues visit:"
+ elog " http://www.gentoo.org/doc/en/udev-guide.xml"
+}