summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch
diff options
context:
space:
mode:
authorAndrej Valek <andrej.valek@siemens.com>2019-04-18 12:19:06 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-26 10:09:08 +0100
commitc814947e03943c305226f17686f34b0c62450680 (patch)
treef0000576030b9d1d3d0b3f61e57da3daf7f579cf /meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch
parent018be19fbf50dc5d9be9aa1dad5f33023cec1595 (diff)
downloadpoky-c814947e03943c305226f17686f34b0c62450680.tar.gz
systemd: upgrade to 242
PATCH REBASED: ============== 0001-do-not-disable-buffer-in-writing-files.patch 0002-don-t-use-glibc-specific-qsort_r.patch 0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch 0004-add-fallback-parse_printf_format-implementation.patch 0005-rules-watch-metadata-changes-in-ide-devices.patch 0005-src-basic-missing.h-check-for-missing-strndupa.patch 0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch 0009-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch 0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch 0021-avoid-redefinition-of-prctl_mm_map-structure.patch 0024-test-json.c-define-M_PIl.patch PATCH DROPPED: ============== 0001-meson-declare-version.h-as-dep-for-various-targets-t.patch 0001-meson-declare-version.h-as-dependency-for-systemd.patch 0013-test-hexdecoct.c-Include-missing.h-for-strndupa.patch PATCH ADDED: 0025-fs-utilh-add-missing-sys-stat-include.patch (From OE-Core rev: 1d453c9087f92da1ceddc66a887941e4929b3448) Signed-off-by: Andrej Valek <andrej.valek@siemens.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.patch22
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
22diff --git a/meson.build b/meson.build 22diff --git a/meson.build b/meson.build
23index 3386546..44b24ee 100644 23index 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',
34diff --git a/src/basic/meson.build b/src/basic/meson.build 34diff --git a/src/basic/meson.build b/src/basic/meson.build
35index e5852f3..2192a0c 100644 35index 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')
50diff --git a/src/basic/parse-printf-format.c b/src/basic/parse-printf-format.c 50diff --git a/src/basic/parse-printf-format.c b/src/basic/parse-printf-format.c
51new file mode 100644 51new file mode 100644
52index 0000000..49437e5 52index 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+}
329diff --git a/src/basic/parse-printf-format.h b/src/basic/parse-printf-format.h 329diff --git a/src/basic/parse-printf-format.h b/src/basic/parse-printf-format.h
330new file mode 100644 330new file mode 100644
331index 0000000..47be752 331index 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 */
392diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h 392diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h
393index dc67b6e..cf8d514 100644 393index 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))
411diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c 411diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c
412index 8618454..3fea912 100644 412index 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--
4322.7.4 4322.11.0
433 433