| 1 |
commit: 81a13f851b7502d547ff8c0434bf64a443877fb1 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 3 07:45:55 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 3 07:48:41 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81a13f85 |
| 7 |
|
| 8 |
sys-fs/mdadm: add REQUIRED_USE for systemd/udev/static |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/830485 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
profiles/targets/systemd/package.use.force | 5 +++++ |
| 14 |
sys-fs/mdadm/mdadm-4.2-r1.ebuild | 9 +++++++-- |
| 15 |
2 files changed, 12 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/profiles/targets/systemd/package.use.force b/profiles/targets/systemd/package.use.force |
| 18 |
index 0abe8e8aadcc..ee209ac51ca1 100644 |
| 19 |
--- a/profiles/targets/systemd/package.use.force |
| 20 |
+++ b/profiles/targets/systemd/package.use.force |
| 21 |
@@ -1,6 +1,11 @@ |
| 22 |
# Copyright 1999-2020 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
+# Sam James <sam@g.o> (2021-01-03) |
| 26 |
+# Need systemd enabled here for depgraph: bug #830485 |
| 27 |
+# (only sys-fs/eudev supports static which isn't available on systemd profiles) |
| 28 |
+sys-fs/mdadm systemd |
| 29 |
+ |
| 30 |
# Mike Gilbert <floppym@g.o> (2015-04-22) |
| 31 |
# Force systemd to avoid depgraph breakage, bug 547360. |
| 32 |
virtual/libudev systemd |
| 33 |
|
| 34 |
diff --git a/sys-fs/mdadm/mdadm-4.2-r1.ebuild b/sys-fs/mdadm/mdadm-4.2-r1.ebuild |
| 35 |
index c5fe5d5dfb8d..aff2ca081cb7 100644 |
| 36 |
--- a/sys-fs/mdadm/mdadm-4.2-r1.ebuild |
| 37 |
+++ b/sys-fs/mdadm/mdadm-4.2-r1.ebuild |
| 38 |
@@ -15,12 +15,17 @@ LICENSE="GPL-2" |
| 39 |
SLOT="0" |
| 40 |
[[ "${PV}" = *_rc* ]] || \ |
| 41 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" |
| 42 |
-IUSE="static +udev" |
| 43 |
+IUSE="static systemd +udev" |
| 44 |
+ |
| 45 |
+# Only sys-fs/eudev provides static-libs right now, so if you have systemd, |
| 46 |
+# you need to choose between static or udev, as your udev won't have static libs. |
| 47 |
+# bug #830485 |
| 48 |
+REQUIRED_USE="systemd? ( ?? ( static udev ) )" |
| 49 |
|
| 50 |
BDEPEND="app-arch/xz-utils |
| 51 |
virtual/pkgconfig" |
| 52 |
DEPEND="udev? ( |
| 53 |
- static? ( sys-fs/eudev[static-libs] ) |
| 54 |
+ static? ( !systemd? ( sys-fs/eudev[static-libs] ) ) |
| 55 |
!static? ( virtual/libudev:= ) |
| 56 |
)" |
| 57 |
RDEPEND=">=sys-apps/util-linux-2.16 |
Archives