From 82adc9973cd6bc70534b60bffb98262904c8c31d Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Fri, 9 Dec 2011 18:01:32 +0000 Subject: Rev bumps for #380929. All scripts should now be /run aware. Package-Manager: portage-2.2.0_alpha79/cvs/Linux i686 --- sys-fs/udev/ChangeLog | 9 +- sys-fs/udev/Manifest | 15 +- sys-fs/udev/udev-171-r3.ebuild | 597 +++++++++++++++++++++++++++++++++++++++++ sys-fs/udev/udev-175-r1.ebuild | 461 +++++++++++++++++++++++++++++++ 4 files changed, 1075 insertions(+), 7 deletions(-) create mode 100644 sys-fs/udev/udev-171-r3.ebuild create mode 100644 sys-fs/udev/udev-175-r1.ebuild (limited to 'sys-fs/udev') diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 0a33584210b4..2bd68c8a7e64 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.616 2011/11/11 19:34:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.617 2011/12/09 18:01:32 williamh Exp $ + +*udev-175-r1 (09 Dec 2011) +*udev-171-r3 (09 Dec 2011) + + 09 Dec 2011; William Hubbs +udev-171-r3.ebuild, + +udev-175-r1.ebuild: + Rev bumps for #380929. All scripts should now be /run aware. 11 Nov 2011; Mike Frysinger udev-171-r2.ebuild, udev-175.ebuild, udev-9999.ebuild: diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index c5329b45f3c4..af443ed3616d 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +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 @@ -116,6 +116,7 @@ DIST udev-171.tar.bz2 597937 RMD160 5b8f9f1e7ba353c58fef851f6f4e1f4c468540b4 SHA DIST udev-175.tar.bz2 616780 RMD160 3e568f3137e4f768be2122382b57bf1ceac2385c SHA1 2ef42ca4b11e6b9d0d5c7f47da39eb2e64695e44 SHA256 4c7937fe5a1521316ea571188745b9a00a9fdf314228cffc53a7ba9e5968b7ab DIST udev-gentoo-scripts-164-v2.tar.bz2 9504 RMD160 826fe14de7cd4d60688dbc2a35daa38377b2e706 SHA1 d27d615d48133dc4411cdc47e3edfed04a78b385 SHA256 5fff00a00da6f6bfc47e375d2a8da6679a4e1de152d9f30f16b4bc8c6d79a5ef DIST udev-gentoo-scripts-5.tar.bz2 16254 RMD160 e2192a8c8e5aa8e073c3db97174d7232c9497e87 SHA1 fec2b8242033e601f13d26557470d136d2aca33a SHA256 0b40e0a066c734d74d032d19475a0450790bdcecde892a9978c5987c4d0aec77 +DIST udev-gentoo-scripts-6.tar.bz2 16242 RMD160 f6ba565ca36cd12a5ed07fdffda0f5dc864c271a SHA1 5891ac0550db26112cc180904ce46f3be43f950a SHA256 d319dd8a5496361561344c1c190dde1b9ffc0023a29875647a407ed577f2727f 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 @@ -130,14 +131,16 @@ EBUILD udev-151-r4.ebuild 16852 RMD160 e0d2c7041c102e0e5979a1ed5c99d9f4d5820842 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-171-r2.ebuild 16440 RMD160 6ec304fc5af203a47341ea50edbc43d4c2c71ec4 SHA1 f10745cdcb690db11e8de47c59c2011a7afcc9e8 SHA256 dec83333d70e1c0a2a22e13dc259dc4c0366f04beed6dc3b9a0ab84889c75224 +EBUILD udev-171-r3.ebuild 16145 RMD160 d3af47fc8563e184f3ad4dd4ae34149f3f2bc2dc SHA1 e1ac5daf384ce83eaef5e08319fca77958af11d6 SHA256 abcdfad71f571fd20f49b3fb437182f19dd690f619b24ff52a6ddc3802f13b32 +EBUILD udev-175-r1.ebuild 12549 RMD160 f42a1d484de406ba347dcd3d18c1038c8e5ae67a SHA1 d7962f0ea5fdf9068fba1b68928c2ecbfb30a811 SHA256 f14590c8e6fbd493b341abfc11d9a3a45a1e1b09f08dabdec2c5dc50de48cb45 EBUILD udev-175.ebuild 12544 RMD160 5e8bf60d47ffccfcc9d2c0133dcdef005695b84a SHA1 1e95d64453be4b5350683273bc02fd02c4607fe6 SHA256 90e56f1d2ef8a10e0ab9f9e12858a9948c261d3e13a539e423abc57723d7d9f8 EBUILD udev-9999.ebuild 12548 RMD160 9d3151fa7508cf5026d47ea7fef3c8934b90f8cc SHA1 641c6edfb9fc5475c3254b09b2f88dc9ed39d55e SHA256 bdd980948a4f10939be6396af5aa236cc97611099becb7f27d32d8cc3cc88101 -MISC ChangeLog 125988 RMD160 48332ed7059770f2cd59791062416323492ba471 SHA1 8f089dfbd844ef2942075f20c257f6050f3c4a3c SHA256 acbc7a60a0ab364bc7bce7cd12138b4d0d2b8d527b2a0933951e4f1ffaacfc53 +MISC ChangeLog 126204 RMD160 e99d4ec390578a830eb49bb2ce6a7dd72c52bbf8 SHA1 6f5122dc215a728bfe8786f4399982059e1c65ef SHA256 59650227f593b0b9b8eaa03f03eb96299e28214363c73ee10b46e096449b02f8 MISC metadata.xml 1235 RMD160 36ff4665ed99aa392ff8003e9351bd620cc79424 SHA1 3fd0e915598c248b5c7d609b6a98a4cde8431b05 SHA256 dbbbd093a910a5cb541d7be160f749dc87fc699d72165c184965fa056d60f24b -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk69eMIACgkQaC/OocHi7Jbz+wEAoFOG6U49YZNYVVqc7I6pjfHu -zJSqUUdhwVP9oDi+bv0BAIBAsl7HT6wJOJRzSuUPUjNKra+XHujc76QxaLC/xn+T -=fNIn +iEYEARECAAYFAk7iS98ACgkQblQW9DDEZTinBgCfT5Y5FpiDE2rIrQERxQCfdFip +1FMAn2WNz9TMX2AO/DJn6ASPtVKcOjkT +=iSQi -----END PGP SIGNATURE----- diff --git a/sys-fs/udev/udev-171-r3.ebuild b/sys-fs/udev/udev-171-r3.ebuild new file mode 100644 index 000000000000..3dbcbf6b0fd5 --- /dev/null +++ b/sys-fs/udev/udev-171-r3.ebuild @@ -0,0 +1,597 @@ +# 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-r3.ebuild,v 1.1 2011/12/09 18:01:32 williamh Exp $ + +EAPI=4 + +KV_min=2.6.32 +KV_reliable=2.6.32 +PATCHSET=${P}-gentoo-patchset-v1 +scriptversion=6 +scriptname=udev-gentoo-scripts +[[ -n "${scriptversion}" ]] && scriptname="${scriptname}-${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 libtool + +if [[ ${PV} != "9999" ]] +then + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux" + # 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 + !> "${ED}"/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 "${ED}/usr/share/doc/${PN}" + if use keymap + then + dodoc extras/keymap/README.keymap.txt + fi + + cd "${WORKDIR}/${scriptname}" + sed -i -e 's/2.6.34/2.6.32/' init.d/udev + doconfd conf.d/* + exeinto /lib/udev + doexe helpers/* + doinitd init.d/* + insinto /etc/modprobe.d + doins modprobe.d/* + insinto /lib/udev/rules.d + doins rules.d/* +} + +src_test() { + local emake_cmd="${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE}" + + 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=${EROOT}/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 ${EROOT}/lib/udev-state ]] + then + mv -f "${EROOT}"/lib/udev-state/* "${ED}"/lib/udev/state/ + rm -r "${EROOT}"/lib/udev-state + fi + + if [[ -f ${EROOT}/etc/udev/udev.config && + ! -f ${EROOT}/etc/udev/udev.rules ]] + then + mv -f "${EROOT}"/etc/udev/udev.config "${EROOT}"/etc/udev/udev.rules + fi + + # delete the old udev.hotplug symlink if it is present + if [[ -h ${EROOT}/etc/hotplug.d/default/udev.hotplug ]] + then + rm -f "${EROOT}"/etc/hotplug.d/default/udev.hotplug + fi + + # delete the old wait_for_sysfs.hotplug symlink if it is present + if [[ -h ${EROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug ]] + then + rm -f "${EROOT}"/etc/hotplug.d/default/05-wait_for_sysfs.hotplug + fi + + # delete the old wait_for_sysfs.hotplug symlink if it is present + if [[ -h ${EROOT}/etc/hotplug.d/default/10-udev.hotplug ]] + then + rm -f "${EROOT}"/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=${EROOT}/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 + [[ ${EROOT} = / ]] || 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 "${EROOT}"/etc/init.d/udev \ + && -d "${EROOT}"/etc/runlevels/sysinit ]] + then + ln -s "${EPREFIX}"/etc/init.d/udev "${EROOT}"/etc/runlevels/sysinit/udev + fi + enable_postmount=true + fi + + # migration to >=openrc-0.4 + if [[ -e "${EROOT}"/etc/runlevels/sysinit && ! -e "${EROOT}"/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 "${EROOT}"/etc/runlevels/default/udev-postmount ]] && return + + [[ -e "${EROOT}"/etc/runlevels/sysinit/udev ]] && enable_postmount=true + [[ "${EROOT}" = "/" && -d /dev/.udev/ ]] && enable_postmount=true + + if $enable_postmount + then + local initd=udev-postmount + + if [[ -e ${EROOT}/etc/init.d/${initd} ]] && \ + [[ ! -e ${EROOT}/etc/runlevels/default/${initd} ]] + then + ln -snf "${EPREFIX}"/etc/init.d/${initd} "${EROOT}"/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 "${EROOT}"/dev/loop 2>/dev/null + if [[ -d "${EROOT}"/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 ${EROOT}/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 "${EROOT}"/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 ${EROOT}/lib/udev/devices ]] + then + rm -f "${EROOT}"/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 "${EROOT}"/etc/dev.d/net/hotplug.dev + rmdir --ignore-fail-on-non-empty "${EROOT}"/etc/dev.d/net 2>/dev/null + fi + + # 19 Mar 2007 + if [[ $previous_less_than_106_r5 = 0 ]] && + [[ -e ${EROOT}/etc/udev/rules.d/95-net.rules ]] + then + rm -f "${EROOT}"/etc/udev/rules.d/95-net.rules + fi + + # Try to remove /etc/dev.d as that is obsolete, 23 Apr 2007 + if [[ -d ${EROOT}/etc/dev.d ]] + then + rmdir --ignore-fail-on-non-empty "${EROOT}"/etc/dev.d/default "${EROOT}"/etc/dev.d 2>/dev/null + if [[ -d ${EROOT}/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 ${EROOT}/etc/udev/rules.d/64-device-mapper.rules ]] && + ! has_version sys-fs/device-mapper + then + rm -f "${EROOT}"/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 ${EROOT}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" +} diff --git a/sys-fs/udev/udev-175-r1.ebuild b/sys-fs/udev/udev-175-r1.ebuild new file mode 100644 index 000000000000..f4e611d61fb7 --- /dev/null +++ b/sys-fs/udev/udev-175-r1.ebuild @@ -0,0 +1,461 @@ +# 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-175-r1.ebuild,v 1.1 2011/12/09 18:01:32 williamh Exp $ + +EAPI=4 + +KV_min=2.6.34 +# patchversion=1 +scriptversion=6 +udev_rules_md5=7a7180a394e5bdea9011f68582b94fe8 + +EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git" + +[[ ${PV} == "9999" ]] && vcs="git-2 autotools" +inherit ${vcs} eutils flag-o-matic multilib toolchain-funcs linux-info systemd libtool + +scriptname=${PN}-gentoo-scripts +if [[ ${PV} != "9999" ]] +then + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux" + SRC_URI="http://people.freedesktop.org/~kay/${PN}/${P}.tar.bz2" + if [[ -n "${patchversion}" ]] + then + patchset=${P}-patchset-${patchversion} + SRC_URI="${SRC_URI} mirror://gentoo/${patchset}.tar.bz2" + fi + scriptname="${scriptname}-${scriptversion}" + SRC_URI="${SRC_URI} mirror://gentoo/${scriptname}.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" +IUSE="build selinux debug +rule_generator hwdb acl gudev introspection + keymap floppy edd doc" + +COMMON_DEPEND="selinux? ( sys-libs/libselinux ) + acl? ( sys-apps/acl dev-libs/glib:2 ) + gudev? ( dev-libs/glib:2 ) + introspection? ( dev-libs/gobject-introspection ) + >=sys-apps/util-linux-2.16 + >=sys-libs/glibc-2.10" + +DEPEND="${COMMON_DEPEND} + keymap? ( dev-util/gperf ) + dev-util/pkgconfig + virtual/os-headers + !> "${ED}"/etc/udev/udev.conf + + # Now install rules + insinto /lib/udev/rules.d/ + + # support older kernels + doins rules/misc/30-kernel-compat.rules + + # add arch specific rules + if [[ -f rules/arch/40-${ARCH}.rules ]] + then + doins "rules/arch/40-${ARCH}.rules" + fi + + cd "${WORKDIR}/${scriptname}" + doconfd conf.d/* + exeinto /lib/udev + doexe helpers/* + doinitd init.d/* + insinto /etc/modprobe.d + doins modprobe.d/* + insinto /lib/udev/rules.d + doins rules.d/* +} + +# 19 Nov 2008 +fix_old_persistent_net_rules() +{ + local rules=${EROOT}/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 + [[ ${EROOT} = / ]] || 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 "${EROOT}"/etc/init.d/udev \ + && -d "${EROOT}"/etc/runlevels/sysinit ]] + then + ln -s "${EPREFIX}"/etc/init.d/udev "${EROOT}"/etc/runlevels/sysinit/udev + fi + enable_postmount=true + fi + + # migration to >=openrc-0.4 + if [[ -e "${EROOT}"/etc/runlevels/sysinit && ! -e "${EROOT}"/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 "${EROOT}"/etc/runlevels/default/udev-postmount ]] && return + + [[ -e "${EROOT}"/etc/runlevels/sysinit/udev ]] && enable_postmount=true + [[ "${EROOT}" = "/" && -d /dev/.udev/ ]] && enable_postmount=true + + if $enable_postmount + then + local initd=udev-postmount + + if [[ -e ${EROOT}/etc/init.d/${initd} ]] && \ + [[ ! -e ${EROOT}/etc/runlevels/default/${initd} ]] + then + ln -snf "${EPREFIX}"/etc/init.d/${initd} "${EROOT}"/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 +} + +# This function determines if a directory is a mount point. +# It was lifted from dracut. +ismounted() +{ + while read a m a; do + [ "$m" = "$1" ] && return 0 + done < "${EROOT}"/proc/mounts + return 1 +} + +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 "${EROOT}"/dev/loop 2>/dev/null + if [[ -d "${EROOT}"/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... + + # Removing some device-nodes we thought we need some time ago, 25 Jan 2007 + if [[ -d ${EROOT}/lib/udev/devices ]] + then + rm -f "${EROOT}"/lib/udev/devices/{null,zero,console,urandom} + fi + + # Try to remove /etc/dev.d as that is obsolete, 23 Apr 2007 + if [[ -d ${EROOT}/etc/dev.d ]] + then + rmdir --ignore-fail-on-non-empty "${EROOT}"/etc/dev.d/default "${EROOT}"/etc/dev.d 2>/dev/null + if [[ -d ${EROOT}/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 [[ -f ${EROOT}/etc/udev/rules.d/64-device-mapper.rules ]] && + ! has_version sys-fs/device-mapper + then + rm -f "${EROOT}"/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 assigns fixed names to network devices." + elog "If you have problems with the persistent-net rules," + elog "just delete the rules file" + elog "\trm ${EROOT}etc/udev/rules.d/70-persistent-net.rules" + elog "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." + + ewarn + ewarn "action_modeswitch has been removed by upstream." + ewarn "Please use sys-apps/usb_modeswitch." + + if ismounted /usr + then + ewarn + ewarn "Your system has /usr on a separate partition. This means" + ewarn "you will need to use an initramfs to pre-mount /usr before" + ewarn "udev runs." + ewarn "This must be set up before your next reboot, or you may" + ewarn "experience failures which are very difficult to troubleshoot." + ewarn "For a more detailed explanation, see the following URL:" + ewarn "http://www.freedesktop.org/wiki/Software/systemd/separate-usr-is-broken" + fi + + 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" +} -- cgit v1.2.3-65-gdbad