commit: aa3fae8d768c871af0574da9ea81d7282e83036d Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Wed Jul 31 23:51:03 2019 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Wed Jul 31 23:52:09 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa3fae8d
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 <AT> gentoo.org> sys-apps/systemd/systemd-242-r6.ebuild | 5 ++--- sys-apps/systemd/systemd-243_rc1.ebuild | 5 ++--- sys-apps/systemd/systemd-9999.ebuild | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/sys-apps/systemd/systemd-242-r6.ebuild b/sys-apps/systemd/systemd-242-r6.ebuild index 94fc51babe3..eb97107359b 100644 --- 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 529c0bffc49..3f4f5a43b84 100644 --- 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 de934f0f326..a2bb8171bab 100644 --- 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
