From 766a97cd1fc61e3a924951b4bed63f8b45d847e6 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Fri, 28 Dec 2018 11:47:08 -0500 Subject: sys-fs/udev: backport patches Closes: https://bugs.gentoo.org/673796 Package-Manager: Portage-2.3.52_p18, Repoman-2.3.12_p30 Signed-off-by: Mike Gilbert --- sys-fs/udev/Manifest | 1 + sys-fs/udev/udev-240-r1.ebuild | 325 +++++++++++++++++++++++++++++++++++++++++ sys-fs/udev/udev-240.ebuild | 322 ---------------------------------------- 3 files changed, 326 insertions(+), 322 deletions(-) create mode 100644 sys-fs/udev/udev-240-r1.ebuild delete mode 100644 sys-fs/udev/udev-240.ebuild (limited to 'sys-fs') diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index abc16edd81a1..5c44ec32a816 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -1,4 +1,5 @@ DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d DIST systemd-238.tar.gz 6954022 BLAKE2B 9b5cc36a7234c0d037a2656ee1e5ed54186a394b8be41771ebc29c903d3efcecf7f13f004a6d1695c022923bd0d540a243e897852f07e810f73fd3163f688dde SHA512 c0f272b022308d3bd94679184e102a8dc85de55310bda205a458ea33c77c7733e5c8c8e5b15f786ba3e0ce59e7c6a9bf0d5a0950517c6b91e0f345950129b9c8 DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0 SHA512 fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f +DIST systemd-240-patches-0.tar.gz 2925 BLAKE2B 167ddaddfbe0726b9a64a95ec601495599d7aff052cbad96b80ac16ddfed72f320ba3c5c602e2f79b0cd9aea1d58ea256249a080e0999787a2c183e0bcc0869d SHA512 6b948d17f3a037ef1a291f5df766dc095c4498d5742374e08daa9b534b9b979a07876e41bb7db2ce257ff12b3b97fe1927a11d0f1a79c57f96300a5a8413d2eb DIST systemd-240.tar.gz 7582001 BLAKE2B cf53595a83424984dd9f533f7cd0c9905366c5a52ab946fc45ff7fd1bcc85978ff654720113641534e40c0f9a1ad1c9628255778616770762950426789f659c3 SHA512 da7467781b16f65d868931ae88fd07554db61542aec7f11dbec9f7279b529f900301edfea2d3813ddb64eeb3fdcfb7be86e540c65212dd7cfdcdebbc80de2ff5 diff --git a/sys-fs/udev/udev-240-r1.ebuild b/sys-fs/udev/udev-240-r1.ebuild new file mode 100644 index 000000000000..3cf58bff5dee --- /dev/null +++ b/sys-fs/udev/udev-240-r1.ebuild @@ -0,0 +1,325 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev user + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://github.com/systemd/systemd.git" + inherit git-r3 +else + SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz + https://dev.gentoo.org/~floppym/dist/systemd-${PV}-patches-0.tar.gz" + 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="https://www.freedesktop.org/wiki/Software/systemd" + +LICENSE="LGPL-2.1 MIT GPL-2" +SLOT="0" +IUSE="acl +kmod selinux" + +RESTRICT="test" + +COMMON_DEPEND=">=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}] + sys-libs/libcap[${MULTILIB_USEDEP}] + acl? ( sys-apps/acl ) + kmod? ( >=sys-apps/kmod-16 ) + selinux? ( >=sys-libs/libselinux-2.1.9 ) + ! "${T}"/40-gentoo.rules + # Gentoo specific floppy and usb groups + ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy" + ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" + EOF + + eapply "${WORKDIR}/patches" + + local PATCHES=( + "${FILESDIR}/236-uucp-group.patch" + ) + + default +} + +meson_multilib_native_use() { + if multilib_is_native_abi && use "$1"; then + echo true + else + echo false + fi +} + +multilib_src_configure() { + local emesonargs=( + -Dacl=$(meson_multilib_native_use acl) + -Defi=false + -Dkmod=$(meson_multilib_native_use kmod) + -Dselinux=$(meson_multilib_native_use selinux) + -Dlink-udev-shared=false + -Dsplit-usr=true + + # Prevent automagic deps + -Dgcrypt=false + -Dlibcryptsetup=false + -Dlibidn=false + -Dlibidn2=false + -Dlibiptc=false + -Dseccomp=false + -Dlz4=false + -Dxz=false + ) + meson_src_configure +} + +src_configure() { + # Prevent conflicts with i686 cross toolchain, bug 559726 + tc-export AR CC NM OBJCOPY RANLIB + multilib-minimal_src_configure +} + +multilib_src_compile() { + # meson creates this link + local libudev=$(readlink src/udev/libudev.so.1) + + local targets=( + src/udev/${libudev} + ) + if multilib_is_native_abi; then + targets+=( + systemd-udevd + udevadm + src/udev/ata_id + src/udev/cdrom_id + src/udev/mtd_probe + src/udev/scsi_id + src/udev/v4l_id + man/udev.conf.5 + man/systemd.link.5 + man/hwdb.7 + man/udev.7 + man/systemd-udevd.service.8 + man/udevadm.8 + ) + fi + eninja "${targets[@]}" +} + +multilib_src_install() { + local libudev=$(readlink src/udev/libudev.so.1) + + into / + dolib.so src/udev/{${libudev},libudev.so.1,libudev.so} + + insinto "/usr/$(get_libdir)/pkgconfig" + doins src/libudev/libudev.pc + + if multilib_is_native_abi; then + into / + dobin udevadm + + exeinto /lib/systemd + doexe systemd-udevd + + exeinto /lib/udev + doexe src/udev/{ata_id,cdrom_id,mtd_probe,scsi_id,v4l_id} + + rm rules/99-systemd.rules || die + insinto /lib/udev/rules.d + doins rules/*.rules + + insinto /usr/share/pkgconfig + doins src/udev/udev.pc + + mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die + rm man/systemd-udevd-{control,kernel}.socket.8 || die + doman man/*.[0-9] + fi +} + +multilib_src_install_all() { + doheader src/libudev/libudev.h + + insinto /etc/udev + doins src/udev/udev.conf + keepdir /etc/udev/{hwdb.d,rules.d} + + insinto /lib/systemd/network + doins network/99-default.link + + # see src_prepare() for content of 40-gentoo.rules + insinto /lib/udev/rules.d + doins "${T}"/40-gentoo.rules + doins "${S}"/rules/*.rules + + dobashcomp shell-completion/bash/udevadm + + insinto /usr/share/zsh/site-functions + doins shell-completion/zsh/_udevadm + + einstalldocs +} + +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 + + 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, https://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_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 "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames" + elog "https://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 with, for example, eth0):" + elog "# udevadm test-builtin net_id /sys/class/net/ 2> /dev/null" + elog + elog "You can use either kernel parameter \"net.ifnames=0\", create empty" + elog "file /etc/systemd/network/99-default.link, 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 "https://wiki.gentoo.org/wiki/Udev" + elog "https://wiki.gentoo.org/wiki/Udev/upgrade" + + # If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null, + # do the same for 80-net-setup-link.rules to keep the old behavior + local net_move=no + local net_name_slot_sym=no + local net_rules_path="${ROOT%/}"/etc/udev/rules.d + local net_name_slot="${net_rules_path}"/80-net-name-slot.rules + local net_setup_link="${net_rules_path}"/80-net-setup-link.rules + if [[ ! -e ${net_setup_link} ]]; then + [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes + if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then + net_move=yes + net_name_slot_sym=yes + fi + fi + if [[ ${net_move} == yes ]]; then + ebegin "Copying ${net_name_slot} to ${net_setup_link}" + + if [[ ${net_name_slot_sym} == yes ]]; then + ln -nfs /dev/null "${net_setup_link}" + else + cp "${net_name_slot}" "${net_setup_link}" + fi + eend $? + fi + + # https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69 + # https://bugs.gentoo.org/246847 + # https://bugs.gentoo.org/514174 + enewgroup input + + # 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 + # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda + [[ -z ${REPLACING_VERSIONS} ]] && udev_reload + fi +} diff --git a/sys-fs/udev/udev-240.ebuild b/sys-fs/udev/udev-240.ebuild deleted file mode 100644 index 7934423439b0..000000000000 --- a/sys-fs/udev/udev-240.ebuild +++ /dev/null @@ -1,322 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev user - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://github.com/systemd/systemd.git" - inherit git-r3 -else - SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz" - 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="https://www.freedesktop.org/wiki/Software/systemd" - -LICENSE="LGPL-2.1 MIT GPL-2" -SLOT="0" -IUSE="acl +kmod selinux" - -RESTRICT="test" - -COMMON_DEPEND=">=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}] - sys-libs/libcap[${MULTILIB_USEDEP}] - acl? ( sys-apps/acl ) - kmod? ( >=sys-apps/kmod-16 ) - selinux? ( >=sys-libs/libselinux-2.1.9 ) - ! "${T}"/40-gentoo.rules - # Gentoo specific floppy and usb groups - ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy" - ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" - EOF - - local PATCHES=( - "${FILESDIR}/236-uucp-group.patch" - ) - - default -} - -meson_multilib_native_use() { - if multilib_is_native_abi && use "$1"; then - echo true - else - echo false - fi -} - -multilib_src_configure() { - local emesonargs=( - -Dacl=$(meson_multilib_native_use acl) - -Defi=false - -Dkmod=$(meson_multilib_native_use kmod) - -Dselinux=$(meson_multilib_native_use selinux) - -Dlink-udev-shared=false - -Dsplit-usr=true - - # Prevent automagic deps - -Dgcrypt=false - -Dlibcryptsetup=false - -Dlibidn=false - -Dlibidn2=false - -Dlibiptc=false - -Dseccomp=false - -Dlz4=false - -Dxz=false - ) - meson_src_configure -} - -src_configure() { - # Prevent conflicts with i686 cross toolchain, bug 559726 - tc-export AR CC NM OBJCOPY RANLIB - multilib-minimal_src_configure -} - -multilib_src_compile() { - # meson creates this link - local libudev=$(readlink src/udev/libudev.so.1) - - local targets=( - src/udev/${libudev} - ) - if multilib_is_native_abi; then - targets+=( - systemd-udevd - udevadm - src/udev/ata_id - src/udev/cdrom_id - src/udev/mtd_probe - src/udev/scsi_id - src/udev/v4l_id - man/udev.conf.5 - man/systemd.link.5 - man/hwdb.7 - man/udev.7 - man/systemd-udevd.service.8 - man/udevadm.8 - ) - fi - eninja "${targets[@]}" -} - -multilib_src_install() { - local libudev=$(readlink src/udev/libudev.so.1) - - into / - dolib.so src/udev/{${libudev},libudev.so.1,libudev.so} - - insinto "/usr/$(get_libdir)/pkgconfig" - doins src/libudev/libudev.pc - - if multilib_is_native_abi; then - into / - dobin udevadm - - exeinto /lib/systemd - doexe systemd-udevd - - exeinto /lib/udev - doexe src/udev/{ata_id,cdrom_id,mtd_probe,scsi_id,v4l_id} - - rm rules/99-systemd.rules || die - insinto /lib/udev/rules.d - doins rules/*.rules - - insinto /usr/share/pkgconfig - doins src/udev/udev.pc - - mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die - rm man/systemd-udevd-{control,kernel}.socket.8 || die - doman man/*.[0-9] - fi -} - -multilib_src_install_all() { - doheader src/libudev/libudev.h - - insinto /etc/udev - doins src/udev/udev.conf - keepdir /etc/udev/{hwdb.d,rules.d} - - insinto /lib/systemd/network - doins network/99-default.link - - # see src_prepare() for content of 40-gentoo.rules - insinto /lib/udev/rules.d - doins "${T}"/40-gentoo.rules - doins "${S}"/rules/*.rules - - dobashcomp shell-completion/bash/udevadm - - insinto /usr/share/zsh/site-functions - doins shell-completion/zsh/_udevadm - - einstalldocs -} - -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 - - 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, https://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_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 "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames" - elog "https://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 with, for example, eth0):" - elog "# udevadm test-builtin net_id /sys/class/net/ 2> /dev/null" - elog - elog "You can use either kernel parameter \"net.ifnames=0\", create empty" - elog "file /etc/systemd/network/99-default.link, 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 "https://wiki.gentoo.org/wiki/Udev" - elog "https://wiki.gentoo.org/wiki/Udev/upgrade" - - # If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null, - # do the same for 80-net-setup-link.rules to keep the old behavior - local net_move=no - local net_name_slot_sym=no - local net_rules_path="${ROOT%/}"/etc/udev/rules.d - local net_name_slot="${net_rules_path}"/80-net-name-slot.rules - local net_setup_link="${net_rules_path}"/80-net-setup-link.rules - if [[ ! -e ${net_setup_link} ]]; then - [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes - if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then - net_move=yes - net_name_slot_sym=yes - fi - fi - if [[ ${net_move} == yes ]]; then - ebegin "Copying ${net_name_slot} to ${net_setup_link}" - - if [[ ${net_name_slot_sym} == yes ]]; then - ln -nfs /dev/null "${net_setup_link}" - else - cp "${net_name_slot}" "${net_setup_link}" - fi - eend $? - fi - - # https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69 - # https://bugs.gentoo.org/246847 - # https://bugs.gentoo.org/514174 - enewgroup input - - # 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 - # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda - [[ -z ${REPLACING_VERSIONS} ]] && udev_reload - fi -} -- cgit v1.2.3-65-gdbad