Add src_test function that also tests the udev-scripts. Sync live ebuild and normal...
authorMatthias Schwarzott <zzam@gentoo.org>
Tue, 13 Sep 2011 19:17:28 +0000 (19:17 +0000)
committerMatthias Schwarzott <zzam@gentoo.org>
Tue, 13 Sep 2011 19:17:28 +0000 (19:17 +0000)
Package-Manager: portage-2.1.10.15/cvs/Linux x86_64

sys-fs/udev/ChangeLog
sys-fs/udev/Manifest
sys-fs/udev/udev-171-r2.ebuild [new file with mode: 0644]
sys-fs/udev/udev-9999.ebuild

index 0cced48ef18bf4326f3e12d8867508b908b6ab82..91187e4e01bdad6eaeaa334672baf155a0db992f 100644 (file)
@@ -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.601 2011/07/09 17:24:03 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.602 2011/09/13 19:17:28 zzam Exp $
+
+*udev-171-r2 (13 Sep 2011)
+
+  13 Sep 2011; Matthias Schwarzott <zzam@gentoo.org> +udev-171-r2.ebuild,
+  udev-9999.ebuild:
+  Add src_test function that also tests the udev-scripts. Sync live ebuild and
+  normal version.
 
   09 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> udev-164-r2.ebuild:
   ppc/ppc64 stable wrt #352827
index 64208df3859ee63de4ea4b4742a861654fb94082..f0c2c7a123670690fb0908bd1687c4dcfecd4d17 100644 (file)
@@ -114,7 +114,6 @@ DIST udev-171-gentoo-patchset-v1.tar.bz2 796 RMD160 ec60115b9a21866adc484430aa7d
 DIST udev-171-testsys.tar.bz2 155001 RMD160 c73d2e52bcca8cd84f9467f8e26ef6efaf5744c2 SHA1 c1ced44f6a1a21e9b0db4c538f605960e750149e SHA256 7383701b64701f58f16e0ddb19fe33b4eb53fac6fc6068bdcbff7e6325b79dcc
 DIST udev-171.tar.bz2 597937 RMD160 5b8f9f1e7ba353c58fef851f6f4e1f4c468540b4 SHA1 8b851f0e8681020b89a76a1e7a0273814fa2b24b SHA256 fed1e46074c1a16c828193ebd73b3940b7905cc7dcaeb0b3c720d4615210695e
 DIST udev-gentoo-scripts-164-v2.tar.bz2 9504 RMD160 826fe14de7cd4d60688dbc2a35daa38377b2e706 SHA1 d27d615d48133dc4411cdc47e3edfed04a78b385 SHA256 5fff00a00da6f6bfc47e375d2a8da6679a4e1de152d9f30f16b4bc8c6d79a5ef
-DIST udev-gentoo-scripts-v3.tar.bz2 9534 RMD160 c4d311d241896987c9c24e31feff994fb8a629e5 SHA1 bdf2b5b0f7373c700562b8bfef5d419333ba4408 SHA256 4cae68974f15624f6387252e25cbcd1fcb67c7d4bf37c7cf08656843fcafbc2d
 DIST udev-gentoo-scripts-v4.tar.bz2 9927 RMD160 f409d6615f55068292f2f958e0515a66dfb2532a SHA1 ca84c3a7cd51b472b63ecdd12b9f25b4d4e38dba SHA256 2724814aa07c357b7191969877b418f84d9d6c6e87315357fbddbb97b1d3b4c4
 EBUILD udev-114.ebuild 9021 RMD160 64b07c73985d287107db391785c626aa10ff5414 SHA1 a5754bfee36dd35e2abade6abedf0f31b7fd08d4 SHA256 0ae31d95d25a9553c2313c9e23eaf5542b309955b949fc8379ab50f20a3790d1
 EBUILD udev-115-r1.ebuild 10098 RMD160 dbe906361bd6fb6eea0e6b9efec1727ba5c0fa5c SHA1 3f021a8b10e7e82ca82a0feb24f2ee3e276c0c2f SHA256 5eb4847f2ddff4db3065eacdc2c4c2fbae73024f52165caad1bb25f719f4f515
@@ -128,15 +127,14 @@ EBUILD udev-149.ebuild 16613 RMD160 65d46a5b3188f7bcfcdb9d8a8ff3b6d34829e314 SHA
 EBUILD udev-151-r4.ebuild 16852 RMD160 e0d2c7041c102e0e5979a1ed5c99d9f4d5820842 SHA1 907db35a89e1ad163c631941e76a5e8105ffd196 SHA256 c2657e3c93dbb8bd3e6dda1c779150aa6127f7a525ed2f04342e33afb4306cfb
 EBUILD udev-164-r2.ebuild 15294 RMD160 2d7299b463cb765a58ec0840c4c86607fbf37e64 SHA1 cb4060adb3235d261f027be37e56272ac8f4755b SHA256 3f1b289c9c9c2d6ee6cd63b8db530240dcc9532dbc3ff273c052679b3062724b
 EBUILD udev-171-r1.ebuild 15984 RMD160 2f687585ae93014dbeaaa61e440e0f708ecd2b04 SHA1 92b4eee4956b24677d9e8251b29c40c300cf059c SHA256 9cf4a54cc9e34bf48c5299142a625d056869fbabcd683a233053e6fd04305218
-EBUILD udev-9999.ebuild 14426 RMD160 91e7bc9d4c87bc5f3b34cd066499ae2f4230cbbc SHA1 14a805ecc9bb5425a35ca1b8fc7a62788f3b4a88 SHA256 47adf46b0a3acf83bc294619bad2e8c619da3d55b0201b971fd2f8a4d1fe0eaf
-MISC ChangeLog 123372 RMD160 404f7fe3573cbe5e8e483715ecaee97ddb226262 SHA1 c9813735630b3084e950a24990905865975fa848 SHA256 167b63802185bf460b234aa0bc27b761d98a6f1fbeb6c07e880764e2ff25752a
+EBUILD udev-171-r2.ebuild 15979 RMD160 c0b33d7ede0c2b59e1503410c9605183f69c9a7a SHA1 bc1c2645111e195fcdce317e6d6c6ddc001323c8 SHA256 10f910cea50138684873889c733b2a66281e22510680dad7beb77ee2a66a9d59
+EBUILD udev-9999.ebuild 15175 RMD160 35b07d176a5de24e485a8c33835f6bc8803d8b5c SHA1 c37ce304c8b20487571e5efc28fb5b6781f22267 SHA256 0f096f310be3b494530f747987a52782e2e00d17d065a3a92b36abdc19e9ad1e
+MISC ChangeLog 123586 RMD160 0cdd55866b3447bea69e4ab60269d4969e2225a2 SHA1 8150552be50d4b825269e72a3f6231a8934c883e SHA256 cd320bb4c29c83a94c0182d8196a4c77d7d1f69468ad187a8d7390ee653a7737
 MISC metadata.xml 1256 RMD160 54b67bdde62c90a3eab48e8b5b97940eea887421 SHA1 093a8ec3a1dcd0da2c124373609ff007dc6fdb11 SHA256 cce07cae1a4a26b900f28186b6a81fc494887885410ed8e83e91e460c5306a0a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk4YjrwACgkQIiMqcbOVdxRdXAP/SoWvGlAIhmsW+Hf+55VGnnUu
-pakpCTN9LkZPbOfh7KD6QnhftTtDXuSc4ak2LAHuBLll8i1j1W1BqiSUJApiLmc8
-ULQUqvBpPC0jLtdFj9WG/b0/j10UXQAEc7/rp1l7vTBr+h67uy+4PlAZe7ypD+en
-huyMFB1F0l5m8CpB368=
-=95xs
+iEYEARECAAYFAk5vrEwACgkQt2vP6XvVdOdPewCffpq0Fbe0y0eRl4mzvSCo9It5
+3NgAnA5IVxWlm6lPbpH0vmLbAhyOPRZ/
+=ur5n
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-171-r2.ebuild b/sys-fs/udev/udev-171-r2.ebuild
new file mode 100644 (file)
index 0000000..56df336
--- /dev/null
@@ -0,0 +1,595 @@
+# 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-171-r2.ebuild,v 1.1 2011/09/13 19:17:28 zzam Exp $
+
+EAPI=4
+
+KV_min=2.6.32
+KV_reliable=2.6.32
+PATCHSET=${P}-gentoo-patchset-v1
+scriptversion=v4
+scriptname=udev-gentoo-scripts-${scriptversion}
+
+if [[ ${PV} == "9999" ]]
+then
+       EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git"
+       EGIT_BRANCH="master"
+       vcs="git-2 autotools"
+fi
+
+inherit ${vcs} eutils flag-o-matic multilib toolchain-funcs linux-info systemd
+
+if [[ ${PV} != "9999" ]]
+then
+       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+       # 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}-171-testsys.tar.bz2 )"
+       if [[ -n "${PATCHSET}" ]]
+       then
+               SRC_URI="${SRC_URI} mirror://gentoo/${PATCHSET}.tar.bz2"
+       fi
+fi
+SRC_URI="${SRC_URI} mirror://gentoo/${scriptname}.tar.bz2"
+
+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"
+IUSE="build selinux test debug +rule_generator hwdb acl gudev introspection
+       keymap floppy edd action_modeswitch extras"
+
+COMMON_DEPEND="selinux? ( sys-libs/libselinux )
+       extras? ( sys-apps/acl
+               dev-libs/glib:2
+               dev-libs/gobject-introspection
+               virtual/libusb:0 )
+       acl? ( sys-apps/acl dev-libs/glib:2 )
+       gudev? ( dev-libs/glib:2 )
+       introspection? ( dev-libs/gobject-introspection )
+       action_modeswitch? ( virtual/libusb:0 )
+       >=sys-apps/util-linux-2.16
+       >=sys-libs/glibc-2.10"
+
+DEPEND="${COMMON_DEPEND}
+       keymap? ( dev-util/gperf )
+       extras? ( dev-util/gperf )
+       dev-util/pkgconfig
+       virtual/os-headers
+       !<sys-kernel/linux-headers-2.6.34
+       test? ( app-text/tree )"
+
+RDEPEND="${COMMON_DEPEND}
+       hwdb?
+       (
+               >=sys-apps/usbutils-0.82
+               sys-apps/pciutils
+       )
+       extras?
+       (
+               >=sys-apps/usbutils-0.82
+               sys-apps/pciutils
+       )
+       !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 ~BLK_DEV_BSG"
+
+# Return values:
+# 2 - reliable
+# 1 - unreliable
+# 0 - too old
+udev_check_KV() {
+       local ok=0
+       if kernel_is -ge ${KV_reliable//./ }
+       then
+               ok=2
+       elif kernel_is -ge ${KV_min//./ }
+       then
+               ok=1
+       fi
+       return $ok
+}
+
+pkg_setup() {
+       linux-info_pkg_setup
+
+       # always print kernel version requirements
+       ewarn
+       ewarn "${P} does not support Linux kernel before version ${KV_min}!"
+       if [[ ${KV_min} != ${KV_reliable} ]]
+       then
+               ewarn "For a reliable udev, use at least kernel ${KV_reliable}"
+       fi
+
+       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."
+                       ;;
+               0)      eerror "Your kernel version (${KV_FULL}) is too old to run ${P}"
+                       ;;
+       esac
+
+       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
+       fi
+}
+
+src_unpack() {
+       unpack ${A}
+       if [[ ${PV} == "9999" ]]
+       then
+               git-2_src_unpack
+       fi
+}
+
+src_prepare() {
+       if use test && [[ -d "${WORKDIR}"/test/sys ]]
+       then
+               mv "${WORKDIR}"/test/sys "${S}"/test/
+       fi
+
+       # patches go here...
+
+       # 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} != a9954d57e97aa0ad2e0ed53899d9559a ]]
+               then
+                       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
+
+       if [[ ${PV} == 9999 ]]
+       then
+               gtkdocize --copy || die "gtkdocize failed"
+               eautoreconf
+       fi
+}
+
+src_configure() {
+       if ! use extras
+       then
+       econf \
+               --prefix=/usr \
+               --sysconfdir=/etc \
+               --sbindir=/sbin \
+               --libdir=/usr/$(get_libdir) \
+               --with-rootlibdir=/$(get_libdir) \
+               --libexecdir=/lib/udev \
+               --enable-logging \
+               --enable-static \
+               $(use_with selinux) \
+               $(use_enable debug) \
+               $(use_enable rule_generator) \
+               $(use_enable hwdb) \
+               --with-pci-ids-path=/usr/share/misc/pci.ids \
+               --with-usb-ids-path=/usr/share/misc/usb.ids \
+               $(use_enable acl udev_acl) \
+               $(use_enable gudev) \
+               $(use_enable introspection) \
+               $(use_enable keymap) \
+               $(use_enable floppy) \
+               $(use_enable edd) \
+               $(use_enable action_modeswitch) \
+               $(systemd_with_unitdir)
+       else
+       econf \
+               --prefix=/usr \
+               --sysconfdir=/etc \
+               --sbindir=/sbin \
+               --libdir=/usr/$(get_libdir) \
+               --with-rootlibdir=/$(get_libdir) \
+               --libexecdir=/lib/udev \
+               --enable-logging \
+               --enable-static \
+               $(use_with selinux) \
+               $(use_enable debug) \
+               --enable-rule_generator \
+               --enable-hwdb \
+               --with-pci-ids-path=/usr/share/misc/pci.ids \
+               --with-usb-ids-path=/usr/share/misc/usb.ids \
+               --enable-udev_acl \
+               --enable-gudev \
+               --enable-introspection \
+               --enable-keymap \
+               --enable-floppy \
+               --enable-edd \
+               --enable-action_modeswitch \
+               $(systemd_with_unitdir)
+       fi
+}
+
+src_compile() {
+       filter-flags -fprefetch-loop-arrays
+
+       emake
+}
+
+src_install() {
+       emake -C "${WORKDIR}/${scriptname}" \
+               DESTDIR="${D}" LIBDIR="$(get_libdir)" \
+               KV_min="${KV_min}" KV_reliable="${KV_reliable}" \
+               install
+
+       into /
+       emake DESTDIR="${D}" install
+
+       exeinto /lib/udev
+       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/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 /lib/udev/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
+
+       # keep doc in just one directory, Bug #281137
+       rm -rf "${D}/usr/share/doc/${PN}"
+       if use keymap
+       then
+               dodoc extras/keymap/README.keymap.txt
+       fi
+}
+
+src_test() {
+       local emake_cmd="${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE}"
+       cd "${WORKDIR}/${scriptname}"
+       vecho ">>> Test phase [scripts:test]: ${CATEGORY}/${PF}"
+       if ! $emake_cmd -j1 test
+       then
+               has test $FEATURES && die "scripts: Make test failed. See above for details."
+               has test $FEATURES || eerror "scripts: Make test failed. See above for details."
+       fi
+
+       cd "${S}"
+       vecho ">>> Test phase [udev:check]: ${CATEGORY}/${PF}"
+       has userpriv $FEATURES && einfo "Disable FEATURES userpriv to run the udev tests"
+       if ! $emake_cmd -j1 check
+       then
+               has test $FEATURES && die "udev: Make test failed. See above for details."
+               has test $FEATURES || eerror "udev: Make test failed. See above for details."
+       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"
+       fi
+}
+
+postinst_init_scripts() {
+       local enable_postmount=false
+
+       # FIXME: inconsistent handling of init-scripts here
+       #  * udev is added to sysinit in openrc-ebuild
+       #  * we add udev-postmount to default in here
+       #
+
+       # If we are building stages, add udev to the sysinit runlevel automatically.
+       if use build
+       then
+               if [[ -x "${ROOT}"/etc/init.d/udev  \
+                       && -d "${ROOT}"/etc/runlevels/sysinit ]]
+               then
+                       ln -s /etc/init.d/udev "${ROOT}"/etc/runlevels/sysinit/udev
+               fi
+               enable_postmount=true
+       fi
+
+       # 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
+
+       [[ -e "${ROOT}"/etc/runlevels/sysinit/udev ]] && enable_postmount=true
+       [[ "${ROOT}" = "/" && -d /dev/.udev/ ]] && enable_postmount=true
+
+       if $enable_postmount
+       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 #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"
+}
index 75acfc5db9c810b055ef478dc533dd7aaf00f05c..b601b0583c46202edeae5028853bb0c07abdd521 100644 (file)
@@ -1,13 +1,13 @@
 # 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-9999.ebuild,v 1.51 2011/07/07 19:30:44 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.52 2011/09/13 19:17:28 zzam Exp $
 
 EAPI=4
 
 KV_min=2.6.32
 KV_reliable=2.6.32
 #PATCHSET=${P}-gentoo-patchset-v1
-scriptversion=v3
+scriptversion=v4
 scriptname=udev-gentoo-scripts-${scriptversion}
 
 if [[ ${PV} == "9999" ]]
@@ -24,7 +24,7 @@ then
        KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
        # 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 )"
+                        test? ( mirror://gentoo/${PN}-171-testsys.tar.bz2 )"
        if [[ -n "${PATCHSET}" ]]
        then
                SRC_URI="${SRC_URI} mirror://gentoo/${PATCHSET}.tar.bz2"
@@ -56,7 +56,11 @@ DEPEND="${COMMON_DEPEND}
        test? ( app-text/tree )"
 
 RDEPEND="${COMMON_DEPEND}
-       hwdb? ( >=sys-apps/usbutils-0.82 sys-apps/pciutils )
+       hwdb?
+       (
+               >=sys-apps/usbutils-0.82
+               sys-apps/pciutils
+       )
        !sys-apps/coldplug
        !<sys-fs/lvm2-2.02.45
        !sys-fs/device-mapper
@@ -134,7 +138,7 @@ src_unpack() {
 }
 
 src_prepare() {
-       if use test
+       if use test && [[ -d "${WORKDIR}"/test/sys ]]
        then
                mv "${WORKDIR}"/test/sys "${S}"/test/
        fi
@@ -259,6 +263,26 @@ src_install() {
        fi
 }
 
+src_test() {
+       local emake_cmd="${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE}"
+       cd "${WORKDIR}/${scriptname}"
+       vecho ">>> Test phase [scripts:test]: ${CATEGORY}/${PF}"
+       if ! $emake_cmd -j1 test
+       then
+               has test $FEATURES && die "scripts: Make test failed. See above for details."
+               has test $FEATURES || eerror "scripts: Make test failed. See above for details."
+       fi
+
+       cd "${S}"
+       vecho ">>> Test phase [udev:check]: ${CATEGORY}/${PF}"
+       has userpriv $FEATURES && einfo "Disable FEATURES userpriv to run the udev tests"
+       if ! $emake_cmd -j1 check
+       then
+               has test $FEATURES && die "udev: Make test failed. See above for details."
+               has test $FEATURES || eerror "udev: Make test failed. See above for details."
+       fi
+}
+
 pkg_preinst() {
        # moving old files to support newer modprobe, 12 May 2009
        local f dir=${ROOT}/etc/modprobe.d/