diff options
author | Khem Raj <raj.khem@gmail.com> | 2022-01-24 11:11:43 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-01-26 06:27:00 +0000 |
commit | e7ffa406dcaefd168b1641fee2f19ca3df850d53 (patch) | |
tree | 605ac6337bb21ef2d286627879eda3b082ceff00 /meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch | |
parent | 603dffc49a2c0084ce73340fdf1d7c624d1a954e (diff) | |
download | poky-e7ffa406dcaefd168b1641fee2f19ca3df850d53.tar.gz |
systemd: Forward port musl patches
Redo the header include patch and add fixes for new code.
(From OE-Core rev: 7e35a575ef09a85e625a81e0b4d80b020e3e3a92)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch b/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch index 40ee43b155..d93f630752 100644 --- a/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch +++ b/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch | |||
@@ -22,11 +22,9 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
22 | create mode 100644 src/basic/parse-printf-format.c | 22 | create mode 100644 src/basic/parse-printf-format.c |
23 | create mode 100644 src/basic/parse-printf-format.h | 23 | create mode 100644 src/basic/parse-printf-format.h |
24 | 24 | ||
25 | diff --git a/meson.build b/meson.build | ||
26 | index 5bdfd9753d..3421da3a4d 100644 | ||
27 | --- a/meson.build | 25 | --- a/meson.build |
28 | +++ b/meson.build | 26 | +++ b/meson.build |
29 | @@ -656,6 +656,7 @@ endif | 27 | @@ -686,6 +686,7 @@ endif |
30 | foreach header : ['crypt.h', | 28 | foreach header : ['crypt.h', |
31 | 'linux/memfd.h', | 29 | 'linux/memfd.h', |
32 | 'linux/vm_sockets.h', | 30 | 'linux/vm_sockets.h', |
@@ -34,11 +32,9 @@ index 5bdfd9753d..3421da3a4d 100644 | |||
34 | 'sys/auxv.h', | 32 | 'sys/auxv.h', |
35 | 'valgrind/memcheck.h', | 33 | 'valgrind/memcheck.h', |
36 | 'valgrind/valgrind.h', | 34 | 'valgrind/valgrind.h', |
37 | diff --git a/src/basic/meson.build b/src/basic/meson.build | ||
38 | index 452b965db3..4e64d883dc 100644 | ||
39 | --- a/src/basic/meson.build | 35 | --- a/src/basic/meson.build |
40 | +++ b/src/basic/meson.build | 36 | +++ b/src/basic/meson.build |
41 | @@ -321,6 +321,11 @@ endforeach | 37 | @@ -335,6 +335,11 @@ endforeach |
42 | 38 | ||
43 | basic_sources += generated_gperf_headers | 39 | basic_sources += generated_gperf_headers |
44 | 40 | ||
@@ -50,9 +46,6 @@ index 452b965db3..4e64d883dc 100644 | |||
50 | ############################################################ | 46 | ############################################################ |
51 | 47 | ||
52 | arch_list = [ | 48 | arch_list = [ |
53 | diff --git a/src/basic/parse-printf-format.c b/src/basic/parse-printf-format.c | ||
54 | new file mode 100644 | ||
55 | index 0000000000..49437e5445 | ||
56 | --- /dev/null | 49 | --- /dev/null |
57 | +++ b/src/basic/parse-printf-format.c | 50 | +++ b/src/basic/parse-printf-format.c |
58 | @@ -0,0 +1,273 @@ | 51 | @@ -0,0 +1,273 @@ |
@@ -329,9 +322,6 @@ index 0000000000..49437e5445 | |||
329 | + | 322 | + |
330 | + return last; | 323 | + return last; |
331 | +} | 324 | +} |
332 | diff --git a/src/basic/parse-printf-format.h b/src/basic/parse-printf-format.h | ||
333 | new file mode 100644 | ||
334 | index 0000000000..47be7522d7 | ||
335 | --- /dev/null | 325 | --- /dev/null |
336 | +++ b/src/basic/parse-printf-format.h | 326 | +++ b/src/basic/parse-printf-format.h |
337 | @@ -0,0 +1,57 @@ | 327 | @@ -0,0 +1,57 @@ |
@@ -392,8 +382,6 @@ index 0000000000..47be7522d7 | |||
392 | +size_t parse_printf_format(const char *fmt, size_t n, int *types); | 382 | +size_t parse_printf_format(const char *fmt, size_t n, int *types); |
393 | + | 383 | + |
394 | +#endif /* HAVE_PRINTF_H */ | 384 | +#endif /* HAVE_PRINTF_H */ |
395 | diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h | ||
396 | index 6dc1e72312..cea76b36cf 100644 | ||
397 | --- a/src/basic/stdio-util.h | 385 | --- a/src/basic/stdio-util.h |
398 | +++ b/src/basic/stdio-util.h | 386 | +++ b/src/basic/stdio-util.h |
399 | @@ -1,13 +1,13 @@ | 387 | @@ -1,13 +1,13 @@ |
@@ -409,10 +397,8 @@ index 6dc1e72312..cea76b36cf 100644 | |||
409 | #include "memory-util.h" | 397 | #include "memory-util.h" |
410 | +#include "parse-printf-format.h" | 398 | +#include "parse-printf-format.h" |
411 | 399 | ||
412 | #define snprintf_ok(buf, len, fmt, ...) \ | 400 | #define snprintf_ok(buf, len, fmt, ...) \ |
413 | ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len)) | 401 | ({ \ |
414 | diff --git a/src/libsystemd/sd-journal/journal-send.c b/src/libsystemd/sd-journal/journal-send.c | ||
415 | index fd3fd7ef9c..e8e6ad555b 100644 | ||
416 | --- a/src/libsystemd/sd-journal/journal-send.c | 402 | --- a/src/libsystemd/sd-journal/journal-send.c |
417 | +++ b/src/libsystemd/sd-journal/journal-send.c | 403 | +++ b/src/libsystemd/sd-journal/journal-send.c |
418 | @@ -2,7 +2,6 @@ | 404 | @@ -2,7 +2,6 @@ |