From e3872864be25f7421015bef2732fa57c0c9fb726 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 4 Aug 2018 08:53:53 +0100 Subject: gentoo resync : 04.08.2018 --- sys-fs/udev/Manifest | 11 +- sys-fs/udev/files/233-fix-includes.patch | 38 --- sys-fs/udev/files/233-format-warnings.patch | 84 ----- sys-fs/udev/metadata.xml | 2 - sys-fs/udev/udev-216.ebuild | 485 ---------------------------- sys-fs/udev/udev-225-r1.ebuild | 426 ------------------------ sys-fs/udev/udev-233.ebuild | 405 ----------------------- 7 files changed, 1 insertion(+), 1450 deletions(-) delete mode 100644 sys-fs/udev/files/233-fix-includes.patch delete mode 100644 sys-fs/udev/files/233-format-warnings.patch delete mode 100644 sys-fs/udev/udev-216.ebuild delete mode 100644 sys-fs/udev/udev-225-r1.ebuild delete mode 100644 sys-fs/udev/udev-233.ebuild (limited to 'sys-fs/udev') diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 4a496ca3c809..2c22697243ed 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -1,19 +1,10 @@ -AUX 233-fix-includes.patch 1053 BLAKE2B 77e46c52bfed92e86e784dba346198413672de31c33f7fdfc4dc63786b1dd47a6c3f80d4bf0873a57fc676f3b72a4a27e7dd2e94ef2bd2ac0b4d7fcc1f8dc7bc SHA512 a4df18879862a17c6135a51591677c7e1ab8a98e5f2ba4eaec8e9275e4345c85a84ccd5bf2f8d8c6da51fd9152711681fd71eec86aab311e24bfe5469940f5ab -AUX 233-format-warnings.patch 3837 BLAKE2B be24951d2b3b70c6596c9fdabf6faf7492791b3ea5310aff77462ab05fca1c82026e7aabe4fd3656dc486e5d11ce8138c64740c66f75a6151107a86282b90958 SHA512 491cdbdb75e1ef338cd660fd89c776e3dd2881922eb04f505dda985104f14813e9da9e758393d906ff224e9e03888cafd05f7e665f71c43580a2989af54981bc AUX 236-uucp-group.patch 743 BLAKE2B 6dd28f1096d25cd776f66b1e574874d840a287b645701620459d5f5a5aec40784aca3ba86018911b5274e3643d17bd4b19dbe5fcad8a1ce4477ed136eae9bbdb SHA512 481400b0fd66ccfd559353a54e6d00749a10de3e67b304eeac0e63346ca404abc9e744c0dfaadc7783a231db929dc1cd4d97bf6e5bf585d7c41e03331c4e37ba AUX 239-basic-add-missing-comma-in-raw_clone-assembly-for-sp.patch 1098 BLAKE2B 7e846f475ae42e3c0e461b042042adca0475dc88d49a6bacea257381235f755dbd67569b8119efd7f25e68d64dbcd2b50a922df0f91c51ec16fe52cec65f9523 SHA512 2c8064540b669aa90a26bbd1d5af0b1afff030598a1a11bfe32a9c7f7ee59860acecfcdc7a94066c8ba6b62534432c28f72739dbbe16047958e5362a46d52215 -DIST systemd-216.tar.xz 3612960 BLAKE2B 677fa79e7a8dae5d62f37115c3087d89c46a28515c1fe48abbd77016ee41565583e407913b5a9738908436a2ccc36a1d3305392d8dfa5ac053a44ca66d587611 SHA512 f4eee6664368168eafd61939f1355ac21c7eeecce6247de98ef36f40bb6a942d12c006ced4ee15f3d8f11699c194990222d5a5115b45f2aa81f2a1abafebbdd2 -DIST systemd-225.tar.gz 3878442 BLAKE2B 24bf9f6bfdd7d7c585829c1b172f73e669e137020b990ecd07dffafbe6890f1819e6c8efd5b322008473a62007a4a6f6ab2fb209be7db4ecb89a2bc01d60aaab SHA512 35b3946509c7b01660da4370d3c51ff0e6a537dadd9dbb0a039c4f7ed552fd4e02ebac6eb8a788f61f1e3ba99444238d959051dd004c174b027729a80368ac19 -DIST systemd-233.tar.gz 4660737 BLAKE2B 38cdd74543447b3c02391b328428fed169fe2cf2df6e9341dcaf2f7d3d977612ec102301e144c1cada90d61e9e9bda3b2faaef708c8ff4bd0b52b143760a83b2 SHA512 5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e 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 udev-216-patches-2.tar.xz 1264 BLAKE2B b1bbb6b1b7734edc3352b4352a45b4b5df4715b0fc92c4936798aa93fb078755b7795f475d7bc42392ad8ef57853e9ce2507c66cc9bfbd37e6fe22ada4c156cc SHA512 1f5912f3bbc3e40a4efad9de8b1fab2b3a750f3f23c9f2e33a581658959d22cf23f9ff1b8f51597874e7bca1d0f757f37fd5550b4112160261559524eda261f4 -EBUILD udev-216.ebuild 15081 BLAKE2B adc66d5478de63a817c208832802557672c072368d98495b9d1e8f53d790a4171bbe451503c81efd53d293e43426cb1b44acc0f8ae755dfe33a8138665c35b5a SHA512 8884c4ab00af90cd6e910e6137674f9dbe6baa846876a16e6048e6960dba74dd685407a24343e9e20f61d18299b1900f7eab1b9c9eab726ddba9a62ebd826709 -EBUILD udev-225-r1.ebuild 13436 BLAKE2B 551c495815193eeaf89dd70e1b0d969bb717200f18eedd241b6a308cbfe62388c5fb9bcd801597482f5c4f8451475c61b628b4f38de1df01d62a7cce11361cfb SHA512 b3310daf82972b710c37a6ee25776369bc09beac4926ea056d73421bd01627f93c2aaacdb2bd2b0819989629d82eea619d475ae4c6cd4179be2201cf7ec632a7 -EBUILD udev-233.ebuild 12904 BLAKE2B 53e3f5f68bf504acf0085f5e957894c1a3462bdcf8282e2399787a6d2ccf0a3b409116cbac5a3df22432d7576604807c8400755102731031416e9cec3a899fca SHA512 d7bc4f8d9c68ce67b25de78669301b39816c1ab2221e498dcf27c80c62466db99db32581648e5aab79fd960989c498cd035794c3f80666c388d363e6a9628c9c EBUILD udev-236-r1.ebuild 10048 BLAKE2B cd7b1f1b4edaf2dec245c9b00e1f19af56e3f4b21f6de1535f062d9deaa16107efc9f873dc50928604562da3c8877cdfff70c5489bec15cbcfa952b9bf4ff8ca SHA512 e6dca2f55c992a025cefc67b06df09d402fdd8438cfd819419a70de6ea2b26e58e380781aa66f0d63bf682b4500ab94f6b552117969851ddd892bb8a6415f4ee EBUILD udev-238.ebuild 9595 BLAKE2B 9b475a74399ce0fc0187d8dd265fe7cc4c615080a4bb7ba6fd22cb8876570d78232ea5b36c02b0de2581c540a798cefd9d17d23d59c7c494969a7ab3d9e0cd6f SHA512 0c219e93fa5f35821d83707ffb061c3a01a5b6f1788ca4cc72cb1a89039f648d87f159c80c7cade5048babbd6456e7c6e6e794fbf2240cae0170ec0dec4d49f0 EBUILD udev-239.ebuild 9686 BLAKE2B fc36f38c3634825efc120fc97c6f08d530068def4fe1d471fc94c4ccceae524fece9bc610277fd3e00fdf94ca10bdd176d9f47a6fed14a0ea2681da3fbe6c377 SHA512 905e177799fa810c260a07e4f684de80f9ae9f1d8dc182a81c1d89c7ec5b8db5bd80e58ccc0f73013f9dc5b0c4ed25f48c470f8f10491bf2e3298b9f229613e5 EBUILD udev-9999.ebuild 9607 BLAKE2B c175d2eed5f59f08225701dab78983864208fb1fd2a4a2d2dd6ba90d35cbc7ecb3b39929ceae89e845433d8261845fbd773f01321c0f32434594bc7f65453920 SHA512 3593e0e706fb81c82a3f031580e338d85cdbc0bf48b4c86c4466041a9ab6c4a2e4b91e35ded2ea7e104f65a3dd28728f5169fccbc9d570eb4f5284de2fe978f5 -MISC metadata.xml 680 BLAKE2B 3f6b21eff391977d69921da6eeb7f48ae6c706dd856e12c4b0126f0db4ced358925374bed23d950d957a58b5447e087ad98301aa1f75dd140a1cd816ef1d2426 SHA512 2e90cdfb013904211fba8404c6b96ad940dfaea05eebe7592e3fa185dec9b16b738cc7661fd466990788accf8c261a596bcb08477e879e0e18fcc91cdce65c5e +MISC metadata.xml 476 BLAKE2B 5d293590663fda69b35a5f434b64827de86ac14831536e873c38d1e3baa8575cc02cc45525726046103b73212c02852dce6c407fe7c02705370e4b6402771686 SHA512 552311593b07f4f3d41e406fe99606d79973d9c69e5e448ffcdf3f6d1e04ea6b59c97b022ad2fe7fedbf0c627e2b45efc293dc1065e7cec035c2e48c85c3495d diff --git a/sys-fs/udev/files/233-fix-includes.patch b/sys-fs/udev/files/233-fix-includes.patch deleted file mode 100644 index 44b06214f89d..000000000000 --- a/sys-fs/udev/files/233-fix-includes.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 284d1cd0a12cad96a5ea61d1afb0dd677dbd147e Mon Sep 17 00:00:00 2001 -From: Matija Skala -Date: Wed, 15 Mar 2017 13:21:10 +0100 -Subject: [PATCH] fix includes - -linux/sockios.h is needed for the SIOCGSTAMPNS macro - -xlocale.h is included indirectly in glibc and doesn't even exist in -other libcs ---- - src/basic/parse-util.c | 1 - - src/libsystemd-network/sd-lldp.c | 1 + - 2 files changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c -index 6e58ced6f5..d86700736d 100644 ---- a/src/basic/parse-util.c -+++ b/src/basic/parse-util.c -@@ -23,7 +23,6 @@ - #include - #include - #include --#include - - #include "alloc-util.h" - #include "extract-word.h" -diff --git a/src/libsystemd-network/sd-lldp.c b/src/libsystemd-network/sd-lldp.c -index 0702241506..39ddb2461a 100644 ---- a/src/libsystemd-network/sd-lldp.c -+++ b/src/libsystemd-network/sd-lldp.c -@@ -19,6 +19,7 @@ - ***/ - - #include -+#include - - #include "sd-lldp.h" - diff --git a/sys-fs/udev/files/233-format-warnings.patch b/sys-fs/udev/files/233-format-warnings.patch deleted file mode 100644 index 7bb08f0a3201..000000000000 --- a/sys-fs/udev/files/233-format-warnings.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 3e7d14d78c4d15ec7789299216cbf5c58e61547b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Sat, 3 Jun 2017 05:41:17 -0400 -Subject: [PATCH] sd-bus: silence format warnings in kdbus code (#6072) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The code is mostly correct, but gcc is trying to outsmart us, and emits a -warning for a "llu vs lu" mismatch, even though they are the same size (on alpha): - -src/libsystemd/sd-bus/bus-control.c: In function ‘kernel_get_list’: -src/libsystemd/sd-bus/bus-control.c:267:42: error: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument 3 has type ‘__u64 {aka long unsigned int}’ [-Werror=format=] - if (asprintf(&n, ":1.%llu", name->id) < 0) { - ^ -src/libsystemd/sd-bus/bus-control.c: In function ‘bus_get_name_creds_kdbus’: -src/libsystemd/sd-bus/bus-control.c:714:47: error: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument 3 has type ‘__u64 {aka long unsigned int}’ [-Werror=format=] - if (asprintf(&c->unique_name, ":1.%llu", conn_info->id) < 0) { - ^ -This is hard to work around properly, because kdbus.h uses __u64 which is -defined-differently-despite-being-the-same-size then uint64_t. Thus the simple -solution of using %PRIu64 fails on amd64: - -src/libsystemd/sd-bus/bus-control.c:714:47: error: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 3 has type ‘__u64 {aka long long unsigned int}’ [-Werror=format=] - if (asprintf(&c->unique_name, ":1.%"PRIu64, conn_info->id) < 0) { - ^~~~~~ - -Let's just avoid the whole issue for now by silencing the warning. -After the next release, we should just get rid of the kdbus code. - -Fixes #5561. ---- - src/libsystemd/sd-bus/bus-control.c | 6 ++++++ - src/libsystemd/sd-bus/bus-kernel.c | 2 ++ - 2 files changed, 8 insertions(+) - -diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c -index 9e58ffbd8..303ae0f23 100644 ---- a/src/libsystemd/sd-bus/bus-control.c -+++ b/src/libsystemd/sd-bus/bus-control.c -@@ -264,10 +264,13 @@ static int kernel_get_list(sd_bus *bus, uint64_t flags, char ***x) { - if ((flags & KDBUS_LIST_UNIQUE) && name->id != previous_id && !(name->flags & KDBUS_HELLO_ACTIVATOR)) { - char *n; - -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat" - if (asprintf(&n, ":1.%llu", name->id) < 0) { - r = -ENOMEM; - goto fail; - } -+#pragma GCC diagnostic pop - - r = strv_consume(x, n); - if (r < 0) -@@ -711,10 +714,13 @@ int bus_get_name_creds_kdbus( - } - - if (mask & SD_BUS_CREDS_UNIQUE_NAME) { -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat" - if (asprintf(&c->unique_name, ":1.%llu", conn_info->id) < 0) { - r = -ENOMEM; - goto fail; - } -+#pragma GCC diagnostic pop - - c->mask |= SD_BUS_CREDS_UNIQUE_NAME; - } -diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c -index c82caeb3f..ca6aee7c0 100644 ---- a/src/libsystemd/sd-bus/bus-kernel.c -+++ b/src/libsystemd/sd-bus/bus-kernel.c -@@ -51,6 +51,8 @@ - #include "user-util.h" - #include "util.h" - -+#pragma GCC diagnostic ignored "-Wformat" -+ - #define UNIQUE_NAME_MAX (3+DECIMAL_STR_MAX(uint64_t)) - - int bus_kernel_parse_unique_name(const char *s, uint64_t *id) { --- -2.13.2 - diff --git a/sys-fs/udev/metadata.xml b/sys-fs/udev/metadata.xml index e6e0979044dd..39f61746d0df 100644 --- a/sys-fs/udev/metadata.xml +++ b/sys-fs/udev/metadata.xml @@ -5,8 +5,6 @@ udev-bugs@gentoo.org - Enable the userspace firmware loader (DEPRECATED, replaced by the in-kernel loader starting from 3.8) - Build the gobject interface library Enable kernel module loading/unloading support using sys-apps/kmod diff --git a/sys-fs/udev/udev-216.ebuild b/sys-fs/udev/udev-216.ebuild deleted file mode 100644 index 3d009073e05b..000000000000 --- a/sys-fs/udev/udev-216.ebuild +++ /dev/null @@ -1,485 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools bash-completion-r1 eutils linux-info multilib multilib-minimal toolchain-funcs udev user versionator - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd" - inherit git-2 - patchset= -else - patchset=2 - SRC_URI="https://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz" - if [[ -n "${patchset}" ]]; then - SRC_URI+=" - https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz - https://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="https://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.34.3[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.38 ) - kmod? ( >=sys-apps/kmod-16 ) - selinux? ( >=sys-libs/libselinux-2.1.9 ) - != -r4 to skip some parallel build issues -DEPEND="${COMMON_DEPEND} - dev-util/gperf - >=sys-apps/coreutils-8.16 - sys-libs/libcap - virtual/os-headers - virtual/pkgconfig - >=sys-devel/make-3.82-r4 - >=sys-kernel/linux-headers-3.7 - doc? ( >=dev-util/gtk-doc-1.18 )" -# Try with `emerge -C docbook-xml-dtd` to see the build failure without DTDs -if [[ ${PV} = 9999* ]]; then - DEPEND="${DEPEND} - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt" -fi -RDEPEND="${COMMON_DEPEND} - ! "${T}"/40-gentoo.rules - # Gentoo specific floppy and usb groups - SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy" - SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" - EOF - - # change rules back to group uucp instead of dialout for now wrt #454556 - sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die - - # apply user patches - epatch_user - - 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 - export cc_cv_CFLAGS__flto=no #502950 - - # Keep sorted by ./configure --help and only pass --disable flags - # when *required* to avoid external deps or unnecessary compile - local econf_args - econf_args=( - ac_cv_search_cap_init= - --libdir=/usr/$(get_libdir) - --docdir=/usr/share/doc/${PF} - $(multilib_native_use_enable static-libs static) - --disable-nls - $(multilib_native_use_enable doc gtk-doc) - $(multilib_native_use_enable introspection) - --disable-python-devel - --disable-dbus - $(multilib_native_use_enable kmod) - --disable-seccomp - $(multilib_native_use_enable selinux) - --disable-xz - --disable-lz4 - --disable-pam - $(multilib_native_use_enable acl) - --disable-gcrypt - --disable-audit - --disable-libcryptsetup - --disable-qrencode - --disable-microhttpd - --disable-gnutls - --disable-libcurl - --disable-libidn - --disable-readahead - --disable-quotacheck - --disable-logind - --disable-polkit - --disable-myhostname - $(use_enable gudev) - $(multilib_is_native_abi || echo "--disable-manpages") - --enable-split-usr - --with-html-dir=/usr/share/doc/${PF}/html - --without-python - --with-bashcompletiondir="$(get_bashcompdir)" - $(use firmware-loader && echo "--with-firmware-path=/lib/firmware/updates:/lib/firmware") - --with-rootprefix= - $(multilib_is_native_abi && echo "--with-rootlibdir=/$(get_libdir)") - ) - - # Use pregenerated copies when possible wrt #480924 - [[ ${PV} = 9999* ]] || econf_args+=( --disable-manpages ) - - 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.conf.5 - man/systemd.link.5 - man/udev.7 - man/systemd-udevd.service.8 - man/udevadm.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 - install-dist_networkDATA - ) - - 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 \ - $(sysconfdir)/systemd/network' - dist_bashcompletion_DATA="shell-completion/bash/udevadm" - dist_network_DATA="network/99-default.link" - ) - 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 - - if [[ ${PV} = 9999* ]]; then - doman man/{udev.conf.5,systemd.link.5,udev.7,systemd-udevd.service.8,udevadm.8} - else - doman "${S}"/man/{udev.conf.5,systemd.link.5,udev.7,systemd-udevd.service.8,udevadm.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.*,GVARIANT-SERIALIZATION,DIFFERENCES,PORTING-DBUS1,sd-shutdown.h} - - # see src_prepare() for content of 40-gentoo.rules - insinto /lib/udev/rules.d - doins "${T}"/40-gentoo.rules - - # maintainer note: by not letting the upstream build-sys create the .so - # link, you also avoid a parallel make problem - mv "${D}"/usr/share/man/man8/systemd-udevd{.service,}.8 - - if ! [[ ${PV} = 9999* ]]; then - insinto /usr/share/doc/${PF}/html/gudev - doins "${S}"/docs/gudev/html/* - - insinto /usr/share/doc/${PF}/html/libudev - doins "${S}"/docs/libudev/html/* - fi -} - -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 - - 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-225-r1.ebuild b/sys-fs/udev/udev-225-r1.ebuild deleted file mode 100644 index ee167a2d7eca..000000000000 --- a/sys-fs/udev/udev-225-r1.ebuild +++ /dev/null @@ -1,426 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools bash-completion-r1 eutils linux-info multilib multilib-minimal toolchain-funcs udev user versionator - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd" - inherit git-r3 -else - patchset= - SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz" - if [[ -n "${patchset}" ]]; then - SRC_URI+=" - https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz - https://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="https://www.freedesktop.org/wiki/Software/systemd" - -LICENSE="LGPL-2.1 MIT GPL-2" -SLOT="0" -IUSE="acl +kmod selinux static-libs" - -RESTRICT="test" - -COMMON_DEPEND=">=sys-apps/util-linux-2.24 - sys-libs/libcap[${MULTILIB_USEDEP}] - acl? ( sys-apps/acl ) - kmod? ( >=sys-apps/kmod-16 ) - selinux? ( >=sys-libs/libselinux-2.1.9 ) - != -r4 to skip some parallel build issues -DEPEND="${COMMON_DEPEND} - dev-util/gperf - >=dev-util/intltool-0.50 - >=sys-apps/coreutils-8.16 - virtual/os-headers - virtual/pkgconfig - >=sys-devel/make-3.82-r4 - >=sys-kernel/linux-headers-3.9 - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt" -RDEPEND="${COMMON_DEPEND} - ! "${T}"/40-gentoo.rules - # Gentoo specific floppy and usb groups - SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy" - SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" - EOF - - # change rules back to group uucp instead of dialout for now wrt #454556 - sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die - - # stub out the am_path_libcrypt function - echo 'AC_DEFUN([AM_PATH_LIBGCRYPT],[:])' > m4/gcrypt.m4 - - # apply user patches - epatch_user - - eautoreconf - - if ! [[ ${PV} = 9999* ]]; then - check_default_rules - 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 -} - -src_configure() { - # Prevent conflicts with i686 cross toolchain, bug 559726 - tc-export AR CC NM OBJCOPY RANLIB - multilib-minimal_src_configure -} - -multilib_src_configure() { - tc-export CC #463846 - export cc_cv_CFLAGS__flto=no #502950 - export cc_cv_CFLAGS__Werror_shadow=no #554454 - - # Keep sorted by ./configure --help and only pass --disable flags - # when *required* to avoid external deps or unnecessary compile - local econf_args - econf_args=( - --libdir=/usr/$(get_libdir) - --docdir=/usr/share/doc/${PF} - $(multilib_native_use_enable static-libs static) - --disable-nls - --disable-dbus - $(multilib_native_use_enable kmod) - --disable-xkbcommon - --disable-seccomp - $(multilib_native_use_enable selinux) - --disable-xz - --disable-lz4 - --disable-pam - $(multilib_native_use_enable acl) - --disable-gcrypt - --disable-audit - --disable-libcryptsetup - --disable-qrencode - --disable-microhttpd - --disable-gnuefi - --disable-gnutls - --disable-libcurl - --disable-libidn - --disable-quotacheck - --disable-logind - --disable-polkit - --disable-myhostname - $(multilib_is_native_abi || echo "--disable-manpages") - --enable-split-usr - --without-python - --with-bashcompletiondir="$(get_bashcompdir)" - --with-rootprefix= - $(multilib_is_native_abi && echo "--with-rootlibdir=/$(get_libdir)") - --disable-elfutils - ) - - if ! multilib_is_native_abi; then - econf_args+=( - MOUNT_{CFLAGS,LIBS}=' ' - ) - fi - - 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 ) - emake "${lib_targets[@]}" - - local exec_targets=( - systemd-udevd - udevadm - ) - emake "${exec_targets[@]}" - - local helper_targets=( - ata_id - cdrom_id - collect - scsi_id - v4l_id - mtd_probe - ) - emake "${helper_targets[@]}" - - local man_targets=( - man/udev.conf.5 - man/systemd.link.5 - man/udev.7 - man/systemd-udevd.service.8 - man/udevadm.8 - ) - emake "${man_targets[@]}" - else - local lib_targets=( libudev.la ) - emake "${lib_targets[@]}" - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - local lib_LTLIBRARIES="libudev.la" - local pkgconfiglib_DATA="src/libudev/libudev.pc" - - local targets=( - install-libLTLIBRARIES - install-includeHEADERS - install-rootbinPROGRAMS - install-rootlibexecPROGRAMS - install-udevlibexecPROGRAMS - install-dist_udevconfDATA - install-dist_udevrulesDATA - install-pkgconfiglibDATA - install-pkgconfigdataDATA - install-dist_docDATA - libudev-install-hook - install-directories-hook - install-dist_bashcompletionDATA - install-dist_networkDATA - ) - - # add final values of variables: - targets+=( - rootlibexec_PROGRAMS=systemd-udevd - rootbin_PROGRAMS=udevadm - lib_LTLIBRARIES="${lib_LTLIBRARIES}" - pkgconfiglib_DATA="${pkgconfiglib_DATA}" - pkgconfigdata_DATA="src/udev/udev.pc" - INSTALL_DIRS='$(sysconfdir)/udev/rules.d $(sysconfdir)/udev/hwdb.d $(sysconfdir)/systemd/network' - dist_bashcompletion_DATA="shell-completion/bash/udevadm" - dist_network_DATA="network/99-default.link" - ) - emake -j1 DESTDIR="${D}" "${targets[@]}" - doman man/{udev.conf.5,systemd.link.5,udev.7,systemd-udevd.service.8,udevadm.8} - else - local lib_LTLIBRARIES="libudev.la" - local pkgconfiglib_DATA="src/libudev/libudev.pc" - local include_HEADERS="src/libudev/libudev.h" - - local targets=( - install-libLTLIBRARIES - install-includeHEADERS - install-pkgconfiglibDATA - ) - - 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 - rm -f "${D}"/usr/share/doc/${PF}/{LICENSE.*,GVARIANT-SERIALIZATION,DIFFERENCES,PORTING-DBUS1,sd-shutdown.h} - - # see src_prepare() for content of 40-gentoo.rules - insinto /lib/udev/rules.d - doins "${T}"/40-gentoo.rules - - # maintainer note: by not letting the upstream build-sys create the .so - # link, you also avoid a parallel make problem - mv "${D}"/usr/share/man/man8/systemd-udevd{.service,}.8 -} - -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-233.ebuild b/sys-fs/udev/udev-233.ebuild deleted file mode 100644 index 9ca311c705fc..000000000000 --- a/sys-fs/udev/udev-233.ebuild +++ /dev/null @@ -1,405 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools bash-completion-r1 linux-info ltprune multilib-minimal toolchain-funcs udev user versionator - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd" - 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.27.1[${MULTILIB_USEDEP}] - sys-libs/libcap[${MULTILIB_USEDEP}] - acl? ( sys-apps/acl ) - kmod? ( >=sys-apps/kmod-16 ) - selinux? ( >=sys-libs/libselinux-2.1.9 ) - != -r4 to skip some parallel build issues -DEPEND="${COMMON_DEPEND} - dev-util/gperf - >=dev-util/intltool-0.50 - >=sys-apps/coreutils-8.16 - virtual/os-headers - virtual/pkgconfig - >=sys-devel/make-3.82-r4 - >=sys-kernel/linux-headers-3.9 - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt" -RDEPEND="${COMMON_DEPEND} - ! "${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 - - # change rules back to group uucp instead of dialout for now wrt #454556 - sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die - - # stub out the am_path_libcrypt function - echo 'AC_DEFUN([AM_PATH_LIBGCRYPT],[:])' > m4/gcrypt.m4 - - default - - eautoreconf - - if ! [[ ${PV} = 9999* ]]; then - check_default_rules - fi - - 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 -} - -src_configure() { - # Prevent conflicts with i686 cross toolchain, bug 559726 - tc-export AR CC NM OBJCOPY RANLIB - multilib-minimal_src_configure -} - -multilib_src_configure() { - tc-export CC #463846 - export cc_cv_CFLAGS__flto=no #502950 - export cc_cv_CFLAGS__Werror_shadow=no #554454 - export cc_cv_LDFLAGS__Wl__fuse_ld_gold=no #573874 - - # Keep sorted by ./configure --help and only pass --disable flags - # when *required* to avoid external deps or unnecessary compile - local econf_args - econf_args=( - --libdir=/usr/$(get_libdir) - --docdir=/usr/share/doc/${PF} - --disable-nls - --disable-dbus - $(multilib_native_use_enable kmod) - --disable-xkbcommon - --disable-seccomp - $(multilib_native_use_enable selinux) - --disable-xz - --disable-lz4 - --disable-pam - $(multilib_native_use_enable acl) - --disable-gcrypt - --disable-audit - --disable-libcryptsetup - --disable-qrencode - --disable-microhttpd - --disable-gnuefi - --disable-gnutls - --disable-libcurl - --disable-libidn - --disable-quotacheck - --disable-logind - --disable-polkit - --disable-myhostname - $(multilib_is_native_abi || echo "--disable-manpages") - --enable-split-usr - --without-python - --with-bashcompletiondir="$(get_bashcompdir)" - --with-rootprefix= - $(multilib_is_native_abi && echo "--with-rootlibdir=/$(get_libdir)") - --disable-elfutils - ) - - if ! multilib_is_native_abi; then - econf_args+=( - MOUNT_{CFLAGS,LIBS}=' ' - ) - fi - - 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 ) - emake "${lib_targets[@]}" - - local exec_targets=( - systemd-udevd - udevadm - ) - emake "${exec_targets[@]}" - - local helper_targets=( - ata_id - cdrom_id - collect - scsi_id - v4l_id - mtd_probe - ) - emake "${helper_targets[@]}" - - local man_targets=( - man/udev.conf.5 - man/systemd.link.5 - man/udev.7 - man/systemd-udevd.service.8 - man/udevadm.8 - ) - emake "${man_targets[@]}" - else - local lib_targets=( libudev.la ) - emake "${lib_targets[@]}" - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - local targets=( - install-includeHEADERS - install-rootbinPROGRAMS - install-rootlibLTLIBRARIES - install-rootlibexecPROGRAMS - install-udevlibexecPROGRAMS - install-dist_udevconfDATA - install-dist_udevrulesDATA - install-pkgconfiglibDATA - install-pkgconfigdataDATA - install-dist_docDATA - install-directories-hook - install-dist_bashcompletionDATA - install-dist_networkDATA - rootlibexec_PROGRAMS=systemd-udevd - rootbin_PROGRAMS=udevadm - rootlib_LTLIBRARIES="libudev.la" - pkgconfiglib_DATA="src/libudev/libudev.pc" - pkgconfigdata_DATA="src/udev/udev.pc" - INSTALL_DIRS='$(sysconfdir)/udev/rules.d $(sysconfdir)/udev/hwdb.d $(sysconfdir)/systemd/network' - dist_bashcompletion_DATA="shell-completion/bash/udevadm" - dist_network_DATA="network/99-default.link" - ) - emake -j1 DESTDIR="${D}" "${targets[@]}" - doman man/{udev.conf.5,systemd.link.5,udev.7,systemd-udevd.service.8,udevadm.8} - - # Compatibility symlink for software that looks for libudev.so - # without using pkg-config - dosym ../../$(get_libdir)/libudev.so.1 \ - /usr/$(get_libdir)/libudev.so - else - local targets=( - install-libLTLIBRARIES - install-includeHEADERS - install-pkgconfiglibDATA - lib_LTLIBRARIES="libudev.la" - pkgconfiglib_DATA="src/libudev/libudev.pc" - include_HEADERS="src/libudev/libudev.h" - ) - - 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 - rm -f "${D}"/usr/share/doc/${PF}/{LICENSE.*,GVARIANT-SERIALIZATION,DIFFERENCES,PORTING-DBUS1,sd-shutdown.h} - - # see src_prepare() for content of 40-gentoo.rules - insinto /lib/udev/rules.d - doins "${T}"/40-gentoo.rules - - # maintainer note: by not letting the upstream build-sys create the .so - # link, you also avoid a parallel make problem - mv "${D}"/usr/share/man/man8/systemd-udevd{.service,}.8 -} - -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