diff options
Diffstat (limited to 'meta-oe/recipes-core')
15 files changed, 1165 insertions, 415 deletions
diff --git a/meta-oe/recipes-core/systemd/systemd-systemctl-native.bb b/meta-oe/recipes-core/systemd/systemd-systemctl-native.bb index 78eb8f36b..59405842e 100644 --- a/meta-oe/recipes-core/systemd/systemd-systemctl-native.bb +++ b/meta-oe/recipes-core/systemd/systemd-systemctl-native.bb | |||
@@ -3,7 +3,7 @@ DESCRIPTION = "Wrapper to enable of systemd services" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" | 4 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" |
5 | 5 | ||
6 | PR = "r2" | 6 | PR = "r6" |
7 | 7 | ||
8 | inherit native | 8 | inherit native |
9 | 9 | ||
diff --git a/meta-oe/recipes-core/systemd/systemd-systemctl-native/systemctl b/meta-oe/recipes-core/systemd/systemd-systemctl-native/systemctl index c4a0a3fad..6b8832b1e 100755 --- a/meta-oe/recipes-core/systemd/systemd-systemctl-native/systemctl +++ b/meta-oe/recipes-core/systemd/systemd-systemctl-native/systemctl | |||
@@ -1,4 +1,5 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | echo "Started $0 $*" | ||
2 | 3 | ||
3 | ROOT= | 4 | ROOT= |
4 | 5 | ||
@@ -24,6 +25,14 @@ while [ $# != 0 ]; do | |||
24 | cmd_args="1" | 25 | cmd_args="1" |
25 | shift | 26 | shift |
26 | ;; | 27 | ;; |
28 | mask) | ||
29 | shift | ||
30 | |||
31 | action="$opt" | ||
32 | services="$1" | ||
33 | cmd_args="1" | ||
34 | shift | ||
35 | ;; | ||
27 | --root=*) | 36 | --root=*) |
28 | ROOT=${opt##--root=} | 37 | ROOT=${opt##--root=} |
29 | cmd_args="0" | 38 | cmd_args="0" |
@@ -42,6 +51,17 @@ while [ $# != 0 ]; do | |||
42 | done | 51 | done |
43 | 52 | ||
44 | for service in $services; do | 53 | for service in $services; do |
54 | if [ "$action" = "mask" ]; then | ||
55 | if [ ! -d $ROOT/etc/systemd/system/ ]; then | ||
56 | mkdir -p $ROOT/etc/systemd/system/ | ||
57 | fi | ||
58 | cmd="ln -s /dev/null $ROOT/etc/systemd/system/$service" | ||
59 | echo "$cmd" | ||
60 | $cmd | ||
61 | exit 0 | ||
62 | fi | ||
63 | |||
64 | echo "Try to find location of $service..." | ||
45 | # find service file | 65 | # find service file |
46 | for p in $ROOT/etc/systemd/system \ | 66 | for p in $ROOT/etc/systemd/system \ |
47 | $ROOT/lib/systemd/system \ | 67 | $ROOT/lib/systemd/system \ |
@@ -55,14 +75,16 @@ for service in $services; do | |||
55 | echo "'$service' couldn't be found; exiting with error" | 75 | echo "'$service' couldn't be found; exiting with error" |
56 | exit 1 | 76 | exit 1 |
57 | fi | 77 | fi |
78 | echo "Found $service in $service_file" | ||
58 | 79 | ||
59 | # create the required symbolic links | 80 | # create the required symbolic links |
60 | wanted_by=$(grep WantedBy $ROOT/$service_file \ | 81 | wanted_by=$(grep WantedBy $ROOT/$service_file \ |
61 | | sed 's,WantedBy=,,g' \ | 82 | | sed 's,WantedBy=,,g' \ |
62 | | tr ',' '\n' \ | 83 | | tr ',' '\n' \ |
63 | | grep '\.target$') | 84 | | grep '\(\.target$\)\|\(\.service$\)') |
64 | 85 | ||
65 | for r in $wanted_by; do | 86 | for r in $wanted_by; do |
87 | echo "WantedBy=$r found in $service" | ||
66 | if [ "$action" = "enable" ]; then | 88 | if [ "$action" = "enable" ]; then |
67 | mkdir -p $ROOT/etc/systemd/system/$r.wants | 89 | mkdir -p $ROOT/etc/systemd/system/$r.wants |
68 | ln -s $service_file $ROOT/etc/systemd/system/$r.wants | 90 | ln -s $service_file $ROOT/etc/systemd/system/$r.wants |
@@ -74,11 +96,29 @@ for service in $services; do | |||
74 | fi | 96 | fi |
75 | done | 97 | done |
76 | 98 | ||
99 | # create the required symbolic 'Alias' links | ||
100 | alias=$(grep Alias $ROOT/$service_file \ | ||
101 | | sed 's,Alias=,,g' \ | ||
102 | | tr ',' '\n' \ | ||
103 | | grep '\.service$') | ||
104 | |||
105 | for r in $alias; do | ||
106 | if [ "$action" = "enable" ]; then | ||
107 | mkdir -p $ROOT/etc/systemd/system | ||
108 | ln -s $service_file $ROOT/etc/systemd/system/$r | ||
109 | echo "Enabled $service for $alias." | ||
110 | else | ||
111 | rm -f $ROOT/etc/systemd/system/$r | ||
112 | echo "Disabled $service for $alias." | ||
113 | fi | ||
114 | done | ||
115 | |||
77 | # call us for the other required scripts | 116 | # call us for the other required scripts |
78 | also=$(grep Also $ROOT/$service_file \ | 117 | also=$(grep Also $ROOT/$service_file \ |
79 | | sed 's,Also=,,g' \ | 118 | | sed 's,Also=,,g' \ |
80 | | tr ',' '\n') | 119 | | tr ',' '\n') |
81 | for a in $also; do | 120 | for a in $also; do |
121 | echo "Also=$a found in $service" | ||
82 | if [ "$action" = "enable" ]; then | 122 | if [ "$action" = "enable" ]; then |
83 | $0 --root=$ROOT enable $a | 123 | $0 --root=$ROOT enable $a |
84 | fi | 124 | fi |
diff --git a/meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch b/meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch deleted file mode 100644 index 1c95023bb..000000000 --- a/meta-oe/recipes-core/systemd/systemd/format-replace-m-uclibc.patch +++ /dev/null | |||
@@ -1,380 +0,0 @@ | |||
1 | Patch from Henning. %m is a glibc only thing. For uclibc we need to do it | ||
2 | differently. So we use static strings instead of mallocing them and free'ing | ||
3 | |||
4 | I dont know if upstream systemd have plans to make systemd work on non | ||
5 | glibc system libraries if not then this patch would not make sense for | ||
6 | upstream | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | |||
10 | Index: git/src/mount-setup.c | ||
11 | =================================================================== | ||
12 | --- git.orig/src/mount-setup.c 2012-01-25 21:27:23.000000000 -0800 | ||
13 | +++ git/src/mount-setup.c 2012-01-25 21:59:43.897031326 -0800 | ||
14 | @@ -182,10 +182,10 @@ | ||
15 | (void) fgets(buf, sizeof(buf), f); | ||
16 | |||
17 | for (;;) { | ||
18 | - char *controller; | ||
19 | + char controller[30]; | ||
20 | int enabled = 0; | ||
21 | |||
22 | - if (fscanf(f, "%ms %*i %*i %i", &controller, &enabled) != 2) { | ||
23 | + if (fscanf(f, "%s %*i %*i %i", controller, &enabled) != 2) { | ||
24 | |||
25 | if (feof(f)) | ||
26 | break; | ||
27 | @@ -196,14 +196,12 @@ | ||
28 | } | ||
29 | |||
30 | if (!enabled) { | ||
31 | - free(controller); | ||
32 | continue; | ||
33 | } | ||
34 | |||
35 | r = set_put(controllers, controller); | ||
36 | if (r < 0) { | ||
37 | log_error("Failed to add controller to set."); | ||
38 | - free(controller); | ||
39 | goto finish; | ||
40 | } | ||
41 | } | ||
42 | @@ -273,7 +271,6 @@ | ||
43 | p.fatal = false; | ||
44 | |||
45 | r = mount_one(&p, true); | ||
46 | - free(controller); | ||
47 | free(where); | ||
48 | |||
49 | if (r < 0) { | ||
50 | Index: git/src/socket-util.c | ||
51 | =================================================================== | ||
52 | --- git.orig/src/socket-util.c 2012-01-25 21:27:23.000000000 -0800 | ||
53 | +++ git/src/socket-util.c 2012-01-25 21:59:43.897031326 -0800 | ||
54 | @@ -192,7 +192,7 @@ | ||
55 | int socket_address_parse_netlink(SocketAddress *a, const char *s) { | ||
56 | int family; | ||
57 | unsigned group = 0; | ||
58 | - char* sfamily = NULL; | ||
59 | + char sfamily[50]; | ||
60 | assert(a); | ||
61 | assert(s); | ||
62 | |||
63 | @@ -200,17 +200,14 @@ | ||
64 | a->type = SOCK_RAW; | ||
65 | |||
66 | errno = 0; | ||
67 | - if (sscanf(s, "%ms %u", &sfamily, &group) < 1) | ||
68 | + if (sscanf(s, "%49s %u", &sfamily, &group) < 1) | ||
69 | return errno ? -errno : -EINVAL; | ||
70 | |||
71 | if ((family = netlink_family_from_string(sfamily)) < 0) | ||
72 | if (safe_atoi(sfamily, &family) < 0) { | ||
73 | - free(sfamily); | ||
74 | return -EINVAL; | ||
75 | } | ||
76 | |||
77 | - free(sfamily); | ||
78 | - | ||
79 | a->sockaddr.nl.nl_family = AF_NETLINK; | ||
80 | a->sockaddr.nl.nl_groups = group; | ||
81 | |||
82 | Index: git/src/swap.c | ||
83 | =================================================================== | ||
84 | --- git.orig/src/swap.c 2012-01-25 21:27:23.000000000 -0800 | ||
85 | +++ git/src/swap.c 2012-01-25 21:59:43.897031326 -0800 | ||
86 | @@ -1049,11 +1049,12 @@ | ||
87 | (void) fscanf(m->proc_swaps, "%*s %*s %*s %*s %*s\n"); | ||
88 | |||
89 | for (i = 1;; i++) { | ||
90 | - char *dev = NULL, *d; | ||
91 | + char *d; | ||
92 | + char dev[20]; | ||
93 | int prio = 0, k; | ||
94 | |||
95 | if ((k = fscanf(m->proc_swaps, | ||
96 | - "%ms " /* device/file */ | ||
97 | + "%19s " /* device/file */ | ||
98 | "%*s " /* type of swap */ | ||
99 | "%*s " /* swap size */ | ||
100 | "%*s " /* used */ | ||
101 | @@ -1064,12 +1065,10 @@ | ||
102 | break; | ||
103 | |||
104 | log_warning("Failed to parse /proc/swaps:%u.", i); | ||
105 | - free(dev); | ||
106 | continue; | ||
107 | } | ||
108 | |||
109 | d = cunescape(dev); | ||
110 | - free(dev); | ||
111 | |||
112 | if (!d) | ||
113 | return -ENOMEM; | ||
114 | Index: git/src/tmpfiles.c | ||
115 | =================================================================== | ||
116 | --- git.orig/src/tmpfiles.c 2012-01-25 21:27:23.000000000 -0800 | ||
117 | +++ git/src/tmpfiles.c 2012-01-25 22:06:58.649052774 -0800 | ||
118 | @@ -73,8 +73,8 @@ | ||
119 | typedef struct Item { | ||
120 | ItemType type; | ||
121 | |||
122 | - char *path; | ||
123 | - char *argument; | ||
124 | + char path[50]; | ||
125 | + char argument[50]; | ||
126 | uid_t uid; | ||
127 | gid_t gid; | ||
128 | mode_t mode; | ||
129 | @@ -822,7 +822,6 @@ | ||
130 | case CREATE_CHAR_DEVICE: | ||
131 | case CREATE_BLOCK_DEVICE: | ||
132 | case IGNORE_PATH: | ||
133 | - case RELABEL_PATH: | ||
134 | case RECURSIVE_RELABEL_PATH: | ||
135 | case WRITE_FILE: | ||
136 | break; | ||
137 | @@ -858,8 +857,6 @@ | ||
138 | static void item_free(Item *i) { | ||
139 | assert(i); | ||
140 | |||
141 | - free(i->path); | ||
142 | - free(i->argument); | ||
143 | free(i); | ||
144 | } | ||
145 | |||
146 | @@ -906,7 +903,7 @@ | ||
147 | |||
148 | static int parse_line(const char *fname, unsigned line, const char *buffer) { | ||
149 | Item *i, *existing; | ||
150 | - char *mode = NULL, *user = NULL, *group = NULL, *age = NULL; | ||
151 | + char mode[50], user[50], group[50], age[50]; | ||
152 | char type; | ||
153 | Hashmap *h; | ||
154 | int r, n = -1; | ||
155 | @@ -923,18 +920,18 @@ | ||
156 | |||
157 | if (sscanf(buffer, | ||
158 | "%c " | ||
159 | - "%ms " | ||
160 | - "%ms " | ||
161 | - "%ms " | ||
162 | - "%ms " | ||
163 | - "%ms " | ||
164 | + "%s " | ||
165 | + "%s " | ||
166 | + "%s " | ||
167 | + "%s " | ||
168 | + "%s " | ||
169 | "%n", | ||
170 | &type, | ||
171 | &i->path, | ||
172 | - &mode, | ||
173 | - &user, | ||
174 | - &group, | ||
175 | - &age, | ||
176 | + mode, | ||
177 | + user, | ||
178 | + group, | ||
179 | + age, | ||
180 | &n) < 2) { | ||
181 | log_error("[%s:%u] Syntax error.", fname, line); | ||
182 | r = -EIO; | ||
183 | @@ -1096,11 +1093,6 @@ | ||
184 | r = 0; | ||
185 | |||
186 | finish: | ||
187 | - free(user); | ||
188 | - free(group); | ||
189 | - free(mode); | ||
190 | - free(age); | ||
191 | - | ||
192 | if (i) | ||
193 | item_free(i); | ||
194 | |||
195 | Index: git/src/mount.c | ||
196 | =================================================================== | ||
197 | --- git.orig/src/mount.c 2012-01-25 21:27:23.000000000 -0800 | ||
198 | +++ git/src/mount.c 2012-01-25 21:59:43.901031505 -0800 | ||
199 | @@ -24,6 +24,7 @@ | ||
200 | #include <mntent.h> | ||
201 | #include <sys/epoll.h> | ||
202 | #include <signal.h> | ||
203 | +#include <string.h> | ||
204 | |||
205 | #include "unit.h" | ||
206 | #include "mount.h" | ||
207 | @@ -1561,7 +1562,13 @@ | ||
208 | static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) { | ||
209 | int r = 0; | ||
210 | unsigned i; | ||
211 | - char *device, *path, *options, *options2, *fstype, *d, *p, *o; | ||
212 | + char *d, *p, *o; | ||
213 | + char device[50]; | ||
214 | + char path[50]; | ||
215 | + char options[50]; | ||
216 | + char options2[50]; | ||
217 | + char fstype[50]; | ||
218 | + | ||
219 | |||
220 | assert(m); | ||
221 | |||
222 | @@ -1570,26 +1577,26 @@ | ||
223 | for (i = 1;; i++) { | ||
224 | int k; | ||
225 | |||
226 | - device = path = options = options2 = fstype = d = p = o = NULL; | ||
227 | + d = p = o = NULL; | ||
228 | |||
229 | if ((k = fscanf(m->proc_self_mountinfo, | ||
230 | "%*s " /* (1) mount id */ | ||
231 | "%*s " /* (2) parent id */ | ||
232 | "%*s " /* (3) major:minor */ | ||
233 | "%*s " /* (4) root */ | ||
234 | - "%ms " /* (5) mount point */ | ||
235 | - "%ms" /* (6) mount options */ | ||
236 | + "%49s " /* (5) mount point */ | ||
237 | + "%49s" /* (6) mount options */ | ||
238 | "%*[^-]" /* (7) optional fields */ | ||
239 | "- " /* (8) separator */ | ||
240 | - "%ms " /* (9) file system type */ | ||
241 | - "%ms" /* (10) mount source */ | ||
242 | - "%ms" /* (11) mount options 2 */ | ||
243 | + "%49s " /* (9) file system type */ | ||
244 | + "%49s" /* (10) mount source */ | ||
245 | + "%49s" /* (11) mount options 2 */ | ||
246 | "%*[^\n]", /* some rubbish at the end */ | ||
247 | - &path, | ||
248 | - &options, | ||
249 | - &fstype, | ||
250 | - &device, | ||
251 | - &options2)) != 5) { | ||
252 | + path, | ||
253 | + options, | ||
254 | + fstype, | ||
255 | + device, | ||
256 | + options2)) != 5) { | ||
257 | |||
258 | if (k == EOF) | ||
259 | break; | ||
260 | @@ -1613,22 +1620,12 @@ | ||
261 | r = k; | ||
262 | |||
263 | clean_up: | ||
264 | - free(device); | ||
265 | - free(path); | ||
266 | - free(options); | ||
267 | - free(options2); | ||
268 | - free(fstype); | ||
269 | free(d); | ||
270 | free(p); | ||
271 | free(o); | ||
272 | } | ||
273 | |||
274 | finish: | ||
275 | - free(device); | ||
276 | - free(path); | ||
277 | - free(options); | ||
278 | - free(options2); | ||
279 | - free(fstype); | ||
280 | free(d); | ||
281 | free(p); | ||
282 | free(o); | ||
283 | Index: git/src/umount.c | ||
284 | =================================================================== | ||
285 | --- git.orig/src/umount.c 2012-01-25 21:27:23.000000000 -0800 | ||
286 | +++ git/src/umount.c 2012-01-25 21:59:43.901031505 -0800 | ||
287 | @@ -60,7 +60,9 @@ | ||
288 | |||
289 | static int mount_points_list_get(MountPoint **head) { | ||
290 | FILE *proc_self_mountinfo; | ||
291 | - char *path, *p; | ||
292 | + char *p; | ||
293 | + char path[50]; | ||
294 | + | ||
295 | unsigned int i; | ||
296 | int r; | ||
297 | |||
298 | @@ -72,17 +74,17 @@ | ||
299 | for (i = 1;; i++) { | ||
300 | int k; | ||
301 | MountPoint *m; | ||
302 | - char *root; | ||
303 | + char root[50]; | ||
304 | bool skip_ro; | ||
305 | |||
306 | - path = p = NULL; | ||
307 | + p = NULL; | ||
308 | |||
309 | if ((k = fscanf(proc_self_mountinfo, | ||
310 | "%*s " /* (1) mount id */ | ||
311 | "%*s " /* (2) parent id */ | ||
312 | "%*s " /* (3) major:minor */ | ||
313 | - "%ms " /* (4) root */ | ||
314 | - "%ms " /* (5) mount point */ | ||
315 | + "%49s " /* (4) root */ | ||
316 | + "%49s " /* (5) mount point */ | ||
317 | "%*s" /* (6) mount options */ | ||
318 | "%*[^-]" /* (7) optional fields */ | ||
319 | "- " /* (8) separator */ | ||
320 | @@ -90,24 +92,21 @@ | ||
321 | "%*s" /* (10) mount source */ | ||
322 | "%*s" /* (11) mount options 2 */ | ||
323 | "%*[^\n]", /* some rubbish at the end */ | ||
324 | - &root, | ||
325 | - &path)) != 2) { | ||
326 | + root, | ||
327 | + path)) != 2) { | ||
328 | if (k == EOF) | ||
329 | break; | ||
330 | |||
331 | log_warning("Failed to parse /proc/self/mountinfo:%u.", i); | ||
332 | |||
333 | - free(path); | ||
334 | continue; | ||
335 | } | ||
336 | |||
337 | /* If we encounter a bind mount, don't try to remount | ||
338 | * the source dir too early */ | ||
339 | skip_ro = !streq(root, "/"); | ||
340 | - free(root); | ||
341 | |||
342 | p = cunescape(path); | ||
343 | - free(path); | ||
344 | |||
345 | if (!p) { | ||
346 | r = -ENOMEM; | ||
347 | @@ -152,28 +151,28 @@ | ||
348 | |||
349 | for (i = 2;; i++) { | ||
350 | MountPoint *swap; | ||
351 | - char *dev = NULL, *d; | ||
352 | + char *d; | ||
353 | + char dev[50]; | ||
354 | + | ||
355 | int k; | ||
356 | |||
357 | if ((k = fscanf(proc_swaps, | ||
358 | - "%ms " /* device/file */ | ||
359 | + "%50s " /* device/file */ | ||
360 | "%*s " /* type of swap */ | ||
361 | "%*s " /* swap size */ | ||
362 | "%*s " /* used */ | ||
363 | "%*s\n", /* priority */ | ||
364 | - &dev)) != 1) { | ||
365 | + dev)) != 1) { | ||
366 | |||
367 | if (k == EOF) | ||
368 | break; | ||
369 | |||
370 | log_warning("Failed to parse /proc/swaps:%u.", i); | ||
371 | |||
372 | - free(dev); | ||
373 | continue; | ||
374 | } | ||
375 | |||
376 | if (endswith(dev, "(deleted)")) { | ||
377 | - free(dev); | ||
378 | continue; | ||
379 | } | ||
380 | |||
diff --git a/meta-oe/recipes-core/systemd/systemd/gtk-doc.make b/meta-oe/recipes-core/systemd/systemd/gtk-doc.make new file mode 100644 index 000000000..57fab9868 --- /dev/null +++ b/meta-oe/recipes-core/systemd/systemd/gtk-doc.make | |||
@@ -0,0 +1,230 @@ | |||
1 | # -*- mode: makefile -*- | ||
2 | |||
3 | #################################### | ||
4 | # Everything below here is generic # | ||
5 | #################################### | ||
6 | |||
7 | if GTK_DOC_USE_LIBTOOL | ||
8 | GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||
9 | GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) | ||
10 | GTKDOC_RUN = $(LIBTOOL) --mode=execute | ||
11 | else | ||
12 | GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||
13 | GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) | ||
14 | GTKDOC_RUN = | ||
15 | endif | ||
16 | |||
17 | # We set GPATH here; this gives us semantics for GNU make | ||
18 | # which are more like other make's VPATH, when it comes to | ||
19 | # whether a source that is a target of one rule is then | ||
20 | # searched for in VPATH/GPATH. | ||
21 | # | ||
22 | GPATH = $(srcdir) | ||
23 | |||
24 | TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) | ||
25 | |||
26 | EXTRA_DIST = \ | ||
27 | $(content_files) \ | ||
28 | $(HTML_IMAGES) \ | ||
29 | $(DOC_MAIN_SGML_FILE) \ | ||
30 | $(DOC_MODULE)-sections.txt \ | ||
31 | $(DOC_MODULE)-overrides.txt | ||
32 | |||
33 | DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ | ||
34 | pdf-build.stamp \ | ||
35 | $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \ | ||
36 | $(srcdir)/pdf.stamp | ||
37 | |||
38 | SCANOBJ_FILES = \ | ||
39 | $(DOC_MODULE).args \ | ||
40 | $(DOC_MODULE).hierarchy \ | ||
41 | $(DOC_MODULE).interfaces \ | ||
42 | $(DOC_MODULE).prerequisites \ | ||
43 | $(DOC_MODULE).signals | ||
44 | |||
45 | REPORT_FILES = \ | ||
46 | $(DOC_MODULE)-undocumented.txt \ | ||
47 | $(DOC_MODULE)-undeclared.txt \ | ||
48 | $(DOC_MODULE)-unused.txt | ||
49 | |||
50 | CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) | ||
51 | |||
52 | if ENABLE_GTK_DOC | ||
53 | if GTK_DOC_BUILD_HTML | ||
54 | HTML_BUILD_STAMP=html-build.stamp | ||
55 | else | ||
56 | HTML_BUILD_STAMP= | ||
57 | endif | ||
58 | if GTK_DOC_BUILD_PDF | ||
59 | PDF_BUILD_STAMP=pdf-build.stamp | ||
60 | else | ||
61 | PDF_BUILD_STAMP= | ||
62 | endif | ||
63 | |||
64 | all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) | ||
65 | else | ||
66 | all-local: | ||
67 | endif | ||
68 | |||
69 | docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) | ||
70 | |||
71 | $(REPORT_FILES): sgml-build.stamp | ||
72 | |||
73 | #### scan #### | ||
74 | |||
75 | scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) | ||
76 | @echo 'gtk-doc: Scanning header files' | ||
77 | @-chmod -R u+w $(srcdir) | ||
78 | @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \ | ||
79 | _source_dir="$${_source_dir} --source-dir=$$i" ; \ | ||
80 | done ; \ | ||
81 | cd $(srcdir) && \ | ||
82 | gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) | ||
83 | @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ | ||
84 | CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ | ||
85 | else \ | ||
86 | cd $(srcdir) ; \ | ||
87 | for i in $(SCANOBJ_FILES) ; do \ | ||
88 | test -f $$i || touch $$i ; \ | ||
89 | done \ | ||
90 | fi | ||
91 | @touch scan-build.stamp | ||
92 | |||
93 | $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp | ||
94 | @true | ||
95 | |||
96 | #### templates #### | ||
97 | |||
98 | tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt | ||
99 | @echo 'gtk-doc: Rebuilding template files' | ||
100 | @-chmod -R u+w $(srcdir) | ||
101 | @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) | ||
102 | @touch tmpl-build.stamp | ||
103 | |||
104 | tmpl.stamp: tmpl-build.stamp | ||
105 | @true | ||
106 | |||
107 | $(srcdir)/tmpl/*.sgml: | ||
108 | @true | ||
109 | |||
110 | #### xml #### | ||
111 | |||
112 | sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) | ||
113 | @echo 'gtk-doc: Building XML' | ||
114 | @-chmod -R u+w $(srcdir) | ||
115 | @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \ | ||
116 | _source_dir="$${_source_dir} --source-dir=$$i" ; \ | ||
117 | done ; \ | ||
118 | cd $(srcdir) && \ | ||
119 | gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) | ||
120 | @touch sgml-build.stamp | ||
121 | |||
122 | sgml.stamp: sgml-build.stamp | ||
123 | @true | ||
124 | |||
125 | #### html #### | ||
126 | |||
127 | html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) | ||
128 | @echo 'gtk-doc: Building HTML' | ||
129 | @-chmod -R u+w $(srcdir) | ||
130 | @rm -rf $(srcdir)/html | ||
131 | @mkdir $(srcdir)/html | ||
132 | @mkhtml_options=""; \ | ||
133 | gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ | ||
134 | if test "$(?)" = "0"; then \ | ||
135 | mkhtml_options=--path="$(srcdir)"; \ | ||
136 | fi; \ | ||
137 | cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) | ||
138 | @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) | ||
139 | @echo 'gtk-doc: Fixing cross-references' | ||
140 | @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) | ||
141 | @touch html-build.stamp | ||
142 | |||
143 | #### pdf #### | ||
144 | |||
145 | pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) | ||
146 | @echo 'gtk-doc: Building PDF' | ||
147 | @-chmod -R u+w $(srcdir) | ||
148 | @rm -rf $(srcdir)/$(DOC_MODULE).pdf | ||
149 | @mkpdf_imgdirs=""; \ | ||
150 | if test "x$(HTML_IMAGES)" != "x"; then \ | ||
151 | for img in $(HTML_IMAGES); do \ | ||
152 | part=`dirname $$img`; \ | ||
153 | echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \ | ||
154 | if test $$? != 0; then \ | ||
155 | mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \ | ||
156 | fi; \ | ||
157 | done; \ | ||
158 | fi; \ | ||
159 | cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) | ||
160 | @touch pdf-build.stamp | ||
161 | |||
162 | ############## | ||
163 | |||
164 | clean-local: | ||
165 | rm -f *~ *.bak | ||
166 | rm -rf .libs | ||
167 | |||
168 | distclean-local: | ||
169 | cd $(srcdir) && \ | ||
170 | rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \ | ||
171 | $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt | ||
172 | |||
173 | maintainer-clean-local: clean | ||
174 | cd $(srcdir) && rm -rf xml html | ||
175 | |||
176 | install-data-local: | ||
177 | @installfiles=`echo $(srcdir)/html/*`; \ | ||
178 | if test "$$installfiles" = '$(srcdir)/html/*'; \ | ||
179 | then echo '-- Nothing to install' ; \ | ||
180 | else \ | ||
181 | if test -n "$(DOC_MODULE_VERSION)"; then \ | ||
182 | installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ | ||
183 | else \ | ||
184 | installdir="$(DESTDIR)$(TARGET_DIR)"; \ | ||
185 | fi; \ | ||
186 | $(mkinstalldirs) $${installdir} ; \ | ||
187 | for i in $$installfiles; do \ | ||
188 | echo '-- Installing '$$i ; \ | ||
189 | $(INSTALL_DATA) $$i $${installdir}; \ | ||
190 | done; \ | ||
191 | if test -n "$(DOC_MODULE_VERSION)"; then \ | ||
192 | mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ | ||
193 | $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ | ||
194 | mv -f $${installdir}/$(DOC_MODULE).devhelp \ | ||
195 | $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ | ||
196 | fi; \ | ||
197 | $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ | ||
198 | fi | ||
199 | |||
200 | uninstall-local: | ||
201 | @if test -n "$(DOC_MODULE_VERSION)"; then \ | ||
202 | installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ | ||
203 | else \ | ||
204 | installdir="$(DESTDIR)$(TARGET_DIR)"; \ | ||
205 | fi; \ | ||
206 | rm -rf $${installdir} | ||
207 | |||
208 | # | ||
209 | # Require gtk-doc when making dist | ||
210 | # | ||
211 | if ENABLE_GTK_DOC | ||
212 | dist-check-gtkdoc: | ||
213 | else | ||
214 | dist-check-gtkdoc: | ||
215 | @echo "*** gtk-doc must be installed and enabled in order to make dist" | ||
216 | @false | ||
217 | endif | ||
218 | |||
219 | dist-hook: dist-check-gtkdoc dist-hook-local | ||
220 | mkdir $(distdir)/tmpl | ||
221 | mkdir $(distdir)/html | ||
222 | -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl | ||
223 | cp $(srcdir)/html/* $(distdir)/html | ||
224 | -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/ | ||
225 | -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ | ||
226 | -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ | ||
227 | cd $(distdir) && rm -f $(DISTCLEANFILES) | ||
228 | $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html | ||
229 | |||
230 | .PHONY : dist-hook-local docs | ||
diff --git a/meta-oe/recipes-core/systemd/systemd/modprobe.rules b/meta-oe/recipes-core/systemd/systemd/modprobe.rules new file mode 100644 index 000000000..d4a096b82 --- /dev/null +++ b/meta-oe/recipes-core/systemd/systemd/modprobe.rules | |||
@@ -0,0 +1,17 @@ | |||
1 | # There are a number of modifiers that are allowed to be used in some | ||
2 | # of the different fields. They provide the following subsitutions: | ||
3 | # | ||
4 | # %n the "kernel number" of the device. | ||
5 | # For example, 'sda3' has a "kernel number" of '3' | ||
6 | # %e the smallest number for that name which does not matches an existing node | ||
7 | # %k the kernel name for the device | ||
8 | # %M the kernel major number for the device | ||
9 | # %m the kernel minor number for the device | ||
10 | # %b the bus id for the device | ||
11 | # %c the string returned by the PROGRAM | ||
12 | # %s{filename} the content of a sysfs attribute | ||
13 | # %% the '%' char itself | ||
14 | # | ||
15 | |||
16 | # Try and modprobe for drivers for new hardware | ||
17 | ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}" | ||
diff --git a/meta-oe/recipes-core/systemd/systemd/paper-over-mkostemp.patch b/meta-oe/recipes-core/systemd/systemd/paper-over-mkostemp.patch deleted file mode 100644 index ca10440a8..000000000 --- a/meta-oe/recipes-core/systemd/systemd/paper-over-mkostemp.patch +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | uclibc does not have mkostemp() so we redefine it to use mkstemp() | ||
2 | |||
3 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
4 | |||
5 | Index: git/src/macro.h | ||
6 | =================================================================== | ||
7 | --- git.orig/src/macro.h 2011-06-30 10:33:53.000000000 -0700 | ||
8 | +++ git/src/macro.h 2011-06-30 15:07:28.285270006 -0700 | ||
9 | @@ -27,6 +27,10 @@ | ||
10 | #include <sys/uio.h> | ||
11 | #include <inttypes.h> | ||
12 | |||
13 | +#ifdef __UCLIBC__ | ||
14 | +/* uclibc does not implement mkostemp GNU extention */ | ||
15 | +#define mkostemp(x,y) mkstemp(x) | ||
16 | +#endif | ||
17 | #define _printf_attr_(a,b) __attribute__ ((format (printf, a, b))) | ||
18 | #define _sentinel_ __attribute__ ((sentinel)) | ||
19 | #define _noreturn_ __attribute__((noreturn)) | ||
diff --git a/meta-oe/recipes-core/systemd/systemd/systemd-pam-configure-check-uclibc.patch b/meta-oe/recipes-core/systemd/systemd/systemd-pam-configure-check-uclibc.patch new file mode 100644 index 000000000..1bfc3bdb1 --- /dev/null +++ b/meta-oe/recipes-core/systemd/systemd/systemd-pam-configure-check-uclibc.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | --- systemd-185.orig/configure.ac 2012-06-04 14:15:16.000000000 -0400 | ||
2 | +++ systemd-pam-185/configure.ac 2012-06-21 22:57:10.000000000 -0400 | ||
3 | @@ -63,6 +63,23 @@ | ||
4 | |||
5 | AC_PATH_PROG([M4], [m4]) | ||
6 | |||
7 | +# check for few functions not implemented in uClibc | ||
8 | + | ||
9 | +AC_CHECK_FUNCS_ONCE(mkostemp execvpe posix_fallocate) | ||
10 | + | ||
11 | +# check for %ms format support - assume always no if cross compiling | ||
12 | + | ||
13 | +AC_MSG_CHECKING([whether %ms format is supported by *scanf]) | ||
14 | + | ||
15 | +AC_RUN_IFELSE( | ||
16 | + [AC_LANG_PROGRAM([[ include <stdio.h> ]], | ||
17 | + [[ char *buf1, *buf2, *buf3, str="1 2.3 abcde" ; | ||
18 | + int rc = sscanf(str, "%ms %ms %ms", &buf1, &buf2, &buf3) ; | ||
19 | + return (rc==3)?0:1;]])], | ||
20 | + [AC_DEFINE([HAVE_MSFORMAT], [1], [Define if %ms format is supported by *scanf.])], | ||
21 | + [AC_MSG_RESULT([no])], | ||
22 | + [AC_MSG_RESULT([no])]) | ||
23 | + | ||
24 | # gtkdocize greps for '^GTK_DOC_CHECK', so it needs to be on its own line | ||
25 | m4_ifdef([GTK_DOC_CHECK], [ | ||
26 | GTK_DOC_CHECK([1.18],[--flavour no-tmpl]) | ||
diff --git a/meta-oe/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch b/meta-oe/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch new file mode 100644 index 000000000..ea8b3ffb1 --- /dev/null +++ b/meta-oe/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | --- systemd-pam-185/src/nspawn/nspawn.c.orig 2012-06-21 05:31:24.000000000 -0400 | ||
2 | +++ systemd-pam-185/src/nspawn/nspawn.c 2012-06-21 05:29:50.000000000 -0400 | ||
3 | @@ -61,6 +61,8 @@ | ||
4 | #include "path-util.h" | ||
5 | #include "loopback-setup.h" | ||
6 | |||
7 | +#include "config.h" | ||
8 | + | ||
9 | static char *arg_directory = NULL; | ||
10 | static char *arg_user = NULL; | ||
11 | static char **arg_controllers = NULL; | ||
12 | @@ -1315,9 +1317,14 @@ | ||
13 | |||
14 | a[0] = (char*) "/sbin/init"; | ||
15 | execve(a[0], a, (char**) envp); | ||
16 | - } else if (argc > optind) | ||
17 | - execvpe(argv[optind], argv + optind, (char**) envp); | ||
18 | - else { | ||
19 | + } else if (argc > optind) { | ||
20 | +#ifdef HAVE_EXECVPE | ||
21 | + execvpe(argv[optind], argv + optind, (char**) envp); | ||
22 | +#else | ||
23 | + environ = (char **)envp; | ||
24 | + execvp(argv[optind], argv + optind); | ||
25 | +#endif /* HAVE_EXECVPE */ | ||
26 | + } else { | ||
27 | chdir(home ? home : "/root"); | ||
28 | execle("/bin/bash", "-bash", NULL, (char**) envp); | ||
29 | } | ||
diff --git a/meta-oe/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch b/meta-oe/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch new file mode 100644 index 000000000..089ba6469 --- /dev/null +++ b/meta-oe/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch | |||
@@ -0,0 +1,82 @@ | |||
1 | Index: git/src/journal/journal-file.c | ||
2 | =================================================================== | ||
3 | --- git.orig/src/journal/journal-file.c 2012-09-02 09:49:15.126089594 -0700 | ||
4 | +++ git/src/journal/journal-file.c 2012-09-02 09:49:17.118089670 -0700 | ||
5 | @@ -34,6 +34,8 @@ | ||
6 | #include "compress.h" | ||
7 | #include "fsprg.h" | ||
8 | |||
9 | +#include "config.h" | ||
10 | + | ||
11 | #define DEFAULT_DATA_HASH_TABLE_SIZE (2047ULL*sizeof(HashItem)) | ||
12 | #define DEFAULT_FIELD_HASH_TABLE_SIZE (333ULL*sizeof(HashItem)) | ||
13 | |||
14 | @@ -262,7 +264,7 @@ | ||
15 | |||
16 | static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) { | ||
17 | uint64_t old_size, new_size; | ||
18 | - int r; | ||
19 | + int r = 0; | ||
20 | |||
21 | assert(f); | ||
22 | |||
23 | @@ -307,10 +309,25 @@ | ||
24 | /* Note that the glibc fallocate() fallback is very | ||
25 | inefficient, hence we try to minimize the allocation area | ||
26 | as we can. */ | ||
27 | +#ifdef HAVE_POSIX_ALLOCATE | ||
28 | r = posix_fallocate(f->fd, old_size, new_size - old_size); | ||
29 | if (r != 0) | ||
30 | return -r; | ||
31 | |||
32 | +#else | ||
33 | + /* Use good old method to write zeros into the journal file | ||
34 | + perhaps very inefficient yet working. */ | ||
35 | + if(new_size > old_size) { | ||
36 | + char *buf = alloca(new_size - old_size); | ||
37 | + off_t oldpos = lseek(f->fd, 0, SEEK_CUR); | ||
38 | + bzero(buf, new_size - old_size); | ||
39 | + lseek(f->fd, old_size, SEEK_SET); | ||
40 | + r = write(f->fd, buf, new_size - old_size); | ||
41 | + lseek(f->fd, oldpos, SEEK_SET); | ||
42 | + } | ||
43 | + if (r < 0) | ||
44 | + return -errno; | ||
45 | +#endif /* HAVE_POSIX_FALLOCATE */ | ||
46 | if (fstat(f->fd, &f->last_stat) < 0) | ||
47 | return -errno; | ||
48 | |||
49 | Index: git/src/journal/journald-kmsg.c | ||
50 | =================================================================== | ||
51 | --- git.orig/src/journal/journald-kmsg.c 2012-09-02 09:49:15.130089595 -0700 | ||
52 | +++ git/src/journal/journald-kmsg.c 2012-09-02 12:26:17.326447895 -0700 | ||
53 | @@ -404,6 +404,7 @@ | ||
54 | |||
55 | int server_open_kernel_seqnum(Server *s) { | ||
56 | int fd; | ||
57 | + int r = 0; | ||
58 | uint64_t *p; | ||
59 | |||
60 | assert(s); | ||
61 | @@ -417,8 +418,19 @@ | ||
62 | log_error("Failed to open /run/systemd/journal/kernel-seqnum, ignoring: %m"); | ||
63 | return 0; | ||
64 | } | ||
65 | - | ||
66 | - if (posix_fallocate(fd, 0, sizeof(uint64_t)) < 0) { | ||
67 | +#ifdef HAVE_POSIX_ALLOCATE | ||
68 | + r = posix_fallocate(fd, 0, sizeof(uint64_t)); | ||
69 | +#else | ||
70 | + /* Use good old method to write zeros into the journal file | ||
71 | + perhaps very inefficient yet working. */ | ||
72 | + char *buf = alloca(sizeof(uint64_t)); | ||
73 | + off_t oldpos = lseek(fd, 0, SEEK_CUR); | ||
74 | + bzero(buf, sizeof(uint64_t)); | ||
75 | + lseek(fd, 0, SEEK_SET); | ||
76 | + r = write(fd, buf, sizeof(uint64_t)); | ||
77 | + lseek(fd, oldpos, SEEK_SET); | ||
78 | +#endif /* HAVE_POSIX_FALLOCATE */ | ||
79 | + if (r < 0) { | ||
80 | log_error("Failed to allocate sequential number file, ignoring: %m"); | ||
81 | close_nointr_nofail(fd); | ||
82 | return 0; | ||
diff --git a/meta-oe/recipes-core/systemd/systemd/systemd-pam-fix-getty-unit.patch b/meta-oe/recipes-core/systemd/systemd/systemd-pam-fix-getty-unit.patch new file mode 100644 index 000000000..3e5ea71e0 --- /dev/null +++ b/meta-oe/recipes-core/systemd/systemd/systemd-pam-fix-getty-unit.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | Prefer getty to agetty in console setup systemd units | ||
2 | |||
3 | Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> | ||
4 | --- | ||
5 | units/getty@.service.m4 | 2 +- | ||
6 | units/serial-getty@.service.m4 | 2 +- | ||
7 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
8 | |||
9 | Index: systemd-37/units/getty@.service.m4 | ||
10 | =================================================================== | ||
11 | --- systemd-37.orig/units/getty@.service.m4 | ||
12 | +++ systemd-37/units/getty@.service.m4 | ||
13 | @@ -41,7 +41,7 @@ | ||
14 | |||
15 | [Service] | ||
16 | Environment=TERM=linux | ||
17 | # the VT is cleared by TTYVTDisallocate | ||
18 | -ExecStart=-/sbin/agetty --noclear %I 38400 | ||
19 | +ExecStart=-/sbin/getty -L %I 115200 linux | ||
20 | Type=idle | ||
21 | Restart=always | ||
22 | RestartSec=0 | ||
23 | Index: systemd-37/units/serial-getty@.service.m4 | ||
24 | =================================================================== | ||
25 | --- systemd-37.orig/units/serial-getty@.service.m4 | ||
26 | +++ systemd-37/units/serial-getty@.service.m4 | ||
27 | @@ -37,7 +37,7 @@ | ||
28 | |||
29 | [Service] | ||
30 | Environment=TERM=vt102 | ||
31 | -ExecStart=-/sbin/agetty -s %I 115200,38400,9600 | ||
32 | +ExecStart=-/sbin/getty -L %I 115200 vt100 | ||
33 | Type=idle | ||
34 | Restart=always | ||
35 | RestartSec=0 | ||
diff --git a/meta-oe/recipes-core/systemd/systemd/systemd-pam-fix-mkostemp.patch b/meta-oe/recipes-core/systemd/systemd/systemd-pam-fix-mkostemp.patch new file mode 100644 index 000000000..8de9a3a32 --- /dev/null +++ b/meta-oe/recipes-core/systemd/systemd/systemd-pam-fix-mkostemp.patch | |||
@@ -0,0 +1,166 @@ | |||
1 | Index: git/src/journal/journal-send.c | ||
2 | =================================================================== | ||
3 | --- git.orig/src/journal/journal-send.c 2012-09-02 00:10:08.748768268 -0700 | ||
4 | +++ git/src/journal/journal-send.c 2012-09-02 00:10:10.508768335 -0700 | ||
5 | @@ -34,6 +34,8 @@ | ||
6 | |||
7 | #define SNDBUF_SIZE (8*1024*1024) | ||
8 | |||
9 | +#include "config.h" | ||
10 | + | ||
11 | /* We open a single fd, and we'll share it with the current process, | ||
12 | * all its threads, and all its subprocesses. This means we need to | ||
13 | * initialize it atomically, and need to operate on it atomically | ||
14 | @@ -293,7 +295,12 @@ | ||
15 | * file and just pass a file descriptor of it to the other | ||
16 | * side */ | ||
17 | |||
18 | +#ifdef HAVE_MKOSTEMP | ||
19 | buffer_fd = mkostemp(path, O_CLOEXEC|O_RDWR); | ||
20 | +#else | ||
21 | + buffer_fd = mkstemp(path); | ||
22 | + if (buffer_fd >= 0) fcntl(buffer_fd, F_SETFD, FD_CLOEXEC); | ||
23 | +#endif /* HAVE_MKOSTEMP */ | ||
24 | if (buffer_fd < 0) { | ||
25 | r = -errno; | ||
26 | goto finish; | ||
27 | Index: git/src/core/manager.c | ||
28 | =================================================================== | ||
29 | --- git.orig/src/core/manager.c 2012-09-02 00:10:08.732768266 -0700 | ||
30 | +++ git/src/core/manager.c 2012-09-02 00:10:10.512768334 -0700 | ||
31 | @@ -67,6 +67,8 @@ | ||
32 | #include "cgroup-util.h" | ||
33 | #include "path-util.h" | ||
34 | |||
35 | +#include "config.h" | ||
36 | + | ||
37 | /* As soon as 16 units are in our GC queue, make sure to run a gc sweep */ | ||
38 | #define GC_QUEUE_ENTRIES_MAX 16 | ||
39 | |||
40 | @@ -1701,7 +1703,12 @@ | ||
41 | return -ENOMEM; | ||
42 | |||
43 | saved_umask = umask(0077); | ||
44 | +#ifdef HAVE_MKOSTEMP | ||
45 | fd = mkostemp(path, O_RDWR|O_CLOEXEC); | ||
46 | +#else | ||
47 | + fd = mkstemp(path); | ||
48 | + if (fd >= 0) fcntl(fd, F_SETFD, FD_CLOEXEC); | ||
49 | +#endif /* HAVE_MKOSTEMP */ | ||
50 | umask(saved_umask); | ||
51 | |||
52 | if (fd < 0) { | ||
53 | Index: git/src/shared/util.c | ||
54 | =================================================================== | ||
55 | --- git.orig/src/shared/util.c 2012-09-02 00:10:08.784768269 -0700 | ||
56 | +++ git/src/shared/util.c 2012-09-02 00:10:10.512768334 -0700 | ||
57 | @@ -68,6 +68,8 @@ | ||
58 | #include "exit-status.h" | ||
59 | #include "hashmap.h" | ||
60 | |||
61 | +#include "config.h" | ||
62 | + | ||
63 | int saved_argc = 0; | ||
64 | char **saved_argv = NULL; | ||
65 | |||
66 | @@ -4519,7 +4521,12 @@ | ||
67 | t[k] = '.'; | ||
68 | stpcpy(stpcpy(t+k+1, fn), "XXXXXX"); | ||
69 | |||
70 | +#ifdef HAVE_MKOSTEMP | ||
71 | fd = mkostemp(t, O_WRONLY|O_CLOEXEC); | ||
72 | +#else | ||
73 | + fd = mkstemp(t); | ||
74 | + if (fd >= 0) fcntl(fd, F_SETFD, FD_CLOEXEC); | ||
75 | +#endif /* HAVE_MKOSTEMP */ | ||
76 | if (fd < 0) { | ||
77 | free(t); | ||
78 | return -errno; | ||
79 | Index: git/src/shared/ask-password-api.c | ||
80 | =================================================================== | ||
81 | --- git.orig/src/shared/ask-password-api.c 2012-09-02 00:10:08.772768268 -0700 | ||
82 | +++ git/src/shared/ask-password-api.c 2012-09-02 00:10:10.512768334 -0700 | ||
83 | @@ -37,6 +37,8 @@ | ||
84 | |||
85 | #include "ask-password-api.h" | ||
86 | |||
87 | +#include "config.h" | ||
88 | + | ||
89 | static void backspace_chars(int ttyfd, size_t p) { | ||
90 | |||
91 | if (ttyfd < 0) | ||
92 | @@ -326,7 +328,12 @@ | ||
93 | mkdir_p_label("/run/systemd/ask-password", 0755); | ||
94 | |||
95 | u = umask(0022); | ||
96 | +#ifdef HAVE_MKOSTEMP | ||
97 | fd = mkostemp(temp, O_CLOEXEC|O_CREAT|O_WRONLY); | ||
98 | +#else | ||
99 | + fd = mkstemp(temp); | ||
100 | + if (fd >= 0) fcntl(fd, F_SETFD, FD_CLOEXEC); | ||
101 | +#endif /* HAVE_MKOSTEMP */ | ||
102 | umask(u); | ||
103 | |||
104 | if (fd < 0) { | ||
105 | Index: git/src/journal/journalctl.c | ||
106 | =================================================================== | ||
107 | --- git.orig/src/journal/journalctl.c 2012-09-02 00:10:08.752768267 -0700 | ||
108 | +++ git/src/journal/journalctl.c 2012-09-02 00:18:41.928787779 -0700 | ||
109 | @@ -540,7 +540,13 @@ | ||
110 | n /= arg_interval; | ||
111 | |||
112 | close_nointr_nofail(fd); | ||
113 | +#ifdef HAVE_MKOSTEMP | ||
114 | fd = mkostemp(k, O_WRONLY|O_CLOEXEC|O_NOCTTY); | ||
115 | +#else | ||
116 | + fd = mkstemp(k); | ||
117 | + if (fd >= 0) fcntl(fd, F_SETFD, FD_CLOEXEC); | ||
118 | +#endif /* HAVE_MKOSTEMP */ | ||
119 | + | ||
120 | if (fd < 0) { | ||
121 | log_error("Failed to open %s: %m", k); | ||
122 | r = -errno; | ||
123 | Index: git/src/journal/journal-verify.c | ||
124 | =================================================================== | ||
125 | --- git.orig/src/journal/journal-verify.c 2012-09-02 00:10:08.752768267 -0700 | ||
126 | +++ git/src/journal/journal-verify.c 2012-09-02 00:24:10.268800268 -0700 | ||
127 | @@ -693,8 +693,12 @@ | ||
128 | #endif | ||
129 | } else if (f->seal) | ||
130 | return -ENOKEY; | ||
131 | - | ||
132 | +#ifdef HAVE_MKOSTEMP | ||
133 | data_fd = mkostemp(data_path, O_CLOEXEC); | ||
134 | +#else | ||
135 | + data_fd = mkstemp(data_path); | ||
136 | + if (data_fd >= 0) fcntl(data_fd, F_SETFD, FD_CLOEXEC); | ||
137 | +#endif /* HAVE_MKOSTEMP */ | ||
138 | if (data_fd < 0) { | ||
139 | log_error("Failed to create data file: %m"); | ||
140 | r = -errno; | ||
141 | @@ -702,7 +706,12 @@ | ||
142 | } | ||
143 | unlink(data_path); | ||
144 | |||
145 | +#ifdef HAVE_MKOSTEMP | ||
146 | entry_fd = mkostemp(entry_path, O_CLOEXEC); | ||
147 | +#else | ||
148 | + entry_fd = mkstemp(entry_path); | ||
149 | + if (entry_fd >= 0) fcntl(entry_fd, F_SETFD, FD_CLOEXEC); | ||
150 | +#endif /* HAVE_MKOSTEMP */ | ||
151 | if (entry_fd < 0) { | ||
152 | log_error("Failed to create entry file: %m"); | ||
153 | r = -errno; | ||
154 | @@ -710,7 +719,12 @@ | ||
155 | } | ||
156 | unlink(entry_path); | ||
157 | |||
158 | +#ifdef HAVE_MKOSTEMP | ||
159 | entry_array_fd = mkostemp(entry_array_path, O_CLOEXEC); | ||
160 | +#else | ||
161 | + entry_array_fd = mkstemp(entry_array_path); | ||
162 | + if (entry_array_fd >= 0) fcntl(entry_array_fd, F_SETFD, FD_CLOEXEC); | ||
163 | +#endif /* HAVE_MKOSTEMP */ | ||
164 | if (entry_array_fd < 0) { | ||
165 | log_error("Failed to create entry array file: %m"); | ||
166 | r = -errno; | ||
diff --git a/meta-oe/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch b/meta-oe/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch new file mode 100644 index 000000000..ee6332983 --- /dev/null +++ b/meta-oe/recipes-core/systemd/systemd/systemd-pam-fix-msformat.patch | |||
@@ -0,0 +1,335 @@ | |||
1 | --- systemd-pam-185/src/fsck/fsck.c.orig 2012-06-22 23:22:22.000000000 -0400 | ||
2 | +++ systemd-pam-185/src/fsck/fsck.c 2012-06-22 21:15:56.000000000 -0400 | ||
3 | @@ -36,6 +36,8 @@ | ||
4 | #include "bus-errors.h" | ||
5 | #include "virt.h" | ||
6 | |||
7 | +#include "config.h" | ||
8 | + | ||
9 | static bool arg_skip = false; | ||
10 | static bool arg_force = false; | ||
11 | static bool arg_show_progress = false; | ||
12 | @@ -193,9 +195,16 @@ | ||
13 | char *device; | ||
14 | double p; | ||
15 | usec_t t; | ||
16 | - | ||
17 | +#ifdef HAVE_MSFORMAT | ||
18 | if (fscanf(f, "%i %lu %lu %ms", &pass, &cur, &max, &device) != 4) | ||
19 | - break; | ||
20 | +#else | ||
21 | + device = malloc(257); | ||
22 | + if (fscanf(f, "%i %lu %lu %256s", &pass, &cur, &max, device) != 4) { | ||
23 | + free(device); | ||
24 | + } | ||
25 | + | ||
26 | +#endif /* HAVE_MSFORMAT */ | ||
27 | + break; | ||
28 | |||
29 | /* Only show one progress counter at max */ | ||
30 | if (!locked) { | ||
31 | --- systemd-pam-185/src/core/swap.c.orig 2012-06-22 23:22:55.000000000 -0400 | ||
32 | +++ systemd-pam-185/src/core/swap.c 2012-06-22 21:17:10.000000000 -0400 | ||
33 | @@ -40,6 +40,8 @@ | ||
34 | #include "def.h" | ||
35 | #include "path-util.h" | ||
36 | |||
37 | +#include "config.h" | ||
38 | + | ||
39 | static const UnitActiveState state_translation_table[_SWAP_STATE_MAX] = { | ||
40 | [SWAP_DEAD] = UNIT_INACTIVE, | ||
41 | [SWAP_ACTIVATING] = UNIT_ACTIVATING, | ||
42 | @@ -1038,7 +1040,7 @@ | ||
43 | for (i = 1;; i++) { | ||
44 | char *dev = NULL, *d; | ||
45 | int prio = 0, k; | ||
46 | - | ||
47 | +#ifdef HAVE_MSFORMAT | ||
48 | if ((k = fscanf(m->proc_swaps, | ||
49 | "%ms " /* device/file */ | ||
50 | "%*s " /* type of swap */ | ||
51 | @@ -1046,10 +1048,18 @@ | ||
52 | "%*s " /* used */ | ||
53 | "%i\n", /* priority */ | ||
54 | &dev, &prio)) != 2) { | ||
55 | - | ||
56 | +#else | ||
57 | + dev = malloc(257); | ||
58 | + if ((k = fscanf(m->proc_swaps, | ||
59 | + "%256s " /* device/file */ | ||
60 | + "%*s " /* type of swap */ | ||
61 | + "%*s " /* swap size */ | ||
62 | + "%*s " /* used */ | ||
63 | + "%i\n", /* priority */ | ||
64 | + dev, &prio)) != 2) { | ||
65 | +#endif /* HAVE_MSFORMAT */ | ||
66 | if (k == EOF) | ||
67 | break; | ||
68 | - | ||
69 | log_warning("Failed to parse /proc/swaps:%u.", i); | ||
70 | free(dev); | ||
71 | continue; | ||
72 | --- systemd-pam-185/src/core/mount-setup.c.orig 2012-06-22 23:23:41.000000000 -0400 | ||
73 | +++ systemd-pam-185/src/core/mount-setup.c 2012-06-22 21:19:44.000000000 -0400 | ||
74 | @@ -28,6 +28,7 @@ | ||
75 | #include <assert.h> | ||
76 | #include <unistd.h> | ||
77 | #include <ftw.h> | ||
78 | +#include <linux/fs.h> | ||
79 | |||
80 | #include "mount-setup.h" | ||
81 | #include "dev-setup.h" | ||
82 | @@ -41,6 +41,8 @@ | ||
83 | #include "path-util.h" | ||
84 | #include "missing.h" | ||
85 | |||
86 | +#include "config.h" | ||
87 | + | ||
88 | #ifndef TTY_GID | ||
89 | #define TTY_GID 5 | ||
90 | #endif | ||
91 | @@ -200,9 +202,12 @@ | ||
92 | for (;;) { | ||
93 | char *controller; | ||
94 | int enabled = 0; | ||
95 | - | ||
96 | +#ifdef HAVE_MSFORMAT | ||
97 | if (fscanf(f, "%ms %*i %*i %i", &controller, &enabled) != 2) { | ||
98 | - | ||
99 | +#else | ||
100 | + controller = malloc(257); | ||
101 | + if (fscanf(f, "%256s %*i %*i %i", controller, &enabled) != 2) { | ||
102 | +#endif /* HAVE_MSFORMAT */ | ||
103 | if (feof(f)) | ||
104 | break; | ||
105 | |||
106 | --- systemd-pam-185/src/core/mount.c.orig 2012-06-22 23:24:17.000000000 -0400 | ||
107 | +++ systemd-pam-185/src/core/mount.c 2012-06-22 22:51:21.000000000 -0400 | ||
108 | @@ -41,6 +41,8 @@ | ||
109 | #include "exit-status.h" | ||
110 | #include "def.h" | ||
111 | |||
112 | +#include "config.h" | ||
113 | + | ||
114 | static const UnitActiveState state_translation_table[_MOUNT_STATE_MAX] = { | ||
115 | [MOUNT_DEAD] = UNIT_INACTIVE, | ||
116 | [MOUNT_MOUNTING] = UNIT_ACTIVATING, | ||
117 | @@ -1514,7 +1516,7 @@ | ||
118 | int k; | ||
119 | |||
120 | device = path = options = options2 = fstype = d = p = o = NULL; | ||
121 | - | ||
122 | +#ifdef HAVE_MSFORMAT | ||
123 | if ((k = fscanf(m->proc_self_mountinfo, | ||
124 | "%*s " /* (1) mount id */ | ||
125 | "%*s " /* (2) parent id */ | ||
126 | @@ -1533,7 +1535,31 @@ | ||
127 | &fstype, | ||
128 | &device, | ||
129 | &options2)) != 5) { | ||
130 | - | ||
131 | +#else | ||
132 | + path = malloc(257); | ||
133 | + options = malloc(257); | ||
134 | + fstype = malloc(257); | ||
135 | + device = malloc(257); | ||
136 | + options2 = malloc(257); | ||
137 | + if ((k = fscanf(m->proc_self_mountinfo, | ||
138 | + "%*s " /* (1) mount id */ | ||
139 | + "%*s " /* (2) parent id */ | ||
140 | + "%*s " /* (3) major:minor */ | ||
141 | + "%*s " /* (4) root */ | ||
142 | + "%256s " /* (5) mount point */ | ||
143 | + "%256s" /* (6) mount options */ | ||
144 | + "%*[^-]" /* (7) optional fields */ | ||
145 | + "- " /* (8) separator */ | ||
146 | + "%256s " /* (9) file system type */ | ||
147 | + "%256s" /* (10) mount source */ | ||
148 | + "%256s" /* (11) mount options 2 */ | ||
149 | + "%*[^\n]", /* some rubbish at the end */ | ||
150 | + path, | ||
151 | + options, | ||
152 | + fstype, | ||
153 | + device, | ||
154 | + options2)) != 5) { | ||
155 | +#endif /* HAVE_MSFORMAT */ | ||
156 | if (k == EOF) | ||
157 | break; | ||
158 | |||
159 | --- systemd-pam-185/src/core/umount.c.orig 2012-06-22 23:24:37.000000000 -0400 | ||
160 | +++ systemd-pam-185/src/core/umount.c 2012-06-22 22:56:15.000000000 -0400 | ||
161 | @@ -35,6 +35,8 @@ | ||
162 | #include "path-util.h" | ||
163 | #include "util.h" | ||
164 | |||
165 | +#include "config.h" | ||
166 | + | ||
167 | typedef struct MountPoint { | ||
168 | char *path; | ||
169 | dev_t devnum; | ||
170 | @@ -74,7 +76,7 @@ | ||
171 | MountPoint *m; | ||
172 | |||
173 | path = p = NULL; | ||
174 | - | ||
175 | +#ifdef HAVE_MSFORMAT | ||
176 | if ((k = fscanf(proc_self_mountinfo, | ||
177 | "%*s " /* (1) mount id */ | ||
178 | "%*s " /* (2) parent id */ | ||
179 | @@ -89,6 +91,23 @@ | ||
180 | "%*s" /* (11) mount options 2 */ | ||
181 | "%*[^\n]", /* some rubbish at the end */ | ||
182 | &path)) != 1) { | ||
183 | +#else | ||
184 | + path = malloc(257); | ||
185 | + if ((k = fscanf(proc_self_mountinfo, | ||
186 | + "%*s " /* (1) mount id */ | ||
187 | + "%*s " /* (2) parent id */ | ||
188 | + "%*s " /* (3) major:minor */ | ||
189 | + "%*s " /* (4) root */ | ||
190 | + "%256s " /* (5) mount point */ | ||
191 | + "%*s" /* (6) mount options */ | ||
192 | + "%*[^-]" /* (7) optional fields */ | ||
193 | + "- " /* (8) separator */ | ||
194 | + "%*s " /* (9) file system type */ | ||
195 | + "%*s" /* (10) mount source */ | ||
196 | + "%*s" /* (11) mount options 2 */ | ||
197 | + "%*[^\n]", /* some rubbish at the end */ | ||
198 | + path)) != 1) { | ||
199 | +#endif /* HAVE_MSFORMAT */ | ||
200 | if (k == EOF) | ||
201 | break; | ||
202 | |||
203 | @@ -150,7 +169,7 @@ | ||
204 | MountPoint *swap; | ||
205 | char *dev = NULL, *d; | ||
206 | int k; | ||
207 | - | ||
208 | +#ifdef HAVE_MSFORMAT | ||
209 | if ((k = fscanf(proc_swaps, | ||
210 | "%ms " /* device/file */ | ||
211 | "%*s " /* type of swap */ | ||
212 | @@ -158,7 +177,16 @@ | ||
213 | "%*s " /* used */ | ||
214 | "%*s\n", /* priority */ | ||
215 | &dev)) != 1) { | ||
216 | - | ||
217 | +#else | ||
218 | + dev = malloc(257); | ||
219 | + if ((k = fscanf(proc_swaps, | ||
220 | + "%256s " /* device/file */ | ||
221 | + "%*s " /* type of swap */ | ||
222 | + "%*s " /* swap size */ | ||
223 | + "%*s " /* used */ | ||
224 | + "%*s\n", /* priority */ | ||
225 | + dev)) != 1) { | ||
226 | +#endif /* HAVE_MSFORMAT */ | ||
227 | if (k == EOF) | ||
228 | break; | ||
229 | |||
230 | --- systemd-pam-185/src/shared/socket-util.c.orig 2012-06-22 23:25:00.000000000 -0400 | ||
231 | +++ systemd-pam-185/src/shared/socket-util.c 2012-06-22 22:59:27.000000000 -0400 | ||
232 | @@ -39,6 +39,8 @@ | ||
233 | #include "socket-util.h" | ||
234 | #include "missing.h" | ||
235 | |||
236 | +#include "config.h" | ||
237 | + | ||
238 | int socket_address_parse(SocketAddress *a, const char *s) { | ||
239 | int r; | ||
240 | char *e, *n; | ||
241 | @@ -201,8 +203,16 @@ | ||
242 | a->type = SOCK_RAW; | ||
243 | |||
244 | errno = 0; | ||
245 | - if (sscanf(s, "%ms %u", &sfamily, &group) < 1) | ||
246 | +#ifdef HAVE_MSFORMAT | ||
247 | + if (sscanf(s, "%ms %u", &sfamily, &group) < 1) | ||
248 | + return errno ? -errno : -EINVAL; | ||
249 | +#else | ||
250 | + sfamily = malloc(257); | ||
251 | + if (sscanf(s, "%256s %u", sfamily, &group) < 1) { | ||
252 | + free(sfamily); | ||
253 | return errno ? -errno : -EINVAL; | ||
254 | + } | ||
255 | +#endif /* HAVE_MSFORMAT */ | ||
256 | |||
257 | if ((family = netlink_family_from_string(sfamily)) < 0) | ||
258 | if (safe_atoi(sfamily, &family) < 0) { | ||
259 | --- systemd-pam-185/src/tmpfiles/tmpfiles.c.orig 2012-06-22 23:25:21.000000000 -0400 | ||
260 | +++ systemd-pam-185/src/tmpfiles/tmpfiles.c 2012-06-22 23:13:49.000000000 -0400 | ||
261 | @@ -48,6 +48,8 @@ | ||
262 | #include "set.h" | ||
263 | #include "conf-files.h" | ||
264 | |||
265 | +#include "config.h" | ||
266 | + | ||
267 | /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates | ||
268 | * them in the file system. This is intended to be used to create | ||
269 | * properly owned directories beneath /tmp, /var/tmp, /run, which are | ||
270 | @@ -970,7 +972,7 @@ | ||
271 | i = new0(Item, 1); | ||
272 | if (!i) | ||
273 | return log_oom(); | ||
274 | - | ||
275 | +#ifdef HAVE_MSFORMAT | ||
276 | if (sscanf(buffer, | ||
277 | "%c " | ||
278 | "%ms " | ||
279 | @@ -986,6 +988,28 @@ | ||
280 | &group, | ||
281 | &age, | ||
282 | &n) < 2) { | ||
283 | +#else | ||
284 | + i->path = malloc(257); | ||
285 | + mode = malloc(257); | ||
286 | + user = malloc(257); | ||
287 | + group = malloc(257); | ||
288 | + age = malloc(257); | ||
289 | + if (sscanf(buffer, | ||
290 | + "%c " | ||
291 | + "%256s " | ||
292 | + "%256s " | ||
293 | + "%256s " | ||
294 | + "%256s " | ||
295 | + "%256s " | ||
296 | + "%n", | ||
297 | + &type, | ||
298 | + i->path, | ||
299 | + mode, | ||
300 | + user, | ||
301 | + group, | ||
302 | + age, | ||
303 | + &n) < 2) { | ||
304 | +#endif /* HAVE_MSFORMAT */ | ||
305 | log_error("[%s:%u] Syntax error.", fname, line); | ||
306 | r = -EIO; | ||
307 | goto finish; | ||
308 | --- systemd-pam-185/src/cryptsetup/cryptsetup-generator.c.orig 2012-06-22 23:25:47.000000000 -0400 | ||
309 | +++ systemd-pam-185/src/cryptsetup/cryptsetup-generator.c 2012-06-22 23:16:35.000000000 -0400 | ||
310 | @@ -30,6 +30,8 @@ | ||
311 | #include "virt.h" | ||
312 | #include "strv.h" | ||
313 | |||
314 | +#include "config.h" | ||
315 | + | ||
316 | static const char *arg_dest = "/tmp"; | ||
317 | static bool arg_enabled = true; | ||
318 | static bool arg_read_crypttab = true; | ||
319 | @@ -421,8 +423,15 @@ | ||
320 | l = strstrip(line); | ||
321 | if (*l == '#' || *l == 0) | ||
322 | continue; | ||
323 | - | ||
324 | +#ifdef HAVE_MSFORMAT | ||
325 | k = sscanf(l, "%ms %ms %ms %ms", &name, &device, &password, &options); | ||
326 | +#else | ||
327 | + name = malloc(257); | ||
328 | + device = malloc(257); | ||
329 | + password = malloc(257); | ||
330 | + options = malloc(257); | ||
331 | + k = sscanf(l, "%256s %256s %256s %256s", name, device, password, options); | ||
332 | +#endif /* HAVE_MSFORMAT */ | ||
333 | if (k < 2 || k > 4) { | ||
334 | log_error("Failed to parse /etc/crypttab:%u, ignoring.", n); | ||
335 | r = EXIT_FAILURE; | ||
diff --git a/meta-oe/recipes-core/systemd/systemd/touchscreen.rules b/meta-oe/recipes-core/systemd/systemd/touchscreen.rules new file mode 100644 index 000000000..d83fd1673 --- /dev/null +++ b/meta-oe/recipes-core/systemd/systemd/touchscreen.rules | |||
@@ -0,0 +1,18 @@ | |||
1 | # There are a number of modifiers that are allowed to be used in some | ||
2 | # of the different fields. They provide the following subsitutions: | ||
3 | # | ||
4 | # %n the "kernel number" of the device. | ||
5 | # For example, 'sda3' has a "kernel number" of '3' | ||
6 | # %e the smallest number for that name which does not matches an existing node | ||
7 | # %k the kernel name for the device | ||
8 | # %M the kernel major number for the device | ||
9 | # %m the kernel minor number for the device | ||
10 | # %b the bus id for the device | ||
11 | # %c the string returned by the PROGRAM | ||
12 | # %s{filename} the content of a sysfs attribute | ||
13 | # %% the '%' char itself | ||
14 | # | ||
15 | |||
16 | # Create a symlink to any touchscreen input device | ||
17 | SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0" | ||
18 | SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{modalias}=="ads7846", SYMLINK+="input/touchscreen0" | ||
diff --git a/meta-oe/recipes-core/systemd/systemd/use-rootlibdir.patch b/meta-oe/recipes-core/systemd/systemd/use-rootlibdir.patch new file mode 100644 index 000000000..216721684 --- /dev/null +++ b/meta-oe/recipes-core/systemd/systemd/use-rootlibdir.patch | |||
@@ -0,0 +1,94 @@ | |||
1 | Upstream-Status: Undecided | ||
2 | |||
3 | This patch removes some of hardcoded references to /lib | ||
4 | and /usr/lib since on some architectures it should be | ||
5 | /lib64 and /usr/lib64 atleast in OE | ||
6 | |||
7 | I am not sure about the intention of hardcoded values | ||
8 | thats why status is undecided | ||
9 | |||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | |||
12 | Index: git/Makefile.am | ||
13 | =================================================================== | ||
14 | --- git.orig/Makefile.am 2012-07-22 16:20:38.424405916 -0700 | ||
15 | +++ git/Makefile.am 2012-07-22 16:23:21.232406621 -0700 | ||
16 | @@ -61,23 +61,23 @@ | ||
17 | |||
18 | # Our own, non-special dirs | ||
19 | pkgsysconfdir=$(sysconfdir)/systemd | ||
20 | -userunitdir=$(prefix)/lib/systemd/user | ||
21 | -tmpfilesdir=$(prefix)/lib/tmpfiles.d | ||
22 | -sysctldir=$(prefix)/lib/sysctl.d | ||
23 | -usergeneratordir=$(prefix)/lib/systemd/user-generators | ||
24 | +userunitdir=$(prefix)/$(rootlibdir)/systemd/user | ||
25 | +tmpfilesdir=$(prefix)/$(rootlibdir)/tmpfiles.d | ||
26 | +sysctldir=$(prefix)/$(rootlibdir)/sysctl.d | ||
27 | +usergeneratordir=$(prefix)/$(rootlibdir)/systemd/user-generators | ||
28 | pkgincludedir=$(includedir)/systemd | ||
29 | systemgeneratordir=$(rootlibexecdir)/system-generators | ||
30 | systemshutdowndir=$(rootlibexecdir)/system-shutdown | ||
31 | systemsleepdir=$(rootlibexecdir)/system-sleep | ||
32 | -systemunitdir=$(rootprefix)/lib/systemd/system | ||
33 | -udevlibexecdir=$(rootprefix)/lib/udev | ||
34 | +systemunitdir=$(rootprefix)/$(rootlibdir)/systemd/system | ||
35 | +udevlibexecdir=$(rootprefix)/$(rootlibdir)/udev | ||
36 | udevhomedir = $(udevlibexecdir) | ||
37 | udevrulesdir = $(udevlibexecdir)/rules.d | ||
38 | |||
39 | # And these are the special ones for / | ||
40 | rootprefix=@rootprefix@ | ||
41 | rootbindir=$(rootprefix)/bin | ||
42 | -rootlibexecdir=$(rootprefix)/lib/systemd | ||
43 | +rootlibexecdir=$(rootprefix)/$(rootlibdir)/systemd | ||
44 | |||
45 | CLEANFILES = | ||
46 | EXTRA_DIST = | ||
47 | @@ -126,7 +126,7 @@ | ||
48 | -DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \ | ||
49 | -DROOTPREFIX=\"$(rootprefix)\" \ | ||
50 | -DRUNTIME_DIR=\"/run\" \ | ||
51 | - -DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \ | ||
52 | + -DRANDOM_SEED=\"$(localstatedir)/$(rootlibdir)/random-seed\" \ | ||
53 | -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \ | ||
54 | -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \ | ||
55 | -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \ | ||
56 | @@ -2535,7 +2535,7 @@ | ||
57 | |||
58 | binfmt-install-data-hook: | ||
59 | $(MKDIR_P) -m 0755 \ | ||
60 | - $(DESTDIR)$(prefix)/lib/binfmt.d \ | ||
61 | + $(DESTDIR)$(prefix)/$(rootlibdir)/binfmt.d \ | ||
62 | $(DESTDIR)$(sysconfdir)/binfmt.d \ | ||
63 | $(DESTDIR)$(systemunitdir)/sysinit.target.wants | ||
64 | ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \ | ||
65 | @@ -3165,7 +3165,7 @@ | ||
66 | logind-install-data-hook: | ||
67 | $(MKDIR_P) -m 0755 \ | ||
68 | $(DESTDIR)$(systemunitdir)/multi-user.target.wants \ | ||
69 | - $(DESTDIR)$(localstatedir)/lib/systemd | ||
70 | + $(DESTDIR)$(localstatedir)/$(rootlibdir)/systemd | ||
71 | ( cd $(DESTDIR)$(systemunitdir) && \ | ||
72 | rm -f dbus-org.freedesktop.login1.service && \ | ||
73 | $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service) | ||
74 | @@ -3284,7 +3284,7 @@ | ||
75 | -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ | ||
76 | -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \ | ||
77 | -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \ | ||
78 | - -e 's,@RANDOM_SEED\@,$(localstatedir)/lib/random-seed,g' \ | ||
79 | + -e 's,@RANDOM_SEED\@,$(localstatedir)/$(rootlibdir)/random-seed,g' \ | ||
80 | -e 's,@prefix\@,$(prefix),g' \ | ||
81 | -e 's,@exec_prefix\@,$(exec_prefix),g' \ | ||
82 | -e 's,@libdir\@,$(libdir),g' \ | ||
83 | @@ -3407,9 +3407,9 @@ | ||
84 | $(MKDIR_P) -m 0755 \ | ||
85 | $(DESTDIR)$(tmpfilesdir) \ | ||
86 | $(DESTDIR)$(sysconfdir)/tmpfiles.d \ | ||
87 | - $(DESTDIR)$(prefix)/lib/modules-load.d \ | ||
88 | + $(DESTDIR)$(prefix)/$(rootlibdir)/modules-load.d \ | ||
89 | $(DESTDIR)$(sysconfdir)/modules-load.d \ | ||
90 | - $(DESTDIR)$(prefix)/lib/sysctl.d \ | ||
91 | + $(DESTDIR)$(prefix)/$(rootlibdir)/sysctl.d \ | ||
92 | $(DESTDIR)$(sysconfdir)/sysctl.d \ | ||
93 | $(DESTDIR)$(systemshutdowndir) \ | ||
94 | $(DESTDIR)$(systemsleepdir) \ | ||
diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb index b9c8a190c..712ec7982 100644 --- a/meta-oe/recipes-core/systemd/systemd_git.bb +++ b/meta-oe/recipes-core/systemd/systemd_git.bb | |||
@@ -1,9 +1,14 @@ | |||
1 | DESCRIPTION = "Systemd a init replacement" | 1 | DESCRIPTION = "Systemd a init replacement" |
2 | HOMEPAGE = "http://www.freedesktop.org/wiki/Software/systemd" | 2 | HOMEPAGE = "http://www.freedesktop.org/wiki/Software/systemd" |
3 | LICENSE = "GPLv2+" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" | ||
5 | 3 | ||
6 | DEPENDS = "xz kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline udev dbus libcap libcgroup tcp-wrappers" | 4 | LICENSE = "GPLv2 & LGPLv2.1 & MIT" |
5 | LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ | ||
6 | file://LICENSE.LGPL2.1;md5=fb919cc88dbe06ec0b0bd50e001ccf1f \ | ||
7 | file://LICENSE.MIT;md5=544799d0b492f119fa04641d1b8868ed" | ||
8 | |||
9 | PROVIDES = "udev" | ||
10 | |||
11 | DEPENDS = "xz kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers usbutils glib-2.0 libgcrypt" | ||
7 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 12 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
8 | 13 | ||
9 | SERIAL_CONSOLE ?= "115200 /dev/ttyS0" | 14 | SERIAL_CONSOLE ?= "115200 /dev/ttyS0" |
@@ -14,21 +19,28 @@ inherit gitpkgv | |||
14 | PKGV = "v${GITPKGVTAG}" | 19 | PKGV = "v${GITPKGVTAG}" |
15 | 20 | ||
16 | PV = "git" | 21 | PV = "git" |
17 | PR = "r28" | 22 | PR = "r6" |
18 | 23 | ||
19 | inherit useradd pkgconfig autotools vala perlnative | 24 | inherit useradd pkgconfig autotools perlnative |
20 | 25 | ||
21 | SRCREV = "3eff4208ffecedd778fec260f0d4b18e94dab443" | 26 | SRCREV = "38a60d7112d33ffd596b23e8df53d75a7c09e71b" |
22 | 27 | ||
23 | SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;protocol=git \ | 28 | SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;protocol=git \ |
24 | ${UCLIBCPATCHES} \ | 29 | file://use-rootlibdir.patch \ |
30 | file://gtk-doc.make \ | ||
31 | file://touchscreen.rules \ | ||
32 | file://modprobe.rules \ | ||
25 | file://var-run.conf \ | 33 | file://var-run.conf \ |
34 | ${UCLIBCPATCHES} \ | ||
26 | " | 35 | " |
27 | UCLIBCPATCHES = "" | 36 | UCLIBCPATCHES = "" |
28 | UCLIBCPATCHES_libc-uclibc = "file://paper-over-mkostemp.patch \ | 37 | UCLIBCPATCHES_libc-uclibc = "file://systemd-pam-configure-check-uclibc.patch \ |
29 | file://format-replace-m-uclibc.patch \ | 38 | file://systemd-pam-fix-execvpe.patch \ |
39 | file://systemd-pam-fix-fallocate.patch \ | ||
40 | file://systemd-pam-fix-getty-unit.patch \ | ||
41 | file://systemd-pam-fix-mkostemp.patch \ | ||
42 | file://systemd-pam-fix-msformat.patch \ | ||
30 | " | 43 | " |
31 | |||
32 | LDFLAGS_libc-uclibc_append = " -lrt" | 44 | LDFLAGS_libc-uclibc_append = " -lrt" |
33 | 45 | ||
34 | S = "${WORKDIR}/git" | 46 | S = "${WORKDIR}/git" |
@@ -36,21 +48,33 @@ S = "${WORKDIR}/git" | |||
36 | SYSTEMDDISTRO ?= "debian" | 48 | SYSTEMDDISTRO ?= "debian" |
37 | SYSTEMDDISTRO_angstrom = "angstrom" | 49 | SYSTEMDDISTRO_angstrom = "angstrom" |
38 | 50 | ||
51 | CACHED_CONFIGUREVARS = "ac_cv_file__usr_share_pci_ids=no \ | ||
52 | ac_cv_file__usr_share_hwdata_pci_ids=no \ | ||
53 | ac_cv_file__usr_share_misc_pci_ids=yes" | ||
39 | # The gtk+ tools should get built as a separate recipe e.g. systemd-tools | 54 | # The gtk+ tools should get built as a separate recipe e.g. systemd-tools |
40 | EXTRA_OECONF = " --with-distro=${SYSTEMDDISTRO} \ | 55 | EXTRA_OECONF = " --with-distro=${SYSTEMDDISTRO} \ |
41 | --with-rootprefix=${base_prefix} \ | 56 | --with-rootprefix=${base_prefix} \ |
42 | --with-rootlibdir=${base_libdir} \ | 57 | --with-rootlibdir=${base_libdir} \ |
58 | --sbindir=${base_sbindir} \ | ||
59 | --libexecdir=${base_libdir} \ | ||
43 | ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \ | 60 | ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \ |
44 | --disable-gtk \ | ||
45 | --enable-xz \ | 61 | --enable-xz \ |
46 | --disable-manpages \ | 62 | --disable-manpages \ |
47 | --disable-coredump \ | 63 | --disable-coredump \ |
64 | --disable-introspection \ | ||
65 | --with-pci-ids-path=/usr/share/misc \ | ||
66 | --disable-gtk-doc-html \ | ||
67 | --disable-tcpwrap \ | ||
68 | --enable-split-usr \ | ||
48 | " | 69 | " |
49 | 70 | ||
50 | # There's no docbook-xsl-native, so for the xsltproc check to false | 71 | # There's no docbook-xsl-native, so for the xsltproc check to false |
51 | do_configure_prepend() { | 72 | do_configure_prepend() { |
73 | export CPP="${HOST_PREFIX}cpp ${TOOLCHAIN_OPTIONS} ${HOST_CC_ARCH}" | ||
52 | sed -i /xsltproc/d configure.ac | 74 | sed -i /xsltproc/d configure.ac |
53 | 75 | ||
76 | cp ${WORKDIR}/gtk-doc.make ${S}/docs/ | ||
77 | |||
54 | # we only have /home/root, not /root | 78 | # we only have /home/root, not /root |
55 | sed -i -e 's:=/root:=/home/root:g' units/*.service* | 79 | sed -i -e 's:=/root:=/home/root:g' units/*.service* |
56 | } | 80 | } |
@@ -70,6 +94,8 @@ do_install() { | |||
70 | # 20:12 < mezcalero> koen: you have three options: a) run systemd-machine-id-setup at install time, b) have / read-only and an empty file there (for stateless) and c) boot with / writable | 94 | # 20:12 < mezcalero> koen: you have three options: a) run systemd-machine-id-setup at install time, b) have / read-only and an empty file there (for stateless) and c) boot with / writable |
71 | touch ${D}${sysconfdir}/machine-id | 95 | touch ${D}${sysconfdir}/machine-id |
72 | 96 | ||
97 | install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/ | ||
98 | |||
73 | install -m 0644 ${WORKDIR}/var-run.conf ${D}${sysconfdir}/tmpfiles.d/ | 99 | install -m 0644 ${WORKDIR}/var-run.conf ${D}${sysconfdir}/tmpfiles.d/ |
74 | } | 100 | } |
75 | 101 | ||
@@ -103,10 +129,18 @@ FILES_${PN} = " ${base_bindir}/* \ | |||
103 | ${datadir}/dbus-1/system-services \ | 129 | ${datadir}/dbus-1/system-services \ |
104 | ${datadir}/polkit-1 \ | 130 | ${datadir}/polkit-1 \ |
105 | ${datadir}/${PN} \ | 131 | ${datadir}/${PN} \ |
106 | ${sysconfdir} \ | 132 | ${sysconfdir}/bash_completion.d/ \ |
133 | ${sysconfdir}/binfmt.d/ \ | ||
134 | ${sysconfdir}/dbus-1/ \ | ||
135 | ${sysconfdir}/machine-id \ | ||
136 | ${sysconfdir}/modules-load.d/ \ | ||
137 | ${sysconfdir}/sysctl.d/ \ | ||
138 | ${sysconfdir}/systemd/ \ | ||
139 | ${sysconfdir}/tmpfiles.d/ \ | ||
140 | ${sysconfdir}/xdg/ \ | ||
107 | ${systemd_unitdir}/* \ | 141 | ${systemd_unitdir}/* \ |
108 | ${systemd_unitdir}/system/* \ | 142 | ${systemd_unitdir}/system/* \ |
109 | ${base_libdir}/udev/rules.d \ | 143 | ${base_libdir}/udev/rules.d/99-systemd.rules \ |
110 | ${base_libdir}/security/*.so \ | 144 | ${base_libdir}/security/*.so \ |
111 | /cgroup \ | 145 | /cgroup \ |
112 | ${bindir}/systemd* \ | 146 | ${bindir}/systemd* \ |
@@ -117,10 +151,14 @@ FILES_${PN} = " ${base_bindir}/* \ | |||
117 | ${libdir}/sysctl.d \ | 151 | ${libdir}/sysctl.d \ |
118 | ${localstatedir} \ | 152 | ${localstatedir} \ |
119 | ${libexecdir} \ | 153 | ${libexecdir} \ |
154 | ${base_libdir}/udev/rules.d/70-uaccess.rules \ | ||
155 | ${base_libdir}/udev/rules.d/71-seat.rules \ | ||
156 | ${base_libdir}/udev/rules.d/73-seat-late.rules \ | ||
157 | ${base_libdir}/udev/rules.d/99-systemd.rules \ | ||
120 | " | 158 | " |
121 | 159 | ||
122 | FILES_${PN}-dbg += "${systemd_unitdir}/.debug ${systemd_unitdir}/*/.debug ${base_libdir}/security/.debug/" | 160 | FILES_${PN}-dbg += "${systemd_unitdir}/.debug ${systemd_unitdir}/*/.debug ${base_libdir}/security/.debug/" |
123 | FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/" | 161 | FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd" |
124 | 162 | ||
125 | RDEPENDS_${PN} += "dbus-systemd udev-systemd" | 163 | RDEPENDS_${PN} += "dbus-systemd udev-systemd" |
126 | 164 | ||
@@ -139,6 +177,45 @@ RRECOMMENDS_${PN} += "systemd-serialgetty \ | |||
139 | kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 \ | 177 | kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 \ |
140 | " | 178 | " |
141 | 179 | ||
180 | PACKAGES =+ "udev-dbg udev udev-consolekit udev-utils udev-systemd" | ||
181 | |||
182 | FILES_udev-dbg += "${base_libdir}/udev/.debug" | ||
183 | |||
184 | RDEPENDS_udev += "udev-utils" | ||
185 | RPROVIDES_udev = "hotplug" | ||
186 | |||
187 | FILES_udev += "${base_libdir}/udev/udevd \ | ||
188 | ${base_libdir}/systemd/systemd-udevd \ | ||
189 | ${base_libdir}/udev/accelerometer \ | ||
190 | ${base_libdir}/udev/ata_id \ | ||
191 | ${base_libdir}/udev/cdrom_id \ | ||
192 | ${base_libdir}/udev/collect \ | ||
193 | ${base_libdir}/udev/findkeyboards \ | ||
194 | ${base_libdir}/udev/keyboard-force-release.sh \ | ||
195 | ${base_libdir}/udev/keymap \ | ||
196 | ${base_libdir}/udev/mtd_probe \ | ||
197 | ${base_libdir}/udev/scsi_id \ | ||
198 | ${base_libdir}/udev/v4l_id \ | ||
199 | ${base_libdir}/udev/keymaps \ | ||
200 | ${base_libdir}/udev/rules.d/4*.rules \ | ||
201 | ${base_libdir}/udev/rules.d/5*.rules \ | ||
202 | ${base_libdir}/udev/rules.d/6*.rules \ | ||
203 | ${base_libdir}/udev/rules.d/70-power-switch.rules \ | ||
204 | ${base_libdir}/udev/rules.d/75*.rules \ | ||
205 | ${base_libdir}/udev/rules.d/78*.rules \ | ||
206 | ${base_libdir}/udev/rules.d/8*.rules \ | ||
207 | ${base_libdir}/udev/rules.d/95*.rules \ | ||
208 | ${sysconfdir}/udev \ | ||
209 | " | ||
210 | |||
211 | FILES_udev-consolekit += "${libdir}/ConsoleKit" | ||
212 | RDEPENDS_udev-consolekit += "${@base_contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d)}" | ||
213 | |||
214 | FILES_udev-utils = "${bindir}/udevadm" | ||
215 | |||
216 | FILES_udev-systemd = "${base_libdir}/systemd/system/*udev* ${base_libdir}/systemd/system/*.wants/*udev*" | ||
217 | RDEPENDS_udev-systemd = "udev" | ||
218 | |||
142 | # TODO: | 219 | # TODO: |
143 | # u-a for runlevel and telinit | 220 | # u-a for runlevel and telinit |
144 | 221 | ||