diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0001-build-sys-do-not-install-tmpfiles-and-sysusers-files.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0001-build-sys-do-not-install-tmpfiles-and-sysusers-files.patch | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-build-sys-do-not-install-tmpfiles-and-sysusers-files.patch b/meta/recipes-core/systemd/systemd/0001-build-sys-do-not-install-tmpfiles-and-sysusers-files.patch deleted file mode 100644 index 4795f8670f..0000000000 --- a/meta/recipes-core/systemd/systemd/0001-build-sys-do-not-install-tmpfiles-and-sysusers-files.patch +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | From bedd083aaedb3bbb14ef579a047bf4b4fed56d9b Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?=C5=81ukasz=20Stelmach?= <l.stelmach@samsung.com> | ||
3 | Date: Wed, 26 Nov 2014 09:17:50 +0100 | ||
4 | Subject: [PATCH] build-sys: do not install tmpfiles and sysusers files by | ||
5 | default | ||
6 | |||
7 | Upstream-Status: Backport | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | |||
11 | --- | ||
12 | Makefile.am | 14 +++++++++++--- | ||
13 | 1 file changed, 11 insertions(+), 3 deletions(-) | ||
14 | |||
15 | diff --git a/Makefile.am b/Makefile.am | ||
16 | index ddd0df1..65bb176 100644 | ||
17 | --- a/Makefile.am | ||
18 | +++ b/Makefile.am | ||
19 | @@ -2039,7 +2039,6 @@ nodist_tmpfiles_DATA = \ | ||
20 | dist_tmpfiles_DATA = \ | ||
21 | tmpfiles.d/systemd.conf \ | ||
22 | tmpfiles.d/systemd-nologin.conf \ | ||
23 | - tmpfiles.d/systemd-remote.conf \ | ||
24 | tmpfiles.d/tmp.conf \ | ||
25 | tmpfiles.d/x11.conf \ | ||
26 | tmpfiles.d/var.conf | ||
27 | @@ -2094,8 +2093,7 @@ SYSINIT_TARGET_WANTS += \ | ||
28 | systemd-sysusers.service | ||
29 | |||
30 | dist_sysusers_DATA = \ | ||
31 | - sysusers.d/systemd.conf \ | ||
32 | - sysusers.d/systemd-remote.conf | ||
33 | + sysusers.d/systemd.conf | ||
34 | |||
35 | nodist_sysusers_DATA = \ | ||
36 | sysusers.d/basic.conf | ||
37 | @@ -3839,6 +3837,16 @@ systemd_journal_remote_CFLAGS = \ | ||
38 | systemd_journal_remote_LDADD += \ | ||
39 | $(MICROHTTPD_LIBS) | ||
40 | |||
41 | +if ENABLE_SYSUSERS | ||
42 | +dist_sysusers_DATA += \ | ||
43 | + sysusers.d/systemd-remote.conf | ||
44 | +endif | ||
45 | + | ||
46 | +if ENABLE_TMPFILES | ||
47 | +dist_tmpfiles_DATA += \ | ||
48 | + tmpfiles.d/systemd-remote.conf | ||
49 | +endif | ||
50 | + | ||
51 | if HAVE_GNUTLS | ||
52 | systemd_journal_remote_LDADD += \ | ||
53 | $(GNUTLS_LIBS) | ||
54 | -- | ||
55 | 1.9.1 | ||
56 | |||