diff options
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, 11 insertions, 11 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 bb738e22c1..fa8217e3da 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 | |||
@@ -20,10 +20,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
20 | create mode 100644 src/basic/parse-printf-format.h | 20 | create mode 100644 src/basic/parse-printf-format.h |
21 | 21 | ||
22 | diff --git a/meson.build b/meson.build | 22 | diff --git a/meson.build b/meson.build |
23 | index 3386546..44b24ee 100644 | 23 | index 79195c9748..0bffbf29c5 100644 |
24 | --- a/meson.build | 24 | --- a/meson.build |
25 | +++ b/meson.build | 25 | +++ b/meson.build |
26 | @@ -667,6 +667,7 @@ foreach header : ['crypt.h', | 26 | @@ -685,6 +685,7 @@ foreach header : ['crypt.h', |
27 | 'linux/memfd.h', | 27 | 'linux/memfd.h', |
28 | 'linux/vm_sockets.h', | 28 | 'linux/vm_sockets.h', |
29 | 'linux/can/vxcan.h', | 29 | 'linux/can/vxcan.h', |
@@ -32,10 +32,10 @@ index 3386546..44b24ee 100644 | |||
32 | 'valgrind/memcheck.h', | 32 | 'valgrind/memcheck.h', |
33 | 'valgrind/valgrind.h', | 33 | 'valgrind/valgrind.h', |
34 | diff --git a/src/basic/meson.build b/src/basic/meson.build | 34 | diff --git a/src/basic/meson.build b/src/basic/meson.build |
35 | index e5852f3..2192a0c 100644 | 35 | index 91e0df3d2f..a732b554da 100644 |
36 | --- a/src/basic/meson.build | 36 | --- a/src/basic/meson.build |
37 | +++ b/src/basic/meson.build | 37 | +++ b/src/basic/meson.build |
38 | @@ -284,6 +284,11 @@ foreach item : [['af', af_list_txt, 'af', ''], | 38 | @@ -298,6 +298,11 @@ foreach item : [['af', af_list_txt, 'af', ''], |
39 | endforeach | 39 | endforeach |
40 | 40 | ||
41 | basic_sources += generated_gperf_headers | 41 | basic_sources += generated_gperf_headers |
@@ -49,7 +49,7 @@ index e5852f3..2192a0c 100644 | |||
49 | 'gcrypt-util.h') | 49 | 'gcrypt-util.h') |
50 | diff --git a/src/basic/parse-printf-format.c b/src/basic/parse-printf-format.c | 50 | diff --git a/src/basic/parse-printf-format.c b/src/basic/parse-printf-format.c |
51 | new file mode 100644 | 51 | new file mode 100644 |
52 | index 0000000..49437e5 | 52 | index 0000000000..49437e5445 |
53 | --- /dev/null | 53 | --- /dev/null |
54 | +++ b/src/basic/parse-printf-format.c | 54 | +++ b/src/basic/parse-printf-format.c |
55 | @@ -0,0 +1,273 @@ | 55 | @@ -0,0 +1,273 @@ |
@@ -328,7 +328,7 @@ index 0000000..49437e5 | |||
328 | +} | 328 | +} |
329 | diff --git a/src/basic/parse-printf-format.h b/src/basic/parse-printf-format.h | 329 | diff --git a/src/basic/parse-printf-format.h b/src/basic/parse-printf-format.h |
330 | new file mode 100644 | 330 | new file mode 100644 |
331 | index 0000000..47be752 | 331 | index 0000000000..47be7522d7 |
332 | --- /dev/null | 332 | --- /dev/null |
333 | +++ b/src/basic/parse-printf-format.h | 333 | +++ b/src/basic/parse-printf-format.h |
334 | @@ -0,0 +1,57 @@ | 334 | @@ -0,0 +1,57 @@ |
@@ -390,7 +390,7 @@ index 0000000..47be752 | |||
390 | + | 390 | + |
391 | +#endif /* HAVE_PRINTF_H */ | 391 | +#endif /* HAVE_PRINTF_H */ |
392 | diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h | 392 | diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h |
393 | index dc67b6e..cf8d514 100644 | 393 | index c3b9448d4f..2937aa13b1 100644 |
394 | --- a/src/basic/stdio-util.h | 394 | --- a/src/basic/stdio-util.h |
395 | +++ b/src/basic/stdio-util.h | 395 | +++ b/src/basic/stdio-util.h |
396 | @@ -1,13 +1,13 @@ | 396 | @@ -1,13 +1,13 @@ |
@@ -403,13 +403,13 @@ index dc67b6e..cf8d514 100644 | |||
403 | #include <sys/types.h> | 403 | #include <sys/types.h> |
404 | 404 | ||
405 | #include "macro.h" | 405 | #include "macro.h" |
406 | #include "util.h" | 406 | #include "memory-util.h" |
407 | +#include "parse-printf-format.h" | 407 | +#include "parse-printf-format.h" |
408 | 408 | ||
409 | #define snprintf_ok(buf, len, fmt, ...) \ | 409 | #define snprintf_ok(buf, len, fmt, ...) \ |
410 | ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len)) | 410 | ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len)) |
411 | diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c | 411 | diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c |
412 | index 8618454..3fea912 100644 | 412 | index 5ef11fa1a4..6384ab620c 100644 |
413 | --- a/src/journal/journal-send.c | 413 | --- a/src/journal/journal-send.c |
414 | +++ b/src/journal/journal-send.c | 414 | +++ b/src/journal/journal-send.c |
415 | @@ -2,7 +2,6 @@ | 415 | @@ -2,7 +2,6 @@ |
@@ -421,13 +421,13 @@ index 8618454..3fea912 100644 | |||
421 | #include <sys/socket.h> | 421 | #include <sys/socket.h> |
422 | #include <sys/un.h> | 422 | #include <sys/un.h> |
423 | @@ -21,6 +20,7 @@ | 423 | @@ -21,6 +20,7 @@ |
424 | #include "stdio-util.h" | ||
424 | #include "string-util.h" | 425 | #include "string-util.h" |
425 | #include "tmpfile-util.h" | 426 | #include "tmpfile-util.h" |
426 | #include "util.h" | ||
427 | +#include "parse-printf-format.h" | 427 | +#include "parse-printf-format.h" |
428 | 428 | ||
429 | #define SNDBUF_SIZE (8*1024*1024) | 429 | #define SNDBUF_SIZE (8*1024*1024) |
430 | 430 | ||
431 | -- | 431 | -- |
432 | 2.7.4 | 432 | 2.11.0 |
433 | 433 | ||