From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/
Date: Mon, 9 Aug 2021 16:47:19 +0000 (UTC) [thread overview]
Message-ID: <1628527628.5214ebaec6f7fac27e3fc1994c1c89c9f8fd8222.sam@gentoo> (raw)
commit: 5214ebaec6f7fac27e3fc1994c1c89c9f8fd8222
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 9 16:46:45 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 9 16:47:08 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5214ebae
sys-fs/udev: sync live
Bug: https://bugs.gentoo.org/807193
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-fs/udev/udev-249-r2.ebuild | 12 ++++---
sys-fs/udev/udev-9999.ebuild | 75 +++++++++++++++++++++++++++++++++++++++---
2 files changed, 77 insertions(+), 10 deletions(-)
diff --git a/sys-fs/udev/udev-249-r2.ebuild b/sys-fs/udev/udev-249-r2.ebuild
index 5dbd7be0b71..a77771e66f7 100644
--- a/sys-fs/udev/udev-249-r2.ebuild
+++ b/sys-fs/udev/udev-249-r2.ebuild
@@ -15,21 +15,23 @@ else
else
MY_PN=systemd
fi
+
MY_PV="${PV/_/-}"
MY_P="${MY_PN}-${MY_PV}"
S="${WORKDIR}/${MY_P}"
SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-# musl patches taken from:
-# http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd
-SRC_URI+="
+ # musl patches taken from:
+ # http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd
+ SRC_URI+="
elibc_musl? (
https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${PV}.1-r1.tar.xz
https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${PV}.1-r1.tar.xz
)"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 8cc1075e8be..270009d07a3 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -2,9 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
-inherit bash-completion-r1 linux-info meson-multilib ninja-utils python-any-r1 toolchain-funcs udev usr-ldscript
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib ninja-utils python-any-r1 toolchain-funcs udev usr-ldscript
if [[ ${PV} = 9999* ]] ; then
EGIT_REPO_URI="https://github.com/systemd/systemd.git"
@@ -15,10 +15,20 @@ else
else
MY_PN=systemd
fi
+
MY_PV="${PV/_/-}"
MY_P="${MY_PN}-${MY_PV}"
S="${WORKDIR}/${MY_P}"
SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
+
+ # musl patches taken from:
+ # http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd
+ SRC_URI+="
+ elibc_musl? (
+ https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${PV}.1-r1.tar.xz
+ https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${PV}.1-r1.tar.xz
+ )"
+
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
fi
@@ -27,9 +37,8 @@ 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"
+IUSE="acl +kmod selinux static-libs test"
+RESTRICT="!test? ( test )"
BDEPEND="
dev-util/gperf
@@ -42,6 +51,10 @@ BDEPEND="
dev-libs/libxslt
${PYTHON_DEPS}
$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+ test? (
+ app-text/tree
+ dev-lang/perl
+ )
"
COMMON_DEPEND="
>=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
@@ -101,6 +114,7 @@ pkg_setup() {
src_prepare() {
local PATCHES=(
)
+ use elibc_musl && PATCHES+=( "${WORKDIR}"/musl-patches )
default
}
@@ -119,6 +133,7 @@ multilib_src_configure() {
# Prevent automagic deps
-Dgcrypt=false
-Dlibcryptsetup=false
+ -Didn=false
-Dlibidn=false
-Dlibidn2=false
-Dlibiptc=false
@@ -127,6 +142,12 @@ multilib_src_configure() {
-Dlz4=false
-Dxz=false
)
+ use elibc_musl && emesonargs+=(
+ -Dgshadow=false
+ -Dsmack=false
+ -Dutmp=false
+ )
+
meson_src_configure
}
@@ -134,6 +155,9 @@ src_configure() {
# Prevent conflicts with i686 cross toolchain, bug 559726
tc-export AR CC NM OBJCOPY RANLIB
python_setup
+
+ use elibc_musl && append-cppflags -D__UAPI_DEF_ETHHDR=0
+
multilib-minimal_src_configure
}
@@ -171,6 +195,34 @@ multilib_src_compile() {
eninja "${targets[@]}"
}
+multilib_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"
+ ewarn "udev tests needs full access to /dev"
+ ewarn "Skipping tests"
+ else
+ einfo Running tests
+
+ # 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
+
+ # the perl script contains all the udev tests
+ "${S}"/test/udev-test.pl || die
+ fi
+}
+
multilib_src_install() {
local libudev=$(readlink libudev.so.1)
@@ -226,6 +278,10 @@ multilib_src_install_all() {
einstalldocs
}
+pkg_preinst() {
+ has_version 'sys-fs/eudev' && HAD_EUDEV=1
+}
+
pkg_postinst() {
# Update hwdb database in case the format is changed by udev version.
if has_version 'sys-apps/hwids[udev]' ; then
@@ -234,4 +290,13 @@ pkg_postinst() {
# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
[[ -z ${REPLACING_VERSIONS} ]] && udev_reload
fi
+
+ if [[ ${HAD_EUDEV} -eq 1 ]] ; then
+ ewarn
+ ewarn "${P} defaults to predictable interface renaming, as described in the URL below:"
+ ewarn "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
+ ewarn
+ ewarn "If you wish to disable this, please see the above documentation, or set"
+ ewarn "net.ifnames=0 on the kernel command line."
+ fi
}
next reply other threads:[~2021-08-09 16:47 UTC|newest]
Thread overview: 240+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-09 16:47 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-08-20 15:54 [gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/ Arthur Zamarin
2022-06-04 2:21 Sam James
2022-06-03 7:05 Sam James
2022-06-03 0:52 Sam James
2022-06-03 0:52 Sam James
2022-06-03 0:37 Sam James
2022-06-02 1:52 Sam James
2022-06-02 1:52 Sam James
2022-05-30 7:15 Sam James
2022-04-16 23:13 Mike Gilbert
2022-01-13 0:20 Sam James
2021-12-08 16:20 Mike Gilbert
2021-12-07 20:29 Sam James
2021-12-04 17:49 Sam James
2021-12-02 1:44 Sam James
2021-12-01 20:15 Mike Gilbert
2021-12-01 20:09 Mike Gilbert
2021-12-01 13:31 Agostino Sarubbo
2021-12-01 10:52 Sam James
2021-12-01 10:52 Sam James
2021-12-01 9:02 Agostino Sarubbo
2021-11-30 14:49 Agostino Sarubbo
2021-11-29 22:39 Sam James
2021-11-29 22:39 Sam James
2021-11-29 16:35 Mike Gilbert
2021-11-28 20:08 Mike Gilbert
2021-11-26 20:55 Georgy Yakovlev
2021-11-18 20:51 Mike Gilbert
2021-09-09 18:46 Mike Gilbert
2021-09-07 17:37 Mike Gilbert
2021-09-05 1:09 Mike Gilbert
2021-09-03 18:03 Sam James
2021-08-23 22:16 Agostino Sarubbo
2021-08-20 23:51 Sam James
2021-08-20 5:58 Agostino Sarubbo
2021-08-19 11:22 Sam James
2021-08-19 1:28 Agostino Sarubbo
2021-08-19 1:27 Agostino Sarubbo
2021-08-19 1:08 Sam James
2021-08-11 18:03 Mike Gilbert
2021-08-09 16:47 Sam James
2021-08-09 15:15 Mike Gilbert
2021-08-06 2:30 Georgy Yakovlev
2021-08-03 17:51 Mike Gilbert
2021-08-03 17:26 Mike Gilbert
2021-08-01 21:16 William Hubbs
2021-08-01 20:32 William Hubbs
2021-07-17 21:54 Andreas K. Hüttel
2021-07-16 21:44 Sam James
2021-07-15 21:42 Sam James
2021-07-15 13:44 Sergei Trofimovich
2021-07-15 7:42 Agostino Sarubbo
2021-07-15 7:40 Agostino Sarubbo
2021-07-15 7:40 Agostino Sarubbo
2021-07-15 7:39 Agostino Sarubbo
2021-07-15 7:38 Agostino Sarubbo
2021-07-14 20:45 Mike Gilbert
2021-07-14 16:40 Mike Gilbert
2021-07-13 18:53 Mike Gilbert
2021-07-09 17:31 Mike Gilbert
2021-07-09 17:10 William Hubbs
2021-07-09 5:53 William Hubbs
2021-06-04 1:14 Matt Turner
2021-05-01 7:36 Andreas Sturmlechner
2021-04-05 19:27 Lars Wendler
2021-04-05 19:27 Lars Wendler
2021-03-10 16:22 Mike Gilbert
2021-01-10 17:55 Mike Gilbert
2021-01-07 2:35 Sam James
2021-01-06 20:32 Mike Gilbert
2021-01-06 15:47 Mike Gilbert
2020-08-10 18:04 Sergei Trofimovich
2020-08-07 20:44 William Hubbs
2020-08-07 14:32 Mike Gilbert
2020-08-07 14:32 Mike Gilbert
2020-08-07 11:53 Agostino Sarubbo
2020-08-07 11:52 Agostino Sarubbo
2020-08-07 11:48 Agostino Sarubbo
2020-08-07 11:47 Agostino Sarubbo
2020-08-07 11:44 Agostino Sarubbo
2020-08-06 14:35 Sam James
2020-08-06 4:00 Sam James
2020-08-06 1:18 Mike Gilbert
2020-08-06 1:18 Mike Gilbert
2020-08-05 21:37 Mike Gilbert
2020-08-05 21:28 William Hubbs
2020-05-25 16:16 Mike Gilbert
2020-03-08 4:00 Mike Gilbert
2020-03-08 4:00 Mike Gilbert
2020-03-08 4:00 Mike Gilbert
2019-11-30 21:45 Sergei Trofimovich
2019-11-12 10:16 Agostino Sarubbo
2019-11-12 10:13 Agostino Sarubbo
2019-11-08 15:58 Aaron Bauman
2019-11-01 20:09 Matt Turner
2019-11-01 20:09 Matt Turner
2019-11-01 10:51 Mikle Kolyada
2019-10-29 12:53 Agostino Sarubbo
2019-10-29 9:29 Agostino Sarubbo
2019-10-27 14:22 Mike Gilbert
2019-10-26 18:33 Mike Gilbert
2019-10-26 18:33 Mike Gilbert
2019-10-10 17:52 William Hubbs
2019-08-22 6:03 Sergei Trofimovich
2019-08-02 8:00 Mikle Kolyada
2019-08-02 8:00 Mikle Kolyada
2019-08-02 8:00 Mikle Kolyada
2019-08-02 8:00 Mikle Kolyada
2019-08-02 8:00 Mikle Kolyada
2019-08-02 8:00 Mikle Kolyada
2019-08-02 8:00 Mikle Kolyada
2019-08-02 8:00 Mikle Kolyada
2019-08-02 8:00 Mikle Kolyada
2019-08-02 8:00 Mikle Kolyada
2019-08-01 21:11 Aaron Bauman
2019-08-01 18:35 Sergei Trofimovich
2019-07-29 16:20 Mike Gilbert
2019-07-29 16:20 Mike Gilbert
2019-04-14 0:35 William Hubbs
2019-03-05 18:03 Mikle Kolyada
2019-03-05 18:03 Mikle Kolyada
2019-02-25 16:31 William Hubbs
2019-01-30 20:44 Mike Gilbert
2019-01-30 20:14 Mike Gilbert
2019-01-30 16:04 Tobias Klausmann
2019-01-29 11:38 Mikle Kolyada
2019-01-26 16:50 Mike Gilbert
2019-01-26 16:50 Mike Gilbert
2019-01-24 14:59 Mike Gilbert
2019-01-23 13:41 Mikle Kolyada
2019-01-08 22:12 Mart Raudsepp
2019-01-05 21:11 Matt Turner
2019-01-05 21:11 Matt Turner
2019-01-03 21:10 Mike Gilbert
2018-12-28 16:47 Mike Gilbert
2018-12-26 11:46 Sergei Trofimovich
2018-12-25 21:08 William Hubbs
2018-12-25 21:08 William Hubbs
2018-12-15 22:39 Sergei Trofimovich
2018-12-13 21:27 Sergei Trofimovich
2018-12-13 14:15 Mikle Kolyada
2018-12-13 12:48 Thomas Deutschmann
2018-10-30 1:15 Mike Gilbert
2018-09-26 20:49 Sergei Trofimovich
2018-05-27 11:34 Mikle Kolyada
2018-05-24 10:23 Mike Frysinger
2018-05-19 9:26 Sergei Trofimovich
2018-05-16 22:16 Sergei Trofimovich
2018-05-15 17:35 Mart Raudsepp
2018-05-15 1:46 Thomas Deutschmann
2018-05-14 21:19 Tobias Klausmann
2018-05-14 12:33 Mikle Kolyada
2018-05-11 20:31 William Hubbs
2018-04-21 9:42 Mikle Kolyada
2018-04-18 5:54 Mart Raudsepp
2018-03-25 17:18 Markus Meier
2018-03-18 1:40 Matt Turner
2018-03-18 1:40 Matt Turner
2018-03-10 18:27 William Hubbs
2018-03-04 16:23 Tobias Klausmann
2018-02-19 8:02 Sergei Trofimovich
2018-02-13 16:03 Mike Gilbert
2018-02-04 15:06 Sergei Trofimovich
2018-01-29 21:36 Mike Gilbert
2018-01-26 21:17 Mikle Kolyada
2018-01-26 20:22 Mike Gilbert
2018-01-22 21:27 Sergei Trofimovich
2018-01-21 20:30 Thomas Deutschmann
2018-01-13 6:51 Mike Frysinger
2018-01-13 6:51 Mike Frysinger
2018-01-10 18:32 Mike Gilbert
2017-12-28 18:06 Sergei Trofimovich
2017-12-28 18:06 Sergei Trofimovich
2017-12-28 18:06 Sergei Trofimovich
2017-12-28 12:54 Sergei Trofimovich
2017-12-28 12:54 Sergei Trofimovich
2017-12-28 12:54 Sergei Trofimovich
2017-12-16 17:54 William Hubbs
2017-12-05 19:43 Matt Turner
2017-12-05 19:43 Matt Turner
2017-12-05 5:11 Matt Turner
2017-10-09 14:40 Mike Gilbert
2017-10-06 17:27 William Hubbs
2017-10-06 17:27 William Hubbs
2017-09-14 20:19 Sergei Trofimovich
2017-09-07 19:28 Markus Meier
2017-08-25 22:39 Matt Turner
2017-07-30 15:33 Sergei Trofimovich
2017-07-25 19:28 Markus Meier
2017-07-23 18:50 Sergei Trofimovich
2017-07-18 13:51 William Hubbs
2017-07-18 8:27 Sergei Trofimovich
2017-07-17 21:15 Mike Gilbert
2017-07-17 20:31 Mike Gilbert
2017-07-17 20:15 Mike Gilbert
2017-07-17 17:50 William Hubbs
2017-07-13 1:56 Markus Meier
2017-07-12 9:38 Sergei Trofimovich
2017-07-04 15:49 Agostino Sarubbo
2017-07-04 14:50 Agostino Sarubbo
2017-04-30 18:13 Mike Gilbert
2017-04-30 17:23 Mike Gilbert
2017-04-30 15:02 Mike Gilbert
2017-04-30 15:02 Mike Gilbert
2017-03-07 1:33 William Hubbs
2016-11-25 23:36 Mike Frysinger
2016-11-05 19:35 Mike Gilbert
2016-11-04 23:15 William Hubbs
2016-09-27 9:05 Michał Górny
2016-06-04 20:07 William Hubbs
2016-06-04 20:07 William Hubbs
2016-06-04 19:42 William Hubbs
2016-06-04 3:21 Mike Gilbert
2016-05-30 14:50 Mike Gilbert
2016-05-25 19:35 William Hubbs
2016-03-07 18:44 Mike Gilbert
2016-03-05 18:17 William Hubbs
2016-03-05 15:42 William Hubbs
2016-02-15 14:32 William Hubbs
2016-02-15 14:32 William Hubbs
2016-02-15 1:16 William Hubbs
2016-01-14 2:29 Mike Frysinger
2016-01-11 9:56 Agostino Sarubbo
2016-01-10 11:22 Agostino Sarubbo
2016-01-09 7:00 Agostino Sarubbo
2016-01-07 20:15 Markus Meier
2015-12-26 12:03 Agostino Sarubbo
2015-12-14 16:13 Agostino Sarubbo
2015-12-14 16:09 Agostino Sarubbo
2015-11-28 17:55 William Hubbs
2015-11-28 17:55 William Hubbs
2015-10-05 22:05 Mike Frysinger
2015-09-06 6:36 William Hubbs
2015-09-06 6:36 William Hubbs
2015-08-18 19:21 William Hubbs
2015-08-18 19:21 William Hubbs
2015-08-18 19:21 William Hubbs
2015-08-18 19:21 William Hubbs
2015-08-15 12:52 Mike Gilbert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1628527628.5214ebaec6f7fac27e3fc1994c1c89c9f8fd8222.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox