diff options
-rw-r--r-- | meta/recipes-core/systemd/systemd/0001-missing_type.h-add-comparison_fn_t.patch (renamed from meta/recipes-core/systemd/systemd/0009-missing_type.h-add-comparison_fn_t.patch) | 10 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd/0002-add-fallback-parse_printf_format-implementation.patch (renamed from meta/recipes-core/systemd/systemd/0010-add-fallback-parse_printf_format-implementation.patch) | 27 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch (renamed from meta/recipes-core/systemd/systemd/0011-src-basic-missing.h-check-for-missing-strndupa.patch) | 157 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd/0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch (renamed from meta/recipes-core/systemd/systemd/0012-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch) | 19 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch (renamed from meta/recipes-core/systemd/systemd/0013-add-missing-FTW_-macros-for-musl.patch) | 10 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd/0006-Use-uintmax_t-for-handling-rlim_t.patch (renamed from meta/recipes-core/systemd/systemd/0014-Use-uintmax_t-for-handling-rlim_t.patch) | 23 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd/0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch (renamed from meta/recipes-core/systemd/systemd/0016-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch) | 10 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch (renamed from meta/recipes-core/systemd/systemd/0017-Define-glibc-compatible-basename-for-non-glibc-syste.patch) | 14 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch (renamed from meta/recipes-core/systemd/systemd/0018-Do-not-disable-buffering-when-writing-to-oom_score_a.patch) | 10 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch (renamed from meta/recipes-core/systemd/systemd/0019-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch) | 12 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch (renamed from meta/recipes-core/systemd/systemd/0020-avoid-redefinition-of-prctl_mm_map-structure.patch) | 8 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd/0012-do-not-disable-buffer-in-writing-files.patch (renamed from meta/recipes-core/systemd/systemd/0021-do-not-disable-buffer-in-writing-files.patch) | 255 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd/0013-Handle-__cpu_mask-usage.patch (renamed from meta/recipes-core/systemd/systemd/0022-Handle-__cpu_mask-usage.patch) | 11 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd/0014-Handle-missing-gshadow.patch (renamed from meta/recipes-core/systemd/systemd/0023-Handle-missing-gshadow.patch) | 10 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch (renamed from meta/recipes-core/systemd/systemd/0024-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch) | 10 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd/0016-pass-correct-parameters-to-getdents64.patch (renamed from meta/recipes-core/systemd/systemd/0005-pass-correct-parameters-to-getdents64.patch) | 6 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd/0017-Adjust-for-musl-headers.patch (renamed from meta/recipes-core/systemd/systemd/0001-Adjust-for-musl-headers.patch) | 92 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch (renamed from meta/recipes-core/systemd/systemd/0006-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch) | 10 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch (renamed from meta/recipes-core/systemd/systemd/0003-errno-util-Make-STRERROR-portable-for-musl.patch) | 17 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch (renamed from meta/recipes-core/systemd/systemd/0028-sd-event-Make-malloc_trim-conditional-on-glibc.patch) | 18 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch (renamed from meta/recipes-core/systemd/systemd/0029-shared-Do-not-use-malloc_info-on-musl.patch) | 15 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd/0022-avoid-missing-LOCK_EX-declaration.patch | 43 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd_254.4.bb | 43 |
23 files changed, 559 insertions, 271 deletions
diff --git a/meta/recipes-core/systemd/systemd/0009-missing_type.h-add-comparison_fn_t.patch b/meta/recipes-core/systemd/systemd/0001-missing_type.h-add-comparison_fn_t.patch index e50b47a5a0..2aa5dee6b5 100644 --- a/meta/recipes-core/systemd/systemd/0009-missing_type.h-add-comparison_fn_t.patch +++ b/meta/recipes-core/systemd/systemd/0001-missing_type.h-add-comparison_fn_t.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 542f999a846dfd49d9373d30fffb2a44168d7b5e Mon Sep 17 00:00:00 2001 | 1 | From 01195eb9f7d59139fb45df506ac6b3968c14a57f Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Mon, 25 Feb 2019 13:55:12 +0800 | 3 | Date: Mon, 25 Feb 2019 13:55:12 +0800 |
4 | Subject: [PATCH] missing_type.h: add comparison_fn_t | 4 | Subject: [PATCH 01/22] missing_type.h: add comparison_fn_t |
5 | 5 | ||
6 | Make it work with musl where comparison_fn_t and is not provided. | 6 | Make it work with musl where comparison_fn_t and is not provided. |
7 | 7 | ||
@@ -33,7 +33,7 @@ index f6233090a9..6c0456349d 100644 | |||
33 | +typedef int (*comparison_fn_t)(const void *, const void *); | 33 | +typedef int (*comparison_fn_t)(const void *, const void *); |
34 | +#endif | 34 | +#endif |
35 | diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h | 35 | diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h |
36 | index f0bf246aa3..33669c7a75 100644 | 36 | index 9c818bd747..ef10c8be2c 100644 |
37 | --- a/src/basic/sort-util.h | 37 | --- a/src/basic/sort-util.h |
38 | +++ b/src/basic/sort-util.h | 38 | +++ b/src/basic/sort-util.h |
39 | @@ -4,6 +4,7 @@ | 39 | @@ -4,6 +4,7 @@ |
@@ -45,7 +45,7 @@ index f0bf246aa3..33669c7a75 100644 | |||
45 | /* This is the same as glibc's internal __compar_d_fn_t type. glibc exports a public comparison_fn_t, for the | 45 | /* This is the same as glibc's internal __compar_d_fn_t type. glibc exports a public comparison_fn_t, for the |
46 | * external type __compar_fn_t, but doesn't do anything similar for __compar_d_fn_t. Let's hence do that | 46 | * external type __compar_fn_t, but doesn't do anything similar for __compar_d_fn_t. Let's hence do that |
47 | diff --git a/src/libsystemd/sd-journal/catalog.c b/src/libsystemd/sd-journal/catalog.c | 47 | diff --git a/src/libsystemd/sd-journal/catalog.c b/src/libsystemd/sd-journal/catalog.c |
48 | index 7527abf636..f33383e57f 100644 | 48 | index ae91534198..7f67eea38b 100644 |
49 | --- a/src/libsystemd/sd-journal/catalog.c | 49 | --- a/src/libsystemd/sd-journal/catalog.c |
50 | +++ b/src/libsystemd/sd-journal/catalog.c | 50 | +++ b/src/libsystemd/sd-journal/catalog.c |
51 | @@ -28,6 +28,7 @@ | 51 | @@ -28,6 +28,7 @@ |
@@ -57,5 +57,5 @@ index 7527abf636..f33383e57f 100644 | |||
57 | const char * const catalog_file_dirs[] = { | 57 | const char * const catalog_file_dirs[] = { |
58 | "/usr/local/lib/systemd/catalog/", | 58 | "/usr/local/lib/systemd/catalog/", |
59 | -- | 59 | -- |
60 | 2.39.2 | 60 | 2.34.1 |
61 | 61 | ||
diff --git a/meta/recipes-core/systemd/systemd/0010-add-fallback-parse_printf_format-implementation.patch b/meta/recipes-core/systemd/systemd/0002-add-fallback-parse_printf_format-implementation.patch index 4143ab4d70..900a931632 100644 --- a/meta/recipes-core/systemd/systemd/0010-add-fallback-parse_printf_format-implementation.patch +++ b/meta/recipes-core/systemd/systemd/0002-add-fallback-parse_printf_format-implementation.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 383e85e15f16a46aac925aa439b8b60f58b40aa6 Mon Sep 17 00:00:00 2001 | 1 | From 872b72739e62123867ce6c4f82aa37de24cc3f75 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Sat, 22 May 2021 20:26:24 +0200 | 3 | Date: Sat, 22 May 2021 20:26:24 +0200 |
4 | Subject: [PATCH] add fallback parse_printf_format implementation | 4 | Subject: [PATCH 02/22] add fallback parse_printf_format implementation |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [musl specific] | 6 | Upstream-Status: Inappropriate [musl specific] |
7 | 7 | ||
@@ -21,9 +21,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
21 | create mode 100644 src/basic/parse-printf-format.c | 21 | create mode 100644 src/basic/parse-printf-format.c |
22 | create mode 100644 src/basic/parse-printf-format.h | 22 | create mode 100644 src/basic/parse-printf-format.h |
23 | 23 | ||
24 | diff --git a/meson.build b/meson.build | ||
25 | index 7419e2b0b0..01fd3ffc19 100644 | ||
24 | --- a/meson.build | 26 | --- a/meson.build |
25 | +++ b/meson.build | 27 | +++ b/meson.build |
26 | @@ -781,6 +781,7 @@ endif | 28 | @@ -725,6 +725,7 @@ endif |
27 | foreach header : ['crypt.h', | 29 | foreach header : ['crypt.h', |
28 | 'linux/memfd.h', | 30 | 'linux/memfd.h', |
29 | 'linux/vm_sockets.h', | 31 | 'linux/vm_sockets.h', |
@@ -31,9 +33,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
31 | 'sys/auxv.h', | 33 | 'sys/auxv.h', |
32 | 'threads.h', | 34 | 'threads.h', |
33 | 'valgrind/memcheck.h', | 35 | 'valgrind/memcheck.h', |
36 | diff --git a/src/basic/meson.build b/src/basic/meson.build | ||
37 | index d7450d8b44..c3e3daf4bd 100644 | ||
34 | --- a/src/basic/meson.build | 38 | --- a/src/basic/meson.build |
35 | +++ b/src/basic/meson.build | 39 | +++ b/src/basic/meson.build |
36 | @@ -179,6 +179,11 @@ endforeach | 40 | @@ -183,6 +183,11 @@ endforeach |
37 | 41 | ||
38 | basic_sources += generated_gperf_headers | 42 | basic_sources += generated_gperf_headers |
39 | 43 | ||
@@ -45,6 +49,9 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
45 | ############################################################ | 49 | ############################################################ |
46 | 50 | ||
47 | arch_list = [ | 51 | arch_list = [ |
52 | diff --git a/src/basic/parse-printf-format.c b/src/basic/parse-printf-format.c | ||
53 | new file mode 100644 | ||
54 | index 0000000000..49437e5445 | ||
48 | --- /dev/null | 55 | --- /dev/null |
49 | +++ b/src/basic/parse-printf-format.c | 56 | +++ b/src/basic/parse-printf-format.c |
50 | @@ -0,0 +1,273 @@ | 57 | @@ -0,0 +1,273 @@ |
@@ -321,6 +328,9 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
321 | + | 328 | + |
322 | + return last; | 329 | + return last; |
323 | +} | 330 | +} |
331 | diff --git a/src/basic/parse-printf-format.h b/src/basic/parse-printf-format.h | ||
332 | new file mode 100644 | ||
333 | index 0000000000..47be7522d7 | ||
324 | --- /dev/null | 334 | --- /dev/null |
325 | +++ b/src/basic/parse-printf-format.h | 335 | +++ b/src/basic/parse-printf-format.h |
326 | @@ -0,0 +1,57 @@ | 336 | @@ -0,0 +1,57 @@ |
@@ -381,6 +391,8 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
381 | +size_t parse_printf_format(const char *fmt, size_t n, int *types); | 391 | +size_t parse_printf_format(const char *fmt, size_t n, int *types); |
382 | + | 392 | + |
383 | +#endif /* HAVE_PRINTF_H */ | 393 | +#endif /* HAVE_PRINTF_H */ |
394 | diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h | ||
395 | index 4e93ac90c9..f9deb6f662 100644 | ||
384 | --- a/src/basic/stdio-util.h | 396 | --- a/src/basic/stdio-util.h |
385 | +++ b/src/basic/stdio-util.h | 397 | +++ b/src/basic/stdio-util.h |
386 | @@ -1,12 +1,12 @@ | 398 | @@ -1,12 +1,12 @@ |
@@ -397,6 +409,8 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
397 | 409 | ||
398 | _printf_(3, 4) | 410 | _printf_(3, 4) |
399 | static inline char *snprintf_ok(char *buf, size_t len, const char *format, ...) { | 411 | static inline char *snprintf_ok(char *buf, size_t len, const char *format, ...) { |
412 | diff --git a/src/libsystemd/sd-journal/journal-send.c b/src/libsystemd/sd-journal/journal-send.c | ||
413 | index be23b2fe75..69a2eb6404 100644 | ||
400 | --- a/src/libsystemd/sd-journal/journal-send.c | 414 | --- a/src/libsystemd/sd-journal/journal-send.c |
401 | +++ b/src/libsystemd/sd-journal/journal-send.c | 415 | +++ b/src/libsystemd/sd-journal/journal-send.c |
402 | @@ -2,7 +2,6 @@ | 416 | @@ -2,7 +2,6 @@ |
@@ -407,7 +421,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
407 | #include <stddef.h> | 421 | #include <stddef.h> |
408 | #include <sys/un.h> | 422 | #include <sys/un.h> |
409 | #include <unistd.h> | 423 | #include <unistd.h> |
410 | @@ -27,6 +26,7 @@ | 424 | @@ -28,6 +27,7 @@ |
411 | #include "stdio-util.h" | 425 | #include "stdio-util.h" |
412 | #include "string-util.h" | 426 | #include "string-util.h" |
413 | #include "tmpfile-util.h" | 427 | #include "tmpfile-util.h" |
@@ -415,3 +429,6 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
415 | 429 | ||
416 | #define SNDBUF_SIZE (8*1024*1024) | 430 | #define SNDBUF_SIZE (8*1024*1024) |
417 | 431 | ||
432 | -- | ||
433 | 2.34.1 | ||
434 | |||
diff --git a/meta/recipes-core/systemd/systemd/0011-src-basic-missing.h-check-for-missing-strndupa.patch b/meta/recipes-core/systemd/systemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch index ec451cddb7..5595b5bc23 100644 --- a/meta/recipes-core/systemd/systemd/0011-src-basic-missing.h-check-for-missing-strndupa.patch +++ b/meta/recipes-core/systemd/systemd/0003-src-basic-missing.h-check-for-missing-strndupa.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From ee5c8b494a3269edd154a0b799a03b39dba2ceb0 Mon Sep 17 00:00:00 2001 | 1 | From 87f1d38f40c5fe9cadf2b2de442473e4e5605788 Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Mon, 25 Feb 2019 14:18:21 +0800 | 3 | Date: Mon, 25 Feb 2019 14:18:21 +0800 |
4 | Subject: [PATCH] src/basic/missing.h: check for missing strndupa | 4 | Subject: [PATCH 03/22] src/basic/missing.h: check for missing strndupa |
5 | 5 | ||
6 | include missing.h for definition of strndupa | 6 | include missing.h for definition of strndupa |
7 | 7 | ||
@@ -18,6 +18,8 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
18 | [Rebased for v247] | 18 | [Rebased for v247] |
19 | Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | 19 | Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> |
20 | [Rebased for v254] | 20 | [Rebased for v254] |
21 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
22 | [Rebased for v255.1] | ||
21 | --- | 23 | --- |
22 | meson.build | 1 + | 24 | meson.build | 1 + |
23 | src/backlight/backlight.c | 1 + | 25 | src/backlight/backlight.c | 1 + |
@@ -66,16 +68,17 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
66 | src/shared/pager.c | 1 + | 68 | src/shared/pager.c | 1 + |
67 | src/socket-proxy/socket-proxyd.c | 1 + | 69 | src/socket-proxy/socket-proxyd.c | 1 + |
68 | src/test/test-hexdecoct.c | 1 + | 70 | src/test/test-hexdecoct.c | 1 + |
71 | src/udev/udev-builtin-net_id.c | 1 + | ||
69 | src/udev/udev-builtin-path_id.c | 1 + | 72 | src/udev/udev-builtin-path_id.c | 1 + |
70 | src/udev/udev-event.c | 1 + | 73 | src/udev/udev-event.c | 1 + |
71 | src/udev/udev-rules.c | 1 + | 74 | src/udev/udev-rules.c | 1 + |
72 | 50 files changed, 61 insertions(+) | 75 | 51 files changed, 62 insertions(+) |
73 | 76 | ||
74 | diff --git a/meson.build b/meson.build | 77 | diff --git a/meson.build b/meson.build |
75 | index fb96143c37..739b2f7f72 100644 | 78 | index 01fd3ffc19..61a872b753 100644 |
76 | --- a/meson.build | 79 | --- a/meson.build |
77 | +++ b/meson.build | 80 | +++ b/meson.build |
78 | @@ -595,6 +595,7 @@ foreach ident : ['secure_getenv', '__secure_getenv'] | 81 | @@ -567,6 +567,7 @@ foreach ident : ['secure_getenv', '__secure_getenv'] |
79 | endforeach | 82 | endforeach |
80 | 83 | ||
81 | foreach ident : [ | 84 | foreach ident : [ |
@@ -84,10 +87,10 @@ index fb96143c37..739b2f7f72 100644 | |||
84 | ['gettid', '''#include <sys/types.h> | 87 | ['gettid', '''#include <sys/types.h> |
85 | #include <unistd.h>'''], | 88 | #include <unistd.h>'''], |
86 | diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c | 89 | diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c |
87 | index e66477f328..2613d1e3f9 100644 | 90 | index 5ac9f904a9..99d5122dd7 100644 |
88 | --- a/src/backlight/backlight.c | 91 | --- a/src/backlight/backlight.c |
89 | +++ b/src/backlight/backlight.c | 92 | +++ b/src/backlight/backlight.c |
90 | @@ -19,6 +19,7 @@ | 93 | @@ -20,6 +20,7 @@ |
91 | #include "string-util.h" | 94 | #include "string-util.h" |
92 | #include "strv.h" | 95 | #include "strv.h" |
93 | #include "terminal-util.h" | 96 | #include "terminal-util.h" |
@@ -96,7 +99,7 @@ index e66477f328..2613d1e3f9 100644 | |||
96 | #define PCI_CLASS_GRAPHICS_CARD 0x30000 | 99 | #define PCI_CLASS_GRAPHICS_CARD 0x30000 |
97 | 100 | ||
98 | diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c | 101 | diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c |
99 | index feda596939..11b4375ed5 100644 | 102 | index 18b16ecc0e..d2be79622f 100644 |
100 | --- a/src/basic/cgroup-util.c | 103 | --- a/src/basic/cgroup-util.c |
101 | +++ b/src/basic/cgroup-util.c | 104 | +++ b/src/basic/cgroup-util.c |
102 | @@ -38,6 +38,7 @@ | 105 | @@ -38,6 +38,7 @@ |
@@ -105,10 +108,10 @@ index feda596939..11b4375ed5 100644 | |||
105 | #include "xattr-util.h" | 108 | #include "xattr-util.h" |
106 | +#include "missing_stdlib.h" | 109 | +#include "missing_stdlib.h" |
107 | 110 | ||
108 | static int cg_enumerate_items(const char *controller, const char *path, FILE **_f, const char *item) { | 111 | static int cg_enumerate_items(const char *controller, const char *path, FILE **ret, const char *item) { |
109 | _cleanup_free_ char *fs = NULL; | 112 | _cleanup_free_ char *fs = NULL; |
110 | diff --git a/src/basic/env-util.c b/src/basic/env-util.c | 113 | diff --git a/src/basic/env-util.c b/src/basic/env-util.c |
111 | index 55ac11a512..7ccb1d7887 100644 | 114 | index d3bf73385f..16b17358ca 100644 |
112 | --- a/src/basic/env-util.c | 115 | --- a/src/basic/env-util.c |
113 | +++ b/src/basic/env-util.c | 116 | +++ b/src/basic/env-util.c |
114 | @@ -19,6 +19,7 @@ | 117 | @@ -19,6 +19,7 @@ |
@@ -120,7 +123,7 @@ index 55ac11a512..7ccb1d7887 100644 | |||
120 | /* We follow bash for the character set. Different shells have different rules. */ | 123 | /* We follow bash for the character set. Different shells have different rules. */ |
121 | #define VALID_BASH_ENV_NAME_CHARS \ | 124 | #define VALID_BASH_ENV_NAME_CHARS \ |
122 | diff --git a/src/basic/log.c b/src/basic/log.c | 125 | diff --git a/src/basic/log.c b/src/basic/log.c |
123 | index fc5793139e..515218fca8 100644 | 126 | index 1470611a75..9924ec2b9a 100644 |
124 | --- a/src/basic/log.c | 127 | --- a/src/basic/log.c |
125 | +++ b/src/basic/log.c | 128 | +++ b/src/basic/log.c |
126 | @@ -40,6 +40,7 @@ | 129 | @@ -40,6 +40,7 @@ |
@@ -152,10 +155,10 @@ index 8c76f93eb2..9068bfb4f0 100644 | |||
152 | + }) | 155 | + }) |
153 | +#endif | 156 | +#endif |
154 | diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c | 157 | diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c |
155 | index 7ad19ee33b..cc1d5e1e5b 100644 | 158 | index c770e5ed32..1fd8816cd0 100644 |
156 | --- a/src/basic/mkdir.c | 159 | --- a/src/basic/mkdir.c |
157 | +++ b/src/basic/mkdir.c | 160 | +++ b/src/basic/mkdir.c |
158 | @@ -15,6 +15,7 @@ | 161 | @@ -16,6 +16,7 @@ |
159 | #include "stat-util.h" | 162 | #include "stat-util.h" |
160 | #include "stdio-util.h" | 163 | #include "stdio-util.h" |
161 | #include "user-util.h" | 164 | #include "user-util.h" |
@@ -164,7 +167,7 @@ index 7ad19ee33b..cc1d5e1e5b 100644 | |||
164 | int mkdirat_safe_internal( | 167 | int mkdirat_safe_internal( |
165 | int dir_fd, | 168 | int dir_fd, |
166 | diff --git a/src/basic/mountpoint-util.c b/src/basic/mountpoint-util.c | 169 | diff --git a/src/basic/mountpoint-util.c b/src/basic/mountpoint-util.c |
167 | index bc74fbef8f..cdb609bb84 100644 | 170 | index bf67f7e01a..409f8d8a73 100644 |
168 | --- a/src/basic/mountpoint-util.c | 171 | --- a/src/basic/mountpoint-util.c |
169 | +++ b/src/basic/mountpoint-util.c | 172 | +++ b/src/basic/mountpoint-util.c |
170 | @@ -18,6 +18,7 @@ | 173 | @@ -18,6 +18,7 @@ |
@@ -176,7 +179,7 @@ index bc74fbef8f..cdb609bb84 100644 | |||
176 | #include "nulstr-util.h" | 179 | #include "nulstr-util.h" |
177 | #include "parse-util.h" | 180 | #include "parse-util.h" |
178 | diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c | 181 | diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c |
179 | index 3445d31307..d82b4415d9 100644 | 182 | index 0430e33e40..f3728de026 100644 |
180 | --- a/src/basic/parse-util.c | 183 | --- a/src/basic/parse-util.c |
181 | +++ b/src/basic/parse-util.c | 184 | +++ b/src/basic/parse-util.c |
182 | @@ -18,6 +18,7 @@ | 185 | @@ -18,6 +18,7 @@ |
@@ -188,7 +191,7 @@ index 3445d31307..d82b4415d9 100644 | |||
188 | int parse_boolean(const char *v) { | 191 | int parse_boolean(const char *v) { |
189 | if (!v) | 192 | if (!v) |
190 | diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c | 193 | diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c |
191 | index c99e9d8786..71a917a0b0 100644 | 194 | index 4e3d59fc56..726e240df0 100644 |
192 | --- a/src/basic/path-lookup.c | 195 | --- a/src/basic/path-lookup.c |
193 | +++ b/src/basic/path-lookup.c | 196 | +++ b/src/basic/path-lookup.c |
194 | @@ -16,6 +16,7 @@ | 197 | @@ -16,6 +16,7 @@ |
@@ -212,7 +215,7 @@ index cab9d0eaea..5f6ca258e9 100644 | |||
212 | static int parse_parts_value_whole(const char *p, const char *symbol) { | 215 | static int parse_parts_value_whole(const char *p, const char *symbol) { |
213 | const char *pc, *n; | 216 | const char *pc, *n; |
214 | diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c | 217 | diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c |
215 | index eea70d8606..ae3abd8402 100644 | 218 | index 522d8de1f4..7c129dc0fc 100644 |
216 | --- a/src/basic/proc-cmdline.c | 219 | --- a/src/basic/proc-cmdline.c |
217 | +++ b/src/basic/proc-cmdline.c | 220 | +++ b/src/basic/proc-cmdline.c |
218 | @@ -16,6 +16,7 @@ | 221 | @@ -16,6 +16,7 @@ |
@@ -224,7 +227,7 @@ index eea70d8606..ae3abd8402 100644 | |||
224 | int proc_cmdline_filter_pid1_args(char **argv, char ***ret) { | 227 | int proc_cmdline_filter_pid1_args(char **argv, char ***ret) { |
225 | enum { | 228 | enum { |
226 | diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c | 229 | diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c |
227 | index bcba5a5208..64a95dd866 100644 | 230 | index d7cfcd9105..6cb0ddf575 100644 |
228 | --- a/src/basic/procfs-util.c | 231 | --- a/src/basic/procfs-util.c |
229 | +++ b/src/basic/procfs-util.c | 232 | +++ b/src/basic/procfs-util.c |
230 | @@ -12,6 +12,7 @@ | 233 | @@ -12,6 +12,7 @@ |
@@ -236,7 +239,7 @@ index bcba5a5208..64a95dd866 100644 | |||
236 | int procfs_get_pid_max(uint64_t *ret) { | 239 | int procfs_get_pid_max(uint64_t *ret) { |
237 | _cleanup_free_ char *value = NULL; | 240 | _cleanup_free_ char *value = NULL; |
238 | diff --git a/src/basic/time-util.c b/src/basic/time-util.c | 241 | diff --git a/src/basic/time-util.c b/src/basic/time-util.c |
239 | index b700f364ef..48a26bcec9 100644 | 242 | index f9014dc560..1d7840a5b5 100644 |
240 | --- a/src/basic/time-util.c | 243 | --- a/src/basic/time-util.c |
241 | +++ b/src/basic/time-util.c | 244 | +++ b/src/basic/time-util.c |
242 | @@ -27,6 +27,7 @@ | 245 | @@ -27,6 +27,7 @@ |
@@ -248,7 +251,7 @@ index b700f364ef..48a26bcec9 100644 | |||
248 | static clockid_t map_clock_id(clockid_t c) { | 251 | static clockid_t map_clock_id(clockid_t c) { |
249 | 252 | ||
250 | diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c | 253 | diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c |
251 | index 59f02b761a..7496646350 100644 | 254 | index 0c0b4f23c7..68fe5ca509 100644 |
252 | --- a/src/boot/bless-boot.c | 255 | --- a/src/boot/bless-boot.c |
253 | +++ b/src/boot/bless-boot.c | 256 | +++ b/src/boot/bless-boot.c |
254 | @@ -22,6 +22,7 @@ | 257 | @@ -22,6 +22,7 @@ |
@@ -260,22 +263,22 @@ index 59f02b761a..7496646350 100644 | |||
260 | static char **arg_path = NULL; | 263 | static char **arg_path = NULL; |
261 | 264 | ||
262 | diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c | 265 | diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c |
263 | index b5484eda78..54ed62c790 100644 | 266 | index 4237e694c0..05f9d9d9a9 100644 |
264 | --- a/src/core/dbus-cgroup.c | 267 | --- a/src/core/dbus-cgroup.c |
265 | +++ b/src/core/dbus-cgroup.c | 268 | +++ b/src/core/dbus-cgroup.c |
266 | @@ -23,6 +23,7 @@ | 269 | @@ -25,6 +25,7 @@ |
267 | #include "parse-util.h" | 270 | #include "parse-util.h" |
268 | #include "path-util.h" | 271 | #include "path-util.h" |
269 | #include "percent-util.h" | 272 | #include "percent-util.h" |
270 | +#include "missing_stdlib.h" | 273 | +#include "missing_stdlib.h" |
271 | #include "socket-util.h" | 274 | #include "socket-util.h" |
272 | 275 | ||
273 | BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", TasksMax, tasks_max_resolve); | 276 | BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", CGroupTasksMax, cgroup_tasks_max_resolve); |
274 | diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c | 277 | diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c |
275 | index f514b8fd12..4febd0d496 100644 | 278 | index 4daa1cefd3..2c77901471 100644 |
276 | --- a/src/core/dbus-execute.c | 279 | --- a/src/core/dbus-execute.c |
277 | +++ b/src/core/dbus-execute.c | 280 | +++ b/src/core/dbus-execute.c |
278 | @@ -48,6 +48,7 @@ | 281 | @@ -42,6 +42,7 @@ |
279 | #include "unit-printf.h" | 282 | #include "unit-printf.h" |
280 | #include "user-util.h" | 283 | #include "user-util.h" |
281 | #include "utf8.h" | 284 | #include "utf8.h" |
@@ -284,7 +287,7 @@ index f514b8fd12..4febd0d496 100644 | |||
284 | BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput); | 287 | BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput); |
285 | static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input, exec_input, ExecInput); | 288 | static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input, exec_input, ExecInput); |
286 | diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c | 289 | diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c |
287 | index edfa0eb69a..6fd2ec9062 100644 | 290 | index d680a64268..e59f48103e 100644 |
288 | --- a/src/core/dbus-util.c | 291 | --- a/src/core/dbus-util.c |
289 | +++ b/src/core/dbus-util.c | 292 | +++ b/src/core/dbus-util.c |
290 | @@ -9,6 +9,7 @@ | 293 | @@ -9,6 +9,7 @@ |
@@ -296,19 +299,19 @@ index edfa0eb69a..6fd2ec9062 100644 | |||
296 | int bus_property_get_triggered_unit( | 299 | int bus_property_get_triggered_unit( |
297 | sd_bus *bus, | 300 | sd_bus *bus, |
298 | diff --git a/src/core/execute.c b/src/core/execute.c | 301 | diff --git a/src/core/execute.c b/src/core/execute.c |
299 | index 853e87450f..8ef76de9ab 100644 | 302 | index ef0bf88687..bd3da0c401 100644 |
300 | --- a/src/core/execute.c | 303 | --- a/src/core/execute.c |
301 | +++ b/src/core/execute.c | 304 | +++ b/src/core/execute.c |
302 | @@ -113,6 +113,7 @@ | 305 | @@ -72,6 +72,7 @@ |
303 | #include "unit-serialize.h" | 306 | #include "unit-serialize.h" |
304 | #include "user-util.h" | 307 | #include "user-util.h" |
305 | #include "utmp-wtmp.h" | 308 | #include "utmp-wtmp.h" |
306 | +#include "missing_stdlib.h" | 309 | +#include "missing_stdlib.h" |
307 | 310 | ||
308 | #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC) | 311 | static bool is_terminal_input(ExecInput i) { |
309 | #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC) | 312 | return IN_SET(i, |
310 | diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c | 313 | diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c |
311 | index e843743777..e149807492 100644 | 314 | index b8e3f7aadd..8ce8ca68d8 100644 |
312 | --- a/src/core/kmod-setup.c | 315 | --- a/src/core/kmod-setup.c |
313 | +++ b/src/core/kmod-setup.c | 316 | +++ b/src/core/kmod-setup.c |
314 | @@ -13,6 +13,7 @@ | 317 | @@ -13,6 +13,7 @@ |
@@ -320,7 +323,7 @@ index e843743777..e149807492 100644 | |||
320 | #if HAVE_KMOD | 323 | #if HAVE_KMOD |
321 | #include "module-util.h" | 324 | #include "module-util.h" |
322 | diff --git a/src/core/service.c b/src/core/service.c | 325 | diff --git a/src/core/service.c b/src/core/service.c |
323 | index 9ad3c3d995..b112d64919 100644 | 326 | index b9eb40c555..268fe7573b 100644 |
324 | --- a/src/core/service.c | 327 | --- a/src/core/service.c |
325 | +++ b/src/core/service.c | 328 | +++ b/src/core/service.c |
326 | @@ -45,6 +45,7 @@ | 329 | @@ -45,6 +45,7 @@ |
@@ -332,7 +335,7 @@ index 9ad3c3d995..b112d64919 100644 | |||
332 | #define service_spawn(...) service_spawn_internal(__func__, __VA_ARGS__) | 335 | #define service_spawn(...) service_spawn_internal(__func__, __VA_ARGS__) |
333 | 336 | ||
334 | diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c | 337 | diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c |
335 | index c6e201ecf2..ab034475e2 100644 | 338 | index 7e0c98cb7d..978a7f5874 100644 |
336 | --- a/src/coredump/coredump-vacuum.c | 339 | --- a/src/coredump/coredump-vacuum.c |
337 | +++ b/src/coredump/coredump-vacuum.c | 340 | +++ b/src/coredump/coredump-vacuum.c |
338 | @@ -17,6 +17,7 @@ | 341 | @@ -17,6 +17,7 @@ |
@@ -344,7 +347,7 @@ index c6e201ecf2..ab034475e2 100644 | |||
344 | #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL) /* 1 MiB */ | 347 | #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL) /* 1 MiB */ |
345 | #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */ | 348 | #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */ |
346 | diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c | 349 | diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c |
347 | index efc553b698..acea922311 100644 | 350 | index 016f3baa7f..b1def81313 100644 |
348 | --- a/src/fstab-generator/fstab-generator.c | 351 | --- a/src/fstab-generator/fstab-generator.c |
349 | +++ b/src/fstab-generator/fstab-generator.c | 352 | +++ b/src/fstab-generator/fstab-generator.c |
350 | @@ -37,6 +37,7 @@ | 353 | @@ -37,6 +37,7 @@ |
@@ -356,10 +359,10 @@ index efc553b698..acea922311 100644 | |||
356 | typedef enum MountPointFlags { | 359 | typedef enum MountPointFlags { |
357 | MOUNT_NOAUTO = 1 << 0, | 360 | MOUNT_NOAUTO = 1 << 0, |
358 | diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c | 361 | diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c |
359 | index 7df264fb53..9463a0e9fb 100644 | 362 | index da0f20d3ce..f22ce41908 100644 |
360 | --- a/src/journal-remote/journal-remote-main.c | 363 | --- a/src/journal-remote/journal-remote-main.c |
361 | +++ b/src/journal-remote/journal-remote-main.c | 364 | +++ b/src/journal-remote/journal-remote-main.c |
362 | @@ -26,6 +26,7 @@ | 365 | @@ -27,6 +27,7 @@ |
363 | #include "stat-util.h" | 366 | #include "stat-util.h" |
364 | #include "string-table.h" | 367 | #include "string-table.h" |
365 | #include "strv.h" | 368 | #include "strv.h" |
@@ -368,7 +371,7 @@ index 7df264fb53..9463a0e9fb 100644 | |||
368 | #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" | 371 | #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" |
369 | #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" | 372 | #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" |
370 | diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c | 373 | diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c |
371 | index da0fac548e..c1c043e0e0 100644 | 374 | index 7f3dcd56a4..41b7cbaaf1 100644 |
372 | --- a/src/journal/journalctl.c | 375 | --- a/src/journal/journalctl.c |
373 | +++ b/src/journal/journalctl.c | 376 | +++ b/src/journal/journalctl.c |
374 | @@ -77,6 +77,7 @@ | 377 | @@ -77,6 +77,7 @@ |
@@ -380,7 +383,7 @@ index da0fac548e..c1c043e0e0 100644 | |||
380 | #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) | 383 | #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) |
381 | #define PROCESS_INOTIFY_INTERVAL 1024 /* Every 1,024 messages processed */ | 384 | #define PROCESS_INOTIFY_INTERVAL 1024 /* Every 1,024 messages processed */ |
382 | diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c | 385 | diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c |
383 | index 9719f97c02..75decd9834 100644 | 386 | index ff0228081f..9066fcb133 100644 |
384 | --- a/src/libsystemd/sd-bus/bus-message.c | 387 | --- a/src/libsystemd/sd-bus/bus-message.c |
385 | +++ b/src/libsystemd/sd-bus/bus-message.c | 388 | +++ b/src/libsystemd/sd-bus/bus-message.c |
386 | @@ -19,6 +19,7 @@ | 389 | @@ -19,6 +19,7 @@ |
@@ -392,7 +395,7 @@ index 9719f97c02..75decd9834 100644 | |||
392 | static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); | 395 | static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); |
393 | static int message_parse_fields(sd_bus_message *m); | 396 | static int message_parse_fields(sd_bus_message *m); |
394 | diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c | 397 | diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c |
395 | index 2ad7a9993d..bba72f99f4 100644 | 398 | index c25c40ff37..57a5da704f 100644 |
396 | --- a/src/libsystemd/sd-bus/bus-objects.c | 399 | --- a/src/libsystemd/sd-bus/bus-objects.c |
397 | +++ b/src/libsystemd/sd-bus/bus-objects.c | 400 | +++ b/src/libsystemd/sd-bus/bus-objects.c |
398 | @@ -11,6 +11,7 @@ | 401 | @@ -11,6 +11,7 @@ |
@@ -404,10 +407,10 @@ index 2ad7a9993d..bba72f99f4 100644 | |||
404 | static int node_vtable_get_userdata( | 407 | static int node_vtable_get_userdata( |
405 | sd_bus *bus, | 408 | sd_bus *bus, |
406 | diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c | 409 | diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c |
407 | index 64037e4fe0..9b9ce0aaa9 100644 | 410 | index 3c59d0d615..746922d46f 100644 |
408 | --- a/src/libsystemd/sd-bus/bus-socket.c | 411 | --- a/src/libsystemd/sd-bus/bus-socket.c |
409 | +++ b/src/libsystemd/sd-bus/bus-socket.c | 412 | +++ b/src/libsystemd/sd-bus/bus-socket.c |
410 | @@ -28,6 +28,7 @@ | 413 | @@ -29,6 +29,7 @@ |
411 | #include "string-util.h" | 414 | #include "string-util.h" |
412 | #include "user-util.h" | 415 | #include "user-util.h" |
413 | #include "utf8.h" | 416 | #include "utf8.h" |
@@ -416,7 +419,7 @@ index 64037e4fe0..9b9ce0aaa9 100644 | |||
416 | #define SNDBUF_SIZE (8*1024*1024) | 419 | #define SNDBUF_SIZE (8*1024*1024) |
417 | 420 | ||
418 | diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c | 421 | diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c |
419 | index f6a5e4aa06..b36faa79a3 100644 | 422 | index 4a0259f8bb..aaa90d2223 100644 |
420 | --- a/src/libsystemd/sd-bus/sd-bus.c | 423 | --- a/src/libsystemd/sd-bus/sd-bus.c |
421 | +++ b/src/libsystemd/sd-bus/sd-bus.c | 424 | +++ b/src/libsystemd/sd-bus/sd-bus.c |
422 | @@ -46,6 +46,7 @@ | 425 | @@ -46,6 +46,7 @@ |
@@ -428,19 +431,19 @@ index f6a5e4aa06..b36faa79a3 100644 | |||
428 | #define log_debug_bus_message(m) \ | 431 | #define log_debug_bus_message(m) \ |
429 | do { \ | 432 | do { \ |
430 | diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c | 433 | diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c |
431 | index 1eb6edd329..d434a3c178 100644 | 434 | index d988588de0..458df8df9a 100644 |
432 | --- a/src/libsystemd/sd-bus/test-bus-benchmark.c | 435 | --- a/src/libsystemd/sd-bus/test-bus-benchmark.c |
433 | +++ b/src/libsystemd/sd-bus/test-bus-benchmark.c | 436 | +++ b/src/libsystemd/sd-bus/test-bus-benchmark.c |
434 | @@ -13,6 +13,7 @@ | 437 | @@ -14,6 +14,7 @@ |
435 | #include "missing_resource.h" | ||
436 | #include "string-util.h" | 438 | #include "string-util.h" |
439 | #include "tests.h" | ||
437 | #include "time-util.h" | 440 | #include "time-util.h" |
438 | +#include "missing_stdlib.h" | 441 | +#include "missing_stdlib.h" |
439 | 442 | ||
440 | #define MAX_SIZE (2*1024*1024) | 443 | #define MAX_SIZE (2*1024*1024) |
441 | 444 | ||
442 | diff --git a/src/libsystemd/sd-journal/sd-journal.c b/src/libsystemd/sd-journal/sd-journal.c | 445 | diff --git a/src/libsystemd/sd-journal/sd-journal.c b/src/libsystemd/sd-journal/sd-journal.c |
443 | index 9947947ef2..8dc6f93159 100644 | 446 | index 6b9ff0a4ed..4a5027ad0f 100644 |
444 | --- a/src/libsystemd/sd-journal/sd-journal.c | 447 | --- a/src/libsystemd/sd-journal/sd-journal.c |
445 | +++ b/src/libsystemd/sd-journal/sd-journal.c | 448 | +++ b/src/libsystemd/sd-journal/sd-journal.c |
446 | @@ -44,6 +44,7 @@ | 449 | @@ -44,6 +44,7 @@ |
@@ -452,19 +455,19 @@ index 9947947ef2..8dc6f93159 100644 | |||
452 | #define JOURNAL_FILES_RECHECK_USEC (2 * USEC_PER_SEC) | 455 | #define JOURNAL_FILES_RECHECK_USEC (2 * USEC_PER_SEC) |
453 | 456 | ||
454 | diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c | 457 | diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c |
455 | index ba2fca32c6..e1f9caa13b 100644 | 458 | index b8da266e27..4bb8dd9496 100644 |
456 | --- a/src/login/pam_systemd.c | 459 | --- a/src/login/pam_systemd.c |
457 | +++ b/src/login/pam_systemd.c | 460 | +++ b/src/login/pam_systemd.c |
458 | @@ -34,6 +34,7 @@ | 461 | @@ -35,6 +35,7 @@ |
459 | #include "locale-util.h" | ||
460 | #include "login-util.h" | 462 | #include "login-util.h" |
461 | #include "macro.h" | 463 | #include "macro.h" |
464 | #include "missing_syscall.h" | ||
462 | +#include "missing_stdlib.h" | 465 | +#include "missing_stdlib.h" |
463 | #include "pam-util.h" | 466 | #include "pam-util.h" |
464 | #include "parse-util.h" | 467 | #include "parse-util.h" |
465 | #include "path-util.h" | 468 | #include "path-util.h" |
466 | diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c | 469 | diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c |
467 | index 1090934bfc..69a77f66e2 100644 | 470 | index 48527a2c73..9777fe0561 100644 |
468 | --- a/src/network/generator/network-generator.c | 471 | --- a/src/network/generator/network-generator.c |
469 | +++ b/src/network/generator/network-generator.c | 472 | +++ b/src/network/generator/network-generator.c |
470 | @@ -14,6 +14,7 @@ | 473 | @@ -14,6 +14,7 @@ |
@@ -476,7 +479,7 @@ index 1090934bfc..69a77f66e2 100644 | |||
476 | /* | 479 | /* |
477 | # .network | 480 | # .network |
478 | diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c | 481 | diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c |
479 | index 05bde1c756..aa29587868 100644 | 482 | index 161b1c1c70..ba1c459f78 100644 |
480 | --- a/src/nspawn/nspawn-settings.c | 483 | --- a/src/nspawn/nspawn-settings.c |
481 | +++ b/src/nspawn/nspawn-settings.c | 484 | +++ b/src/nspawn/nspawn-settings.c |
482 | @@ -16,6 +16,7 @@ | 485 | @@ -16,6 +16,7 @@ |
@@ -500,7 +503,7 @@ index c64e79bdff..eda26b0b9a 100644 | |||
500 | static void setup_logging_once(void) { | 503 | static void setup_logging_once(void) { |
501 | static pthread_once_t once = PTHREAD_ONCE_INIT; | 504 | static pthread_once_t once = PTHREAD_ONCE_INIT; |
502 | diff --git a/src/portable/portable.c b/src/portable/portable.c | 505 | diff --git a/src/portable/portable.c b/src/portable/portable.c |
503 | index 7811833fac..c6414da91c 100644 | 506 | index d4b448a627..bb26623565 100644 |
504 | --- a/src/portable/portable.c | 507 | --- a/src/portable/portable.c |
505 | +++ b/src/portable/portable.c | 508 | +++ b/src/portable/portable.c |
506 | @@ -40,6 +40,7 @@ | 509 | @@ -40,6 +40,7 @@ |
@@ -512,7 +515,7 @@ index 7811833fac..c6414da91c 100644 | |||
512 | /* Markers used in the first line of our 20-portable.conf unit file drop-in to determine, that a) the unit file was | 515 | /* Markers used in the first line of our 20-portable.conf unit file drop-in to determine, that a) the unit file was |
513 | * dropped there by the portable service logic and b) for which image it was dropped there. */ | 516 | * dropped there by the portable service logic and b) for which image it was dropped there. */ |
514 | diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c | 517 | diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c |
515 | index 2638e985fb..82c903fd66 100644 | 518 | index afa537f160..32ccee4ae5 100644 |
516 | --- a/src/resolve/resolvectl.c | 519 | --- a/src/resolve/resolvectl.c |
517 | +++ b/src/resolve/resolvectl.c | 520 | +++ b/src/resolve/resolvectl.c |
518 | @@ -48,6 +48,7 @@ | 521 | @@ -48,6 +48,7 @@ |
@@ -524,7 +527,7 @@ index 2638e985fb..82c903fd66 100644 | |||
524 | static int arg_family = AF_UNSPEC; | 527 | static int arg_family = AF_UNSPEC; |
525 | static int arg_ifindex = 0; | 528 | static int arg_ifindex = 0; |
526 | diff --git a/src/shared/bus-get-properties.c b/src/shared/bus-get-properties.c | 529 | diff --git a/src/shared/bus-get-properties.c b/src/shared/bus-get-properties.c |
527 | index 8b4f66b22e..5926e4c61b 100644 | 530 | index 53e5d6b99f..851ecd5644 100644 |
528 | --- a/src/shared/bus-get-properties.c | 531 | --- a/src/shared/bus-get-properties.c |
529 | +++ b/src/shared/bus-get-properties.c | 532 | +++ b/src/shared/bus-get-properties.c |
530 | @@ -4,6 +4,7 @@ | 533 | @@ -4,6 +4,7 @@ |
@@ -548,10 +551,10 @@ index 8b462b5627..183ce1c18e 100644 | |||
548 | struct CGroupInfo { | 551 | struct CGroupInfo { |
549 | char *cgroup_path; | 552 | char *cgroup_path; |
550 | diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c | 553 | diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c |
551 | index 1e95e36678..640ee031d5 100644 | 554 | index 4ee9706847..30c8084847 100644 |
552 | --- a/src/shared/bus-unit-util.c | 555 | --- a/src/shared/bus-unit-util.c |
553 | +++ b/src/shared/bus-unit-util.c | 556 | +++ b/src/shared/bus-unit-util.c |
554 | @@ -51,6 +51,7 @@ | 557 | @@ -50,6 +50,7 @@ |
555 | #include "unit-def.h" | 558 | #include "unit-def.h" |
556 | #include "user-util.h" | 559 | #include "user-util.h" |
557 | #include "utf8.h" | 560 | #include "utf8.h" |
@@ -560,7 +563,7 @@ index 1e95e36678..640ee031d5 100644 | |||
560 | int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) { | 563 | int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) { |
561 | assert(message); | 564 | assert(message); |
562 | diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c | 565 | diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c |
563 | index d09ec5148d..f38a8f7cc1 100644 | 566 | index 4123152d93..74f148c8b4 100644 |
564 | --- a/src/shared/bus-util.c | 567 | --- a/src/shared/bus-util.c |
565 | +++ b/src/shared/bus-util.c | 568 | +++ b/src/shared/bus-util.c |
566 | @@ -24,6 +24,7 @@ | 569 | @@ -24,6 +24,7 @@ |
@@ -572,7 +575,7 @@ index d09ec5148d..f38a8f7cc1 100644 | |||
572 | static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { | 575 | static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { |
573 | sd_event *e = ASSERT_PTR(userdata); | 576 | sd_event *e = ASSERT_PTR(userdata); |
574 | diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c | 577 | diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c |
575 | index 620b156563..5ee5b09186 100644 | 578 | index b41c9b06ca..e69050a507 100644 |
576 | --- a/src/shared/dns-domain.c | 579 | --- a/src/shared/dns-domain.c |
577 | +++ b/src/shared/dns-domain.c | 580 | +++ b/src/shared/dns-domain.c |
578 | @@ -18,6 +18,7 @@ | 581 | @@ -18,6 +18,7 @@ |
@@ -584,7 +587,7 @@ index 620b156563..5ee5b09186 100644 | |||
584 | int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) { | 587 | int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) { |
585 | const char *n; | 588 | const char *n; |
586 | diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c | 589 | diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c |
587 | index d9eabec886..534c6cf7e3 100644 | 590 | index 83e9834bbf..74eaae6f5e 100644 |
588 | --- a/src/shared/journal-importer.c | 591 | --- a/src/shared/journal-importer.c |
589 | +++ b/src/shared/journal-importer.c | 592 | +++ b/src/shared/journal-importer.c |
590 | @@ -16,6 +16,7 @@ | 593 | @@ -16,6 +16,7 @@ |
@@ -596,7 +599,7 @@ index d9eabec886..534c6cf7e3 100644 | |||
596 | enum { | 599 | enum { |
597 | IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */ | 600 | IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */ |
598 | diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c | 601 | diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c |
599 | index b72e516c8d..6e832b74c3 100644 | 602 | index a5d04003bd..10392c132d 100644 |
600 | --- a/src/shared/logs-show.c | 603 | --- a/src/shared/logs-show.c |
601 | +++ b/src/shared/logs-show.c | 604 | +++ b/src/shared/logs-show.c |
602 | @@ -41,6 +41,7 @@ | 605 | @@ -41,6 +41,7 @@ |
@@ -608,7 +611,7 @@ index b72e516c8d..6e832b74c3 100644 | |||
608 | /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */ | 611 | /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */ |
609 | #define PRINT_LINE_THRESHOLD 3 | 612 | #define PRINT_LINE_THRESHOLD 3 |
610 | diff --git a/src/shared/pager.c b/src/shared/pager.c | 613 | diff --git a/src/shared/pager.c b/src/shared/pager.c |
611 | index 6ed35a3ca9..99d9d36140 100644 | 614 | index 19deefab56..6b6d0af1a0 100644 |
612 | --- a/src/shared/pager.c | 615 | --- a/src/shared/pager.c |
613 | +++ b/src/shared/pager.c | 616 | +++ b/src/shared/pager.c |
614 | @@ -25,6 +25,7 @@ | 617 | @@ -25,6 +25,7 @@ |
@@ -620,7 +623,7 @@ index 6ed35a3ca9..99d9d36140 100644 | |||
620 | static pid_t pager_pid = 0; | 623 | static pid_t pager_pid = 0; |
621 | 624 | ||
622 | diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c | 625 | diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c |
623 | index 821049e667..08a5bdae3d 100644 | 626 | index 287fd6c181..8f8d5493da 100644 |
624 | --- a/src/socket-proxy/socket-proxyd.c | 627 | --- a/src/socket-proxy/socket-proxyd.c |
625 | +++ b/src/socket-proxy/socket-proxyd.c | 628 | +++ b/src/socket-proxy/socket-proxyd.c |
626 | @@ -27,6 +27,7 @@ | 629 | @@ -27,6 +27,7 @@ |
@@ -632,7 +635,7 @@ index 821049e667..08a5bdae3d 100644 | |||
632 | #define BUFFER_SIZE (256 * 1024) | 635 | #define BUFFER_SIZE (256 * 1024) |
633 | 636 | ||
634 | diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c | 637 | diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c |
635 | index 9d71db6ae1..a9938c1e6e 100644 | 638 | index f884008660..987e180697 100644 |
636 | --- a/src/test/test-hexdecoct.c | 639 | --- a/src/test/test-hexdecoct.c |
637 | +++ b/src/test/test-hexdecoct.c | 640 | +++ b/src/test/test-hexdecoct.c |
638 | @@ -7,6 +7,7 @@ | 641 | @@ -7,6 +7,7 @@ |
@@ -643,8 +646,20 @@ index 9d71db6ae1..a9938c1e6e 100644 | |||
643 | #include "tests.h" | 646 | #include "tests.h" |
644 | 647 | ||
645 | TEST(hexchar) { | 648 | TEST(hexchar) { |
649 | diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c | ||
650 | index 91b40088f4..f528a46b8e 100644 | ||
651 | --- a/src/udev/udev-builtin-net_id.c | ||
652 | +++ b/src/udev/udev-builtin-net_id.c | ||
653 | @@ -39,6 +39,7 @@ | ||
654 | #include "strv.h" | ||
655 | #include "strxcpyx.h" | ||
656 | #include "udev-builtin.h" | ||
657 | +#include "missing_stdlib.h" | ||
658 | |||
659 | #define ONBOARD_14BIT_INDEX_MAX ((1U << 14) - 1) | ||
660 | #define ONBOARD_16BIT_INDEX_MAX ((1U << 16) - 1) | ||
646 | diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c | 661 | diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c |
647 | index 8e4d57ee72..6b4555b4d5 100644 | 662 | index 467c9a6ad3..f74dae60af 100644 |
648 | --- a/src/udev/udev-builtin-path_id.c | 663 | --- a/src/udev/udev-builtin-path_id.c |
649 | +++ b/src/udev/udev-builtin-path_id.c | 664 | +++ b/src/udev/udev-builtin-path_id.c |
650 | @@ -24,6 +24,7 @@ | 665 | @@ -24,6 +24,7 @@ |
@@ -656,22 +671,22 @@ index 8e4d57ee72..6b4555b4d5 100644 | |||
656 | _printf_(2,3) | 671 | _printf_(2,3) |
657 | static void path_prepend(char **path, const char *fmt, ...) { | 672 | static void path_prepend(char **path, const char *fmt, ...) { |
658 | diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c | 673 | diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c |
659 | index ec4ad30824..bc40303a46 100644 | 674 | index ed22c8b679..19ebe20237 100644 |
660 | --- a/src/udev/udev-event.c | 675 | --- a/src/udev/udev-event.c |
661 | +++ b/src/udev/udev-event.c | 676 | +++ b/src/udev/udev-event.c |
662 | @@ -34,6 +34,7 @@ | 677 | @@ -16,6 +16,7 @@ |
663 | #include "udev-util.h" | 678 | #include "udev-util.h" |
664 | #include "udev-watch.h" | 679 | #include "udev-watch.h" |
665 | #include "user-util.h" | 680 | #include "user-util.h" |
666 | +#include "missing_stdlib.h" | 681 | +#include "missing_stdlib.h" |
667 | 682 | ||
668 | typedef struct Spawn { | 683 | UdevEvent *udev_event_new(sd_device *dev, usec_t exec_delay_usec, sd_netlink *rtnl, int log_level) { |
669 | sd_device *device; | 684 | UdevEvent *event; |
670 | diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c | 685 | diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c |
671 | index 5bd09a64d1..0ce79f815c 100644 | 686 | index 5f12002394..febe345b4c 100644 |
672 | --- a/src/udev/udev-rules.c | 687 | --- a/src/udev/udev-rules.c |
673 | +++ b/src/udev/udev-rules.c | 688 | +++ b/src/udev/udev-rules.c |
674 | @@ -35,6 +35,7 @@ | 689 | @@ -41,6 +41,7 @@ |
675 | #include "udev-util.h" | 690 | #include "udev-util.h" |
676 | #include "user-util.h" | 691 | #include "user-util.h" |
677 | #include "virt.h" | 692 | #include "virt.h" |
@@ -680,5 +695,5 @@ index 5bd09a64d1..0ce79f815c 100644 | |||
680 | #define RULES_DIRS ((const char* const*) CONF_PATHS_STRV("udev/rules.d")) | 695 | #define RULES_DIRS ((const char* const*) CONF_PATHS_STRV("udev/rules.d")) |
681 | 696 | ||
682 | -- | 697 | -- |
683 | 2.39.2 | 698 | 2.34.1 |
684 | 699 | ||
diff --git a/meta/recipes-core/systemd/systemd/0012-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch b/meta/recipes-core/systemd/systemd/0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch index 0d69e8e9cd..15877bea88 100644 --- a/meta/recipes-core/systemd/systemd/0012-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch +++ b/meta/recipes-core/systemd/systemd/0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch | |||
@@ -1,7 +1,8 @@ | |||
1 | From 747ff78ecda6afe01c7eab4d7c27aea6af810c86 Mon Sep 17 00:00:00 2001 | 1 | From 5325ab5813617f35f03806ec420829dde7104387 Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Mon, 25 Feb 2019 14:56:21 +0800 | 3 | Date: Mon, 25 Feb 2019 14:56:21 +0800 |
4 | Subject: [PATCH] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not defined | 4 | Subject: [PATCH 04/22] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not |
5 | defined | ||
5 | 6 | ||
6 | If the standard library doesn't provide brace | 7 | If the standard library doesn't provide brace |
7 | expansion users just won't get it. | 8 | expansion users just won't get it. |
@@ -23,7 +24,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
23 | 3 files changed, 38 insertions(+) | 24 | 3 files changed, 38 insertions(+) |
24 | 25 | ||
25 | diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c | 26 | diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c |
26 | index fd60a6eda2..c73edc41ea 100644 | 27 | index 802ca8c655..23818a67c6 100644 |
27 | --- a/src/basic/glob-util.c | 28 | --- a/src/basic/glob-util.c |
28 | +++ b/src/basic/glob-util.c | 29 | +++ b/src/basic/glob-util.c |
29 | @@ -12,6 +12,12 @@ | 30 | @@ -12,6 +12,12 @@ |
@@ -114,7 +115,7 @@ index 9b3e73cce0..3790ba3be5 100644 | |||
114 | 115 | ||
115 | (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL); | 116 | (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL); |
116 | diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c | 117 | diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c |
117 | index 458aed7054..2cf24b38c0 100644 | 118 | index 230ec09b97..2cc5f391d7 100644 |
118 | --- a/src/tmpfiles/tmpfiles.c | 119 | --- a/src/tmpfiles/tmpfiles.c |
119 | +++ b/src/tmpfiles/tmpfiles.c | 120 | +++ b/src/tmpfiles/tmpfiles.c |
120 | @@ -73,6 +73,12 @@ | 121 | @@ -73,6 +73,12 @@ |
@@ -130,9 +131,9 @@ index 458aed7054..2cf24b38c0 100644 | |||
130 | /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates | 131 | /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates |
131 | * them in the file system. This is intended to be used to create | 132 | * them in the file system. This is intended to be used to create |
132 | * properly owned directories beneath /tmp, /var/tmp, /run, which are | 133 | * properly owned directories beneath /tmp, /var/tmp, /run, which are |
133 | @@ -2355,7 +2361,9 @@ finish: | 134 | @@ -2434,7 +2440,9 @@ finish: |
134 | 135 | ||
135 | static int glob_item(Item *i, action_t action) { | 136 | static int glob_item(Context *c, Item *i, action_t action) { |
136 | _cleanup_globfree_ glob_t g = { | 137 | _cleanup_globfree_ glob_t g = { |
137 | +#ifdef GLOB_ALTDIRFUNC | 138 | +#ifdef GLOB_ALTDIRFUNC |
138 | .gl_opendir = (void *(*)(const char *)) opendir_nomod, | 139 | .gl_opendir = (void *(*)(const char *)) opendir_nomod, |
@@ -140,9 +141,9 @@ index 458aed7054..2cf24b38c0 100644 | |||
140 | }; | 141 | }; |
141 | int r = 0, k; | 142 | int r = 0, k; |
142 | 143 | ||
143 | @@ -2375,7 +2383,9 @@ static int glob_item(Item *i, action_t action) { | 144 | @@ -2461,7 +2469,9 @@ static int glob_item_recursively( |
145 | fdaction_t action) { | ||
144 | 146 | ||
145 | static int glob_item_recursively(Item *i, fdaction_t action) { | ||
146 | _cleanup_globfree_ glob_t g = { | 147 | _cleanup_globfree_ glob_t g = { |
147 | +#ifdef GLOB_ALTDIRFUNC | 148 | +#ifdef GLOB_ALTDIRFUNC |
148 | .gl_opendir = (void *(*)(const char *)) opendir_nomod, | 149 | .gl_opendir = (void *(*)(const char *)) opendir_nomod, |
@@ -151,5 +152,5 @@ index 458aed7054..2cf24b38c0 100644 | |||
151 | int r = 0, k; | 152 | int r = 0, k; |
152 | 153 | ||
153 | -- | 154 | -- |
154 | 2.39.2 | 155 | 2.34.1 |
155 | 156 | ||
diff --git a/meta/recipes-core/systemd/systemd/0013-add-missing-FTW_-macros-for-musl.patch b/meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch index d6aaadc006..a1dfca22cd 100644 --- a/meta/recipes-core/systemd/systemd/0013-add-missing-FTW_-macros-for-musl.patch +++ b/meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From efd7b41cf270c7b07ee3b9aec0fedd8e52dd422f Mon Sep 17 00:00:00 2001 | 1 | From dad7f897c0de654fa5592fda3e90f874639849f9 Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Mon, 25 Feb 2019 15:00:06 +0800 | 3 | Date: Mon, 25 Feb 2019 15:00:06 +0800 |
4 | Subject: [PATCH] add missing FTW_ macros for musl | 4 | Subject: [PATCH 05/22] add missing FTW_ macros for musl |
5 | 5 | ||
6 | This is to avoid build failures like below for musl. | 6 | This is to avoid build failures like below for musl. |
7 | 7 | ||
@@ -28,10 +28,10 @@ index 6c0456349d..73a5b90e3c 100644 | |||
28 | +#define FTW_CONTINUE 0 | 28 | +#define FTW_CONTINUE 0 |
29 | +#endif | 29 | +#endif |
30 | diff --git a/src/test/test-recurse-dir.c b/src/test/test-recurse-dir.c | 30 | diff --git a/src/test/test-recurse-dir.c b/src/test/test-recurse-dir.c |
31 | index 2c2120b136..bc60a178a2 100644 | 31 | index 8684d064ec..70fc2b5376 100644 |
32 | --- a/src/test/test-recurse-dir.c | 32 | --- a/src/test/test-recurse-dir.c |
33 | +++ b/src/test/test-recurse-dir.c | 33 | +++ b/src/test/test-recurse-dir.c |
34 | @@ -6,6 +6,7 @@ | 34 | @@ -8,6 +8,7 @@ |
35 | #include "recurse-dir.h" | 35 | #include "recurse-dir.h" |
36 | #include "strv.h" | 36 | #include "strv.h" |
37 | #include "tests.h" | 37 | #include "tests.h" |
@@ -40,5 +40,5 @@ index 2c2120b136..bc60a178a2 100644 | |||
40 | static char **list_nftw = NULL; | 40 | static char **list_nftw = NULL; |
41 | 41 | ||
42 | -- | 42 | -- |
43 | 2.39.2 | 43 | 2.34.1 |
44 | 44 | ||
diff --git a/meta/recipes-core/systemd/systemd/0014-Use-uintmax_t-for-handling-rlim_t.patch b/meta/recipes-core/systemd/systemd/0006-Use-uintmax_t-for-handling-rlim_t.patch index 2071f4fb20..4be14b72ec 100644 --- a/meta/recipes-core/systemd/systemd/0014-Use-uintmax_t-for-handling-rlim_t.patch +++ b/meta/recipes-core/systemd/systemd/0006-Use-uintmax_t-for-handling-rlim_t.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 60f7d2c62bc3718023df93c01688d3ee1625d64d Mon Sep 17 00:00:00 2001 | 1 | From 96e975a2412a20e5f80bd3ab144057d275eb8597 Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Mon, 25 Feb 2019 15:12:41 +0800 | 3 | Date: Mon, 25 Feb 2019 15:12:41 +0800 |
4 | Subject: [PATCH] Use uintmax_t for handling rlim_t | 4 | Subject: [PATCH 06/22] Use uintmax_t for handling rlim_t |
5 | 5 | ||
6 | PRIu{32,64} is not right format to represent rlim_t type | 6 | PRIu{32,64} is not right format to represent rlim_t type |
7 | therefore use %ju and typecast the rlim_t variables to | 7 | therefore use %ju and typecast the rlim_t variables to |
@@ -26,9 +26,11 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
26 | src/core/execute.c | 4 ++-- | 26 | src/core/execute.c | 4 ++-- |
27 | 3 files changed, 9 insertions(+), 15 deletions(-) | 27 | 3 files changed, 9 insertions(+), 15 deletions(-) |
28 | 28 | ||
29 | diff --git a/src/basic/format-util.h b/src/basic/format-util.h | ||
30 | index 8719df3e29..9becc96066 100644 | ||
29 | --- a/src/basic/format-util.h | 31 | --- a/src/basic/format-util.h |
30 | +++ b/src/basic/format-util.h | 32 | +++ b/src/basic/format-util.h |
31 | @@ -34,13 +34,7 @@ assert_cc(sizeof(gid_t) == sizeof(uint32 | 33 | @@ -34,13 +34,7 @@ assert_cc(sizeof(gid_t) == sizeof(uint32_t)); |
32 | # error Unknown timex member size | 34 | # error Unknown timex member size |
33 | #endif | 35 | #endif |
34 | 36 | ||
@@ -43,9 +45,11 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
43 | 45 | ||
44 | #if SIZEOF_DEV_T == 8 | 46 | #if SIZEOF_DEV_T == 8 |
45 | # define DEV_FMT "%" PRIu64 | 47 | # define DEV_FMT "%" PRIu64 |
48 | diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c | ||
49 | index c1f0b2b974..61c5412582 100644 | ||
46 | --- a/src/basic/rlimit-util.c | 50 | --- a/src/basic/rlimit-util.c |
47 | +++ b/src/basic/rlimit-util.c | 51 | +++ b/src/basic/rlimit-util.c |
48 | @@ -44,7 +44,7 @@ int setrlimit_closest(int resource, cons | 52 | @@ -44,7 +44,7 @@ int setrlimit_closest(int resource, const struct rlimit *rlim) { |
49 | fixed.rlim_max == highest.rlim_max) | 53 | fixed.rlim_max == highest.rlim_max) |
50 | return 0; | 54 | return 0; |
51 | 55 | ||
@@ -54,7 +58,7 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
54 | 58 | ||
55 | return RET_NERRNO(setrlimit(resource, &fixed)); | 59 | return RET_NERRNO(setrlimit(resource, &fixed)); |
56 | } | 60 | } |
57 | @@ -307,13 +307,13 @@ int rlimit_format(const struct rlimit *r | 61 | @@ -307,13 +307,13 @@ int rlimit_format(const struct rlimit *rl, char **ret) { |
58 | if (rl->rlim_cur >= RLIM_INFINITY && rl->rlim_max >= RLIM_INFINITY) | 62 | if (rl->rlim_cur >= RLIM_INFINITY && rl->rlim_max >= RLIM_INFINITY) |
59 | r = free_and_strdup(&s, "infinity"); | 63 | r = free_and_strdup(&s, "infinity"); |
60 | else if (rl->rlim_cur >= RLIM_INFINITY) | 64 | else if (rl->rlim_cur >= RLIM_INFINITY) |
@@ -72,7 +76,7 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
72 | if (r < 0) | 76 | if (r < 0) |
73 | return -ENOMEM; | 77 | return -ENOMEM; |
74 | 78 | ||
75 | @@ -407,7 +407,7 @@ int rlimit_nofile_safe(void) { | 79 | @@ -422,7 +422,7 @@ int rlimit_nofile_safe(void) { |
76 | rl.rlim_max = MIN(rl.rlim_max, (rlim_t) read_nr_open()); | 80 | rl.rlim_max = MIN(rl.rlim_max, (rlim_t) read_nr_open()); |
77 | rl.rlim_cur = MIN((rlim_t) FD_SETSIZE, rl.rlim_max); | 81 | rl.rlim_cur = MIN((rlim_t) FD_SETSIZE, rl.rlim_max); |
78 | if (setrlimit(RLIMIT_NOFILE, &rl) < 0) | 82 | if (setrlimit(RLIMIT_NOFILE, &rl) < 0) |
@@ -81,9 +85,11 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
81 | 85 | ||
82 | return 1; | 86 | return 1; |
83 | } | 87 | } |
88 | diff --git a/src/core/execute.c b/src/core/execute.c | ||
89 | index bd3da0c401..df1870fd2f 100644 | ||
84 | --- a/src/core/execute.c | 90 | --- a/src/core/execute.c |
85 | +++ b/src/core/execute.c | 91 | +++ b/src/core/execute.c |
86 | @@ -6707,9 +6707,9 @@ void exec_context_dump(const ExecContext | 92 | @@ -1045,9 +1045,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) { |
87 | for (unsigned i = 0; i < RLIM_NLIMITS; i++) | 93 | for (unsigned i = 0; i < RLIM_NLIMITS; i++) |
88 | if (c->rlimit[i]) { | 94 | if (c->rlimit[i]) { |
89 | fprintf(f, "%sLimit%s: " RLIM_FMT "\n", | 95 | fprintf(f, "%sLimit%s: " RLIM_FMT "\n", |
@@ -95,3 +101,6 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
95 | } | 101 | } |
96 | 102 | ||
97 | if (c->ioprio_set) { | 103 | if (c->ioprio_set) { |
104 | -- | ||
105 | 2.34.1 | ||
106 | |||
diff --git a/meta/recipes-core/systemd/systemd/0016-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch b/meta/recipes-core/systemd/systemd/0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch index 543fba7cdb..8d6084239e 100644 --- a/meta/recipes-core/systemd/systemd/0016-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch +++ b/meta/recipes-core/systemd/systemd/0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 26b02348e39fe72b73dd61bba8a0cefb0352717d Mon Sep 17 00:00:00 2001 | 1 | From 4842cff4f1329f0b5034b529d56f8ad1f234ac4c Mon Sep 17 00:00:00 2001 |
2 | From: Andre McCurdy <armccurdy@gmail.com> | 2 | From: Andre McCurdy <armccurdy@gmail.com> |
3 | Date: Tue, 10 Oct 2017 14:33:30 -0700 | 3 | Date: Tue, 10 Oct 2017 14:33:30 -0700 |
4 | Subject: [PATCH] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() | 4 | Subject: [PATCH 07/22] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() |
5 | 5 | ||
6 | Avoid using AT_SYMLINK_NOFOLLOW flag. It doesn't seem like the right | 6 | Avoid using AT_SYMLINK_NOFOLLOW flag. It doesn't seem like the right |
7 | thing to do and it's not portable (not supported by musl). See: | 7 | thing to do and it's not portable (not supported by musl). See: |
@@ -31,7 +31,7 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | |||
31 | 2 files changed, 23 insertions(+), 4 deletions(-) | 31 | 2 files changed, 23 insertions(+), 4 deletions(-) |
32 | 32 | ||
33 | diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h | 33 | diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h |
34 | index 932d003f19..33215dbf5f 100644 | 34 | index 1023ab73ca..c78ff6f27f 100644 |
35 | --- a/src/basic/fs-util.h | 35 | --- a/src/basic/fs-util.h |
36 | +++ b/src/basic/fs-util.h | 36 | +++ b/src/basic/fs-util.h |
37 | @@ -49,8 +49,27 @@ int futimens_opath(int fd, const struct timespec ts[2]); | 37 | @@ -49,8 +49,27 @@ int futimens_opath(int fd, const struct timespec ts[2]); |
@@ -64,7 +64,7 @@ index 932d003f19..33215dbf5f 100644 | |||
64 | int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode); | 64 | int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode); |
65 | 65 | ||
66 | diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c | 66 | diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c |
67 | index be6dd1654a..2726dc946a 100644 | 67 | index 569ef466c3..7ae921a113 100644 |
68 | --- a/src/shared/base-filesystem.c | 68 | --- a/src/shared/base-filesystem.c |
69 | +++ b/src/shared/base-filesystem.c | 69 | +++ b/src/shared/base-filesystem.c |
70 | @@ -145,7 +145,7 @@ int base_filesystem_create_fd(int fd, const char *root, uid_t uid, gid_t gid) { | 70 | @@ -145,7 +145,7 @@ int base_filesystem_create_fd(int fd, const char *root, uid_t uid, gid_t gid) { |
@@ -95,5 +95,5 @@ index be6dd1654a..2726dc946a 100644 | |||
95 | } | 95 | } |
96 | 96 | ||
97 | -- | 97 | -- |
98 | 2.39.2 | 98 | 2.34.1 |
99 | 99 | ||
diff --git a/meta/recipes-core/systemd/systemd/0017-Define-glibc-compatible-basename-for-non-glibc-syste.patch b/meta/recipes-core/systemd/systemd/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch index 24dd6b0df1..c1a8bb19fe 100644 --- a/meta/recipes-core/systemd/systemd/0017-Define-glibc-compatible-basename-for-non-glibc-syste.patch +++ b/meta/recipes-core/systemd/systemd/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch | |||
@@ -1,7 +1,8 @@ | |||
1 | From fdc7fb940bb41020271b9db41d5608004efdbde5 Mon Sep 17 00:00:00 2001 | 1 | From bab07e779ff23d5593bb118efaaa31b60a6dce87 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sun, 27 May 2018 08:36:44 -0700 | 3 | Date: Sun, 27 May 2018 08:36:44 -0700 |
4 | Subject: [PATCH] Define glibc compatible basename() for non-glibc systems | 4 | Subject: [PATCH 08/22] Define glibc compatible basename() for non-glibc |
5 | systems | ||
5 | 6 | ||
6 | Fixes builds with musl, even though systemd is adamant about | 7 | Fixes builds with musl, even though systemd is adamant about |
7 | using non-posix basename implementation, we have a way out | 8 | using non-posix basename implementation, we have a way out |
@@ -10,9 +11,11 @@ Upstream-Status: Inappropriate [musl specific] | |||
10 | 11 | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
12 | --- | 13 | --- |
13 | src/machine/machine-dbus.c | 5 +++++ | 14 | src/basic/string-util.h | 4 ++++ |
14 | 1 file changed, 5 insertions(+) | 15 | 1 file changed, 4 insertions(+) |
15 | 16 | ||
17 | diff --git a/src/basic/string-util.h b/src/basic/string-util.h | ||
18 | index b6d8be3083..0a29036c4c 100644 | ||
16 | --- a/src/basic/string-util.h | 19 | --- a/src/basic/string-util.h |
17 | +++ b/src/basic/string-util.h | 20 | +++ b/src/basic/string-util.h |
18 | @@ -26,6 +26,10 @@ | 21 | @@ -26,6 +26,10 @@ |
@@ -26,3 +29,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
26 | static inline char* strstr_ptr(const char *haystack, const char *needle) { | 29 | static inline char* strstr_ptr(const char *haystack, const char *needle) { |
27 | if (!haystack || !needle) | 30 | if (!haystack || !needle) |
28 | return NULL; | 31 | return NULL; |
32 | -- | ||
33 | 2.34.1 | ||
34 | |||
diff --git a/meta/recipes-core/systemd/systemd/0018-Do-not-disable-buffering-when-writing-to-oom_score_a.patch b/meta/recipes-core/systemd/systemd/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch index 8162bc2c57..3ff0177ae3 100644 --- a/meta/recipes-core/systemd/systemd/0018-Do-not-disable-buffering-when-writing-to-oom_score_a.patch +++ b/meta/recipes-core/systemd/systemd/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 32fd0dc67b6df531f0769dbb099dbe8f30c28514 Mon Sep 17 00:00:00 2001 | 1 | From 25093c5017725b8577c444dfea0f42ad85b43522 Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Wed, 4 Jul 2018 15:00:44 +0800 | 3 | Date: Wed, 4 Jul 2018 15:00:44 +0800 |
4 | Subject: [PATCH] Do not disable buffering when writing to oom_score_adj | 4 | Subject: [PATCH 09/22] Do not disable buffering when writing to oom_score_adj |
5 | 5 | ||
6 | On musl, disabling buffering when writing to oom_score_adj will | 6 | On musl, disabling buffering when writing to oom_score_adj will |
7 | cause the following error. | 7 | cause the following error. |
@@ -24,10 +24,10 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
24 | 1 file changed, 1 insertion(+), 1 deletion(-) | 24 | 1 file changed, 1 insertion(+), 1 deletion(-) |
25 | 25 | ||
26 | diff --git a/src/basic/process-util.c b/src/basic/process-util.c | 26 | diff --git a/src/basic/process-util.c b/src/basic/process-util.c |
27 | index 0747c14c1c..8d0c5aae92 100644 | 27 | index 201c5596ae..ea51595b6c 100644 |
28 | --- a/src/basic/process-util.c | 28 | --- a/src/basic/process-util.c |
29 | +++ b/src/basic/process-util.c | 29 | +++ b/src/basic/process-util.c |
30 | @@ -1516,7 +1516,7 @@ int set_oom_score_adjust(int value) { | 30 | @@ -1716,7 +1716,7 @@ int set_oom_score_adjust(int value) { |
31 | xsprintf(t, "%i", value); | 31 | xsprintf(t, "%i", value); |
32 | 32 | ||
33 | return write_string_file("/proc/self/oom_score_adj", t, | 33 | return write_string_file("/proc/self/oom_score_adj", t, |
@@ -37,5 +37,5 @@ index 0747c14c1c..8d0c5aae92 100644 | |||
37 | 37 | ||
38 | int get_oom_score_adjust(int *ret) { | 38 | int get_oom_score_adjust(int *ret) { |
39 | -- | 39 | -- |
40 | 2.39.2 | 40 | 2.34.1 |
41 | 41 | ||
diff --git a/meta/recipes-core/systemd/systemd/0019-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch b/meta/recipes-core/systemd/systemd/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch index f6d908f947..cf59ac7d06 100644 --- a/meta/recipes-core/systemd/systemd/0019-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch +++ b/meta/recipes-core/systemd/systemd/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From ed46afcbc6bc1f6277a0a54c3db8cf1b056bca1e Mon Sep 17 00:00:00 2001 | 1 | From 2adbe9773cd65c48eec9df96868d4a738927c8d9 Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Tue, 10 Jul 2018 15:40:17 +0800 | 3 | Date: Tue, 10 Jul 2018 15:40:17 +0800 |
4 | Subject: [PATCH] distinguish XSI-compliant strerror_r from GNU-specifi | 4 | Subject: [PATCH 10/22] distinguish XSI-compliant strerror_r from GNU-specifi |
5 | strerror_r | 5 | strerror_r |
6 | 6 | ||
7 | XSI-compliant strerror_r and GNU-specifi strerror_r are different. | 7 | XSI-compliant strerror_r and GNU-specifi strerror_r are different. |
@@ -24,7 +24,7 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
24 | 2 files changed, 15 insertions(+), 1 deletion(-) | 24 | 2 files changed, 15 insertions(+), 1 deletion(-) |
25 | 25 | ||
26 | diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c | 26 | diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c |
27 | index 413e2dd43f..805e5da0c0 100644 | 27 | index 77b2e1a0fd..fdba0e0142 100644 |
28 | --- a/src/libsystemd/sd-bus/bus-error.c | 28 | --- a/src/libsystemd/sd-bus/bus-error.c |
29 | +++ b/src/libsystemd/sd-bus/bus-error.c | 29 | +++ b/src/libsystemd/sd-bus/bus-error.c |
30 | @@ -408,7 +408,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) { | 30 | @@ -408,7 +408,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) { |
@@ -55,10 +55,10 @@ index 413e2dd43f..805e5da0c0 100644 | |||
55 | 55 | ||
56 | static bool map_ok(const sd_bus_error_map *map) { | 56 | static bool map_ok(const sd_bus_error_map *map) { |
57 | diff --git a/src/libsystemd/sd-journal/journal-send.c b/src/libsystemd/sd-journal/journal-send.c | 57 | diff --git a/src/libsystemd/sd-journal/journal-send.c b/src/libsystemd/sd-journal/journal-send.c |
58 | index 136ebcb153..8a75ba4ecd 100644 | 58 | index 69a2eb6404..1561859650 100644 |
59 | --- a/src/libsystemd/sd-journal/journal-send.c | 59 | --- a/src/libsystemd/sd-journal/journal-send.c |
60 | +++ b/src/libsystemd/sd-journal/journal-send.c | 60 | +++ b/src/libsystemd/sd-journal/journal-send.c |
61 | @@ -360,7 +360,12 @@ static int fill_iovec_perror_and_send(const char *message, int skip, struct iove | 61 | @@ -361,7 +361,12 @@ static int fill_iovec_perror_and_send(const char *message, int skip, struct iove |
62 | char* j; | 62 | char* j; |
63 | 63 | ||
64 | errno = 0; | 64 | errno = 0; |
@@ -72,5 +72,5 @@ index 136ebcb153..8a75ba4ecd 100644 | |||
72 | char error[STRLEN("ERRNO=") + DECIMAL_STR_MAX(int) + 1]; | 72 | char error[STRLEN("ERRNO=") + DECIMAL_STR_MAX(int) + 1]; |
73 | 73 | ||
74 | -- | 74 | -- |
75 | 2.39.2 | 75 | 2.34.1 |
76 | 76 | ||
diff --git a/meta/recipes-core/systemd/systemd/0020-avoid-redefinition-of-prctl_mm_map-structure.patch b/meta/recipes-core/systemd/systemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch index e5f017347c..e481b2e2e4 100644 --- a/meta/recipes-core/systemd/systemd/0020-avoid-redefinition-of-prctl_mm_map-structure.patch +++ b/meta/recipes-core/systemd/systemd/0011-avoid-redefinition-of-prctl_mm_map-structure.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 277b680d07a178b8278862b60417052d05c1376f Mon Sep 17 00:00:00 2001 | 1 | From 49c446cfb78cf74a909bed8c3798b77a5469866a Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Mon, 25 Feb 2019 15:44:54 +0800 | 3 | Date: Mon, 25 Feb 2019 15:44:54 +0800 |
4 | Subject: [PATCH] avoid redefinition of prctl_mm_map structure | 4 | Subject: [PATCH 11/22] avoid redefinition of prctl_mm_map structure |
5 | 5 | ||
6 | Fix the following compile failure: | 6 | Fix the following compile failure: |
7 | error: redefinition of 'struct prctl_mm_map' | 7 | error: redefinition of 'struct prctl_mm_map' |
@@ -14,7 +14,7 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
14 | 1 file changed, 2 insertions(+) | 14 | 1 file changed, 2 insertions(+) |
15 | 15 | ||
16 | diff --git a/src/basic/missing_prctl.h b/src/basic/missing_prctl.h | 16 | diff --git a/src/basic/missing_prctl.h b/src/basic/missing_prctl.h |
17 | index ab851306ba..5547cad875 100644 | 17 | index 7d9e395c92..88c2d7dfac 100644 |
18 | --- a/src/basic/missing_prctl.h | 18 | --- a/src/basic/missing_prctl.h |
19 | +++ b/src/basic/missing_prctl.h | 19 | +++ b/src/basic/missing_prctl.h |
20 | @@ -1,7 +1,9 @@ | 20 | @@ -1,7 +1,9 @@ |
@@ -28,5 +28,5 @@ index ab851306ba..5547cad875 100644 | |||
28 | /* 58319057b7847667f0c9585b9de0e8932b0fdb08 (4.3) */ | 28 | /* 58319057b7847667f0c9585b9de0e8932b0fdb08 (4.3) */ |
29 | #ifndef PR_CAP_AMBIENT | 29 | #ifndef PR_CAP_AMBIENT |
30 | -- | 30 | -- |
31 | 2.39.2 | 31 | 2.34.1 |
32 | 32 | ||
diff --git a/meta/recipes-core/systemd/systemd/0021-do-not-disable-buffer-in-writing-files.patch b/meta/recipes-core/systemd/systemd/0012-do-not-disable-buffer-in-writing-files.patch index c85087219c..66be79077e 100644 --- a/meta/recipes-core/systemd/systemd/0021-do-not-disable-buffer-in-writing-files.patch +++ b/meta/recipes-core/systemd/systemd/0012-do-not-disable-buffer-in-writing-files.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From aa6e5588e6d01c12e2f101d140cc710ab199df16 Mon Sep 17 00:00:00 2001 | 1 | From e4885a8e60f883d9217e26e1db3754c2906aca31 Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Fri, 1 Mar 2019 15:22:15 +0800 | 3 | Date: Fri, 1 Mar 2019 15:22:15 +0800 |
4 | Subject: [PATCH] do not disable buffer in writing files | 4 | Subject: [PATCH 12/22] do not disable buffer in writing files |
5 | 5 | ||
6 | Do not disable buffer in writing files, otherwise we get | 6 | Do not disable buffer in writing files, otherwise we get |
7 | failure at boot for musl like below. | 7 | failure at boot for musl like below. |
@@ -19,6 +19,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com> | |||
19 | [rebased for systemd 243] | 19 | [rebased for systemd 243] |
20 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> | 20 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> |
21 | [rebased for systemd 254] | 21 | [rebased for systemd 254] |
22 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
23 | [rebased for systemd 255.1] | ||
22 | --- | 24 | --- |
23 | src/basic/cgroup-util.c | 12 ++++++------ | 25 | src/basic/cgroup-util.c | 12 ++++++------ |
24 | src/basic/namespace-util.c | 4 ++-- | 26 | src/basic/namespace-util.c | 4 ++-- |
@@ -34,17 +36,21 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
34 | src/nspawn/nspawn.c | 6 +++--- | 36 | src/nspawn/nspawn.c | 6 +++--- |
35 | src/shared/binfmt-util.c | 2 +- | 37 | src/shared/binfmt-util.c | 2 +- |
36 | src/shared/cgroup-setup.c | 4 ++-- | 38 | src/shared/cgroup-setup.c | 4 ++-- |
37 | src/shared/coredump-util.c | 2 +- | 39 | src/shared/coredump-util.c | 4 ++-- |
38 | src/shared/sleep-util.c | 4 ++-- | 40 | src/shared/hibernate-util.c | 4 ++-- |
39 | src/shared/smack-util.c | 2 +- | 41 | src/shared/smack-util.c | 2 +- |
42 | src/shared/watchdog.c | 2 +- | ||
40 | src/sleep/sleep.c | 4 ++-- | 43 | src/sleep/sleep.c | 4 ++-- |
44 | src/storagetm/storagetm.c | 24 ++++++++++++------------ | ||
41 | src/udev/udev-rules.c | 1 - | 45 | src/udev/udev-rules.c | 1 - |
42 | src/vconsole/vconsole-setup.c | 2 +- | 46 | src/vconsole/vconsole-setup.c | 2 +- |
43 | 20 files changed, 36 insertions(+), 37 deletions(-) | 47 | 22 files changed, 50 insertions(+), 51 deletions(-) |
44 | 48 | ||
49 | diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c | ||
50 | index d2be79622f..e65fecb68d 100644 | ||
45 | --- a/src/basic/cgroup-util.c | 51 | --- a/src/basic/cgroup-util.c |
46 | +++ b/src/basic/cgroup-util.c | 52 | +++ b/src/basic/cgroup-util.c |
47 | @@ -400,7 +400,7 @@ int cg_kill_kernel_sigkill(const char *c | 53 | @@ -417,7 +417,7 @@ int cg_kill_kernel_sigkill(const char *path) { |
48 | if (r < 0) | 54 | if (r < 0) |
49 | return r; | 55 | return r; |
50 | 56 | ||
@@ -53,7 +59,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
53 | if (r < 0) | 59 | if (r < 0) |
54 | return r; | 60 | return r; |
55 | 61 | ||
56 | @@ -806,7 +806,7 @@ int cg_install_release_agent(const char | 62 | @@ -843,7 +843,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { |
57 | 63 | ||
58 | sc = strstrip(contents); | 64 | sc = strstrip(contents); |
59 | if (isempty(sc)) { | 65 | if (isempty(sc)) { |
@@ -62,7 +68,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
62 | if (r < 0) | 68 | if (r < 0) |
63 | return r; | 69 | return r; |
64 | } else if (!path_equal(sc, agent)) | 70 | } else if (!path_equal(sc, agent)) |
65 | @@ -824,7 +824,7 @@ int cg_install_release_agent(const char | 71 | @@ -861,7 +861,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { |
66 | 72 | ||
67 | sc = strstrip(contents); | 73 | sc = strstrip(contents); |
68 | if (streq(sc, "0")) { | 74 | if (streq(sc, "0")) { |
@@ -71,7 +77,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
71 | if (r < 0) | 77 | if (r < 0) |
72 | return r; | 78 | return r; |
73 | 79 | ||
74 | @@ -851,7 +851,7 @@ int cg_uninstall_release_agent(const cha | 80 | @@ -888,7 +888,7 @@ int cg_uninstall_release_agent(const char *controller) { |
75 | if (r < 0) | 81 | if (r < 0) |
76 | return r; | 82 | return r; |
77 | 83 | ||
@@ -80,7 +86,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
80 | if (r < 0) | 86 | if (r < 0) |
81 | return r; | 87 | return r; |
82 | 88 | ||
83 | @@ -861,7 +861,7 @@ int cg_uninstall_release_agent(const cha | 89 | @@ -898,7 +898,7 @@ int cg_uninstall_release_agent(const char *controller) { |
84 | if (r < 0) | 90 | if (r < 0) |
85 | return r; | 91 | return r; |
86 | 92 | ||
@@ -89,7 +95,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
89 | if (r < 0) | 95 | if (r < 0) |
90 | return r; | 96 | return r; |
91 | 97 | ||
92 | @@ -1764,7 +1764,7 @@ int cg_set_attribute(const char *control | 98 | @@ -1814,7 +1814,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri |
93 | if (r < 0) | 99 | if (r < 0) |
94 | return r; | 100 | return r; |
95 | 101 | ||
@@ -98,9 +104,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
98 | } | 104 | } |
99 | 105 | ||
100 | int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) { | 106 | int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) { |
107 | diff --git a/src/basic/namespace-util.c b/src/basic/namespace-util.c | ||
108 | index 2101f617ad..63817bae17 100644 | ||
101 | --- a/src/basic/namespace-util.c | 109 | --- a/src/basic/namespace-util.c |
102 | +++ b/src/basic/namespace-util.c | 110 | +++ b/src/basic/namespace-util.c |
103 | @@ -227,12 +227,12 @@ int userns_acquire(const char *uid_map, | 111 | @@ -227,12 +227,12 @@ int userns_acquire(const char *uid_map, const char *gid_map) { |
104 | freeze(); | 112 | freeze(); |
105 | 113 | ||
106 | xsprintf(path, "/proc/" PID_FMT "/uid_map", pid); | 114 | xsprintf(path, "/proc/" PID_FMT "/uid_map", pid); |
@@ -115,9 +123,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
115 | if (r < 0) | 123 | if (r < 0) |
116 | return log_error_errno(r, "Failed to write GID map: %m"); | 124 | return log_error_errno(r, "Failed to write GID map: %m"); |
117 | 125 | ||
126 | diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c | ||
127 | index 6cb0ddf575..247cf9e1d1 100644 | ||
118 | --- a/src/basic/procfs-util.c | 128 | --- a/src/basic/procfs-util.c |
119 | +++ b/src/basic/procfs-util.c | 129 | +++ b/src/basic/procfs-util.c |
120 | @@ -64,13 +64,13 @@ int procfs_tasks_set_limit(uint64_t limi | 130 | @@ -64,13 +64,13 @@ int procfs_tasks_set_limit(uint64_t limit) { |
121 | * decrease it, as threads-max is the much more relevant sysctl. */ | 131 | * decrease it, as threads-max is the much more relevant sysctl. */ |
122 | if (limit > pid_max-1) { | 132 | if (limit > pid_max-1) { |
123 | sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ | 133 | sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ |
@@ -133,9 +143,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
133 | if (r < 0) { | 143 | if (r < 0) { |
134 | uint64_t threads_max; | 144 | uint64_t threads_max; |
135 | 145 | ||
146 | diff --git a/src/basic/sysctl-util.c b/src/basic/sysctl-util.c | ||
147 | index b66a6622ae..8d1c93008a 100644 | ||
136 | --- a/src/basic/sysctl-util.c | 148 | --- a/src/basic/sysctl-util.c |
137 | +++ b/src/basic/sysctl-util.c | 149 | +++ b/src/basic/sysctl-util.c |
138 | @@ -58,7 +58,7 @@ int sysctl_write(const char *property, c | 150 | @@ -58,7 +58,7 @@ int sysctl_write(const char *property, const char *value) { |
139 | 151 | ||
140 | log_debug("Setting '%s' to '%s'", p, value); | 152 | log_debug("Setting '%s' to '%s'", p, value); |
141 | 153 | ||
@@ -144,6 +156,8 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
144 | } | 156 | } |
145 | 157 | ||
146 | int sysctl_writef(const char *property, const char *format, ...) { | 158 | int sysctl_writef(const char *property, const char *format, ...) { |
159 | diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c | ||
160 | index d21f3f79ff..258607cc7e 100644 | ||
147 | --- a/src/binfmt/binfmt.c | 161 | --- a/src/binfmt/binfmt.c |
148 | +++ b/src/binfmt/binfmt.c | 162 | +++ b/src/binfmt/binfmt.c |
149 | @@ -30,7 +30,7 @@ static bool arg_unregister = false; | 163 | @@ -30,7 +30,7 @@ static bool arg_unregister = false; |
@@ -155,7 +169,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
155 | } | 169 | } |
156 | 170 | ||
157 | static int apply_rule(const char *filename, unsigned line, const char *rule) { | 171 | static int apply_rule(const char *filename, unsigned line, const char *rule) { |
158 | @@ -58,7 +58,7 @@ static int apply_rule(const char *filena | 172 | @@ -58,7 +58,7 @@ static int apply_rule(const char *filename, unsigned line, const char *rule) { |
159 | if (r >= 0) | 173 | if (r >= 0) |
160 | log_debug("%s:%u: Rule '%s' deleted.", filename, line, rulename); | 174 | log_debug("%s:%u: Rule '%s' deleted.", filename, line, rulename); |
161 | 175 | ||
@@ -164,7 +178,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
164 | if (r < 0) | 178 | if (r < 0) |
165 | return log_error_errno(r, "%s:%u: Failed to add binary format '%s': %m", | 179 | return log_error_errno(r, "%s:%u: Failed to add binary format '%s': %m", |
166 | filename, line, rulename); | 180 | filename, line, rulename); |
167 | @@ -244,7 +244,7 @@ static int run(int argc, char *argv[]) { | 181 | @@ -248,7 +248,7 @@ static int run(int argc, char *argv[]) { |
168 | return r; | 182 | return r; |
169 | 183 | ||
170 | /* Flush out all rules */ | 184 | /* Flush out all rules */ |
@@ -173,9 +187,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
173 | if (r < 0) | 187 | if (r < 0) |
174 | log_warning_errno(r, "Failed to flush binfmt_misc rules, ignoring: %m"); | 188 | log_warning_errno(r, "Failed to flush binfmt_misc rules, ignoring: %m"); |
175 | else | 189 | else |
190 | diff --git a/src/core/cgroup.c b/src/core/cgroup.c | ||
191 | index 61ac4df1a6..ea18970196 100644 | ||
176 | --- a/src/core/cgroup.c | 192 | --- a/src/core/cgroup.c |
177 | +++ b/src/core/cgroup.c | 193 | +++ b/src/core/cgroup.c |
178 | @@ -4349,7 +4349,7 @@ int unit_cgroup_freezer_action(Unit *u, | 194 | @@ -4578,7 +4578,7 @@ int unit_cgroup_freezer_action(Unit *u, FreezerAction action) { |
179 | u->freezer_state = FREEZER_THAWING; | 195 | u->freezer_state = FREEZER_THAWING; |
180 | } | 196 | } |
181 | 197 | ||
@@ -184,9 +200,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
184 | if (r < 0) | 200 | if (r < 0) |
185 | return r; | 201 | return r; |
186 | 202 | ||
203 | diff --git a/src/core/main.c b/src/core/main.c | ||
204 | index 3f71cc0947..0e5aec3e9e 100644 | ||
187 | --- a/src/core/main.c | 205 | --- a/src/core/main.c |
188 | +++ b/src/core/main.c | 206 | +++ b/src/core/main.c |
189 | @@ -1737,7 +1737,7 @@ static void initialize_core_pattern(bool | 207 | @@ -1678,7 +1678,7 @@ static void initialize_core_pattern(bool skip_setup) { |
190 | if (getpid_cached() != 1) | 208 | if (getpid_cached() != 1) |
191 | return; | 209 | return; |
192 | 210 | ||
@@ -195,9 +213,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
195 | if (r < 0) | 213 | if (r < 0) |
196 | log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", | 214 | log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", |
197 | arg_early_core_pattern); | 215 | arg_early_core_pattern); |
216 | diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c | ||
217 | index 7ea902b6f9..1aef2988d0 100644 | ||
198 | --- a/src/core/smack-setup.c | 218 | --- a/src/core/smack-setup.c |
199 | +++ b/src/core/smack-setup.c | 219 | +++ b/src/core/smack-setup.c |
200 | @@ -319,17 +319,17 @@ int mac_smack_setup(bool *loaded_policy) | 220 | @@ -321,17 +321,17 @@ int mac_smack_setup(bool *loaded_policy) { |
201 | } | 221 | } |
202 | 222 | ||
203 | #if HAVE_SMACK_RUN_LABEL | 223 | #if HAVE_SMACK_RUN_LABEL |
@@ -219,6 +239,8 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
219 | if (r < 0) | 239 | if (r < 0) |
220 | log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); | 240 | log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); |
221 | #endif | 241 | #endif |
242 | diff --git a/src/home/homework.c b/src/home/homework.c | ||
243 | index 066483e342..5f92dd7064 100644 | ||
222 | --- a/src/home/homework.c | 244 | --- a/src/home/homework.c |
223 | +++ b/src/home/homework.c | 245 | +++ b/src/home/homework.c |
224 | @@ -278,7 +278,7 @@ static void drop_caches_now(void) { | 246 | @@ -278,7 +278,7 @@ static void drop_caches_now(void) { |
@@ -230,9 +252,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
230 | if (r < 0) | 252 | if (r < 0) |
231 | log_warning_errno(r, "Failed to drop caches, ignoring: %m"); | 253 | log_warning_errno(r, "Failed to drop caches, ignoring: %m"); |
232 | else | 254 | else |
255 | diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c | ||
256 | index 2fbc619a34..09d9591e37 100644 | ||
233 | --- a/src/libsystemd/sd-device/sd-device.c | 257 | --- a/src/libsystemd/sd-device/sd-device.c |
234 | +++ b/src/libsystemd/sd-device/sd-device.c | 258 | +++ b/src/libsystemd/sd-device/sd-device.c |
235 | @@ -2515,7 +2515,7 @@ _public_ int sd_device_set_sysattr_value | 259 | @@ -2516,7 +2516,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, |
236 | if (!value) | 260 | if (!value) |
237 | return -ENOMEM; | 261 | return -ENOMEM; |
238 | 262 | ||
@@ -241,9 +265,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
241 | if (r < 0) { | 265 | if (r < 0) { |
242 | /* On failure, clear cache entry, as we do not know how it fails. */ | 266 | /* On failure, clear cache entry, as we do not know how it fails. */ |
243 | device_remove_cached_sysattr_value(device, sysattr); | 267 | device_remove_cached_sysattr_value(device, sysattr); |
268 | diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c | ||
269 | index a5002437c6..b12e6cd9c9 100644 | ||
244 | --- a/src/nspawn/nspawn-cgroup.c | 270 | --- a/src/nspawn/nspawn-cgroup.c |
245 | +++ b/src/nspawn/nspawn-cgroup.c | 271 | +++ b/src/nspawn/nspawn-cgroup.c |
246 | @@ -122,7 +122,7 @@ int sync_cgroup(pid_t pid, CGroupUnified | 272 | @@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) { |
247 | fn = strjoina(tree, cgroup, "/cgroup.procs"); | 273 | fn = strjoina(tree, cgroup, "/cgroup.procs"); |
248 | 274 | ||
249 | sprintf(pid_string, PID_FMT, pid); | 275 | sprintf(pid_string, PID_FMT, pid); |
@@ -252,9 +278,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
252 | if (r < 0) { | 278 | if (r < 0) { |
253 | log_error_errno(r, "Failed to move process: %m"); | 279 | log_error_errno(r, "Failed to move process: %m"); |
254 | goto finish; | 280 | goto finish; |
281 | diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c | ||
282 | index 6ab604d3dc..bbec6b686c 100644 | ||
255 | --- a/src/nspawn/nspawn.c | 283 | --- a/src/nspawn/nspawn.c |
256 | +++ b/src/nspawn/nspawn.c | 284 | +++ b/src/nspawn/nspawn.c |
257 | @@ -2774,7 +2774,7 @@ static int reset_audit_loginuid(void) { | 285 | @@ -2688,7 +2688,7 @@ static int reset_audit_loginuid(void) { |
258 | if (streq(p, "4294967295")) | 286 | if (streq(p, "4294967295")) |
259 | return 0; | 287 | return 0; |
260 | 288 | ||
@@ -263,7 +291,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
263 | if (r < 0) { | 291 | if (r < 0) { |
264 | log_error_errno(r, | 292 | log_error_errno(r, |
265 | "Failed to reset audit login UID. This probably means that your kernel is too\n" | 293 | "Failed to reset audit login UID. This probably means that your kernel is too\n" |
266 | @@ -4214,7 +4214,7 @@ static int setup_uid_map( | 294 | @@ -4141,7 +4141,7 @@ static int setup_uid_map( |
267 | return log_oom(); | 295 | return log_oom(); |
268 | 296 | ||
269 | xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); | 297 | xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); |
@@ -272,7 +300,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
272 | if (r < 0) | 300 | if (r < 0) |
273 | return log_error_errno(r, "Failed to write UID map: %m"); | 301 | return log_error_errno(r, "Failed to write UID map: %m"); |
274 | 302 | ||
275 | @@ -4224,7 +4224,7 @@ static int setup_uid_map( | 303 | @@ -4151,7 +4151,7 @@ static int setup_uid_map( |
276 | return log_oom(); | 304 | return log_oom(); |
277 | 305 | ||
278 | xsprintf(uid_map, "/proc/" PID_FMT "/gid_map", pid); | 306 | xsprintf(uid_map, "/proc/" PID_FMT "/gid_map", pid); |
@@ -281,6 +309,8 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
281 | if (r < 0) | 309 | if (r < 0) |
282 | return log_error_errno(r, "Failed to write GID map: %m"); | 310 | return log_error_errno(r, "Failed to write GID map: %m"); |
283 | 311 | ||
312 | diff --git a/src/shared/binfmt-util.c b/src/shared/binfmt-util.c | ||
313 | index a26175474b..1413a9c72c 100644 | ||
284 | --- a/src/shared/binfmt-util.c | 314 | --- a/src/shared/binfmt-util.c |
285 | +++ b/src/shared/binfmt-util.c | 315 | +++ b/src/shared/binfmt-util.c |
286 | @@ -46,7 +46,7 @@ int disable_binfmt(void) { | 316 | @@ -46,7 +46,7 @@ int disable_binfmt(void) { |
@@ -292,18 +322,20 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
292 | if (r < 0) | 322 | if (r < 0) |
293 | return log_warning_errno(r, "Failed to unregister binfmt_misc entries: %m"); | 323 | return log_warning_errno(r, "Failed to unregister binfmt_misc entries: %m"); |
294 | 324 | ||
325 | diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c | ||
326 | index 934a16eaf3..c921ced861 100644 | ||
295 | --- a/src/shared/cgroup-setup.c | 327 | --- a/src/shared/cgroup-setup.c |
296 | +++ b/src/shared/cgroup-setup.c | 328 | +++ b/src/shared/cgroup-setup.c |
297 | @@ -351,7 +351,7 @@ int cg_attach(const char *controller, co | 329 | @@ -351,7 +351,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { |
298 | 330 | ||
299 | xsprintf(c, PID_FMT "\n", pid); | 331 | xsprintf(c, PID_FMT "\n", pid); |
300 | 332 | ||
301 | - r = write_string_file(fs, c, WRITE_STRING_FILE_DISABLE_BUFFER); | 333 | - r = write_string_file(fs, c, WRITE_STRING_FILE_DISABLE_BUFFER); |
302 | + r = write_string_file(fs, c, 0); | 334 | + r = write_string_file(fs, c, 0); |
303 | if (r == -EOPNOTSUPP && cg_is_threaded(controller, path) > 0) | 335 | if (r == -EOPNOTSUPP && cg_is_threaded(path) > 0) |
304 | /* When the threaded mode is used, we cannot read/write the file. Let's return recognizable error. */ | 336 | /* When the threaded mode is used, we cannot read/write the file. Let's return recognizable error. */ |
305 | return -EUCLEAN; | 337 | return -EUCLEAN; |
306 | @@ -964,7 +964,7 @@ int cg_enable_everywhere( | 338 | @@ -966,7 +966,7 @@ int cg_enable_everywhere( |
307 | return log_debug_errno(errno, "Failed to open cgroup.subtree_control file of %s: %m", p); | 339 | return log_debug_errno(errno, "Failed to open cgroup.subtree_control file of %s: %m", p); |
308 | } | 340 | } |
309 | 341 | ||
@@ -312,9 +344,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
312 | if (r < 0) { | 344 | if (r < 0) { |
313 | log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", | 345 | log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", |
314 | FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); | 346 | FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); |
347 | diff --git a/src/shared/coredump-util.c b/src/shared/coredump-util.c | ||
348 | index 805503f366..01a7ccb291 100644 | ||
315 | --- a/src/shared/coredump-util.c | 349 | --- a/src/shared/coredump-util.c |
316 | +++ b/src/shared/coredump-util.c | 350 | +++ b/src/shared/coredump-util.c |
317 | @@ -163,7 +163,7 @@ int set_coredump_filter(uint64_t value) | 351 | @@ -163,7 +163,7 @@ int set_coredump_filter(uint64_t value) { |
318 | xsprintf(t, "0x%"PRIx64, value); | 352 | xsprintf(t, "0x%"PRIx64, value); |
319 | 353 | ||
320 | return write_string_file("/proc/self/coredump_filter", t, | 354 | return write_string_file("/proc/self/coredump_filter", t, |
@@ -323,9 +357,20 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
323 | } | 357 | } |
324 | 358 | ||
325 | /* Turn off core dumps but only if we're running outside of a container. */ | 359 | /* Turn off core dumps but only if we're running outside of a container. */ |
326 | --- a/src/shared/sleep-util.c | 360 | @@ -173,7 +173,7 @@ void disable_coredumps(void) { |
327 | +++ b/src/shared/sleep-util.c | 361 | if (detect_container() > 0) |
328 | @@ -1044,7 +1044,7 @@ int write_resume_config(dev_t devno, uin | 362 | return; |
363 | |||
364 | - r = write_string_file("/proc/sys/kernel/core_pattern", "|/bin/false", WRITE_STRING_FILE_DISABLE_BUFFER); | ||
365 | + r = write_string_file("/proc/sys/kernel/core_pattern", "|/bin/false", 0); | ||
366 | if (r < 0) | ||
367 | log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); | ||
368 | } | ||
369 | diff --git a/src/shared/hibernate-util.c b/src/shared/hibernate-util.c | ||
370 | index 3eb13d48f6..d09b901be1 100644 | ||
371 | --- a/src/shared/hibernate-util.c | ||
372 | +++ b/src/shared/hibernate-util.c | ||
373 | @@ -481,7 +481,7 @@ int write_resume_config(dev_t devno, uint64_t offset, const char *device) { | ||
329 | 374 | ||
330 | /* We write the offset first since it's safer. Note that this file is only available in 4.17+, so | 375 | /* We write the offset first since it's safer. Note that this file is only available in 4.17+, so |
331 | * fail gracefully if it doesn't exist and we're only overwriting it with 0. */ | 376 | * fail gracefully if it doesn't exist and we're only overwriting it with 0. */ |
@@ -334,7 +379,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
334 | if (r == -ENOENT) { | 379 | if (r == -ENOENT) { |
335 | if (offset != 0) | 380 | if (offset != 0) |
336 | return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), | 381 | return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), |
337 | @@ -1060,7 +1060,7 @@ int write_resume_config(dev_t devno, uin | 382 | @@ -497,7 +497,7 @@ int write_resume_config(dev_t devno, uint64_t offset, const char *device) { |
338 | log_debug("Wrote resume_offset=%s for device '%s' to /sys/power/resume_offset.", | 383 | log_debug("Wrote resume_offset=%s for device '%s' to /sys/power/resume_offset.", |
339 | offset_str, device); | 384 | offset_str, device); |
340 | 385 | ||
@@ -343,9 +388,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
343 | if (r < 0) | 388 | if (r < 0) |
344 | return log_error_errno(r, | 389 | return log_error_errno(r, |
345 | "Failed to write device '%s' (%s) to /sys/power/resume: %m", | 390 | "Failed to write device '%s' (%s) to /sys/power/resume: %m", |
391 | diff --git a/src/shared/smack-util.c b/src/shared/smack-util.c | ||
392 | index 1f88e724d0..feb18b320a 100644 | ||
346 | --- a/src/shared/smack-util.c | 393 | --- a/src/shared/smack-util.c |
347 | +++ b/src/shared/smack-util.c | 394 | +++ b/src/shared/smack-util.c |
348 | @@ -113,7 +113,7 @@ int mac_smack_apply_pid(pid_t pid, const | 395 | @@ -113,7 +113,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) { |
349 | return 0; | 396 | return 0; |
350 | 397 | ||
351 | p = procfs_file_alloca(pid, "attr/current"); | 398 | p = procfs_file_alloca(pid, "attr/current"); |
@@ -354,29 +401,142 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
354 | if (r < 0) | 401 | if (r < 0) |
355 | return r; | 402 | return r; |
356 | 403 | ||
404 | diff --git a/src/shared/watchdog.c b/src/shared/watchdog.c | ||
405 | index 4c1a968718..6faf6806a5 100644 | ||
406 | --- a/src/shared/watchdog.c | ||
407 | +++ b/src/shared/watchdog.c | ||
408 | @@ -93,7 +93,7 @@ static int set_pretimeout_governor(const char *governor) { | ||
409 | |||
410 | r = write_string_file(sys_fn, | ||
411 | governor, | ||
412 | - WRITE_STRING_FILE_DISABLE_BUFFER | WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE); | ||
413 | + WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE); | ||
414 | if (r < 0) | ||
415 | return log_error_errno(r, "Failed to set pretimeout_governor to '%s': %m", governor); | ||
416 | |||
417 | diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c | ||
418 | index 21af3e9e52..6d4b84b5d5 100644 | ||
357 | --- a/src/sleep/sleep.c | 419 | --- a/src/sleep/sleep.c |
358 | +++ b/src/sleep/sleep.c | 420 | +++ b/src/sleep/sleep.c |
359 | @@ -139,7 +139,7 @@ static int write_mode(char **modes) { | 421 | @@ -137,7 +137,7 @@ static int write_state(int fd, char * const *states) { |
422 | if (k < 0) | ||
423 | return RET_GATHER(r, k); | ||
424 | |||
425 | - k = write_string_stream(f, *state, WRITE_STRING_FILE_DISABLE_BUFFER); | ||
426 | + k = write_string_stream(f, *state, 0); | ||
427 | if (k >= 0) { | ||
428 | log_debug("Using sleep state '%s'.", *state); | ||
429 | return 0; | ||
430 | @@ -155,7 +155,7 @@ static int write_mode(char * const *modes) { | ||
360 | STRV_FOREACH(mode, modes) { | 431 | STRV_FOREACH(mode, modes) { |
361 | int k; | 432 | int k; |
362 | 433 | ||
363 | - k = write_string_file("/sys/power/disk", *mode, WRITE_STRING_FILE_DISABLE_BUFFER); | 434 | - k = write_string_file("/sys/power/disk", *mode, WRITE_STRING_FILE_DISABLE_BUFFER); |
364 | + k = write_string_file("/sys/power/disk", *mode, 0); | 435 | + k = write_string_file("/sys/power/disk", *mode, 0); |
365 | if (k >= 0) | 436 | if (k >= 0) { |
437 | log_debug("Using sleep disk mode '%s'.", *mode); | ||
366 | return 0; | 438 | return 0; |
439 | diff --git a/src/storagetm/storagetm.c b/src/storagetm/storagetm.c | ||
440 | index ae63baaf79..82eeca479a 100644 | ||
441 | --- a/src/storagetm/storagetm.c | ||
442 | +++ b/src/storagetm/storagetm.c | ||
443 | @@ -186,7 +186,7 @@ static int nvme_subsystem_unlink(NvmeSubsystem *s) { | ||
444 | if (!enable_fn) | ||
445 | return log_oom(); | ||
446 | |||
447 | - r = write_string_file_at(namespaces_fd, enable_fn, "0", WRITE_STRING_FILE_DISABLE_BUFFER); | ||
448 | + r = write_string_file_at(namespaces_fd, enable_fn, "0", 0); | ||
449 | if (r < 0) | ||
450 | log_warning_errno(r, "Failed to disable namespace '%s' of NVME subsystem '%s', ignoring: %m", e->d_name, s->name); | ||
451 | |||
452 | @@ -254,7 +254,7 @@ static int nvme_subsystem_write_metadata(int subsystem_fd, sd_device *device) { | ||
453 | _cleanup_free_ char *truncated = strndup(w, 40); /* kernel refuses more than 40 chars (as per nvme spec) */ | ||
454 | |||
455 | /* The default string stored in 'attr_model' is "Linux" btw. */ | ||
456 | - r = write_string_file_at(subsystem_fd, "attr_model", truncated, WRITE_STRING_FILE_DISABLE_BUFFER); | ||
457 | + r = write_string_file_at(subsystem_fd, "attr_model", truncated, 0); | ||
458 | if (r < 0) | ||
459 | log_warning_errno(r, "Failed to set model of subsystem to '%s', ignoring: %m", w); | ||
460 | } | ||
461 | @@ -268,7 +268,7 @@ static int nvme_subsystem_write_metadata(int subsystem_fd, sd_device *device) { | ||
462 | return log_oom(); | ||
367 | 463 | ||
368 | @@ -160,7 +160,7 @@ static int write_state(FILE **f, char ** | 464 | /* The default string stored in 'attr_firmware' is `uname -r` btw, but truncated to 8 chars. */ |
369 | STRV_FOREACH(state, states) { | 465 | - r = write_string_file_at(subsystem_fd, "attr_firmware", truncated, WRITE_STRING_FILE_DISABLE_BUFFER); |
370 | int k; | 466 | + r = write_string_file_at(subsystem_fd, "attr_firmware", truncated, 0); |
467 | if (r < 0) | ||
468 | log_warning_errno(r, "Failed to set model of subsystem to '%s', ignoring: %m", truncated); | ||
469 | } | ||
470 | @@ -295,7 +295,7 @@ static int nvme_subsystem_write_metadata(int subsystem_fd, sd_device *device) { | ||
471 | if (!truncated) | ||
472 | return log_oom(); | ||
371 | 473 | ||
372 | - k = write_string_stream(*f, *state, WRITE_STRING_FILE_DISABLE_BUFFER); | 474 | - r = write_string_file_at(subsystem_fd, "attr_serial", truncated, WRITE_STRING_FILE_DISABLE_BUFFER); |
373 | + k = write_string_stream(*f, *state, 0); | 475 | + r = write_string_file_at(subsystem_fd, "attr_serial", truncated, 0); |
374 | if (k >= 0) | 476 | if (r < 0) |
375 | return 0; | 477 | log_warning_errno(r, "Failed to set serial of subsystem to '%s', ignoring: %m", truncated); |
376 | log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state); | 478 | } |
479 | @@ -345,7 +345,7 @@ static int nvme_namespace_write_metadata(int namespace_fd, sd_device *device, co | ||
480 | id = id128_digest(j, l); | ||
481 | } | ||
482 | |||
483 | - r = write_string_file_at(namespace_fd, "device_uuid", SD_ID128_TO_UUID_STRING(id), WRITE_STRING_FILE_DISABLE_BUFFER); | ||
484 | + r = write_string_file_at(namespace_fd, "device_uuid", SD_ID128_TO_UUID_STRING(id), 0); | ||
485 | if (r < 0) | ||
486 | log_warning_errno(r, "Failed to set uuid of namespace to '%s', ignoring: %m", SD_ID128_TO_UUID_STRING(id)); | ||
487 | |||
488 | @@ -408,7 +408,7 @@ static int nvme_subsystem_add(const char *node, int consumed_fd, sd_device *devi | ||
489 | if (subsystem_fd < 0) | ||
490 | return log_error_errno(subsystem_fd, "Failed to create NVME subsystem '%s': %m", j); | ||
491 | |||
492 | - r = write_string_file_at(subsystem_fd, "attr_allow_any_host", "1", WRITE_STRING_FILE_DISABLE_BUFFER); | ||
493 | + r = write_string_file_at(subsystem_fd, "attr_allow_any_host", "1", 0); | ||
494 | if (r < 0) | ||
495 | return log_error_errno(r, "Failed to set 'attr_allow_any_host' flag: %m"); | ||
496 | |||
497 | @@ -423,11 +423,11 @@ static int nvme_subsystem_add(const char *node, int consumed_fd, sd_device *devi | ||
498 | |||
499 | /* We use /proc/$PID/fd/$FD rather than /proc/self/fd/$FD, because this string is visible to others | ||
500 | * via configfs, and by including the PID it's clear to who the stuff belongs. */ | ||
501 | - r = write_string_file_at(namespace_fd, "device_path", FORMAT_PROC_PID_FD_PATH(0, fd), WRITE_STRING_FILE_DISABLE_BUFFER); | ||
502 | + r = write_string_file_at(namespace_fd, "device_path", FORMAT_PROC_PID_FD_PATH(0, fd), 0); | ||
503 | if (r < 0) | ||
504 | return log_error_errno(r, "Failed to write 'device_path' attribute: %m"); | ||
505 | |||
506 | - r = write_string_file_at(namespace_fd, "enable", "1", WRITE_STRING_FILE_DISABLE_BUFFER); | ||
507 | + r = write_string_file_at(namespace_fd, "enable", "1", 0); | ||
508 | if (r < 0) | ||
509 | return log_error_errno(r, "Failed to write 'enable' attribute: %m"); | ||
510 | |||
511 | @@ -557,19 +557,19 @@ static int nvme_port_add_portnr( | ||
512 | return 0; | ||
513 | } | ||
514 | |||
515 | - r = write_string_file_at(port_fd, "addr_adrfam", af_to_ipv4_ipv6(ip_family), WRITE_STRING_FILE_DISABLE_BUFFER); | ||
516 | + r = write_string_file_at(port_fd, "addr_adrfam", af_to_ipv4_ipv6(ip_family), 0); | ||
517 | if (r < 0) | ||
518 | return log_error_errno(r, "Failed to set address family on NVME port %" PRIu16 ": %m", portnr); | ||
519 | |||
520 | - r = write_string_file_at(port_fd, "addr_trtype", "tcp", WRITE_STRING_FILE_DISABLE_BUFFER); | ||
521 | + r = write_string_file_at(port_fd, "addr_trtype", "tcp", 0); | ||
522 | if (r < 0) | ||
523 | return log_error_errno(r, "Failed to set transport type on NVME port %" PRIu16 ": %m", portnr); | ||
524 | |||
525 | - r = write_string_file_at(port_fd, "addr_trsvcid", fname, WRITE_STRING_FILE_DISABLE_BUFFER); | ||
526 | + r = write_string_file_at(port_fd, "addr_trsvcid", fname, 0); | ||
527 | if (r < 0) | ||
528 | return log_error_errno(r, "Failed to set IP port on NVME port %" PRIu16 ": %m", portnr); | ||
529 | |||
530 | - r = write_string_file_at(port_fd, "addr_traddr", ip_family == AF_INET6 ? "::" : "0.0.0.0", WRITE_STRING_FILE_DISABLE_BUFFER); | ||
531 | + r = write_string_file_at(port_fd, "addr_traddr", ip_family == AF_INET6 ? "::" : "0.0.0.0", 0); | ||
532 | if (r < 0) | ||
533 | return log_error_errno(r, "Failed to set IP address on NVME port %" PRIu16 ": %m", portnr); | ||
534 | |||
535 | diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c | ||
536 | index febe345b4c..a90b610ba1 100644 | ||
377 | --- a/src/udev/udev-rules.c | 537 | --- a/src/udev/udev-rules.c |
378 | +++ b/src/udev/udev-rules.c | 538 | +++ b/src/udev/udev-rules.c |
379 | @@ -2634,7 +2634,6 @@ static int udev_rule_apply_token_to_even | 539 | @@ -2711,7 +2711,6 @@ static int udev_rule_apply_token_to_event( |
380 | log_event_debug(dev, token, "ATTR '%s' writing '%s'", buf, value); | 540 | log_event_debug(dev, token, "ATTR '%s' writing '%s'", buf, value); |
381 | r = write_string_file(buf, value, | 541 | r = write_string_file(buf, value, |
382 | WRITE_STRING_FILE_VERIFY_ON_FAILURE | | 542 | WRITE_STRING_FILE_VERIFY_ON_FAILURE | |
@@ -384,9 +544,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
384 | WRITE_STRING_FILE_AVOID_NEWLINE | | 544 | WRITE_STRING_FILE_AVOID_NEWLINE | |
385 | WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE); | 545 | WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE); |
386 | if (r < 0) | 546 | if (r < 0) |
547 | diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c | ||
548 | index 4d82c65f0a..3a3d861b83 100644 | ||
387 | --- a/src/vconsole/vconsole-setup.c | 549 | --- a/src/vconsole/vconsole-setup.c |
388 | +++ b/src/vconsole/vconsole-setup.c | 550 | +++ b/src/vconsole/vconsole-setup.c |
389 | @@ -260,7 +260,7 @@ static int toggle_utf8_vc(const char *na | 551 | @@ -261,7 +261,7 @@ static int toggle_utf8_vc(const char *name, int fd, bool utf8) { |
390 | static int toggle_utf8_sysfs(bool utf8) { | 552 | static int toggle_utf8_sysfs(bool utf8) { |
391 | int r; | 553 | int r; |
392 | 554 | ||
@@ -395,3 +557,6 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
395 | if (r < 0) | 557 | if (r < 0) |
396 | return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8)); | 558 | return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8)); |
397 | 559 | ||
560 | -- | ||
561 | 2.34.1 | ||
562 | |||
diff --git a/meta/recipes-core/systemd/systemd/0022-Handle-__cpu_mask-usage.patch b/meta/recipes-core/systemd/systemd/0013-Handle-__cpu_mask-usage.patch index 580aff327d..43f75373a6 100644 --- a/meta/recipes-core/systemd/systemd/0022-Handle-__cpu_mask-usage.patch +++ b/meta/recipes-core/systemd/systemd/0013-Handle-__cpu_mask-usage.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From a50ec65dbe660421052656dda7499c925005f486 Mon Sep 17 00:00:00 2001 | 1 | From 2f90f8463423cfbb7e83fcef42f1071018c3b56e Mon Sep 17 00:00:00 2001 |
2 | From: Scott Murray <scott.murray@konsulko.com> | 2 | From: Scott Murray <scott.murray@konsulko.com> |
3 | Date: Fri, 13 Sep 2019 19:26:27 -0400 | 3 | Date: Fri, 13 Sep 2019 19:26:27 -0400 |
4 | Subject: [PATCH] Handle __cpu_mask usage | 4 | Subject: [PATCH 13/22] Handle __cpu_mask usage |
5 | 5 | ||
6 | Fixes errors: | 6 | Fixes errors: |
7 | 7 | ||
@@ -23,6 +23,8 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
23 | src/test/test-sizeof.c | 2 +- | 23 | src/test/test-sizeof.c | 2 +- |
24 | 2 files changed, 3 insertions(+), 1 deletion(-) | 24 | 2 files changed, 3 insertions(+), 1 deletion(-) |
25 | 25 | ||
26 | diff --git a/src/shared/cpu-set-util.h b/src/shared/cpu-set-util.h | ||
27 | index 3c63a58826..4c2d4347fc 100644 | ||
26 | --- a/src/shared/cpu-set-util.h | 28 | --- a/src/shared/cpu-set-util.h |
27 | +++ b/src/shared/cpu-set-util.h | 29 | +++ b/src/shared/cpu-set-util.h |
28 | @@ -6,6 +6,8 @@ | 30 | @@ -6,6 +6,8 @@ |
@@ -34,6 +36,8 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
34 | /* This wraps the libc interface with a variable to keep the allocated size. */ | 36 | /* This wraps the libc interface with a variable to keep the allocated size. */ |
35 | typedef struct CPUSet { | 37 | typedef struct CPUSet { |
36 | cpu_set_t *set; | 38 | cpu_set_t *set; |
39 | diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c | ||
40 | index ea0c58770e..b65c0bd370 100644 | ||
37 | --- a/src/test/test-sizeof.c | 41 | --- a/src/test/test-sizeof.c |
38 | +++ b/src/test/test-sizeof.c | 42 | +++ b/src/test/test-sizeof.c |
39 | @@ -1,6 +1,5 @@ | 43 | @@ -1,6 +1,5 @@ |
@@ -51,3 +55,6 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
51 | 55 | ||
52 | /* Print information about various types. Useful when diagnosing | 56 | /* Print information about various types. Useful when diagnosing |
53 | * gcc diagnostics on an unfamiliar architecture. */ | 57 | * gcc diagnostics on an unfamiliar architecture. */ |
58 | -- | ||
59 | 2.34.1 | ||
60 | |||
diff --git a/meta/recipes-core/systemd/systemd/0023-Handle-missing-gshadow.patch b/meta/recipes-core/systemd/systemd/0014-Handle-missing-gshadow.patch index 19ee3ff311..a751e1ba6f 100644 --- a/meta/recipes-core/systemd/systemd/0023-Handle-missing-gshadow.patch +++ b/meta/recipes-core/systemd/systemd/0014-Handle-missing-gshadow.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From ebf0f69d8614b8d86a971b97ff0d847d1e5d47c9 Mon Sep 17 00:00:00 2001 | 1 | From b7c827bb44edbb6251c9fcdb80aa03982c0e7bf3 Mon Sep 17 00:00:00 2001 |
2 | From: Alex Kiernan <alex.kiernan@gmail.com> | 2 | From: Alex Kiernan <alex.kiernan@gmail.com> |
3 | Date: Tue, 10 Mar 2020 11:05:20 +0000 | 3 | Date: Tue, 10 Mar 2020 11:05:20 +0000 |
4 | Subject: [PATCH] Handle missing gshadow | 4 | Subject: [PATCH 14/22] Handle missing gshadow |
5 | 5 | ||
6 | gshadow usage is now present in the userdb code. Mask all uses of it to | 6 | gshadow usage is now present in the userdb code. Mask all uses of it to |
7 | allow compilation on musl | 7 | allow compilation on musl |
@@ -17,7 +17,7 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
17 | 3 files changed, 30 insertions(+), 1 deletion(-) | 17 | 3 files changed, 30 insertions(+), 1 deletion(-) |
18 | 18 | ||
19 | diff --git a/src/shared/user-record-nss.c b/src/shared/user-record-nss.c | 19 | diff --git a/src/shared/user-record-nss.c b/src/shared/user-record-nss.c |
20 | index 88b8fc2f8f..a819d41bac 100644 | 20 | index 414a49331b..1a4e1b628c 100644 |
21 | --- a/src/shared/user-record-nss.c | 21 | --- a/src/shared/user-record-nss.c |
22 | +++ b/src/shared/user-record-nss.c | 22 | +++ b/src/shared/user-record-nss.c |
23 | @@ -329,8 +329,10 @@ int nss_group_to_group_record( | 23 | @@ -329,8 +329,10 @@ int nss_group_to_group_record( |
@@ -138,7 +138,7 @@ index 22ab04d6ee..4e52e7a911 100644 | |||
138 | #include <shadow.h> | 138 | #include <shadow.h> |
139 | 139 | ||
140 | diff --git a/src/shared/userdb.c b/src/shared/userdb.c | 140 | diff --git a/src/shared/userdb.c b/src/shared/userdb.c |
141 | index a77eff4407..955e361d3a 100644 | 141 | index f60d48ace4..e878199a28 100644 |
142 | --- a/src/shared/userdb.c | 142 | --- a/src/shared/userdb.c |
143 | +++ b/src/shared/userdb.c | 143 | +++ b/src/shared/userdb.c |
144 | @@ -1038,13 +1038,15 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) { | 144 | @@ -1038,13 +1038,15 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) { |
@@ -169,5 +169,5 @@ index a77eff4407..955e361d3a 100644 | |||
169 | return r; | 169 | return r; |
170 | 170 | ||
171 | -- | 171 | -- |
172 | 2.39.2 | 172 | 2.34.1 |
173 | 173 | ||
diff --git a/meta/recipes-core/systemd/systemd/0024-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch b/meta/recipes-core/systemd/systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch index d64cec1585..e112766a9b 100644 --- a/meta/recipes-core/systemd/systemd/0024-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch +++ b/meta/recipes-core/systemd/systemd/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From a2f56a2a6cdd5137bb1e680aa9f6c40540107166 Mon Sep 17 00:00:00 2001 | 1 | From 3dc9d9d410bcce54fddfd94f43f7f77f3aa8e281 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 12 Apr 2021 23:44:53 -0700 | 3 | Date: Mon, 12 Apr 2021 23:44:53 -0700 |
4 | Subject: [PATCH] missing_syscall.h: Define MIPS ABI defines for musl | 4 | Subject: [PATCH 15/22] missing_syscall.h: Define MIPS ABI defines for musl |
5 | 5 | ||
6 | musl does not define _MIPS_SIM_ABI32, _MIPS_SIM_NABI32, _MIPS_SIM_ABI64 | 6 | musl does not define _MIPS_SIM_ABI32, _MIPS_SIM_NABI32, _MIPS_SIM_ABI64 |
7 | unlike glibc where these are provided by libc headers, therefore define | 7 | unlike glibc where these are provided by libc headers, therefore define |
@@ -16,7 +16,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
16 | 2 files changed, 7 insertions(+) | 16 | 2 files changed, 7 insertions(+) |
17 | 17 | ||
18 | diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h | 18 | diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h |
19 | index 98cd037962..ea6a76c2e2 100644 | 19 | index d795efd8f2..d6729d3c1d 100644 |
20 | --- a/src/basic/missing_syscall.h | 20 | --- a/src/basic/missing_syscall.h |
21 | +++ b/src/basic/missing_syscall.h | 21 | +++ b/src/basic/missing_syscall.h |
22 | @@ -20,6 +20,12 @@ | 22 | @@ -20,6 +20,12 @@ |
@@ -33,7 +33,7 @@ index 98cd037962..ea6a76c2e2 100644 | |||
33 | #include "missing_keyctl.h" | 33 | #include "missing_keyctl.h" |
34 | #include "missing_stat.h" | 34 | #include "missing_stat.h" |
35 | diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c | 35 | diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c |
36 | index 2726dc946a..484f63e0b4 100644 | 36 | index 7ae921a113..0ef9d1fd39 100644 |
37 | --- a/src/shared/base-filesystem.c | 37 | --- a/src/shared/base-filesystem.c |
38 | +++ b/src/shared/base-filesystem.c | 38 | +++ b/src/shared/base-filesystem.c |
39 | @@ -20,6 +20,7 @@ | 39 | @@ -20,6 +20,7 @@ |
@@ -45,5 +45,5 @@ index 2726dc946a..484f63e0b4 100644 | |||
45 | typedef struct BaseFilesystem { | 45 | typedef struct BaseFilesystem { |
46 | const char *dir; /* directory or symlink to create */ | 46 | const char *dir; /* directory or symlink to create */ |
47 | -- | 47 | -- |
48 | 2.39.2 | 48 | 2.34.1 |
49 | 49 | ||
diff --git a/meta/recipes-core/systemd/systemd/0005-pass-correct-parameters-to-getdents64.patch b/meta/recipes-core/systemd/systemd/0016-pass-correct-parameters-to-getdents64.patch index c634d8ec3d..0be817e62d 100644 --- a/meta/recipes-core/systemd/systemd/0005-pass-correct-parameters-to-getdents64.patch +++ b/meta/recipes-core/systemd/systemd/0016-pass-correct-parameters-to-getdents64.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 17766c64ecc7dedf09ed2d361690fc4eda77bf42 Mon Sep 17 00:00:00 2001 | 1 | From 0994b59dba9f248ad31cb7087046dc00b72cb4ea Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 21 Jan 2022 15:15:11 -0800 | 3 | Date: Fri, 21 Jan 2022 15:15:11 -0800 |
4 | Subject: [PATCH] pass correct parameters to getdents64 | 4 | Subject: [PATCH 16/22] pass correct parameters to getdents64 |
5 | 5 | ||
6 | Fixes | 6 | Fixes |
7 | ../git/src/basic/recurse-dir.c:57:40: error: incompatible pointer types passing 'uint8_t *' (aka 'unsigned char *') to parameter of type 'struct dirent *' [-Werror,-Wincompatible-pointer-types] | 7 | ../git/src/basic/recurse-dir.c:57:40: error: incompatible pointer types passing 'uint8_t *' (aka 'unsigned char *') to parameter of type 'struct dirent *' [-Werror,-Wincompatible-pointer-types] |
@@ -33,5 +33,5 @@ index 5e98b7a5d8..aef065047b 100644 | |||
33 | return -errno; | 33 | return -errno; |
34 | if (n == 0) | 34 | if (n == 0) |
35 | -- | 35 | -- |
36 | 2.39.2 | 36 | 2.34.1 |
37 | 37 | ||
diff --git a/meta/recipes-core/systemd/systemd/0001-Adjust-for-musl-headers.patch b/meta/recipes-core/systemd/systemd/0017-Adjust-for-musl-headers.patch index 5e9646c569..4176522a1c 100644 --- a/meta/recipes-core/systemd/systemd/0001-Adjust-for-musl-headers.patch +++ b/meta/recipes-core/systemd/systemd/0017-Adjust-for-musl-headers.patch | |||
@@ -1,11 +1,14 @@ | |||
1 | From e5f067cb3dc845dd865e450f4e64077b28feb4c0 Mon Sep 17 00:00:00 2001 | 1 | From 3c094d443ca30f19114392fd8ef274af6eabc12d Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 21 Jan 2022 22:19:37 -0800 | 3 | Date: Fri, 21 Jan 2022 22:19:37 -0800 |
4 | Subject: [PATCH] Adjust for musl headers | 4 | Subject: [PATCH 17/22] Adjust for musl headers |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [musl specific] | 6 | Upstream-Status: Inappropriate [musl specific] |
7 | 7 | ||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
9 | |||
10 | [Rebased for v255.1] | ||
11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
9 | --- | 12 | --- |
10 | src/libsystemd-network/sd-dhcp6-client.c | 2 +- | 13 | src/libsystemd-network/sd-dhcp6-client.c | 2 +- |
11 | src/network/netdev/bareudp.c | 2 +- | 14 | src/network/netdev/bareudp.c | 2 +- |
@@ -33,7 +36,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
33 | src/network/netdev/xfrm.c | 2 +- | 36 | src/network/netdev/xfrm.c | 2 +- |
34 | src/network/networkd-bridge-mdb.c | 4 ++-- | 37 | src/network/networkd-bridge-mdb.c | 4 ++-- |
35 | src/network/networkd-dhcp-common.c | 3 ++- | 38 | src/network/networkd-dhcp-common.c | 3 ++- |
36 | src/network/networkd-dhcp-prefix-delegation.c | 4 ++-- | 39 | src/network/networkd-dhcp-prefix-delegation.c | 3 ++- |
37 | src/network/networkd-dhcp-server.c | 2 +- | 40 | src/network/networkd-dhcp-server.c | 2 +- |
38 | src/network/networkd-dhcp4.c | 2 +- | 41 | src/network/networkd-dhcp4.c | 2 +- |
39 | src/network/networkd-ipv6ll.c | 2 +- | 42 | src/network/networkd-ipv6ll.c | 2 +- |
@@ -41,13 +44,14 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
41 | src/network/networkd-ndisc.c | 2 +- | 44 | src/network/networkd-ndisc.c | 2 +- |
42 | src/network/networkd-route.c | 8 ++++---- | 45 | src/network/networkd-route.c | 8 ++++---- |
43 | src/network/networkd-setlink.c | 2 +- | 46 | src/network/networkd-setlink.c | 2 +- |
47 | src/network/networkd-sysctl.c | 2 +- | ||
44 | src/shared/linux/ethtool.h | 3 ++- | 48 | src/shared/linux/ethtool.h | 3 ++- |
45 | src/shared/netif-util.c | 2 +- | 49 | src/shared/netif-util.c | 2 +- |
46 | src/udev/udev-builtin-net_id.c | 2 +- | 50 | src/udev/udev-builtin-net_id.c | 2 +- |
47 | 37 files changed, 44 insertions(+), 42 deletions(-) | 51 | 38 files changed, 45 insertions(+), 42 deletions(-) |
48 | 52 | ||
49 | diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c | 53 | diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c |
50 | index 57dd91f81f..2b7f4fa3a7 100644 | 54 | index c20367dfc9..b8d4cd8c2a 100644 |
51 | --- a/src/libsystemd-network/sd-dhcp6-client.c | 55 | --- a/src/libsystemd-network/sd-dhcp6-client.c |
52 | +++ b/src/libsystemd-network/sd-dhcp6-client.c | 56 | +++ b/src/libsystemd-network/sd-dhcp6-client.c |
53 | @@ -5,7 +5,7 @@ | 57 | @@ -5,7 +5,7 @@ |
@@ -60,7 +64,7 @@ index 57dd91f81f..2b7f4fa3a7 100644 | |||
60 | 64 | ||
61 | #include "sd-dhcp6-client.h" | 65 | #include "sd-dhcp6-client.h" |
62 | diff --git a/src/network/netdev/bareudp.c b/src/network/netdev/bareudp.c | 66 | diff --git a/src/network/netdev/bareudp.c b/src/network/netdev/bareudp.c |
63 | index 24d3afb877..f6241b41ee 100644 | 67 | index 1df886573b..c8b6714726 100644 |
64 | --- a/src/network/netdev/bareudp.c | 68 | --- a/src/network/netdev/bareudp.c |
65 | +++ b/src/network/netdev/bareudp.c | 69 | +++ b/src/network/netdev/bareudp.c |
66 | @@ -2,7 +2,7 @@ | 70 | @@ -2,7 +2,7 @@ |
@@ -73,7 +77,7 @@ index 24d3afb877..f6241b41ee 100644 | |||
73 | #include "bareudp.h" | 77 | #include "bareudp.h" |
74 | #include "netlink-util.h" | 78 | #include "netlink-util.h" |
75 | diff --git a/src/network/netdev/batadv.c b/src/network/netdev/batadv.c | 79 | diff --git a/src/network/netdev/batadv.c b/src/network/netdev/batadv.c |
76 | index 7e97619657..50fcffcfdf 100644 | 80 | index 26da0231d4..2e8002af8c 100644 |
77 | --- a/src/network/netdev/batadv.c | 81 | --- a/src/network/netdev/batadv.c |
78 | +++ b/src/network/netdev/batadv.c | 82 | +++ b/src/network/netdev/batadv.c |
79 | @@ -3,7 +3,7 @@ | 83 | @@ -3,7 +3,7 @@ |
@@ -86,7 +90,7 @@ index 7e97619657..50fcffcfdf 100644 | |||
86 | #include "batadv.h" | 90 | #include "batadv.h" |
87 | #include "fileio.h" | 91 | #include "fileio.h" |
88 | diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c | 92 | diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c |
89 | index 601bff0a9c..dfed8d9e54 100644 | 93 | index 4d75a0d6bf..985b3197e0 100644 |
90 | --- a/src/network/netdev/bond.c | 94 | --- a/src/network/netdev/bond.c |
91 | +++ b/src/network/netdev/bond.c | 95 | +++ b/src/network/netdev/bond.c |
92 | @@ -1,7 +1,7 @@ | 96 | @@ -1,7 +1,7 @@ |
@@ -99,7 +103,7 @@ index 601bff0a9c..dfed8d9e54 100644 | |||
99 | #include "alloc-util.h" | 103 | #include "alloc-util.h" |
100 | #include "bond.h" | 104 | #include "bond.h" |
101 | diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c | 105 | diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c |
102 | index b65c3b49fc..6875b4fbdb 100644 | 106 | index 3e394edadf..f12f667687 100644 |
103 | --- a/src/network/netdev/bridge.c | 107 | --- a/src/network/netdev/bridge.c |
104 | +++ b/src/network/netdev/bridge.c | 108 | +++ b/src/network/netdev/bridge.c |
105 | @@ -2,7 +2,7 @@ | 109 | @@ -2,7 +2,7 @@ |
@@ -124,7 +128,7 @@ index 00df1d2787..77b506b422 100644 | |||
124 | #include "dummy.h" | 128 | #include "dummy.h" |
125 | 129 | ||
126 | diff --git a/src/network/netdev/geneve.c b/src/network/netdev/geneve.c | 130 | diff --git a/src/network/netdev/geneve.c b/src/network/netdev/geneve.c |
127 | index 777a32d75c..73bfa2b5c1 100644 | 131 | index bc655ec7ff..a77e8e17e4 100644 |
128 | --- a/src/network/netdev/geneve.c | 132 | --- a/src/network/netdev/geneve.c |
129 | +++ b/src/network/netdev/geneve.c | 133 | +++ b/src/network/netdev/geneve.c |
130 | @@ -2,7 +2,7 @@ | 134 | @@ -2,7 +2,7 @@ |
@@ -150,7 +154,7 @@ index d7ff44cb9e..e037629ae4 100644 | |||
150 | #include "ifb.h" | 154 | #include "ifb.h" |
151 | 155 | ||
152 | diff --git a/src/network/netdev/ipoib.c b/src/network/netdev/ipoib.c | 156 | diff --git a/src/network/netdev/ipoib.c b/src/network/netdev/ipoib.c |
153 | index 5dd9286d57..4036d66dad 100644 | 157 | index d5fe299b7b..c9c8002eac 100644 |
154 | --- a/src/network/netdev/ipoib.c | 158 | --- a/src/network/netdev/ipoib.c |
155 | +++ b/src/network/netdev/ipoib.c | 159 | +++ b/src/network/netdev/ipoib.c |
156 | @@ -1,6 +1,6 @@ | 160 | @@ -1,6 +1,6 @@ |
@@ -162,7 +166,7 @@ index 5dd9286d57..4036d66dad 100644 | |||
162 | 166 | ||
163 | #include "ipoib.h" | 167 | #include "ipoib.h" |
164 | diff --git a/src/network/netdev/ipvlan.c b/src/network/netdev/ipvlan.c | 168 | diff --git a/src/network/netdev/ipvlan.c b/src/network/netdev/ipvlan.c |
165 | index 058eadebd7..c470ebb6d7 100644 | 169 | index 05d5d010f6..d440f49537 100644 |
166 | --- a/src/network/netdev/ipvlan.c | 170 | --- a/src/network/netdev/ipvlan.c |
167 | +++ b/src/network/netdev/ipvlan.c | 171 | +++ b/src/network/netdev/ipvlan.c |
168 | @@ -2,7 +2,7 @@ | 172 | @@ -2,7 +2,7 @@ |
@@ -175,7 +179,7 @@ index 058eadebd7..c470ebb6d7 100644 | |||
175 | #include "conf-parser.h" | 179 | #include "conf-parser.h" |
176 | #include "ipvlan.h" | 180 | #include "ipvlan.h" |
177 | diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c | 181 | diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c |
178 | index 0da3dd4bd2..eb20f04469 100644 | 182 | index 17d6acefb6..679d0984f9 100644 |
179 | --- a/src/network/netdev/macsec.c | 183 | --- a/src/network/netdev/macsec.c |
180 | +++ b/src/network/netdev/macsec.c | 184 | +++ b/src/network/netdev/macsec.c |
181 | @@ -1,7 +1,7 @@ | 185 | @@ -1,7 +1,7 @@ |
@@ -188,7 +192,7 @@ index 0da3dd4bd2..eb20f04469 100644 | |||
188 | #include <linux/if_macsec.h> | 192 | #include <linux/if_macsec.h> |
189 | #include <linux/genetlink.h> | 193 | #include <linux/genetlink.h> |
190 | diff --git a/src/network/netdev/macvlan.c b/src/network/netdev/macvlan.c | 194 | diff --git a/src/network/netdev/macvlan.c b/src/network/netdev/macvlan.c |
191 | index 1114bb0cb1..6c79a219a4 100644 | 195 | index 203807e3a5..8ab09a387e 100644 |
192 | --- a/src/network/netdev/macvlan.c | 196 | --- a/src/network/netdev/macvlan.c |
193 | +++ b/src/network/netdev/macvlan.c | 197 | +++ b/src/network/netdev/macvlan.c |
194 | @@ -2,7 +2,7 @@ | 198 | @@ -2,7 +2,7 @@ |
@@ -201,7 +205,7 @@ index 1114bb0cb1..6c79a219a4 100644 | |||
201 | #include "conf-parser.h" | 205 | #include "conf-parser.h" |
202 | #include "macvlan.h" | 206 | #include "macvlan.h" |
203 | diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c | 207 | diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c |
204 | index 038a27c118..67155f0db7 100644 | 208 | index 57127a861a..7f787d0b9f 100644 |
205 | --- a/src/network/netdev/netdev.c | 209 | --- a/src/network/netdev/netdev.c |
206 | +++ b/src/network/netdev/netdev.c | 210 | +++ b/src/network/netdev/netdev.c |
207 | @@ -2,7 +2,7 @@ | 211 | @@ -2,7 +2,7 @@ |
@@ -238,7 +242,7 @@ index ff372092e6..eef66811f4 100644 | |||
238 | #include "nlmon.h" | 242 | #include "nlmon.h" |
239 | 243 | ||
240 | diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c | 244 | diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c |
241 | index 2addfeecaa..954987f26d 100644 | 245 | index db84e7cf6e..93d5642962 100644 |
242 | --- a/src/network/netdev/tunnel.c | 246 | --- a/src/network/netdev/tunnel.c |
243 | +++ b/src/network/netdev/tunnel.c | 247 | +++ b/src/network/netdev/tunnel.c |
244 | @@ -2,7 +2,7 @@ | 248 | @@ -2,7 +2,7 @@ |
@@ -263,7 +267,7 @@ index 380547ee1e..137c1adf8a 100644 | |||
263 | #include "vcan.h" | 267 | #include "vcan.h" |
264 | 268 | ||
265 | diff --git a/src/network/netdev/veth.c b/src/network/netdev/veth.c | 269 | diff --git a/src/network/netdev/veth.c b/src/network/netdev/veth.c |
266 | index fb00e6667f..f52d9ee89a 100644 | 270 | index e0f5b4ebb1..8a424ed03d 100644 |
267 | --- a/src/network/netdev/veth.c | 271 | --- a/src/network/netdev/veth.c |
268 | +++ b/src/network/netdev/veth.c | 272 | +++ b/src/network/netdev/veth.c |
269 | @@ -3,7 +3,7 @@ | 273 | @@ -3,7 +3,7 @@ |
@@ -276,7 +280,7 @@ index fb00e6667f..f52d9ee89a 100644 | |||
276 | 280 | ||
277 | #include "netlink-util.h" | 281 | #include "netlink-util.h" |
278 | diff --git a/src/network/netdev/vlan.c b/src/network/netdev/vlan.c | 282 | diff --git a/src/network/netdev/vlan.c b/src/network/netdev/vlan.c |
279 | index a3d961dac3..386b567a42 100644 | 283 | index 2390206993..efec630e30 100644 |
280 | --- a/src/network/netdev/vlan.c | 284 | --- a/src/network/netdev/vlan.c |
281 | +++ b/src/network/netdev/vlan.c | 285 | +++ b/src/network/netdev/vlan.c |
282 | @@ -2,7 +2,7 @@ | 286 | @@ -2,7 +2,7 @@ |
@@ -289,7 +293,7 @@ index a3d961dac3..386b567a42 100644 | |||
289 | 293 | ||
290 | #include "parse-util.h" | 294 | #include "parse-util.h" |
291 | diff --git a/src/network/netdev/vrf.c b/src/network/netdev/vrf.c | 295 | diff --git a/src/network/netdev/vrf.c b/src/network/netdev/vrf.c |
292 | index 05ef3ff13d..825fc4a398 100644 | 296 | index b75ec2bcc6..6aeeea640b 100644 |
293 | --- a/src/network/netdev/vrf.c | 297 | --- a/src/network/netdev/vrf.c |
294 | +++ b/src/network/netdev/vrf.c | 298 | +++ b/src/network/netdev/vrf.c |
295 | @@ -2,7 +2,7 @@ | 299 | @@ -2,7 +2,7 @@ |
@@ -302,7 +306,7 @@ index 05ef3ff13d..825fc4a398 100644 | |||
302 | #include "vrf.h" | 306 | #include "vrf.h" |
303 | 307 | ||
304 | diff --git a/src/network/netdev/vxcan.c b/src/network/netdev/vxcan.c | 308 | diff --git a/src/network/netdev/vxcan.c b/src/network/netdev/vxcan.c |
305 | index 83269b0707..39c6dbe29c 100644 | 309 | index c0343f45b6..f9e718f40b 100644 |
306 | --- a/src/network/netdev/vxcan.c | 310 | --- a/src/network/netdev/vxcan.c |
307 | +++ b/src/network/netdev/vxcan.c | 311 | +++ b/src/network/netdev/vxcan.c |
308 | @@ -1,7 +1,7 @@ | 312 | @@ -1,7 +1,7 @@ |
@@ -315,7 +319,7 @@ index 83269b0707..39c6dbe29c 100644 | |||
315 | #include "vxcan.h" | 319 | #include "vxcan.h" |
316 | 320 | ||
317 | diff --git a/src/network/netdev/vxlan.c b/src/network/netdev/vxlan.c | 321 | diff --git a/src/network/netdev/vxlan.c b/src/network/netdev/vxlan.c |
318 | index 589161938a..0ec9625b7a 100644 | 322 | index b11fdbbd0d..a971a917f0 100644 |
319 | --- a/src/network/netdev/vxlan.c | 323 | --- a/src/network/netdev/vxlan.c |
320 | +++ b/src/network/netdev/vxlan.c | 324 | +++ b/src/network/netdev/vxlan.c |
321 | @@ -2,7 +2,7 @@ | 325 | @@ -2,7 +2,7 @@ |
@@ -328,7 +332,7 @@ index 589161938a..0ec9625b7a 100644 | |||
328 | #include "conf-parser.h" | 332 | #include "conf-parser.h" |
329 | #include "alloc-util.h" | 333 | #include "alloc-util.h" |
330 | diff --git a/src/network/netdev/wireguard.c b/src/network/netdev/wireguard.c | 334 | diff --git a/src/network/netdev/wireguard.c b/src/network/netdev/wireguard.c |
331 | index 51e7e02990..fc36c0623a 100644 | 335 | index 4c7d837c41..6df6dfb816 100644 |
332 | --- a/src/network/netdev/wireguard.c | 336 | --- a/src/network/netdev/wireguard.c |
333 | +++ b/src/network/netdev/wireguard.c | 337 | +++ b/src/network/netdev/wireguard.c |
334 | @@ -6,7 +6,7 @@ | 338 | @@ -6,7 +6,7 @@ |
@@ -341,7 +345,7 @@ index 51e7e02990..fc36c0623a 100644 | |||
341 | 345 | ||
342 | #include "sd-resolve.h" | 346 | #include "sd-resolve.h" |
343 | diff --git a/src/network/netdev/xfrm.c b/src/network/netdev/xfrm.c | 347 | diff --git a/src/network/netdev/xfrm.c b/src/network/netdev/xfrm.c |
344 | index a961d8fef2..6c1815b257 100644 | 348 | index 905bfc0bdf..39e34dbb3b 100644 |
345 | --- a/src/network/netdev/xfrm.c | 349 | --- a/src/network/netdev/xfrm.c |
346 | +++ b/src/network/netdev/xfrm.c | 350 | +++ b/src/network/netdev/xfrm.c |
347 | @@ -1,6 +1,6 @@ | 351 | @@ -1,6 +1,6 @@ |
@@ -374,7 +378,7 @@ index bd1a9745dc..949d3da029 100644 | |||
374 | #define STATIC_BRIDGE_MDB_ENTRIES_PER_NETWORK_MAX 1024U | 378 | #define STATIC_BRIDGE_MDB_ENTRIES_PER_NETWORK_MAX 1024U |
375 | 379 | ||
376 | diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c | 380 | diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c |
377 | index ca9a825e7b..8735e261ad 100644 | 381 | index 080b15387c..efe8283957 100644 |
378 | --- a/src/network/networkd-dhcp-common.c | 382 | --- a/src/network/networkd-dhcp-common.c |
379 | +++ b/src/network/networkd-dhcp-common.c | 383 | +++ b/src/network/networkd-dhcp-common.c |
380 | @@ -1,7 +1,8 @@ | 384 | @@ -1,7 +1,8 @@ |
@@ -388,18 +392,17 @@ index ca9a825e7b..8735e261ad 100644 | |||
388 | #include "bus-error.h" | 392 | #include "bus-error.h" |
389 | #include "bus-locator.h" | 393 | #include "bus-locator.h" |
390 | diff --git a/src/network/networkd-dhcp-prefix-delegation.c b/src/network/networkd-dhcp-prefix-delegation.c | 394 | diff --git a/src/network/networkd-dhcp-prefix-delegation.c b/src/network/networkd-dhcp-prefix-delegation.c |
391 | index 66c5e979d9..581b6b8c29 100644 | 395 | index af2fe9efcd..511565700f 100644 |
392 | --- a/src/network/networkd-dhcp-prefix-delegation.c | 396 | --- a/src/network/networkd-dhcp-prefix-delegation.c |
393 | +++ b/src/network/networkd-dhcp-prefix-delegation.c | 397 | +++ b/src/network/networkd-dhcp-prefix-delegation.c |
394 | @@ -1,7 +1,5 @@ | 398 | @@ -1,6 +1,5 @@ |
395 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ | 399 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
396 | 400 | ||
397 | -#include <linux/ipv6_route.h> | 401 | -#include <linux/ipv6_route.h> |
398 | - | ||
399 | #include "sd-dhcp6-client.h" | ||
400 | 402 | ||
403 | #include "dhcp6-lease-internal.h" | ||
401 | #include "hashmap.h" | 404 | #include "hashmap.h" |
402 | @@ -21,6 +19,8 @@ | 405 | @@ -20,6 +19,8 @@ |
403 | #include "strv.h" | 406 | #include "strv.h" |
404 | #include "tunnel.h" | 407 | #include "tunnel.h" |
405 | 408 | ||
@@ -409,7 +412,7 @@ index 66c5e979d9..581b6b8c29 100644 | |||
409 | assert(link); | 412 | assert(link); |
410 | 413 | ||
411 | diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c | 414 | diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c |
412 | index 620fbbddc7..c8af20fb34 100644 | 415 | index 607fe0053c..9ce4005874 100644 |
413 | --- a/src/network/networkd-dhcp-server.c | 416 | --- a/src/network/networkd-dhcp-server.c |
414 | +++ b/src/network/networkd-dhcp-server.c | 417 | +++ b/src/network/networkd-dhcp-server.c |
415 | @@ -1,7 +1,7 @@ | 418 | @@ -1,7 +1,7 @@ |
@@ -422,7 +425,7 @@ index 620fbbddc7..c8af20fb34 100644 | |||
422 | 425 | ||
423 | #include "sd-dhcp-server.h" | 426 | #include "sd-dhcp-server.h" |
424 | diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c | 427 | diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c |
425 | index d4b4942173..3d78da5609 100644 | 428 | index efbae6d868..1ea2151d50 100644 |
426 | --- a/src/network/networkd-dhcp4.c | 429 | --- a/src/network/networkd-dhcp4.c |
427 | +++ b/src/network/networkd-dhcp4.c | 430 | +++ b/src/network/networkd-dhcp4.c |
428 | @@ -3,7 +3,7 @@ | 431 | @@ -3,7 +3,7 @@ |
@@ -448,7 +451,7 @@ index 32229a3fc7..662a345d6e 100644 | |||
448 | #include "in-addr-util.h" | 451 | #include "in-addr-util.h" |
449 | #include "networkd-address.h" | 452 | #include "networkd-address.h" |
450 | diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c | 453 | diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c |
451 | index 019bef0590..657fc41ae6 100644 | 454 | index ee5f0f2c0a..ea5269a2de 100644 |
452 | --- a/src/network/networkd-link.c | 455 | --- a/src/network/networkd-link.c |
453 | +++ b/src/network/networkd-link.c | 456 | +++ b/src/network/networkd-link.c |
454 | @@ -3,7 +3,7 @@ | 457 | @@ -3,7 +3,7 @@ |
@@ -461,7 +464,7 @@ index 019bef0590..657fc41ae6 100644 | |||
461 | #include <linux/netdevice.h> | 464 | #include <linux/netdevice.h> |
462 | #include <sys/socket.h> | 465 | #include <sys/socket.h> |
463 | diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c | 466 | diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c |
464 | index 99a07e16fc..e51cd81d96 100644 | 467 | index ab9eeb13a5..dd96fe7483 100644 |
465 | --- a/src/network/networkd-ndisc.c | 468 | --- a/src/network/networkd-ndisc.c |
466 | +++ b/src/network/networkd-ndisc.c | 469 | +++ b/src/network/networkd-ndisc.c |
467 | @@ -6,7 +6,7 @@ | 470 | @@ -6,7 +6,7 @@ |
@@ -474,7 +477,7 @@ index 99a07e16fc..e51cd81d96 100644 | |||
474 | #include "sd-ndisc.h" | 477 | #include "sd-ndisc.h" |
475 | 478 | ||
476 | diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c | 479 | diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c |
477 | index 5214a8ad2c..9dd758daae 100644 | 480 | index 7218d799fc..30d5574eae 100644 |
478 | --- a/src/network/networkd-route.c | 481 | --- a/src/network/networkd-route.c |
479 | +++ b/src/network/networkd-route.c | 482 | +++ b/src/network/networkd-route.c |
480 | @@ -1,9 +1,5 @@ | 483 | @@ -1,9 +1,5 @@ |
@@ -499,7 +502,7 @@ index 5214a8ad2c..9dd758daae 100644 | |||
499 | _cleanup_(route_freep) Route *route = NULL; | 502 | _cleanup_(route_freep) Route *route = NULL; |
500 | 503 | ||
501 | diff --git a/src/network/networkd-setlink.c b/src/network/networkd-setlink.c | 504 | diff --git a/src/network/networkd-setlink.c b/src/network/networkd-setlink.c |
502 | index 541c4b8a72..06ebda8f0f 100644 | 505 | index 2298f9ea3a..7d5f87de53 100644 |
503 | --- a/src/network/networkd-setlink.c | 506 | --- a/src/network/networkd-setlink.c |
504 | +++ b/src/network/networkd-setlink.c | 507 | +++ b/src/network/networkd-setlink.c |
505 | @@ -2,7 +2,7 @@ | 508 | @@ -2,7 +2,7 @@ |
@@ -511,8 +514,21 @@ index 541c4b8a72..06ebda8f0f 100644 | |||
511 | #include <linux/if_bridge.h> | 514 | #include <linux/if_bridge.h> |
512 | 515 | ||
513 | #include "missing_network.h" | 516 | #include "missing_network.h" |
517 | diff --git a/src/network/networkd-sysctl.c b/src/network/networkd-sysctl.c | ||
518 | index 2b226b2e2a..f12a474e2f 100644 | ||
519 | --- a/src/network/networkd-sysctl.c | ||
520 | +++ b/src/network/networkd-sysctl.c | ||
521 | @@ -2,7 +2,7 @@ | ||
522 | |||
523 | #include <netinet/in.h> | ||
524 | #include <linux/if.h> | ||
525 | -#include <linux/if_arp.h> | ||
526 | +//#include <linux/if_arp.h> | ||
527 | |||
528 | #include "missing_network.h" | ||
529 | #include "networkd-link.h" | ||
514 | diff --git a/src/shared/linux/ethtool.h b/src/shared/linux/ethtool.h | 530 | diff --git a/src/shared/linux/ethtool.h b/src/shared/linux/ethtool.h |
515 | index 1458de3627..d5c2d2e0ac 100644 | 531 | index 3d1da515c0..3fca9a4faf 100644 |
516 | --- a/src/shared/linux/ethtool.h | 532 | --- a/src/shared/linux/ethtool.h |
517 | +++ b/src/shared/linux/ethtool.h | 533 | +++ b/src/shared/linux/ethtool.h |
518 | @@ -16,7 +16,8 @@ | 534 | @@ -16,7 +16,8 @@ |
@@ -539,7 +555,7 @@ index f56c5646c1..5af28ff119 100644 | |||
539 | #include "arphrd-util.h" | 555 | #include "arphrd-util.h" |
540 | #include "device-util.h" | 556 | #include "device-util.h" |
541 | diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c | 557 | diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c |
542 | index a48d5dedf8..31a8bc1b3c 100644 | 558 | index f528a46b8e..830318cda5 100644 |
543 | --- a/src/udev/udev-builtin-net_id.c | 559 | --- a/src/udev/udev-builtin-net_id.c |
544 | +++ b/src/udev/udev-builtin-net_id.c | 560 | +++ b/src/udev/udev-builtin-net_id.c |
545 | @@ -18,7 +18,7 @@ | 561 | @@ -18,7 +18,7 @@ |
@@ -552,5 +568,5 @@ index a48d5dedf8..31a8bc1b3c 100644 | |||
552 | #include <linux/pci_regs.h> | 568 | #include <linux/pci_regs.h> |
553 | 569 | ||
554 | -- | 570 | -- |
555 | 2.39.2 | 571 | 2.34.1 |
556 | 572 | ||
diff --git a/meta/recipes-core/systemd/systemd/0006-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch b/meta/recipes-core/systemd/systemd/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch index 96322e5a56..75f6b9094a 100644 --- a/meta/recipes-core/systemd/systemd/0006-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch +++ b/meta/recipes-core/systemd/systemd/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch | |||
@@ -1,8 +1,8 @@ | |||
1 | From fa598869cca684c001f3dc23ce2198f5a6169e2a Mon Sep 17 00:00:00 2001 | 1 | From be02bd0876a061728661535a709d313e39fe1ac3 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Tue, 8 Nov 2022 13:31:34 -0800 | 3 | Date: Tue, 8 Nov 2022 13:31:34 -0800 |
4 | Subject: [PATCH] test-bus-error: strerror() is assumed to be GNU specific | 4 | Subject: [PATCH 18/22] test-bus-error: strerror() is assumed to be GNU |
5 | version mark it so | 5 | specific version mark it so |
6 | 6 | ||
7 | Upstream-Status: Inappropriate [Upstream systemd only supports glibc] | 7 | Upstream-Status: Inappropriate [Upstream systemd only supports glibc] |
8 | 8 | ||
@@ -27,7 +27,7 @@ index a55f3f9856..4123bf3da0 100644 | |||
27 | assert_se(sd_bus_error_get_errno(&error) == EBUSY); | 27 | assert_se(sd_bus_error_get_errno(&error) == EBUSY); |
28 | assert_se(sd_bus_error_is_set(&error)); | 28 | assert_se(sd_bus_error_is_set(&error)); |
29 | diff --git a/src/test/test-errno-util.c b/src/test/test-errno-util.c | 29 | diff --git a/src/test/test-errno-util.c b/src/test/test-errno-util.c |
30 | index d3d022c33f..74e95c804d 100644 | 30 | index 376d532281..967cfd4d67 100644 |
31 | --- a/src/test/test-errno-util.c | 31 | --- a/src/test/test-errno-util.c |
32 | +++ b/src/test/test-errno-util.c | 32 | +++ b/src/test/test-errno-util.c |
33 | @@ -4,7 +4,7 @@ | 33 | @@ -4,7 +4,7 @@ |
@@ -48,5 +48,5 @@ index d3d022c33f..74e95c804d 100644 | |||
48 | TEST(PROTECT_ERRNO) { | 48 | TEST(PROTECT_ERRNO) { |
49 | errno = 12; | 49 | errno = 12; |
50 | -- | 50 | -- |
51 | 2.39.2 | 51 | 2.34.1 |
52 | 52 | ||
diff --git a/meta/recipes-core/systemd/systemd/0003-errno-util-Make-STRERROR-portable-for-musl.patch b/meta/recipes-core/systemd/systemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch index fcc56a2e65..e038b73678 100644 --- a/meta/recipes-core/systemd/systemd/0003-errno-util-Make-STRERROR-portable-for-musl.patch +++ b/meta/recipes-core/systemd/systemd/0019-errno-util-Make-STRERROR-portable-for-musl.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From f629a76e0fba300a9d511614160fee38dd4a5e57 Mon Sep 17 00:00:00 2001 | 1 | From 46d80840bfe37e67d4f18c37a77751ea1fe63a07 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 23 Jan 2023 23:39:46 -0800 | 3 | Date: Mon, 23 Jan 2023 23:39:46 -0800 |
4 | Subject: [PATCH] errno-util: Make STRERROR portable for musl | 4 | Subject: [PATCH 19/22] errno-util: Make STRERROR portable for musl |
5 | 5 | ||
6 | Sadly, systemd has decided to use yet another GNU extention in a macro | 6 | Sadly, systemd has decided to use yet another GNU extention in a macro |
7 | lets make this such that we can use XSI compliant strerror_r() for | 7 | lets make this such that we can use XSI compliant strerror_r() for |
@@ -11,20 +11,21 @@ Upstream-Status: Inappropriate [musl specific] | |||
11 | 11 | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
13 | --- | 13 | --- |
14 | src/basic/errno-util.h | 10 +++++++++- | 14 | src/basic/errno-util.h | 12 ++++++++++-- |
15 | 1 file changed, 9 insertions(+), 1 deletion(-) | 15 | 1 file changed, 10 insertions(+), 2 deletions(-) |
16 | 16 | ||
17 | diff --git a/src/basic/errno-util.h b/src/basic/errno-util.h | 17 | diff --git a/src/basic/errno-util.h b/src/basic/errno-util.h |
18 | index 091f99c590..eb5c1f9961 100644 | 18 | index 27804e6382..274c1c6ef1 100644 |
19 | --- a/src/basic/errno-util.h | 19 | --- a/src/basic/errno-util.h |
20 | +++ b/src/basic/errno-util.h | 20 | +++ b/src/basic/errno-util.h |
21 | @@ -14,8 +14,16 @@ | 21 | @@ -15,8 +15,16 @@ |
22 | * https://stackoverflow.com/questions/34880638/compound-literal-lifetime-and-if-blocks | 22 | * https://stackoverflow.com/questions/34880638/compound-literal-lifetime-and-if-blocks |
23 | * | 23 | * |
24 | * Note that we use the GNU variant of strerror_r() here. */ | 24 | * Note that we use the GNU variant of strerror_r() here. */ |
25 | -#define STRERROR(errnum) strerror_r(abs(errnum), (char[ERRNO_BUF_LEN]){}, ERRNO_BUF_LEN) | 25 | -#define STRERROR(errnum) strerror_r(abs(errnum), (char[ERRNO_BUF_LEN]){}, ERRNO_BUF_LEN) |
26 | - | ||
26 | +static inline const char * STRERROR(int errnum); | 27 | +static inline const char * STRERROR(int errnum); |
27 | 28 | + | |
28 | +static inline const char * STRERROR(int errnum) { | 29 | +static inline const char * STRERROR(int errnum) { |
29 | +#ifdef __GLIBC__ | 30 | +#ifdef __GLIBC__ |
30 | + return strerror_r(abs(errnum), (char[ERRNO_BUF_LEN]){}, ERRNO_BUF_LEN); | 31 | + return strerror_r(abs(errnum), (char[ERRNO_BUF_LEN]){}, ERRNO_BUF_LEN); |
@@ -37,5 +38,5 @@ index 091f99c590..eb5c1f9961 100644 | |||
37 | * Note that we can't use ({ … }) to define a temporary variable, so errnum is | 38 | * Note that we can't use ({ … }) to define a temporary variable, so errnum is |
38 | * evaluated twice. */ | 39 | * evaluated twice. */ |
39 | -- | 40 | -- |
40 | 2.39.2 | 41 | 2.34.1 |
41 | 42 | ||
diff --git a/meta/recipes-core/systemd/systemd/0028-sd-event-Make-malloc_trim-conditional-on-glibc.patch b/meta/recipes-core/systemd/systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch index c9ec00012e..b83fffe793 100644 --- a/meta/recipes-core/systemd/systemd/0028-sd-event-Make-malloc_trim-conditional-on-glibc.patch +++ b/meta/recipes-core/systemd/systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 148645ba8b62f04c7c5ff5907378663f97880f22 Mon Sep 17 00:00:00 2001 | 1 | From 9eb4867b4e2dbdb2484ae854022aff97e2f0feb3 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 2 Aug 2023 12:06:27 -0700 | 3 | Date: Wed, 2 Aug 2023 12:06:27 -0700 |
4 | Subject: [PATCH 1/4] sd-event: Make malloc_trim() conditional on glibc | 4 | Subject: [PATCH 20/22] sd-event: Make malloc_trim() conditional on glibc |
5 | 5 | ||
6 | musl does not have this API | 6 | musl does not have this API |
7 | 7 | ||
@@ -12,28 +12,28 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
12 | 1 file changed, 3 insertions(+), 1 deletion(-) | 12 | 1 file changed, 3 insertions(+), 1 deletion(-) |
13 | 13 | ||
14 | diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c | 14 | diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c |
15 | index aba458185b..48c94a7672 100644 | 15 | index 288798a0dc..6419a7f216 100644 |
16 | --- a/src/libsystemd/sd-event/sd-event.c | 16 | --- a/src/libsystemd/sd-event/sd-event.c |
17 | +++ b/src/libsystemd/sd-event/sd-event.c | 17 | +++ b/src/libsystemd/sd-event/sd-event.c |
18 | @@ -1874,7 +1874,7 @@ _public_ int sd_event_add_exit( | 18 | @@ -1874,7 +1874,7 @@ _public_ int sd_event_add_exit( |
19 | } | 19 | } |
20 | 20 | ||
21 | _public_ int sd_event_trim_memory(void) { | 21 | _public_ int sd_event_trim_memory(void) { |
22 | - int r; | 22 | - int r; |
23 | + int r = 0; | 23 | + int r = 0; |
24 | 24 | ||
25 | /* A default implementation of a memory pressure callback. Simply releases our own allocation caches | 25 | /* A default implementation of a memory pressure callback. Simply releases our own allocation caches |
26 | * and glibc's. This is automatically used when people call sd_event_add_memory_pressure() with a | 26 | * and glibc's. This is automatically used when people call sd_event_add_memory_pressure() with a |
27 | @@ -1888,7 +1888,9 @@ _public_ int sd_event_trim_memory(void) { | 27 | @@ -1888,7 +1888,9 @@ _public_ int sd_event_trim_memory(void) { |
28 | 28 | ||
29 | usec_t before_timestamp = now(CLOCK_MONOTONIC); | 29 | usec_t before_timestamp = now(CLOCK_MONOTONIC); |
30 | hashmap_trim_pools(); | 30 | hashmap_trim_pools(); |
31 | +#ifdef __GLIBC__ | 31 | +#ifdef __GLIBC__ |
32 | r = malloc_trim(0); | 32 | r = malloc_trim(0); |
33 | +#endif | 33 | +#endif |
34 | usec_t after_timestamp = now(CLOCK_MONOTONIC); | 34 | usec_t after_timestamp = now(CLOCK_MONOTONIC); |
35 | 35 | ||
36 | if (r > 0) | 36 | if (r > 0) |
37 | -- | 37 | -- |
38 | 2.41.0 | 38 | 2.34.1 |
39 | 39 | ||
diff --git a/meta/recipes-core/systemd/systemd/0029-shared-Do-not-use-malloc_info-on-musl.patch b/meta/recipes-core/systemd/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch index 8e386551a1..7eff069bb7 100644 --- a/meta/recipes-core/systemd/systemd/0029-shared-Do-not-use-malloc_info-on-musl.patch +++ b/meta/recipes-core/systemd/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 9430646e72ea5d260ade300038a6d976fecf7da5 Mon Sep 17 00:00:00 2001 | 1 | From 502597b9ddd6b145541b23fadca0b1d3ca9f6367 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 2 Aug 2023 12:20:40 -0700 | 3 | Date: Wed, 2 Aug 2023 12:20:40 -0700 |
4 | Subject: [PATCH 4/4] shared: Do not use malloc_info on musl | 4 | Subject: [PATCH 21/22] shared: Do not use malloc_info on musl |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [musl-specific] | 6 | Upstream-Status: Inappropriate [musl-specific] |
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
@@ -10,9 +10,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
10 | src/shared/common-signal.c | 4 ++-- | 10 | src/shared/common-signal.c | 4 ++-- |
11 | 2 files changed, 5 insertions(+), 4 deletions(-) | 11 | 2 files changed, 5 insertions(+), 4 deletions(-) |
12 | 12 | ||
13 | diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c | ||
14 | index 74f148c8b4..2d862a123d 100644 | ||
13 | --- a/src/shared/bus-util.c | 15 | --- a/src/shared/bus-util.c |
14 | +++ b/src/shared/bus-util.c | 16 | +++ b/src/shared/bus-util.c |
15 | @@ -617,15 +617,16 @@ static int method_dump_memory_state_by_f | 17 | @@ -611,15 +611,16 @@ static int method_dump_memory_state_by_fd(sd_bus_message *message, void *userdat |
16 | _cleanup_close_ int fd = -EBADF; | 18 | _cleanup_close_ int fd = -EBADF; |
17 | size_t dump_size; | 19 | size_t dump_size; |
18 | FILE *f; | 20 | FILE *f; |
@@ -31,9 +33,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
31 | if (r < 0) | 33 | if (r < 0) |
32 | return r; | 34 | return r; |
33 | 35 | ||
36 | diff --git a/src/shared/common-signal.c b/src/shared/common-signal.c | ||
37 | index 8e70e365dd..9e782caec9 100644 | ||
34 | --- a/src/shared/common-signal.c | 38 | --- a/src/shared/common-signal.c |
35 | +++ b/src/shared/common-signal.c | 39 | +++ b/src/shared/common-signal.c |
36 | @@ -65,12 +65,12 @@ int sigrtmin18_handler(sd_event_source * | 40 | @@ -65,12 +65,12 @@ int sigrtmin18_handler(sd_event_source *s, const struct signalfd_siginfo *si, vo |
37 | log_oom(); | 41 | log_oom(); |
38 | break; | 42 | break; |
39 | } | 43 | } |
@@ -48,3 +52,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
48 | (void) memstream_dump(LOG_INFO, &m); | 52 | (void) memstream_dump(LOG_INFO, &m); |
49 | break; | 53 | break; |
50 | } | 54 | } |
55 | -- | ||
56 | 2.34.1 | ||
57 | |||
diff --git a/meta/recipes-core/systemd/systemd/0022-avoid-missing-LOCK_EX-declaration.patch b/meta/recipes-core/systemd/systemd/0022-avoid-missing-LOCK_EX-declaration.patch new file mode 100644 index 0000000000..24f3bf74a0 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0022-avoid-missing-LOCK_EX-declaration.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | From fd52f1764647e03a35e8f0ed0ef952049073ccbd Mon Sep 17 00:00:00 2001 | ||
2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
3 | Date: Tue, 2 Jan 2024 11:03:27 +0800 | ||
4 | Subject: [PATCH 22/22] avoid missing LOCK_EX declaration | ||
5 | |||
6 | This only happens on MUSL. Include sys/file.h to avoid compilation | ||
7 | error about missing LOCK_EX declaration. | ||
8 | |||
9 | Upstream-Status: Inappropriate [musl specific] | ||
10 | |||
11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
12 | --- | ||
13 | src/core/exec-invoke.c | 1 + | ||
14 | src/shared/dev-setup.h | 1 + | ||
15 | 2 files changed, 2 insertions(+) | ||
16 | |||
17 | diff --git a/src/core/exec-invoke.c b/src/core/exec-invoke.c | ||
18 | index 70d963e269..7084811439 100644 | ||
19 | --- a/src/core/exec-invoke.c | ||
20 | +++ b/src/core/exec-invoke.c | ||
21 | @@ -4,6 +4,7 @@ | ||
22 | #include <sys/ioctl.h> | ||
23 | #include <sys/mount.h> | ||
24 | #include <sys/prctl.h> | ||
25 | +#include <sys/file.h> | ||
26 | |||
27 | #if HAVE_PAM | ||
28 | #include <security/pam_appl.h> | ||
29 | diff --git a/src/shared/dev-setup.h b/src/shared/dev-setup.h | ||
30 | index 5339bc4e5e..0697495f23 100644 | ||
31 | --- a/src/shared/dev-setup.h | ||
32 | +++ b/src/shared/dev-setup.h | ||
33 | @@ -2,6 +2,7 @@ | ||
34 | #pragma once | ||
35 | |||
36 | #include <sys/types.h> | ||
37 | +#include <sys/file.h> | ||
38 | |||
39 | int lock_dev_console(void); | ||
40 | |||
41 | -- | ||
42 | 2.34.1 | ||
43 | |||
diff --git a/meta/recipes-core/systemd/systemd_254.4.bb b/meta/recipes-core/systemd/systemd_254.4.bb index 05cfc734bf..2819755b81 100644 --- a/meta/recipes-core/systemd/systemd_254.4.bb +++ b/meta/recipes-core/systemd/systemd_254.4.bb | |||
@@ -35,27 +35,28 @@ SRC_URI += " \ | |||
35 | # patches needed by musl | 35 | # patches needed by musl |
36 | SRC_URI:append:libc-musl = " ${SRC_URI_MUSL}" | 36 | SRC_URI:append:libc-musl = " ${SRC_URI_MUSL}" |
37 | SRC_URI_MUSL = "\ | 37 | SRC_URI_MUSL = "\ |
38 | file://0009-missing_type.h-add-comparison_fn_t.patch \ | 38 | file://0001-missing_type.h-add-comparison_fn_t.patch \ |
39 | file://0010-add-fallback-parse_printf_format-implementation.patch \ | 39 | file://0002-add-fallback-parse_printf_format-implementation.patch \ |
40 | file://0011-src-basic-missing.h-check-for-missing-strndupa.patch \ | 40 | file://0003-src-basic-missing.h-check-for-missing-strndupa.patch \ |
41 | file://0012-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch \ | 41 | file://0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch \ |
42 | file://0013-add-missing-FTW_-macros-for-musl.patch \ | 42 | file://0005-add-missing-FTW_-macros-for-musl.patch \ |
43 | file://0014-Use-uintmax_t-for-handling-rlim_t.patch \ | 43 | file://0006-Use-uintmax_t-for-handling-rlim_t.patch \ |
44 | file://0016-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch \ | 44 | file://0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch \ |
45 | file://0017-Define-glibc-compatible-basename-for-non-glibc-syste.patch \ | 45 | file://0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch \ |
46 | file://0018-Do-not-disable-buffering-when-writing-to-oom_score_a.patch \ | 46 | file://0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch \ |
47 | file://0019-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch \ | 47 | file://0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch \ |
48 | file://0020-avoid-redefinition-of-prctl_mm_map-structure.patch \ | 48 | file://0011-avoid-redefinition-of-prctl_mm_map-structure.patch \ |
49 | file://0021-do-not-disable-buffer-in-writing-files.patch \ | 49 | file://0012-do-not-disable-buffer-in-writing-files.patch \ |
50 | file://0022-Handle-__cpu_mask-usage.patch \ | 50 | file://0013-Handle-__cpu_mask-usage.patch \ |
51 | file://0023-Handle-missing-gshadow.patch \ | 51 | file://0014-Handle-missing-gshadow.patch \ |
52 | file://0024-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch \ | 52 | file://0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch \ |
53 | file://0005-pass-correct-parameters-to-getdents64.patch \ | 53 | file://0016-pass-correct-parameters-to-getdents64.patch \ |
54 | file://0001-Adjust-for-musl-headers.patch \ | 54 | file://0017-Adjust-for-musl-headers.patch \ |
55 | file://0006-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch \ | 55 | file://0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch \ |
56 | file://0003-errno-util-Make-STRERROR-portable-for-musl.patch \ | 56 | file://0019-errno-util-Make-STRERROR-portable-for-musl.patch \ |
57 | file://0028-sd-event-Make-malloc_trim-conditional-on-glibc.patch \ | 57 | file://0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch \ |
58 | file://0029-shared-Do-not-use-malloc_info-on-musl.patch \ | 58 | file://0021-shared-Do-not-use-malloc_info-on-musl.patch \ |
59 | file://0022-avoid-missing-LOCK_EX-declaration.patch \ | ||
59 | " | 60 | " |
60 | 61 | ||
61 | PAM_PLUGINS = " \ | 62 | PAM_PLUGINS = " \ |