diff options
author | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
commit | 972dcfcdbfe75dcfeb777150c136576cf1a71e99 (patch) | |
tree | 97a61cd7e293d7ae9d56ef7ed0f81253365bb026 /meta/recipes-core/systemd/systemd/0001-build-sys-configure-the-list-of-system-users-files-a.patch | |
download | poky-972dcfcdbfe75dcfeb777150c136576cf1a71e99.tar.gz |
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0001-build-sys-configure-the-list-of-system-users-files-a.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0001-build-sys-configure-the-list-of-system-users-files-a.patch | 176 |
1 files changed, 176 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-build-sys-configure-the-list-of-system-users-files-a.patch b/meta/recipes-core/systemd/systemd/0001-build-sys-configure-the-list-of-system-users-files-a.patch new file mode 100644 index 0000000000..e0043597a2 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-build-sys-configure-the-list-of-system-users-files-a.patch | |||
@@ -0,0 +1,176 @@ | |||
1 | From 5a16bc264c32237e38a844d55e7a1820a31b8440 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?=C5=81ukasz=20Stelmach?= <l.stelmach@samsung.com> | ||
3 | Date: Fri, 28 Nov 2014 15:59:59 +0100 | ||
4 | Subject: [PATCH] build-sys: configure the list of system users, files and | ||
5 | directories | ||
6 | |||
7 | Choose which system users defined in sysusers.d/systemd.conf and files | ||
8 | or directories in tmpfiles.d/systemd.conf, should be provided depending | ||
9 | on comile-time configuration. | ||
10 | |||
11 | Upstream-Status: Backport | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | Makefile.am | 4 ++++ | ||
15 | configure.ac | 2 ++ | ||
16 | sysusers.d/.gitignore | 1 + | ||
17 | sysusers.d/{systemd.conf => systemd.conf.m4} | 8 ++++++++ | ||
18 | tmpfiles.d/.gitignore | 3 ++- | ||
19 | tmpfiles.d/{systemd.conf => systemd.conf.m4} | 2 ++ | ||
20 | 6 files changed, 19 insertions(+), 1 deletion(-) | ||
21 | rename sysusers.d/{systemd.conf => systemd.conf.m4} (77%) | ||
22 | rename tmpfiles.d/{systemd.conf => systemd.conf.m4} (96%) | ||
23 | |||
24 | Index: git/Makefile.am | ||
25 | =================================================================== | ||
26 | --- git.orig/Makefile.am 2015-01-23 21:23:04.000000000 +0000 | ||
27 | +++ git/Makefile.am 2015-01-23 21:23:04.000000000 +0000 | ||
28 | @@ -5698,6 +5698,10 @@ | ||
29 | $(AM_V_at)$(MKDIR_P) $(dir $@) | ||
30 | $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@ | ||
31 | |||
32 | +sysusers.d/%: sysusers.d/%.m4 | ||
33 | + $(AM_V_at)$(MKDIR_P) $(dir $@) | ||
34 | + $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@ | ||
35 | + | ||
36 | tmpfiles.d/%: tmpfiles.d/%.m4 | ||
37 | $(AM_V_at)$(MKDIR_P) $(dir $@) | ||
38 | $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@ | ||
39 | Index: git/configure.ac | ||
40 | =================================================================== | ||
41 | --- git.orig/configure.ac 2015-01-23 21:23:04.000000000 +0000 | ||
42 | +++ git/configure.ac 2015-01-23 21:23:04.000000000 +0000 | ||
43 | @@ -971,6 +971,7 @@ | ||
44 | AC_ARG_ENABLE(timesyncd, AS_HELP_STRING([--disable-timesyncd], [disable timesync daemon])) | ||
45 | if test "x$enable_timesyncd" != "xno"; then | ||
46 | have_timesyncd=yes | ||
47 | + M4_DEFINES="$M4_DEFINES -DENABLE_TIMESYNCD" | ||
48 | fi | ||
49 | AM_CONDITIONAL(ENABLE_TIMESYNCD, [test "$have_timesyncd" = "yes"]) | ||
50 | |||
51 | @@ -1060,6 +1061,7 @@ | ||
52 | AS_IF([test "x$enable_networkd" != "xno"], [ | ||
53 | AC_DEFINE(ENABLE_NETWORKD, 1, [Define if networkd support is to be enabled]) | ||
54 | have_networkd=yes | ||
55 | + M4_DEFINES="$M4_DEFINES -DENABLE_NETWORKD" | ||
56 | ]) | ||
57 | AM_CONDITIONAL(ENABLE_NETWORKD, [test "x$have_networkd" = "xyes"]) | ||
58 | |||
59 | Index: git/sysusers.d/systemd.conf | ||
60 | =================================================================== | ||
61 | --- git.orig/sysusers.d/systemd.conf 2015-01-23 21:23:02.000000000 +0000 | ||
62 | +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
63 | @@ -1,12 +0,0 @@ | ||
64 | -# This file is part of systemd. | ||
65 | -# | ||
66 | -# systemd is free software; you can redistribute it and/or modify it | ||
67 | -# under the terms of the GNU Lesser General Public License as published by | ||
68 | -# the Free Software Foundation; either version 2.1 of the License, or | ||
69 | -# (at your option) any later version. | ||
70 | - | ||
71 | -g systemd-journal - - | ||
72 | -u systemd-bus-proxy - "systemd Bus Proxy" | ||
73 | -u systemd-network - "systemd Network Management" | ||
74 | -u systemd-resolve - "systemd Resolver" | ||
75 | -u systemd-timesync - "systemd Time Synchronization" | ||
76 | Index: git/sysusers.d/systemd.conf.m4 | ||
77 | =================================================================== | ||
78 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
79 | +++ git/sysusers.d/systemd.conf.m4 2015-01-23 21:26:30.000000000 +0000 | ||
80 | @@ -0,0 +1,20 @@ | ||
81 | +# This file is part of systemd. | ||
82 | +# | ||
83 | +# systemd is free software; you can redistribute it and/or modify it | ||
84 | +# under the terms of the GNU Lesser General Public License as published by | ||
85 | +# the Free Software Foundation; either version 2.1 of the License, or | ||
86 | +# (at your option) any later version. | ||
87 | + | ||
88 | +g systemd-journal - - | ||
89 | +m4_ifdef(`ENABLE_KDBUS', | ||
90 | +u systemd-bus-proxy - "systemd Bus Proxy" | ||
91 | +)m4_dnl | ||
92 | +m4_ifdef(`ENABLE_NETWORKD', | ||
93 | +u systemd-network - "systemd Network Management" | ||
94 | +)m4_dnl | ||
95 | +m4_ifdef(`ENABLE_RESOLVED', | ||
96 | +u systemd-resolve - "systemd Resolver" | ||
97 | +)m4_dnl | ||
98 | +m4_ifdef(`ENABLE_TIMESYNCD', | ||
99 | +u systemd-timesync - "systemd Time Synchronization" | ||
100 | +)m4_dnl | ||
101 | Index: git/tmpfiles.d/systemd.conf | ||
102 | =================================================================== | ||
103 | --- git.orig/tmpfiles.d/systemd.conf 2015-01-23 21:23:02.000000000 +0000 | ||
104 | +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
105 | @@ -1,32 +0,0 @@ | ||
106 | -# This file is part of systemd. | ||
107 | -# | ||
108 | -# systemd is free software; you can redistribute it and/or modify it | ||
109 | -# under the terms of the GNU Lesser General Public License as published by | ||
110 | -# the Free Software Foundation; either version 2.1 of the License, or | ||
111 | -# (at your option) any later version. | ||
112 | - | ||
113 | -# See tmpfiles.d(5) for details | ||
114 | - | ||
115 | -d /run/user 0755 root root - | ||
116 | -F! /run/utmp 0664 root utmp - | ||
117 | - | ||
118 | -d /run/systemd/ask-password 0755 root root - | ||
119 | -d /run/systemd/seats 0755 root root - | ||
120 | -d /run/systemd/sessions 0755 root root - | ||
121 | -d /run/systemd/users 0755 root root - | ||
122 | -d /run/systemd/machines 0755 root root - | ||
123 | -d /run/systemd/shutdown 0755 root root - | ||
124 | -d /run/systemd/netif 0755 systemd-network systemd-network - | ||
125 | -d /run/systemd/netif/links 0755 systemd-network systemd-network - | ||
126 | -d /run/systemd/netif/leases 0755 systemd-network systemd-network - | ||
127 | - | ||
128 | -d /run/log 0755 root root - | ||
129 | - | ||
130 | -z /run/log/journal 2755 root systemd-journal - - | ||
131 | -Z /run/log/journal/%m ~2750 root systemd-journal - - | ||
132 | - | ||
133 | -z /var/log/journal 2755 root systemd-journal - - | ||
134 | -z /var/log/journal/%m 2755 root systemd-journal - - | ||
135 | - | ||
136 | -d /var/lib/systemd 0755 root root - | ||
137 | -d /var/lib/systemd/coredump 0755 root root 3d | ||
138 | Index: git/tmpfiles.d/systemd.conf.m4 | ||
139 | =================================================================== | ||
140 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
141 | +++ git/tmpfiles.d/systemd.conf.m4 2015-01-23 21:26:46.000000000 +0000 | ||
142 | @@ -0,0 +1,34 @@ | ||
143 | +# This file is part of systemd. | ||
144 | +# | ||
145 | +# systemd is free software; you can redistribute it and/or modify it | ||
146 | +# under the terms of the GNU Lesser General Public License as published by | ||
147 | +# the Free Software Foundation; either version 2.1 of the License, or | ||
148 | +# (at your option) any later version. | ||
149 | + | ||
150 | +# See tmpfiles.d(5) for details | ||
151 | + | ||
152 | +d /run/user 0755 root root - | ||
153 | +F! /run/utmp 0664 root utmp - | ||
154 | + | ||
155 | +d /run/systemd/ask-password 0755 root root - | ||
156 | +d /run/systemd/seats 0755 root root - | ||
157 | +d /run/systemd/sessions 0755 root root - | ||
158 | +d /run/systemd/users 0755 root root - | ||
159 | +d /run/systemd/machines 0755 root root - | ||
160 | +d /run/systemd/shutdown 0755 root root - | ||
161 | +m4_ifdef(`ENABLE_NETWORKD', | ||
162 | +d /run/systemd/netif 0755 systemd-network systemd-network - | ||
163 | +d /run/systemd/netif/links 0755 systemd-network systemd-network - | ||
164 | +d /run/systemd/netif/leases 0755 systemd-network systemd-network - | ||
165 | +)m4_dnl | ||
166 | + | ||
167 | +d /run/log 0755 root root - | ||
168 | + | ||
169 | +z /run/log/journal 2755 root systemd-journal - - | ||
170 | +Z /run/log/journal/%m ~2750 root systemd-journal - - | ||
171 | + | ||
172 | +z /var/log/journal 2755 root systemd-journal - - | ||
173 | +z /var/log/journal/%m 2755 root systemd-journal - - | ||
174 | + | ||
175 | +d /var/lib/systemd 0755 root root - | ||
176 | +d /var/lib/systemd/coredump 0755 root root 3d | ||