From 616579b5d773c50af31ee56f00105d96ce641ca2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Aug 2021 10:30:13 +0100 Subject: gentoo resync : 14.08.2021 --- sys-fs/udev/Manifest | 4 ++-- sys-fs/udev/udev-249-r2.ebuild | 28 +++++++++++++--------------- sys-fs/udev/udev-9999.ebuild | 28 +++++++++++++--------------- 3 files changed, 28 insertions(+), 32 deletions(-) (limited to 'sys-fs/udev') diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 9a97d6302ee8..1ea8451ed652 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -5,6 +5,6 @@ DIST systemd-248.tar.gz 10306883 BLAKE2B 3cb25d6101136a5f57e841d3f464f0d7649f6c1 DIST systemd-249.tar.gz 10588828 BLAKE2B f7896dea0bdec25125188b94ee84270b972649b1eb16599bed1967ced79f62dbfd1494e22362934f418823c054b342fb24dc57706b49520814beb95b6956bf27 SHA512 0810d09cc32e4aaa4425ee5b7ddf129262b061ce159cbd43571fabda48285243d8f80b566379ece9215d531b9407ee45e1e72c71935644fea31c7bca1bbf540c DIST systemd-musl-patches-249.1-r1.tar.xz 24536 BLAKE2B 25135519112b2a1c638046addb6971ea1997fc7dd8626de90d162a4beb6383b5724df78a14c73be1283df58632fb4a0fcb32f90f50f1886f31a1aded15e9567c SHA512 4655f2a06e1b3310cb27b839360353dfbfdbdaa86f4392aeebf63f63efd441d1953f7ac108be7fed7ea721596d191988ed999e34443e47922afca92db779175a EBUILD udev-248-r1.ebuild 5468 BLAKE2B 65d07077600d16deb4970920dd728698f3d4b8c58f457e8df7167a2fe3c31ae4b8ad2a45b4d3fac4480c1a3a90e4376c22996d94909463df018543af09333fef SHA512 f73fefbcca00081271756322c19fe959cf2548a4e4a27af88e5b6eece368e0760b98465659106c884f8c16cba3f7a337e7b8c22c82ff575eebd7a6c38f5e0ab9 -EBUILD udev-249-r2.ebuild 7730 BLAKE2B 776a63a9c184e413d71422f27b1bdab1856221ea59801255c8303c4d07644b407e0f6611b0d6f9d72a02b34e52e26cb8865357ce7060cd21d6cc08c90c0f8d85 SHA512 9dc50b184985557b7b60140e1136e92ceda925a3d176b928774ac0d4fc0982e322115043e5193c38042f195a35314a2b13eb826f76c3b769097342f14372239d -EBUILD udev-9999.ebuild 7598 BLAKE2B 9834e65467ec49c9bfcfe5dbaf838073d584b817fdfeaecbd43ac619c0f943e494449795cd24a3b42628b1053ff56cf00ef0b3dec32c6677a47e494f8231381c SHA512 a26c3721038570ae64b97519cbb68864ed0a83902c57262375cc341e25d6e4d18a8216515149667e3d9626e57ddf6584fe8053909b58c0d8ffdf25be79d4f1a6 +EBUILD udev-249-r2.ebuild 7592 BLAKE2B d8fb908499f685f5d4badb5dc274e005217d3432d220863f2130cd8b9685dc817143f29b999eb971bd924a1c720cf3d0399e83d8aa9343076649eb0fe22c9ed0 SHA512 5a3bdad9988c70a3ffaa085853cb7c2ce5fee45ab0fb6f2b330a7232a5b6dbab88e0603dc2ff331397842396ad63cd4401bb0c18f20853b4ff2744c833dc7651 +EBUILD udev-9999.ebuild 7460 BLAKE2B 404739190a89c5011d11227ea42f068d4031b245f9afdd5f4e2f7ef606dc7a6553c60e4f4afe3653c2964e4eb3e8ce257b17d68386ac202ab91ca7f848b32787 SHA512 d8bf83a672516d1f12536952c178c72713c9945d62cfe520cc3688a35e7a2a8556917df28c9b07de1572e9e730baa781d4a23cce1d4b1b182096231ca6b3858a MISC metadata.xml 474 BLAKE2B b657acb428f66f11e028db59d50ff5c52c8f14d092c6f2a66307fca668e300823a9727ab33d02f3337953988b600dbc257019fd333a8c34ff3d5039fea6b0ee3 SHA512 b8610952420e4cc28a58402da8ef9e1c0a9c409eff47c92253ad745f2a2121eaf68380cd3122113b792332e23aa9f7bcae4ccebb1ad6ffb26a38d266cb47b060 diff --git a/sys-fs/udev/udev-249-r2.ebuild b/sys-fs/udev/udev-249-r2.ebuild index a77771e66f71..08a32a5d3c7b 100644 --- a/sys-fs/udev/udev-249-r2.ebuild +++ b/sys-fs/udev/udev-249-r2.ebuild @@ -198,32 +198,30 @@ multilib_src_compile() { eninja "${targets[@]}" } -multilib_src_test() { +src_test() { # The testsuite is *very* finicky. Don't try running it in # containers or anything but a full VM or on bare metal. # udev calls 'mknod' a number of times, and this interacts # badly with kernel namespaces. - if [[ ${EUID} -ne 0 ]]; then - ewarn "udev tests need to run under uid 0" - ewarn "Skipping tests" - elif has sandbox ${FEATURES}; then - ewarn "\'FEATURES=sandbox\' detected" + if [[ ! -w /dev ]]; then ewarn "udev tests needs full access to /dev" ewarn "Skipping tests" else - einfo Running tests + meson-multilib_src_test + fi +} - # two binaries required by udev-test.pl - eninja systemd-detect-virt test-udev - local -x PATH="${PWD}:${PATH}" +multilib_src_test() { + # two binaries required by udev-test.pl + eninja systemd-detect-virt test-udev + local -x PATH="${PWD}:${PATH}" - # prepare ${BUILD_DIR}/test/sys, required by udev-test.pl - "${EPYTHON}" "${S}"/test/sys-script.py test || die + # prepare ${BUILD_DIR}/test/sys, required by udev-test.pl + "${EPYTHON}" "${S}"/test/sys-script.py test || die - # the perl script contains all the udev tests - "${S}"/test/udev-test.pl || die - fi + # the perl script contains all the udev tests + "${S}"/test/udev-test.pl || die } multilib_src_install() { diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild index 270009d07a3c..162f55057995 100644 --- a/sys-fs/udev/udev-9999.ebuild +++ b/sys-fs/udev/udev-9999.ebuild @@ -195,32 +195,30 @@ multilib_src_compile() { eninja "${targets[@]}" } -multilib_src_test() { +src_test() { # The testsuite is *very* finicky. Don't try running it in # containers or anything but a full VM or on bare metal. # udev calls 'mknod' a number of times, and this interacts # badly with kernel namespaces. - if [[ ${EUID} -ne 0 ]]; then - ewarn "udev tests need to run under uid 0" - ewarn "Skipping tests" - elif has sandbox ${FEATURES}; then - ewarn "\'FEATURES=sandbox\' detected" + if [[ ! -w /dev ]]; then ewarn "udev tests needs full access to /dev" ewarn "Skipping tests" else - einfo Running tests + meson-multilib_src_test + fi +} - # two binaries required by udev-test.pl - eninja systemd-detect-virt test-udev - local -x PATH="${PWD}:${PATH}" +multilib_src_test() { + # two binaries required by udev-test.pl + eninja systemd-detect-virt test-udev + local -x PATH="${PWD}:${PATH}" - # prepare ${BUILD_DIR}/test/sys, required by udev-test.pl - "${EPYTHON}" "${S}"/test/sys-script.py test || die + # prepare ${BUILD_DIR}/test/sys, required by udev-test.pl + "${EPYTHON}" "${S}"/test/sys-script.py test || die - # the perl script contains all the udev tests - "${S}"/test/udev-test.pl || die - fi + # the perl script contains all the udev tests + "${S}"/test/udev-test.pl || die } multilib_src_install() { -- cgit v1.2.3