ssuominen 14/06/02 13:32:26 Modified: ChangeLog Added: udev-208-r1.ebuild Log: Backport building of multilib libgudev-1.0 to =208-r1 from >=212-r1 because only 208 works with Linux 2.6.32.x series since CONFIG_FHANDLE=y was introduced in Linux 2.6.39. (Portage version: 2.2.10/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 4868F14D)
Revision Changes Path 1.1042 sys-fs/udev/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.1042&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?rev=1.1042&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/ChangeLog?r1=1.1041&r2=1.1042 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v retrieving revision 1.1041 retrieving revision 1.1042 diff -u -r1.1041 -r1.1042 --- ChangeLog 1 Jun 2014 18:33:31 -0000 1.1041 +++ ChangeLog 2 Jun 2014 13:32:26 -0000 1.1042 @@ -1,6 +1,13 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1041 2014/06/01 18:33:31 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.1042 2014/06/02 13:32:26 ssuominen Exp $ + +*udev-208-r1 (02 Jun 2014) + + 02 Jun 2014; Samuli Suominen <[email protected]> +udev-208-r1.ebuild: + Backport building of multilib libgudev-1.0 to =208-r1 from >=212-r1 because + only 208 works with Linux 2.6.32.x series since CONFIG_FHANDLE=y was + introduced in Linux 2.6.39. 01 Jun 2014; Mikle Kolyada <[email protected]> udev-212-r1.ebuild: ia64 stable wrt big #505962 1.1 sys-fs/udev/udev-208-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-208-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/udev/udev-208-r1.ebuild?rev=1.1&content-type=text/plain Index: udev-208-r1.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-208-r1.ebuild,v 1.1 2014/06/02 13:32:26 ssuominen Exp $ EAPI=5 inherit autotools eutils linux-info multilib toolchain-funcs versionator multilib-minimal 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 -> systemd-${PV}-r1.tar.xz" if [[ -n "${patchset}" ]]; then SRC_URI="${SRC_URI} http://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz http://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"; fi KEYWORDS="alpha amd64 arm ~arm64 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 +firmware-loader gudev introspection +kmod selinux static-libs" RESTRICT="test" COMMON_DEPEND=">=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/glib-2.22[${MULTILIB_USEDEP}] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) kmod? ( >=sys-apps/kmod-14 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" DEPEND="${COMMON_DEPEND} dev-util/gperf >=sys-devel/make-3.82-r4 virtual/os-headers virtual/pkgconfig !<sys-kernel/linux-headers-2.6.32 doc? ( >=dev-util/gtk-doc-1.18 )" if [[ ${PV} = 9999* ]]; then DEPEND="${DEPEND} app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-libs/libxslt >=dev-util/intltool-0.50" fi RDEPEND="${COMMON_DEPEND} !sys-apps/coldplug !<sys-fs/lvm2-2.02.97-r1 !sys-fs/device-mapper !<sys-fs/udev-init-scripts-22 !<sys-kernel/dracut-017-r1 !<sys-kernel/genkernel-3.4.25 !<sec-policy/selinux-base-2.20120725-r10" PDEPEND=">=sys-apps/hwids-20130717-r1[udev] >=sys-fs/udev-init-scripts-25" S=${WORKDIR}/systemd-${PV} # The multilib-build.eclass doesn't handle situation where the installed headers # are different in ABIs. In this case, we install libgudev headers in native # ABI but not for non-native ABI. multilib_check_headers() { :; } 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=7d3733faee4203fd7c75c3f3c0d55741 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() { CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL" linux-info_pkg_setup # Based on README from tarball: local MINKV=3.0 # These arch's have the mandatory accept4() function support in Linux 2.6.32.61, see: # $ grep -r define.*accept4 linux-2.6.32.61/* if use amd64 || use ia64 || use mips || use sparc || use x86; then MINKV=2.6.32 fi if kernel_is -lt ${MINKV//./ }; then eerror "Your running kernel is too old to run this version of ${P}" eerror "You need to upgrade kernel at least to ${MINKV}" fi } src_prepare() { if ! [[ ${PV} = 9999* ]]; then # secure_getenv() disable for non-glibc systems wrt bug #443030 if ! [[ $(grep -r secure_getenv * | wc -l) -eq 20 ]]; then eerror "The line count for secure_getenv() failed, see bug #443030" die fi fi # backport some patches if [[ -n "${patchset}" ]]; then EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch fi # These are missing from upstream 50-udev-default.rules cat <<-EOF > "${T}"/40-gentoo.rules # Gentoo specific usb group SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" # Keep this for Linux 2.6.32 kernels with accept4() support like .60 wrt #457868 SUBSYSTEM=="mem", KERNEL=="null|zero|full|random|urandom", MODE="0666" EOF # Create link to systemd-udevd.8 here to avoid parallel build problem and # while at it, create convinience link to `man 8 udevd` even if upstream # doesn't do that anymore local man for man in udevd systemd-udevd; do echo '.so systemd-udevd.service.8' > "${T}"/${man}.8 done # Remove requirements for gettext and intltool wrt bug #443028 if ! has_version dev-util/intltool && ! [[ ${PV} = 9999* ]]; then sed -i \ -e '/INTLTOOL_APPLIED_VERSION=/s:=.*:=0.40.0:' \ -e '/XML::Parser perl module is required for intltool/s|^|:|' \ configure || die eval export INTLTOOL_{EXTRACT,MERGE,UPDATE}=/bin/true eval export {MSG{FMT,MERGE},XGETTEXT}=/bin/true 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 wrt #454556 sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die 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 # Restore possibility of running --enable-static wrt #472608 sed -i \ -e '/--enable-static is not supported by systemd/s:as_fn_error:echo:' \ configure || die if ! use elibc_glibc; then #443030 echo '#define secure_getenv(x) NULL' >> config.h.in sed -i -e '/error.*secure_getenv/s:.*:#define secure_getenv(x) NULL:' src/shared/missing.h || die fi } multilib_src_configure() { tc-export CC #463846 local econf_args econf_args=( ac_cv_search_cap_init= ac_cv_header_sys_capability_h=yes DBUS_CFLAGS=' ' DBUS_LIBS=' ' --docdir=/usr/share/doc/${PF} --libdir=/usr/$(get_libdir) --with-html-dir=/usr/share/doc/${PF}/html --with-rootprefix= --without-python --disable-python-devel --disable-audit --disable-coredump --disable-hostnamed --disable-ima --disable-libcryptsetup --disable-localed --disable-logind --disable-myhostname --disable-nls --disable-pam --disable-quotacheck --disable-readahead $(use_enable gudev) --enable-split-usr --disable-tcpwrap --disable-timedated --disable-xz --disable-polkit --disable-tmpfiles --disable-machined --disable-xattr ) # Use pregenerated copies when possible wrt #480924 if ! [[ ${PV} = 9999* ]]; then econf_args+=( --disable-manpages ) fi if multilib_is_native_abi; then econf_args+=( --with-rootlibdir=/$(get_libdir) $(use_enable acl) $(use_enable doc gtk-doc) $(use_enable kmod) $(use_enable selinux) $(use_enable static-libs static) --enable-introspection=$(usex introspection) ) else econf_args+=( --with-rootlibdir=/usr/$(get_libdir) --disable-acl --disable-gtk-doc --disable-kmod --disable-selinux --disable-static --disable-manpages --enable-introspection=no ) fi use firmware-loader && econf_args+=( --with-firmware-path="/lib/firmware/updates:/lib/firmware" ) ECONF_SOURCE=${S} econf "${econf_args[@]}" } multilib_src_compile() { echo 'BUILT_SOURCES: $(BUILT_SOURCES)' > "${T}"/Makefile.extra emake -f Makefile -f "${T}"/Makefile.extra BUILT_SOURCES # Most of the parallel build problems were solved by >=sys-devel/make-3.82-r4, # but not everything -- separate building of the binaries as a workaround, # which will force internal libraries required for the helpers to be built # early enough, like eg. libsystemd-shared.la if multilib_is_native_abi; then local lib_targets=( libudev.la ) use gudev && lib_targets+=( libgudev-1.0.la ) emake "${lib_targets[@]}" local exec_targets=( systemd-udevd udevadm ) emake "${exec_targets[@]}" local helper_targets=( ata_id cdrom_id collect scsi_id v4l_id accelerometer mtd_probe ) emake "${helper_targets[@]}" if [[ ${PV} = 9999* ]]; then local man_targets=( man/udev.7 man/udevadm.8 man/systemd-udevd.service.8 ) emake "${man_targets[@]}" fi if use doc; then emake -C docs/libudev use gudev && emake -C docs/gudev fi else local lib_targets=( libudev.la ) use gudev && lib_targets+=( libgudev-1.0.la ) emake "${lib_targets[@]}" fi } multilib_src_install() { if multilib_is_native_abi; then local lib_LTLIBRARIES="libudev.la" \ pkgconfiglib_DATA="src/libudev/libudev.pc" local targets=( install-libLTLIBRARIES install-includeHEADERS install-libgudev_includeHEADERS install-rootbinPROGRAMS install-rootlibexecPROGRAMS install-udevlibexecPROGRAMS install-dist_udevconfDATA install-dist_udevrulesDATA install-girDATA install-pkgconfiglibDATA install-sharepkgconfigDATA install-typelibsDATA install-dist_docDATA libudev-install-hook install-directories-hook install-dist_bashcompletionDATA ) 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 rootbin_PROGRAMS=udevadm lib_LTLIBRARIES="${lib_LTLIBRARIES}" pkgconfiglib_DATA="${pkgconfiglib_DATA}" INSTALL_DIRS='$(sysconfdir)/udev/rules.d \ $(sysconfdir)/udev/hwdb.d' dist_bashcompletion_DATA="shell-completion/bash/udevadm" ) 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 # install udevadm compatibility symlink dosym {../bin,sbin}/udevadm # install udevd to /sbin and remove empty and redudant directory # /lib/systemd because systemd is installed to /usr wrt #462750 mv "${D}"/{lib/systemd/systemd-,sbin/}udevd || die rm -r "${D}"/lib/systemd if [[ ${PV} = 9999* ]]; then doman man/{udev.7,udevadm.8,systemd-udevd.service.8} else doman "${S}"/man/{udev.7,udevadm.8,systemd-udevd.service.8} fi else local lib_LTLIBRARIES="libudev.la" \ pkgconfiglib_DATA="src/libudev/libudev.pc" \ include_HEADERS="src/libudev/libudev.h" local targets=( install-libLTLIBRARIES install-includeHEADERS install-pkgconfiglibDATA ) if use gudev; then lib_LTLIBRARIES+=" libgudev-1.0.la" pkgconfiglib_DATA+=" src/gudev/gudev-1.0.pc" fi targets+=( lib_LTLIBRARIES="${lib_LTLIBRARIES}" pkgconfiglib_DATA="${pkgconfiglib_DATA}" include_HEADERS="${include_HEADERS}" ) emake -j1 DESTDIR="${D}" "${targets[@]}" fi } multilib_src_install_all() { dodoc TODO prune_libtool_files --all rm -f \ "${D}"/lib/udev/rules.d/99-systemd.rules \ "${D}"/usr/share/doc/${PF}/LICENSE.* # see src_prepare() for content of these files insinto /lib/udev/rules.d doins "${T}"/40-gentoo.rules doman "${T}"/{systemd-,}udevd.8 } 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 } 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 # 64-device-mapper.rules is related to sys-fs/device-mapper which we block # in favor of sys-fs/lvm2 old_dm_rules=${ROOT}etc/udev/rules.d/64-device-mapper.rules if [[ -f ${old_dm_rules} ]]; then rm -f "${old_dm_rules}" einfo "Removed unneeded file ${old_dm_rules}" fi local fstab="${ROOT}"etc/fstab dev path fstype rest while read -r dev path fstype rest; do if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs" ewarn "filesystem. Otherwise udev won't be able to boot." ewarn "See, http://bugs.gentoo.org/453186"; fi done < "${fstab}" 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 local old_net_name="${ROOT}"etc/udev/rules.d/80-net-name-slot.rules if [[ -f ${old_net_name} ]]; then local old_net_sum=bebf4bd1b6b668e9ff34a3999aa6ff32 MD5=$(md5sum < "${old_net_name}") MD5=${MD5/ -/} if [[ ${MD5} == ${old_net_sum} ]]; then ewarn "Removing unmodified file ${old_net_name} from old udev installation to enable" ewarn "the new predictable network interface naming." rm -f "${old_net_name}" fi fi local old_cd_rules="${ROOT}"etc/udev/rules.d/70-persistent-cd.rules local old_net_rules="${ROOT}"etc/udev/rules.d/70-persistent-net.rules for old_rules in "${old_cd_rules}" "${old_net_rules}"; do if [[ -f ${old_rules} ]]; then ewarn ewarn "File ${old_rules} is from old udev installation but if you still use it," ewarn "rename it to something else starting with 70- to silence this deprecation" ewarn "warning." fi done elog elog "Starting from version >= 197 the new predictable network interface names are" elog "used by default, see:" elog "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"; elog "http://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-net_id.c"; elog elog "Example command to get the information for the new interface name before booting" elog "(replace <ifname> with, for example, eth0):" elog "# udevadm test-builtin net_id /sys/class/net/<ifname> 2> /dev/null" elog elog "You can use either kernel parameter \"net.ifnames=0\", create empty" elog "file /etc/udev/rules.d/80-net-name-slot.rules, or symlink it to /dev/null" elog "to disable the feature." if has_version 'sys-apps/biosdevname'; then ewarn ewarn "You can replace the functionality of sys-apps/biosdevname which has been" ewarn "detected to be installed with the new predictable network interface names." 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." if has_version 'sys-apps/openrc'; then ewarn "For sys-apps/openrc users it is:" ewarn "# /etc/init.d/udev --nodeps restart" fi elog elog "For more information on udev on Gentoo, upgrading, writing udev rules, and" elog "fixing known issues visit:" elog "http://wiki.gentoo.org/wiki/Udev"; elog "http://wiki.gentoo.org/wiki/Udev/upgrade"; # Update hwdb database in case the format is changed by udev version. if has_version 'sys-apps/hwids[udev]'; then udevadm hwdb --update --root="${ROOT%/}" # Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd if [[ -z ${REPLACING_VERSIONS} ]]; then # http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then return 0 fi udevadm control --reload fi fi }
