| 1 |
commit: f8313536f2eea2a8857c5d5a750e11a4cf707817 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 25 17:32:32 2020 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 25 17:35:05 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8313536 |
| 7 |
|
| 8 |
sys-apps/systemd: enable sysv compat code |
| 9 |
|
| 10 |
This enables some useful functionality for people when swapping init |
| 11 |
providers. Remove sysv-generator since it doesn't process OpenRC |
| 12 |
scripts properly. |
| 13 |
|
| 14 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 15 |
|
| 16 |
sys-apps/systemd/{systemd-245-r3.ebuild => systemd-245-r4.ebuild} | 5 +++-- |
| 17 |
sys-apps/systemd/systemd-9999.ebuild | 5 +++-- |
| 18 |
2 files changed, 6 insertions(+), 4 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sys-apps/systemd/systemd-245-r3.ebuild b/sys-apps/systemd/systemd-245-r4.ebuild |
| 21 |
similarity index 99% |
| 22 |
rename from sys-apps/systemd/systemd-245-r3.ebuild |
| 23 |
rename to sys-apps/systemd/systemd-245-r4.ebuild |
| 24 |
index 0fd4ff855ec..b686b0a738b 100644 |
| 25 |
--- a/sys-apps/systemd/systemd-245-r3.ebuild |
| 26 |
+++ b/sys-apps/systemd/systemd-245-r4.ebuild |
| 27 |
@@ -256,8 +256,6 @@ multilib_src_configure() { |
| 28 |
-Dsplit-bin=true |
| 29 |
-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")" |
| 30 |
-Drootlibdir="${EPREFIX}/usr/$(get_libdir)" |
| 31 |
- -Dsysvinit-path= |
| 32 |
- -Dsysvrcnd-path= |
| 33 |
# Avoid infinite exec recursion, bug 642724 |
| 34 |
-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit" |
| 35 |
# no deps |
| 36 |
@@ -356,6 +354,9 @@ multilib_src_install_all() { |
| 37 |
rm -f "${ED}${rootprefix}"/sbin/resolvconf || die |
| 38 |
fi |
| 39 |
|
| 40 |
+ rm "${ED}"/etc/init.d/README || die |
| 41 |
+ rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die |
| 42 |
+ |
| 43 |
if ! use sysv-utils; then |
| 44 |
rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die |
| 45 |
rm "${ED}"/usr/share/man/man1/init.1 || die |
| 46 |
|
| 47 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild |
| 48 |
index dcf64e48a2a..c692b2d9f5d 100644 |
| 49 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
| 50 |
+++ b/sys-apps/systemd/systemd-9999.ebuild |
| 51 |
@@ -255,8 +255,6 @@ multilib_src_configure() { |
| 52 |
-Dsplit-bin=true |
| 53 |
-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")" |
| 54 |
-Drootlibdir="${EPREFIX}/usr/$(get_libdir)" |
| 55 |
- -Dsysvinit-path= |
| 56 |
- -Dsysvrcnd-path= |
| 57 |
# Avoid infinite exec recursion, bug 642724 |
| 58 |
-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit" |
| 59 |
# no deps |
| 60 |
@@ -355,6 +353,9 @@ multilib_src_install_all() { |
| 61 |
rm -f "${ED}${rootprefix}"/sbin/resolvconf || die |
| 62 |
fi |
| 63 |
|
| 64 |
+ rm "${ED}"/etc/init.d/README || die |
| 65 |
+ rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die |
| 66 |
+ |
| 67 |
if ! use sysv-utils; then |
| 68 |
rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die |
| 69 |
rm "${ED}"/usr/share/man/man1/init.1 || die |
Archives