diff options
author | William Hubbs <williamh@gentoo.org> | 2011-12-29 19:32:46 +0000 |
---|---|---|
committer | William Hubbs <williamh@gentoo.org> | 2011-12-29 19:32:46 +0000 |
commit | 163d8163a0e21bd23a0090d62ea95fd727d5f9f2 (patch) | |
tree | 5a3363d5ed11dec7c113fac94984daf33bcc5a21 | |
parent | Adding back 3.0.6, as it latest stt stable for some archs (diff) | |
download | gentoo-2-163d8163a0e21bd23a0090d62ea95fd727d5f9f2.tar.gz gentoo-2-163d8163a0e21bd23a0090d62ea95fd727d5f9f2.tar.bz2 gentoo-2-163d8163a0e21bd23a0090d62ea95fd727d5f9f2.zip |
add -vserver and -lxc keywords to udev-mount and udev-postmount, fix a typo in udev script and several repoman fixes.
(Portage version: 2.2.0_alpha84/cvs/Linux i686)
-rw-r--r-- | sys-fs/udev/ChangeLog | 11 | ||||
-rw-r--r-- | sys-fs/udev/udev-141-r1.ebuild | 4 | ||||
-rw-r--r-- | sys-fs/udev/udev-141.ebuild | 4 | ||||
-rw-r--r-- | sys-fs/udev/udev-146-r1.ebuild | 4 | ||||
-rw-r--r-- | sys-fs/udev/udev-149.ebuild | 4 | ||||
-rw-r--r-- | sys-fs/udev/udev-151-r4.ebuild | 4 | ||||
-rw-r--r-- | sys-fs/udev/udev-164-r2.ebuild | 4 | ||||
-rw-r--r-- | sys-fs/udev/udev-171-r5.ebuild | 572 | ||||
-rw-r--r-- | sys-fs/udev/udev-175-r1.ebuild | 4 | ||||
-rw-r--r-- | sys-fs/udev/udev-9999.ebuild | 4 |
10 files changed, 598 insertions, 17 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index a977ee953385..67df95714ba6 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,15 @@ # 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.626 2011/12/25 04:59:48 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.627 2011/12/29 19:32:46 williamh Exp $ + +*udev-171-r5 (29 Dec 2011) + + 29 Dec 2011; William Hubbs <williamh@gentoo.org> udev-141.ebuild, + udev-141-r1.ebuild, udev-146-r1.ebuild, udev-149.ebuild, udev-151-r4.ebuild, + udev-164-r2.ebuild, +udev-171-r5.ebuild, udev-175-r1.ebuild, + udev-9999.ebuild: + add -vserver and -lxc keywords to udev-mount and udev-postmount, fix a typo + in udev script and several repoman fixes. 25 Dec 2011; William Hubbs <williamh@gentoo.org> udev-9999.ebuild: udev now needs >=sys-apps/util-linux-2.20 diff --git a/sys-fs/udev/udev-141-r1.ebuild b/sys-fs/udev/udev-141-r1.ebuild index 75538f1ad6f3..7886e4469967 100644 --- a/sys-fs/udev/udev-141-r1.ebuild +++ b/sys-fs/udev/udev-141-r1.ebuild @@ -1,6 +1,6 @@ # 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-141-r1.ebuild,v 1.5 2011/04/15 21:55:18 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-141-r1.ebuild,v 1.6 2011/12/29 19:32:46 williamh Exp $ # # Please do not remove this version: @@ -14,7 +14,7 @@ inherit eutils flag-o-matic multilib toolchain-funcs versionator if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git" EGIT_BRANCH="master" - inherit git autotools + inherit git-2 autotools else SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2" fi diff --git a/sys-fs/udev/udev-141.ebuild b/sys-fs/udev/udev-141.ebuild index 9509c86a4a1a..4d12b8cb4938 100644 --- a/sys-fs/udev/udev-141.ebuild +++ b/sys-fs/udev/udev-141.ebuild @@ -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-141.ebuild,v 1.10 2011/04/15 21:55:18 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-141.ebuild,v 1.11 2011/12/29 19:32:46 williamh Exp $ inherit eutils flag-o-matic multilib toolchain-funcs versionator if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git" EGIT_BRANCH="master" - inherit git autotools + inherit git-2 autotools else SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2" fi diff --git a/sys-fs/udev/udev-146-r1.ebuild b/sys-fs/udev/udev-146-r1.ebuild index 79c208c36754..abe6878ba706 100644 --- a/sys-fs/udev/udev-146-r1.ebuild +++ b/sys-fs/udev/udev-146-r1.ebuild @@ -1,6 +1,6 @@ # 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-146-r1.ebuild,v 1.15 2011/07/06 16:44:44 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-146-r1.ebuild,v 1.16 2011/12/29 19:32:46 williamh Exp $ EAPI="1" @@ -11,7 +11,7 @@ PATCHSET=${P}-gentoo-patchset-v1 if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git" EGIT_BRANCH="master" - inherit git autotools + inherit git-2 autotools else SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2 mirror://gentoo/${PATCHSET}.tar.bz2" diff --git a/sys-fs/udev/udev-149.ebuild b/sys-fs/udev/udev-149.ebuild index f69d03fbc33b..308f38725407 100644 --- a/sys-fs/udev/udev-149.ebuild +++ b/sys-fs/udev/udev-149.ebuild @@ -1,6 +1,6 @@ # 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-149.ebuild,v 1.19 2011/07/06 16:44:44 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-149.ebuild,v 1.20 2011/12/29 19:32:46 williamh Exp $ EAPI="1" @@ -11,7 +11,7 @@ PATCHSET=${P}-gentoo-patchset-v1 if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git" EGIT_BRANCH="master" - inherit git autotools + inherit git-2 autotools else # please update testsys-tarball whenever udev-xxx/test/sys/ is changed SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2 diff --git a/sys-fs/udev/udev-151-r4.ebuild b/sys-fs/udev/udev-151-r4.ebuild index 3e5ab17dedbd..c221e2a0e8e5 100644 --- a/sys-fs/udev/udev-151-r4.ebuild +++ b/sys-fs/udev/udev-151-r4.ebuild @@ -1,6 +1,6 @@ # 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-151-r4.ebuild,v 1.17 2011/07/06 16:44:44 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-151-r4.ebuild,v 1.18 2011/12/29 19:32:46 williamh Exp $ EAPI="1" @@ -11,7 +11,7 @@ inherit eutils flag-o-matic multilib toolchain-funcs linux-info if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/hotplug/udev.git" EGIT_BRANCH="master" - inherit git autotools + inherit git-2 autotools else # please update testsys-tarball whenever udev-xxx/test/sys/ is changed SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2 diff --git a/sys-fs/udev/udev-164-r2.ebuild b/sys-fs/udev/udev-164-r2.ebuild index d766b246a885..52902e071700 100644 --- a/sys-fs/udev/udev-164-r2.ebuild +++ b/sys-fs/udev/udev-164-r2.ebuild @@ -1,6 +1,6 @@ # 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.16 2011/12/17 18:16:48 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-164-r2.ebuild,v 1.17 2011/12/29 19:32:46 williamh Exp $ EAPI="1" @@ -13,7 +13,7 @@ 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 + inherit git-2 autotools else # please update testsys-tarball whenever udev-xxx/test/sys/ is changed SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2 diff --git a/sys-fs/udev/udev-171-r5.ebuild b/sys-fs/udev/udev-171-r5.ebuild new file mode 100644 index 000000000000..0dd7dcbb80f2 --- /dev/null +++ b/sys-fs/udev/udev-171-r5.ebuild @@ -0,0 +1,572 @@ +# 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-r5.ebuild,v 1.1 2011/12/29 19:32:46 williamh Exp $ + +EAPI=4 + +KV_min=2.6.32 +KV_reliable=2.6.32 +PATCHSET=${P}-gentoo-patchset-v1 +scriptversion=7 +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 + !<sys-kernel/linux-headers-2.6.34 + test? ( app-text/tree )" + +RDEPEND="${COMMON_DEPEND} + hwdb? + ( + >=sys-apps/usbutils-0.82 + sys-apps/pciutils[-zlib] + ) + 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 + else + elibtoolize + fi +} + +use_extras() { use extras && echo "--enable-${2:-$1}" || use_enable "$@" ; } +src_configure() { + econf \ + --prefix="${EPREFIX}/usr" \ + --sysconfdir="${EPREFIX}/etc" \ + --sbindir="${EPREFIX}/sbin" \ + --libdir="${EPREFIX}/usr/$(get_libdir)" \ + --with-rootlibdir="${EPREFIX}/$(get_libdir)" \ + --libexecdir="${EPREFIX}/lib/udev" \ + --enable-logging \ + --enable-static \ + $(use_with selinux) \ + $(use_enable debug) \ + $(use_extras rule_generator) \ + $(use_extras hwdb) \ + --with-pci-ids-path="${EPREFIX}/usr/share/misc/pci.ids" \ + --with-usb-ids-path="${EPREFIX}/usr/share/misc/usb.ids" \ + $(use_extras acl udev_acl) \ + $(use_extras gudev) \ + $(use_extras introspection) \ + $(use_extras keymap) \ + $(use_extras floppy) \ + $(use_extras edd) \ + $(use_extras action_modeswitch) \ + $(systemd_with_unitdir) +} + +src_compile() { + filter-flags -fprefetch-loop-arrays + + emake +} + +src_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" \ + >> "${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/* +doexe "${FILESDIR}"/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}" + 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 index 06cd8fcaf57d..4487eeb3cb56 100644 --- a/sys-fs/udev/udev-175-r1.ebuild +++ b/sys-fs/udev/udev-175-r1.ebuild @@ -1,6 +1,6 @@ # 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.2 2011/12/09 20:43:22 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-175-r1.ebuild,v 1.3 2011/12/29 19:32:46 williamh Exp $ EAPI=4 @@ -357,7 +357,7 @@ ismounted() while read a m a; do [ "$m" = "$1" ] && return 0 done < "${EROOT}"/proc/mounts - return 1 + return 1 } pkg_postinst() diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild index e4bd4e29366c..f8227e6424d0 100644 --- a/sys-fs/udev/udev-9999.ebuild +++ b/sys-fs/udev/udev-9999.ebuild @@ -1,6 +1,6 @@ # 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.66 2011/12/25 04:59:48 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.67 2011/12/29 19:32:46 williamh Exp $ EAPI=4 @@ -357,7 +357,7 @@ ismounted() while read a m a; do [ "$m" = "$1" ] && return 0 done < "${ROOT}"/proc/mounts - return 1 + return 1 } pkg_postinst() |