sys-apps/systemd: keepdir /var/log/journal

Closes: https://bugs.gentoo.org/691116
Package-Manager: Portage-2.3.69_p9_p14210, Repoman-2.3.16_p18_p14210
Signed-off-by: Mike Gilbert <floppym@gentoo.org>

diff --git a/sys-apps/systemd/systemd-242-r6.ebuild b/sys-apps/systemd/systemd-242-r6.ebuild
index 94fc51babe354769e54037f1614924fafc062e41..eb97107359b64d2b7d605bc552987320c45c83c0 100644 (file)
--- a/sys-apps/systemd/systemd-242-r6.ebuild
+++ b/sys-apps/systemd/systemd-242-r6.ebuild
@@ -281,11 +281,10 @@ multilib_src_configure() {
                -Dselinux=$(meson_multilib_native_use selinux)
                -Ddbus=$(meson_multilib_native_use test)
                -Dxkbcommon=$(meson_multilib_native_use xkb)
-               # hardcode a few paths to spare some deps
-               -Dkill-path=/bin/kill
                -Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
                # Breaks screen, tmux, etc.
                -Ddefault-kill-user-processes=false
+               -Dcreate-log-dirs=false
 
                # multilib options
                -Dbacklight=$(meson_multilib)
@@ -370,7 +369,7 @@ multilib_src_install_all() {
        keepdir /usr/lib/{binfmt.d,modules-load.d}
        keepdir /usr/lib/systemd/user-generators
        keepdir /var/lib/systemd
-       rm -rf "${ED}"/var/log || die
+       keepdir /var/log/journal
 
        # Symlink /etc/sysctl.conf for easy migration.
        dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf

diff --git a/sys-apps/systemd/systemd-243_rc1.ebuild b/sys-apps/systemd/systemd-243_rc1.ebuild
index 529c0bffc498dc041035bc16cbf924ef36835706..3f4f5a43b843b337d77cf75c8d842a44bcf780b5 100644 (file)
--- a/sys-apps/systemd/systemd-243_rc1.ebuild
+++ b/sys-apps/systemd/systemd-243_rc1.ebuild
@@ -273,11 +273,10 @@ multilib_src_configure() {
                -Dselinux=$(meson_multilib_native_use selinux)
                -Ddbus=$(meson_multilib_native_use test)
                -Dxkbcommon=$(meson_multilib_native_use xkb)
-               # hardcode a few paths to spare some deps
-               -Dkill-path=/bin/kill
                -Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
                # Breaks screen, tmux, etc.
                -Ddefault-kill-user-processes=false
+               -Dcreate-log-dirs=false
 
                # multilib options
                -Dbacklight=$(meson_multilib)
@@ -350,7 +349,7 @@ multilib_src_install_all() {
        keepdir /usr/lib/{binfmt.d,modules-load.d}
        keepdir /usr/lib/systemd/user-generators
        keepdir /var/lib/systemd
-       rm -rf "${ED}"/var/log || die
+       keepdir /var/log/journal
 
        # Symlink /etc/sysctl.conf for easy migration.
        dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index de934f0f3261c8cbb8aafc3ca94a898c5c6d053e..a2bb8171bab60753a2c314c152540c07999be7b2 100644 (file)
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -272,11 +272,10 @@ multilib_src_configure() {
                -Dselinux=$(meson_multilib_native_use selinux)
                -Ddbus=$(meson_multilib_native_use test)
                -Dxkbcommon=$(meson_multilib_native_use xkb)
-               # hardcode a few paths to spare some deps
-               -Dkill-path=/bin/kill
                -Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
                # Breaks screen, tmux, etc.
                -Ddefault-kill-user-processes=false
+               -Dcreate-log-dirs=false
 
                # multilib options
                -Dbacklight=$(meson_multilib)
@@ -349,7 +348,7 @@ multilib_src_install_all() {
        keepdir /usr/lib/{binfmt.d,modules-load.d}
        keepdir /usr/lib/systemd/user-generators
        keepdir /var/lib/systemd
-       rm -rf "${ED}"/var/log || die
+       keepdir /var/log/journal
 
        # Symlink /etc/sysctl.conf for easy migration.
        dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf