| 1 |
commit: 3b5be41d4d70c3761351cb4985c7da8f785858c5 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 17 15:27:38 2017 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 17 15:27:38 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b5be41d |
| 7 |
|
| 8 |
sys-apps/systemd: look for generators in {,/usr}/lib/systemd/system-generators |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/625402 |
| 11 |
Package-Manager: Portage-2.3.6_p16, Repoman-2.3.2_p84 |
| 12 |
|
| 13 |
...-look-for-generators-in-usr-lib-systemd-s.patch | 27 ++++++++++++++++++++++ |
| 14 |
.../{systemd-234.ebuild => systemd-234-r1.ebuild} | 1 + |
| 15 |
2 files changed, 28 insertions(+) |
| 16 |
|
| 17 |
diff --git a/sys-apps/systemd/files/234-0001-path-lookup-look-for-generators-in-usr-lib-systemd-s.patch b/sys-apps/systemd/files/234-0001-path-lookup-look-for-generators-in-usr-lib-systemd-s.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..47e2730a7b3 |
| 20 |
--- /dev/null |
| 21 |
+++ b/sys-apps/systemd/files/234-0001-path-lookup-look-for-generators-in-usr-lib-systemd-s.patch |
| 22 |
@@ -0,0 +1,27 @@ |
| 23 |
+From d9287b10d714175521e3bcd6c53de4819b1357c5 Mon Sep 17 00:00:00 2001 |
| 24 |
+From: Mike Gilbert <floppym@g.o> |
| 25 |
+Date: Mon, 17 Jul 2017 11:21:25 -0400 |
| 26 |
+Subject: [PATCH] path-lookup: look for generators in |
| 27 |
+ {,/usr}/lib/systemd/system-generators |
| 28 |
+ |
| 29 |
+Bug: https://bugs.gentoo.org/625402 |
| 30 |
+--- |
| 31 |
+ src/shared/path-lookup.c | 2 ++ |
| 32 |
+ 1 file changed, 2 insertions(+) |
| 33 |
+ |
| 34 |
+diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c |
| 35 |
+index e2b3f8b74..1ee0e1cdb 100644 |
| 36 |
+--- a/src/shared/path-lookup.c |
| 37 |
++++ b/src/shared/path-lookup.c |
| 38 |
+@@ -821,6 +821,8 @@ char **generator_binary_paths(UnitFileScope scope) { |
| 39 |
+ return strv_new("/run/systemd/system-generators", |
| 40 |
+ "/etc/systemd/system-generators", |
| 41 |
+ "/usr/local/lib/systemd/system-generators", |
| 42 |
++ "/usr/lib/systemd/system-generators", |
| 43 |
++ "/lib/systemd/system-generators", |
| 44 |
+ SYSTEM_GENERATOR_PATH, |
| 45 |
+ NULL); |
| 46 |
+ |
| 47 |
+-- |
| 48 |
+2.13.3 |
| 49 |
+ |
| 50 |
|
| 51 |
diff --git a/sys-apps/systemd/systemd-234.ebuild b/sys-apps/systemd/systemd-234-r1.ebuild |
| 52 |
similarity index 99% |
| 53 |
rename from sys-apps/systemd/systemd-234.ebuild |
| 54 |
rename to sys-apps/systemd/systemd-234-r1.ebuild |
| 55 |
index c80965e1c39..6aaaaf45860 100644 |
| 56 |
--- a/sys-apps/systemd/systemd-234.ebuild |
| 57 |
+++ b/sys-apps/systemd/systemd-234-r1.ebuild |
| 58 |
@@ -151,6 +151,7 @@ src_prepare() { |
| 59 |
sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die |
| 60 |
|
| 61 |
local PATCHES=( |
| 62 |
+ "${FILESDIR}"/234-0001-path-lookup-look-for-generators-in-usr-lib-systemd-s.patch |
| 63 |
) |
| 64 |
|
| 65 |
if ! use vanilla; then |
Archives