diff options
| -rw-r--r-- | meta/recipes-core/systemd/systemd/0010-add-fallback-parse_printf_format-implementation.patch | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/meta/recipes-core/systemd/systemd/0010-add-fallback-parse_printf_format-implementation.patch b/meta/recipes-core/systemd/systemd/0010-add-fallback-parse_printf_format-implementation.patch index 6f01721459..2090d81dc3 100644 --- a/meta/recipes-core/systemd/systemd/0010-add-fallback-parse_printf_format-implementation.patch +++ b/meta/recipes-core/systemd/systemd/0010-add-fallback-parse_printf_format-implementation.patch | |||
| @@ -21,8 +21,6 @@ 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 bfc86857d6..fb96143c37 100644 | ||
| 26 | --- a/meson.build | 24 | --- a/meson.build |
| 27 | +++ b/meson.build | 25 | +++ b/meson.build |
| 28 | @@ -755,6 +755,7 @@ endif | 26 | @@ -755,6 +755,7 @@ endif |
| @@ -31,10 +29,8 @@ index bfc86857d6..fb96143c37 100644 | |||
| 31 | 'linux/vm_sockets.h', | 29 | 'linux/vm_sockets.h', |
| 32 | + 'printf.h', | 30 | + 'printf.h', |
| 33 | 'sys/auxv.h', | 31 | 'sys/auxv.h', |
| 32 | 'threads.h', | ||
| 34 | 'valgrind/memcheck.h', | 33 | 'valgrind/memcheck.h', |
| 35 | 'valgrind/valgrind.h', | ||
| 36 | diff --git a/src/basic/meson.build b/src/basic/meson.build | ||
| 37 | index 7aae031d81..1aa9f5006d 100644 | ||
| 38 | --- a/src/basic/meson.build | 34 | --- a/src/basic/meson.build |
| 39 | +++ b/src/basic/meson.build | 35 | +++ b/src/basic/meson.build |
| 40 | @@ -173,6 +173,11 @@ endforeach | 36 | @@ -173,6 +173,11 @@ endforeach |
| @@ -49,9 +45,6 @@ index 7aae031d81..1aa9f5006d 100644 | |||
| 49 | ############################################################ | 45 | ############################################################ |
| 50 | 46 | ||
| 51 | arch_list = [ | 47 | 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 | ||
| 55 | --- /dev/null | 48 | --- /dev/null |
| 56 | +++ b/src/basic/parse-printf-format.c | 49 | +++ b/src/basic/parse-printf-format.c |
| 57 | @@ -0,0 +1,273 @@ | 50 | @@ -0,0 +1,273 @@ |
| @@ -328,9 +321,6 @@ index 0000000000..49437e5445 | |||
| 328 | + | 321 | + |
| 329 | + return last; | 322 | + return last; |
| 330 | +} | 323 | +} |
| 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 | ||
| 334 | --- /dev/null | 324 | --- /dev/null |
| 335 | +++ b/src/basic/parse-printf-format.h | 325 | +++ b/src/basic/parse-printf-format.h |
| 336 | @@ -0,0 +1,57 @@ | 326 | @@ -0,0 +1,57 @@ |
| @@ -391,8 +381,6 @@ index 0000000000..47be7522d7 | |||
| 391 | +size_t parse_printf_format(const char *fmt, size_t n, int *types); | 381 | +size_t parse_printf_format(const char *fmt, size_t n, int *types); |
| 392 | + | 382 | + |
| 393 | +#endif /* HAVE_PRINTF_H */ | 383 | +#endif /* HAVE_PRINTF_H */ |
| 394 | diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h | ||
| 395 | index 4e93ac90c9..f9deb6f662 100644 | ||
| 396 | --- a/src/basic/stdio-util.h | 384 | --- a/src/basic/stdio-util.h |
| 397 | +++ b/src/basic/stdio-util.h | 385 | +++ b/src/basic/stdio-util.h |
| 398 | @@ -1,12 +1,12 @@ | 386 | @@ -1,12 +1,12 @@ |
| @@ -409,8 +397,6 @@ index 4e93ac90c9..f9deb6f662 100644 | |||
| 409 | 397 | ||
| 410 | _printf_(3, 4) | 398 | _printf_(3, 4) |
| 411 | static inline char *snprintf_ok(char *buf, size_t len, const char *format, ...) { | 399 | 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 3b74d2246e..136ebcb153 100644 | ||
| 414 | --- a/src/libsystemd/sd-journal/journal-send.c | 400 | --- a/src/libsystemd/sd-journal/journal-send.c |
| 415 | +++ b/src/libsystemd/sd-journal/journal-send.c | 401 | +++ b/src/libsystemd/sd-journal/journal-send.c |
| 416 | @@ -2,7 +2,6 @@ | 402 | @@ -2,7 +2,6 @@ |
| @@ -429,6 +415,3 @@ index 3b74d2246e..136ebcb153 100644 | |||
| 429 | 415 | ||
| 430 | #define SNDBUF_SIZE (8*1024*1024) | 416 | #define SNDBUF_SIZE (8*1024*1024) |
| 431 | 417 | ||
| 432 | -- | ||
| 433 | 2.39.2 | ||
| 434 | |||
