From d8bdafb5165307d08726d1f39b133724c2e6c7b6 Mon Sep 17 00:00:00 2001 From: Richard Yao Date: Tue, 18 Dec 2012 20:00:20 +0000 Subject: Backport accept4 fallback path from eudev-1_beta1, approved by WilliamH and ssuominen (Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit) --- sys-fs/udev/ChangeLog | 8 +- sys-fs/udev/udev-171-r10.ebuild | 593 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 600 insertions(+), 1 deletion(-) create mode 100644 sys-fs/udev/udev-171-r10.ebuild (limited to 'sys-fs') diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index c6b5a569ebe2..fcbec4db3c06 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.750 2012/12/02 09:30:04 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.751 2012/12/18 20:00:20 ryao Exp $ + +*udev-171-r10 (18 Dec 2012) + + 18 Dec 2012; Richard Yao +udev-171-r10.ebuild: + Backport accept4 fallback path from eudev-1_beta1, approved by WilliamH and + ssuominen 02 Dec 2012; Samuli Suominen -udev-196.ebuild: old diff --git a/sys-fs/udev/udev-171-r10.ebuild b/sys-fs/udev/udev-171-r10.ebuild new file mode 100644 index 000000000000..837f6710349b --- /dev/null +++ b/sys-fs/udev/udev-171-r10.ebuild @@ -0,0 +1,593 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-171-r10.ebuild,v 1.1 2012/12/18 20:00:20 ryao Exp $ + +EAPI=4 + +KV_min=2.6.32 +KV_reliable=2.6.32 +PATCHSET=${P}-gentoo-patchset-v2 +scriptversion=7.1 +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" + inherit autotools git-2 +fi + +inherit 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" + SRC_URI="mirror://gentoo/${P}.tar.bz2 + test? ( mirror://gentoo/${PN}-171-testsys.tar.bz2 ) + mirror://gentoo/${PN}-gentoo-legacy-patchset-2.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.freedesktop.org/wiki/Software/systemd" + +LICENSE="GPL-2" +SLOT="0" +IUSE="build selinux test debug +rule_generator hwdb gudev introspection + keymap floppy edd action_modeswitch extras" + +COMMON_DEPEND="selinux? ( sys-libs/libselinux ) + extras? ( dev-libs/glib:2 + dev-libs/gobject-introspection + virtual/libusb:0 ) + gudev? ( dev-libs/glib:2 ) + introspection? ( dev-libs/gobject-introspection ) + action_modeswitch? ( virtual/libusb:0 ) + >=sys-apps/util-linux-2.16 + !> "${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 "${WORKDIR}"/blacklist-146 blacklist.conf + newins "${WORKDIR}"/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/* + doexe "${WORKDIR}"/shell-compat-KV.sh + 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}" + einfo ">>> 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 and udev-mount 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 + if [[ -x "${ROOT}"/etc/init.d/udev-mount \ + && -d "${ROOT}"/etc/runlevels/sysinit ]] + then + ln -s /etc/init.d/udev-mount \ + "${ROOT}"/etc/runlevels/sysinit/udev-mount + fi + enable_postmount=true + fi + + # Warn the user about adding the scripts to their sysinit runlevel + if [[ -e "${EROOT}"/etc/runlevels/sysinit ]] + then + if [[ ! -e "${EROOT}"/etc/runlevels/sysinit/udev ]] + then + ewarn + ewarn "You need to add udev to the sysinit runlevel." + ewarn "If you do not do this," + ewarn "your system will not be able to boot!" + ewarn "Run this command:" + ewarn "\trc-update add udev sysinit" + fi + if [[ ! -e "${EROOT}"/etc/runlevels/sysinit/udev-mount ]] + then + ewarn + ewarn "You need to add udev-mount to the sysinit runlevel." + ewarn "If you do not do this," + ewarn "your system will not be able to boot!" + ewarn "Run this command:" + ewarn "\trc-update add udev-mount sysinit" + fi + 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" +} -- cgit v1.2.3-65-gdbad