diff options
author | 2013-01-16 13:55:29 +0000 | |
---|---|---|
committer | 2013-01-16 13:55:29 +0000 | |
commit | f629cf0f665dffe6637bdfdbf71e8c2206616096 (patch) | |
tree | 748ba8906f989923c19db89637362d68fb303ba3 | |
parent | Bump -6.3 development version (diff) | |
download | gentoo-2-f629cf0f665dffe6637bdfdbf71e8c2206616096.tar.gz gentoo-2-f629cf0f665dffe6637bdfdbf71e8c2206616096.tar.bz2 gentoo-2-f629cf0f665dffe6637bdfdbf71e8c2206616096.zip |
Edit -r2 to install 80-net-name-slot.rules if the file isn't there yet; this is for stable. This will make current -r2 as -r3 with a safe kludge to avoid overwriting the file; this is for ~arch.
(Portage version: 2.2.0_alpha151/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
-rw-r--r-- | sys-fs/udev/ChangeLog | 10 | ||||
-rw-r--r-- | sys-fs/udev/udev-197-r2.ebuild | 9 | ||||
-rw-r--r-- | sys-fs/udev/udev-197-r3.ebuild | 424 |
3 files changed, 437 insertions, 6 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 6cfd82fc4ecb..71cfb84779b4 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.764 2013/01/15 16:01:56 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.765 2013/01/16 13:55:29 ssuominen Exp $ + +*udev-197-r3 (16 Jan 2013) + + 16 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> udev-197-r2.ebuild, + +udev-197-r3.ebuild: + Edit -r2 to install 80-net-name-slot.rules if the file isn't there yet; this + is for stable. This will make current -r2 as -r3 with a safe kludge to avoid + overwriting the file; this is for ~arch. 15 Jan 2013; William Hubbs <williamh@gentoo.org> udev-9999.ebuild: sync live ebuild diff --git a/sys-fs/udev/udev-197-r2.ebuild b/sys-fs/udev/udev-197-r2.ebuild index b664fd613120..98dc9279f9bd 100644 --- a/sys-fs/udev/udev-197-r2.ebuild +++ b/sys-fs/udev/udev-197-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r2.ebuild,v 1.7 2013/01/15 15:30:55 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r2.ebuild,v 1.8 2013/01/16 13:55:29 ssuominen Exp $ EAPI=4 @@ -323,10 +323,9 @@ pkg_preinst() fi done preserve_old_lib /$(get_libdir)/libudev.so.0 - if has_version '<sys-fs/udev-197'; then - net_rules="${ROOT}"etc/udev/rules.d/80-net-name-slot.rules - cp "${FILESDIR}"/80-net-name-slot.rules "${net_rules}" - fi + + net_rules="${ROOT}"etc/udev/rules.d/80-net-name-slot.rules + [[ -f ${net_rules} ]] || cp "${FILESDIR}"/80-net-name-slot.rules "${net_rules}" } # This function determines if a directory is a mount point. diff --git a/sys-fs/udev/udev-197-r3.ebuild b/sys-fs/udev/udev-197-r3.ebuild new file mode 100644 index 000000000000..8f13815f1834 --- /dev/null +++ b/sys-fs/udev/udev-197-r3.ebuild @@ -0,0 +1,424 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r3.ebuild,v 1.1 2013/01/16 13:55:29 ssuominen Exp $ + +EAPI=4 + +KV_min=2.6.39 + +inherit autotools eutils linux-info multilib systemd toolchain-funcs versionator + +if [[ ${PV} = 9999* ]] +then + EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd" + inherit git-2 +else + patchset=1 + SRC_URI="http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz" + if [[ -n "${patchset}" ]] + then + SRC_URI="${SRC_URI} + http://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.bz2" + fi + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +fi + +DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" +HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" + +LICENSE="LGPL-2.1 MIT GPL-2" +SLOT="0" +IUSE="acl doc gudev hwdb introspection keymap +kmod +openrc selinux static-libs" + +RESTRICT="test" + +COMMON_DEPEND=">=sys-apps/util-linux-2.20 + acl? ( sys-apps/acl ) + gudev? ( >=dev-libs/glib-2 ) + introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) + kmod? ( >=sys-apps/kmod-12 ) + selinux? ( sys-libs/libselinux ) + !<sys-libs/glibc-2.11" + +DEPEND="${COMMON_DEPEND} + dev-util/gperf + >=dev-util/intltool-0.50 + virtual/os-headers + virtual/pkgconfig + !<sys-kernel/linux-headers-${KV_min} + doc? ( dev-util/gtk-doc ) + hwdb? ( >=sys-apps/hwids-20121202.2[udev] )" + +if [[ ${PV} = 9999* ]] +then + DEPEND="${DEPEND} + app-text/docbook-xsl-stylesheets + dev-libs/libxslt" +fi + +RDEPEND="${COMMON_DEPEND} + openrc? ( !<sys-apps/openrc-0.9.9 ) + !sys-apps/coldplug + !<sys-fs/lvm2-2.02.45 + !sys-fs/device-mapper + !<sys-fs/udev-init-scripts-19 + !<sys-kernel/dracut-017-r1 + !<sys-kernel/genkernel-3.4.25" + +PDEPEND=">=virtual/udev-180 + openrc? ( >=sys-fs/udev-init-scripts-19 )" + +S=${WORKDIR}/systemd-${PV} + +QA_MULTILIB_PATHS="lib/systemd/systemd-udevd" + +udev_check_KV() +{ + if kernel_is lt ${KV_min//./ } + then + return 1 + fi + return 0 +} + +check_default_rules() +{ + # Make sure there are no sudden changes to upstream rules file + # (more for my own needs than anything else ...) + local udev_rules_md5=66bb698deeae64ab444b710baf54a412 + MD5=$(md5sum < "${S}"/rules/50-udev-default.rules) + MD5=${MD5/ -/} + if [[ ${MD5} != ${udev_rules_md5} ]] + 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 +} + +pkg_setup() +{ + # required kernel options + CONFIG_CHECK="~DEVTMPFS" + ERROR_DEVTMPFS="DEVTMPFS is not set in this kernel. Udev will not run." + + linux-info_pkg_setup + + if ! udev_check_KV + then + eerror "Your kernel version (${KV_FULL}) is too old to run ${P}" + eerror "It must be at least ${KV_min}!" + fi + + KV_FULL_SRC=${KV_FULL} + get_running_version + if ! udev_check_KV + then + eerror + eerror "Your running kernel version (${KV_FULL}) is too old" + eerror "for this version of udev." + eerror "You must upgrade your kernel or downgrade udev." + fi +} + +src_prepare() +{ + # backport some patches + if [[ -n "${patchset}" ]] + then + EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch + fi + + # apply user patches + epatch_user + + # compile with older versions of gcc #451110 + version_is_at_least 4.6 $(gcc-version) || \ + sed -i 's:static_assert:alsdjflkasjdfa:' src/shared/macro.h + + # change rules back to group uucp instead of dialout for now + sed -e 's/GROUP="dialout"/GROUP="uucp"/' \ + -i rules/*.rules \ + || die "failed to change group dialout to uucp" + + if [[ ! -e configure ]] + then + if use doc + then + gtkdocize --docdir docs || die "gtkdocize failed" + else + echo 'EXTRA_DIST =' > docs/gtk-doc.make + fi + eautoreconf + else + check_default_rules + elibtoolize + fi +} + +src_configure() +{ + local econf_args + + econf_args=( + ac_cv_search_cap_init= + ac_cv_header_sys_capability_h=yes + DBUS_CFLAGS=' ' + DBUS_LIBS=' ' + --bindir=/bin + --docdir=/usr/share/doc/${PF} + --libdir=/usr/$(get_libdir) + --with-html-dir=/usr/share/doc/${PF}/html + --with-rootprefix= + --with-rootlibdir=/$(get_libdir) + --disable-audit + --disable-coredump + --disable-hostnamed + --disable-ima + --disable-libcryptsetup + --disable-localed + --disable-logind + --disable-myhostname + --disable-nls + --disable-pam + --disable-quotacheck + --disable-readahead + --enable-split-usr + --disable-tcpwrap + --disable-timedated + --disable-xz + $(use_enable acl) + $(use_enable doc gtk-doc) + $(use_enable gudev) + $(use_enable keymap) + $(use_enable kmod) + $(use_enable selinux) + $(use_enable static-libs static) + ) + if use introspection; then + econf_args+=( + --enable-introspection=$(usex introspection) + ) + fi + econf "${econf_args[@]}" +} + +src_compile() +{ + echo 'BUILT_SOURCES: $(BUILT_SOURCES)' > "${T}"/Makefile.extra + emake -f Makefile -f "${T}"/Makefile.extra BUILT_SOURCES + local targets=( + systemd-udevd + udevadm + libudev.la + libsystemd-daemon.la + ata_id + cdrom_id + collect + scsi_id + v4l_id + accelerometer + mtd_probe + man/udev.7 + man/udevadm.8 + man/systemd-udevd.8 + man/systemd-udevd.service.8 + ) + use keymap && targets+=( keymap ) + use gudev && targets+=( libgudev-1.0.la ) + + emake "${targets[@]}" + if use doc + then + emake -C docs/libudev + use gudev && emake -C docs/gudev + fi +} + +src_install() +{ + local lib_LTLIBRARIES="libsystemd-daemon.la libudev.la" \ + pkgconfiglib_DATA="src/libsystemd-daemon/libsystemd-daemon.pc src/libudev/libudev.pc" + + local targets=( + install-libLTLIBRARIES + install-includeHEADERS + install-libgudev_includeHEADERS + install-binPROGRAMS + install-rootlibexecPROGRAMS + install-udevlibexecPROGRAMS + install-dist_systemunitDATA + install-dist_udevconfDATA + install-dist_udevhomeSCRIPTS + install-dist_udevkeymapDATA + install-dist_udevkeymapforcerelDATA + install-dist_udevrulesDATA + install-girDATA + install-man7 + install-man8 + install-nodist_systemunitDATA + install-pkgconfiglibDATA + install-sharepkgconfigDATA + install-typelibsDATA + install-dist_docDATA + udev-confdirs + systemd-install-hook + libudev-install-hook + libsystemd-daemon-install-hook + ) + + if use gudev + then + lib_LTLIBRARIES+=" libgudev-1.0.la" + pkgconfiglib_DATA+=" src/gudev/gudev-1.0.pc" + fi + + # add final values of variables: + targets+=( + rootlibexec_PROGRAMS=systemd-udevd + bin_PROGRAMS=udevadm + lib_LTLIBRARIES="${lib_LTLIBRARIES}" + MANPAGES="man/udev.7 man/udevadm.8 man/systemd-udevd.service.8" + MANPAGES_ALIAS="man/systemd-udevd.8" + dist_systemunit_DATA="units/systemd-udevd-control.socket \ + units/systemd-udevd-kernel.socket" + nodist_systemunit_DATA="units/systemd-udevd.service \ + units/systemd-udev-trigger.service \ + units/systemd-udev-settle.service" + pkgconfiglib_DATA="${pkgconfiglib_DATA}" + systemunitdir="$(systemd_get_unitdir)" + ) + emake -j1 DESTDIR="${D}" "${targets[@]}" + if use doc + then + emake -C docs/libudev DESTDIR="${D}" install + use gudev && emake -C docs/gudev DESTDIR="${D}" install + fi + dodoc TODO + + prune_libtool_files --all + rm -f "${D}"/lib/udev/rules.d/99-systemd.rules + rm -rf "${D}"/usr/share/doc/${PF}/LICENSE.* + + # install gentoo-specific rules + insinto /lib/udev/rules.d + doins "${FILESDIR}"/40-gentoo.rules + + # install udevadm symlink + dosym ../bin/udevadm /sbin/udevadm +} + +pkg_preinst() +{ + local htmldir + for htmldir in gudev libudev; do + if [[ -d ${ROOT}usr/share/gtk-doc/html/${htmldir} ]] + then + rm -rf "${ROOT}"usr/share/gtk-doc/html/${htmldir} + fi + if [[ -d ${D}/usr/share/doc/${PF}/html/${htmldir} ]] + then + dosym ../../doc/${PF}/html/${htmldir} \ + /usr/share/gtk-doc/html/${htmldir} + fi + done + preserve_old_lib /$(get_libdir)/libudev.so.0 + if has_version '<sys-fs/udev-197'; then + net_rules="${ROOT}"etc/udev/rules.d/80-net-name-slot.rules + [[ -f ${net_rules} ]] || cp "${FILESDIR}"/80-net-name-slot.rules "${net_rules}" + 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 < "${ROOT}"/proc/mounts + return 1 +} + +pkg_postinst() +{ + mkdir -p "${ROOT}"/run + + # "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 + + # people want reminders, I'll give them reminders. Odds are they will + # just ignore them anyway... + + # 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 ${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 + + if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 189 ]]; then + ewarn + ewarn "Upstream has removed the persistent-cd rules" + ewarn "generator. If you need persistent names for these devices," + ewarn "place udev rules for them in ${ROOT}etc/udev/rules.d." + fi + + 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" + ewarn + ewarn "For more information on setting up an initramfs, see the" + ewarn "following URL:" + ewarn "http://www.gentoo.org/doc/en/initramfs-guide.xml" + fi + + if [ -n "${net_rules}" ]; then + ewarn + ewarn "udev-197 and newer introduces a new method of naming network" + ewarn "interfaces. The new names are a very significant change, so" + ewarn "they are disabled by default on live systems." + ewarn "Please see the contents of ${net_rules} for more" + ewarn "information on this feature." + fi + if [[ -d ${ROOT}usr/lib/udev ]] + then + ewarn + ewarn "Please re-emerge all packages on your system which install" + ewarn "rules and helpers in /usr/lib/udev. They should now be in" + ewarn "/lib/udev." + ewarn + ewarn "One way to do this is to run the following command:" + ewarn "emerge -av1 \$(qfile -q -S -C /usr/lib/udev)" + ewarn "Note that qfile can be found in app-portage/portage-utils" + fi + + ewarn + ewarn "You need to restart udev as soon as possible to make the upgrade go" + ewarn "into effect." + ewarn "The method you use to do this depends on your init system." + ewarn + + preserve_old_lib_notify /$(get_libdir)/libudev.so.0 + + 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" + + use hwdb && udevadm hwdb --update +} |