diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2020-04-25 13:32:32 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2020-04-25 13:35:05 -0400 |
| commit | f8313536f2eea2a8857c5d5a750e11a4cf707817 (patch) | |
| tree | d9cd090043791eddcf09109971cd7bbb32713e02 /sys-apps/systemd | |
| parent | app-emulation/vice: migrate from libav (diff) | |
| download | gentoo-f8313536f2eea2a8857c5d5a750e11a4cf707817.tar.gz gentoo-f8313536f2eea2a8857c5d5a750e11a4cf707817.tar.bz2 gentoo-f8313536f2eea2a8857c5d5a750e11a4cf707817.zip | |
sys-apps/systemd: enable sysv compat code
This enables some useful functionality for people when swapping init
providers. Remove sysv-generator since it doesn't process OpenRC
scripts properly.
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'sys-apps/systemd')
| -rw-r--r-- | sys-apps/systemd/systemd-245-r4.ebuild (renamed from sys-apps/systemd/systemd-245-r3.ebuild) | 5 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-9999.ebuild | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sys-apps/systemd/systemd-245-r3.ebuild b/sys-apps/systemd/systemd-245-r4.ebuild index 0fd4ff855ecc..b686b0a738b6 100644 --- a/sys-apps/systemd/systemd-245-r3.ebuild +++ b/sys-apps/systemd/systemd-245-r4.ebuild @@ -256,8 +256,6 @@ multilib_src_configure() { -Dsplit-bin=true -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")" -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" - -Dsysvinit-path= - -Dsysvrcnd-path= # Avoid infinite exec recursion, bug 642724 -Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit" # no deps @@ -356,6 +354,9 @@ multilib_src_install_all() { rm -f "${ED}${rootprefix}"/sbin/resolvconf || die fi + rm "${ED}"/etc/init.d/README || die + rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die + if ! use sysv-utils; then rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die rm "${ED}"/usr/share/man/man1/init.1 || die diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index dcf64e48a2af..c692b2d9f5dc 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -255,8 +255,6 @@ multilib_src_configure() { -Dsplit-bin=true -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")" -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" - -Dsysvinit-path= - -Dsysvrcnd-path= # Avoid infinite exec recursion, bug 642724 -Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit" # no deps @@ -355,6 +353,9 @@ multilib_src_install_all() { rm -f "${ED}${rootprefix}"/sbin/resolvconf || die fi + rm "${ED}"/etc/init.d/README || die + rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die + if ! use sysv-utils; then rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die rm "${ED}"/usr/share/man/man1/init.1 || die |