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 | 33 |
1 files changed, 17 insertions, 16 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 7652a2d8cc..bb738e22c1 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 | |||
@@ -1,7 +1,7 @@ | |||
1 | From 582af7ec13131dfcc620ed81de7b211914c4cb03 Mon Sep 17 00:00:00 2001 | 1 | From 7bcf3b166694090497a0acd2c5299e4e04fcc9b6 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, 29 Jun 2018 13:43:49 +0800 | 3 | Date: Mon, 25 Feb 2019 14:04:21 +0800 |
4 | Subject: [PATCH 04/19] add fallback parse_printf_format implementation | 4 | Subject: [PATCH 04/24] add fallback parse_printf_format implementation |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [musl specific] | 6 | Upstream-Status: Inappropriate [musl specific] |
7 | 7 | ||
@@ -20,25 +20,25 @@ 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 e045b9224..8c16bc979 100644 | 23 | index 3386546..44b24ee 100644 |
24 | --- a/meson.build | 24 | --- a/meson.build |
25 | +++ b/meson.build | 25 | +++ b/meson.build |
26 | @@ -598,6 +598,7 @@ foreach header : ['crypt.h', | 26 | @@ -667,6 +667,7 @@ foreach header : ['crypt.h', |
27 | 'linux/btrfs.h', | ||
28 | 'linux/memfd.h', | 27 | 'linux/memfd.h', |
29 | 'linux/vm_sockets.h', | 28 | 'linux/vm_sockets.h', |
29 | 'linux/can/vxcan.h', | ||
30 | + 'printf.h', | 30 | + 'printf.h', |
31 | 'sys/auxv.h', | 31 | 'sys/auxv.h', |
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 31625b178..0c27528e7 100644 | 35 | index e5852f3..2192a0c 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 | @@ -302,6 +302,11 @@ foreach item : [['af', af_list_txt, 'af', ''], | 38 | @@ -284,6 +284,11 @@ foreach item : [['af', af_list_txt, 'af', ''], |
39 | endforeach | 39 | endforeach |
40 | 40 | ||
41 | basic_sources += [missing_h] + generated_gperf_headers | 41 | basic_sources += generated_gperf_headers |
42 | + | 42 | + |
43 | +if conf.get('HAVE_PRINTF_H') != 1 | 43 | +if conf.get('HAVE_PRINTF_H') != 1 |
44 | + basic_sources += [files('parse-printf-format.c')] | 44 | + basic_sources += [files('parse-printf-format.c')] |
@@ -49,7 +49,7 @@ index 31625b178..0c27528e7 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 000000000..49437e544 | 52 | index 0000000..49437e5 |
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 000000000..49437e544 | |||
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 000000000..47be7522d | 331 | index 0000000..47be752 |
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,10 +390,10 @@ index 000000000..47be7522d | |||
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 73c03274c..30192cd71 100644 | 393 | index dc67b6e..cf8d514 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,12 +1,12 @@ | 396 | @@ -1,13 +1,13 @@ |
397 | /* SPDX-License-Identifier: LGPL-2.1+ */ | 397 | /* SPDX-License-Identifier: LGPL-2.1+ */ |
398 | #pragma once | 398 | #pragma once |
399 | 399 | ||
@@ -403,12 +403,13 @@ index 73c03274c..30192cd71 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 "parse-printf-format.h" | 407 | +#include "parse-printf-format.h" |
407 | 408 | ||
408 | #define snprintf_ok(buf, len, fmt, ...) \ | 409 | #define snprintf_ok(buf, len, fmt, ...) \ |
409 | ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len)) | 410 | ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len)) |
410 | 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 |
411 | index a0621524a..65bcbcd2e 100644 | 412 | index 8618454..3fea912 100644 |
412 | --- a/src/journal/journal-send.c | 413 | --- a/src/journal/journal-send.c |
413 | +++ b/src/journal/journal-send.c | 414 | +++ b/src/journal/journal-send.c |
414 | @@ -2,7 +2,6 @@ | 415 | @@ -2,7 +2,6 @@ |
@@ -420,13 +421,13 @@ index a0621524a..65bcbcd2e 100644 | |||
420 | #include <sys/socket.h> | 421 | #include <sys/socket.h> |
421 | #include <sys/un.h> | 422 | #include <sys/un.h> |
422 | @@ -21,6 +20,7 @@ | 423 | @@ -21,6 +20,7 @@ |
423 | #include "stdio-util.h" | ||
424 | #include "string-util.h" | 424 | #include "string-util.h" |
425 | #include "tmpfile-util.h" | ||
425 | #include "util.h" | 426 | #include "util.h" |
426 | +#include "parse-printf-format.h" | 427 | +#include "parse-printf-format.h" |
427 | 428 | ||
428 | #define SNDBUF_SIZE (8*1024*1024) | 429 | #define SNDBUF_SIZE (8*1024*1024) |
429 | 430 | ||
430 | -- | 431 | -- |
431 | 2.11.0 | 432 | 2.7.4 |
432 | 433 | ||