Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/
Date: Wed, 31 Jul 2019 23:53:27
Message-Id: 1564617129.aa3fae8d768c871af0574da9ea81d7282e83036d.floppym@gentoo
1 commit: aa3fae8d768c871af0574da9ea81d7282e83036d
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 31 23:51:03 2019 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 31 23:52:09 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa3fae8d
7
8 sys-apps/systemd: keepdir /var/log/journal
9
10 Closes: https://bugs.gentoo.org/691116
11 Package-Manager: Portage-2.3.69_p9_p14210, Repoman-2.3.16_p18_p14210
12 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
13
14 sys-apps/systemd/systemd-242-r6.ebuild | 5 ++---
15 sys-apps/systemd/systemd-243_rc1.ebuild | 5 ++---
16 sys-apps/systemd/systemd-9999.ebuild | 5 ++---
17 3 files changed, 6 insertions(+), 9 deletions(-)
18
19 diff --git a/sys-apps/systemd/systemd-242-r6.ebuild b/sys-apps/systemd/systemd-242-r6.ebuild
20 index 94fc51babe3..eb97107359b 100644
21 --- a/sys-apps/systemd/systemd-242-r6.ebuild
22 +++ b/sys-apps/systemd/systemd-242-r6.ebuild
23 @@ -281,11 +281,10 @@ multilib_src_configure() {
24 -Dselinux=$(meson_multilib_native_use selinux)
25 -Ddbus=$(meson_multilib_native_use test)
26 -Dxkbcommon=$(meson_multilib_native_use xkb)
27 - # hardcode a few paths to spare some deps
28 - -Dkill-path=/bin/kill
29 -Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
30 # Breaks screen, tmux, etc.
31 -Ddefault-kill-user-processes=false
32 + -Dcreate-log-dirs=false
33
34 # multilib options
35 -Dbacklight=$(meson_multilib)
36 @@ -370,7 +369,7 @@ multilib_src_install_all() {
37 keepdir /usr/lib/{binfmt.d,modules-load.d}
38 keepdir /usr/lib/systemd/user-generators
39 keepdir /var/lib/systemd
40 - rm -rf "${ED}"/var/log || die
41 + keepdir /var/log/journal
42
43 # Symlink /etc/sysctl.conf for easy migration.
44 dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
45
46 diff --git a/sys-apps/systemd/systemd-243_rc1.ebuild b/sys-apps/systemd/systemd-243_rc1.ebuild
47 index 529c0bffc49..3f4f5a43b84 100644
48 --- a/sys-apps/systemd/systemd-243_rc1.ebuild
49 +++ b/sys-apps/systemd/systemd-243_rc1.ebuild
50 @@ -273,11 +273,10 @@ multilib_src_configure() {
51 -Dselinux=$(meson_multilib_native_use selinux)
52 -Ddbus=$(meson_multilib_native_use test)
53 -Dxkbcommon=$(meson_multilib_native_use xkb)
54 - # hardcode a few paths to spare some deps
55 - -Dkill-path=/bin/kill
56 -Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
57 # Breaks screen, tmux, etc.
58 -Ddefault-kill-user-processes=false
59 + -Dcreate-log-dirs=false
60
61 # multilib options
62 -Dbacklight=$(meson_multilib)
63 @@ -350,7 +349,7 @@ multilib_src_install_all() {
64 keepdir /usr/lib/{binfmt.d,modules-load.d}
65 keepdir /usr/lib/systemd/user-generators
66 keepdir /var/lib/systemd
67 - rm -rf "${ED}"/var/log || die
68 + keepdir /var/log/journal
69
70 # Symlink /etc/sysctl.conf for easy migration.
71 dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
72
73 diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
74 index de934f0f326..a2bb8171bab 100644
75 --- a/sys-apps/systemd/systemd-9999.ebuild
76 +++ b/sys-apps/systemd/systemd-9999.ebuild
77 @@ -272,11 +272,10 @@ multilib_src_configure() {
78 -Dselinux=$(meson_multilib_native_use selinux)
79 -Ddbus=$(meson_multilib_native_use test)
80 -Dxkbcommon=$(meson_multilib_native_use xkb)
81 - # hardcode a few paths to spare some deps
82 - -Dkill-path=/bin/kill
83 -Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
84 # Breaks screen, tmux, etc.
85 -Ddefault-kill-user-processes=false
86 + -Dcreate-log-dirs=false
87
88 # multilib options
89 -Dbacklight=$(meson_multilib)
90 @@ -349,7 +348,7 @@ multilib_src_install_all() {
91 keepdir /usr/lib/{binfmt.d,modules-load.d}
92 keepdir /usr/lib/systemd/user-generators
93 keepdir /var/lib/systemd
94 - rm -rf "${ED}"/var/log || die
95 + keepdir /var/log/journal
96
97 # Symlink /etc/sysctl.conf for easy migration.
98 dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf