summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2020-02-06 16:48:13 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-08 13:20:02 +0000
commit306820bad60c62a8096df8d1e4c7cc8e00dc38b7 (patch)
tree78fe9e9d90e19ca52f2cc462e1368e90484d4b4d /meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch
parentcc7164836097a4100dce65e93b24a3a8874f65b3 (diff)
downloadpoky-306820bad60c62a8096df8d1e4c7cc8e00dc38b7.tar.gz
systemd: upgrade 243.4 -> 244.1
Drop 0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch a variant on which was introduced in 2c1047310970 ("Upgrade to systemd 211+") in 2014. The oldest supported build machine is now CentOS 7 which has --relative support in ln, so there no longer appears to be any need for this change. Rebase/refresh musl patches: - replace missing.h with specific missing_... header - fix additional WRITE_STRING_FILE_DISABLE_BUFFER - fix more places that need netinet/if_ether.h (From OE-Core rev: 44a4ac2294da0f53cbbfabc7ece836fe97f4d3f7) Signed-off-by: Alex Kiernan <alex.kiernan@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.patch29
1 files changed, 15 insertions, 14 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 a2aad40ac2..71e52c4967 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 @@
1From 7bcf3b166694090497a0acd2c5299e4e04fcc9b6 Mon Sep 17 00:00:00 2001 1From 142dcaef0d24a78d3c0c94168b66fdf234497e97 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Mon, 25 Feb 2019 14:04:21 +0800 3Date: Mon, 25 Feb 2019 14:04:21 +0800
4Subject: [PATCH 04/24] add fallback parse_printf_format implementation 4Subject: [PATCH] add fallback parse_printf_format implementation
5 5
6Upstream-Status: Inappropriate [musl specific] 6Upstream-Status: Inappropriate [musl specific]
7 7
@@ -10,11 +10,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
10Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 10Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
11[rebased for systemd 243] 11[rebased for systemd 243]
12Signed-off-by: Scott Murray <scott.murray@konsulko.com> 12Signed-off-by: Scott Murray <scott.murray@konsulko.com>
13
13--- 14---
14 meson.build | 1 + 15 meson.build | 1 +
15 src/basic/meson.build | 5 + 16 src/basic/meson.build | 5 +
16 src/basic/parse-printf-format.c | 273 ++++++++++++++++++++++++++++++++++++++++ 17 src/basic/parse-printf-format.c | 273 ++++++++++++++++++++++++++++++++
17 src/basic/parse-printf-format.h | 57 +++++++++ 18 src/basic/parse-printf-format.h | 57 +++++++
18 src/basic/stdio-util.h | 2 +- 19 src/basic/stdio-util.h | 2 +-
19 src/journal/journal-send.c | 2 +- 20 src/journal/journal-send.c | 2 +-
20 6 files changed, 338 insertions(+), 2 deletions(-) 21 6 files changed, 338 insertions(+), 2 deletions(-)
@@ -22,10 +23,10 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
22 create mode 100644 src/basic/parse-printf-format.h 23 create mode 100644 src/basic/parse-printf-format.h
23 24
24diff --git a/meson.build b/meson.build 25diff --git a/meson.build b/meson.build
25index 79b762faeb..7f8c679411 100644 26index 21d6968abdf4..bab0bf84806c 100644
26--- a/meson.build 27--- a/meson.build
27+++ b/meson.build 28+++ b/meson.build
28@@ -613,6 +613,7 @@ endif 29@@ -628,6 +628,7 @@ endif
29 foreach header : ['crypt.h', 30 foreach header : ['crypt.h',
30 'linux/memfd.h', 31 'linux/memfd.h',
31 'linux/vm_sockets.h', 32 'linux/vm_sockets.h',
@@ -34,10 +35,10 @@ index 79b762faeb..7f8c679411 100644
34 'valgrind/memcheck.h', 35 'valgrind/memcheck.h',
35 'valgrind/valgrind.h', 36 'valgrind/valgrind.h',
36diff --git a/src/basic/meson.build b/src/basic/meson.build 37diff --git a/src/basic/meson.build b/src/basic/meson.build
37index d6caf28f14..32c1acf349 100644 38index f70d1b8bf8a0..4cd57373e10d 100644
38--- a/src/basic/meson.build 39--- a/src/basic/meson.build
39+++ b/src/basic/meson.build 40+++ b/src/basic/meson.build
40@@ -312,6 +312,11 @@ foreach item : [['af', af_list_txt, 'af', ''], 41@@ -311,6 +311,11 @@ foreach item : [['af', af_list_txt, 'af', ''],
41 endforeach 42 endforeach
42 43
43 basic_sources += generated_gperf_headers 44 basic_sources += generated_gperf_headers
@@ -51,7 +52,7 @@ index d6caf28f14..32c1acf349 100644
51 'gcrypt-util.h') 52 'gcrypt-util.h')
52diff --git a/src/basic/parse-printf-format.c b/src/basic/parse-printf-format.c 53diff --git a/src/basic/parse-printf-format.c b/src/basic/parse-printf-format.c
53new file mode 100644 54new file mode 100644
54index 0000000000..49437e5445 55index 000000000000..49437e544540
55--- /dev/null 56--- /dev/null
56+++ b/src/basic/parse-printf-format.c 57+++ b/src/basic/parse-printf-format.c
57@@ -0,0 +1,273 @@ 58@@ -0,0 +1,273 @@
@@ -330,7 +331,7 @@ index 0000000000..49437e5445
330+} 331+}
331diff --git a/src/basic/parse-printf-format.h b/src/basic/parse-printf-format.h 332diff --git a/src/basic/parse-printf-format.h b/src/basic/parse-printf-format.h
332new file mode 100644 333new file mode 100644
333index 0000000000..47be7522d7 334index 000000000000..47be7522d7fa
334--- /dev/null 335--- /dev/null
335+++ b/src/basic/parse-printf-format.h 336+++ b/src/basic/parse-printf-format.h
336@@ -0,0 +1,57 @@ 337@@ -0,0 +1,57 @@
@@ -392,7 +393,7 @@ index 0000000000..47be7522d7
392+ 393+
393+#endif /* HAVE_PRINTF_H */ 394+#endif /* HAVE_PRINTF_H */
394diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h 395diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h
395index c3b9448d4f..2937aa13b1 100644 396index c3b9448d4f4f..2937aa13b178 100644
396--- a/src/basic/stdio-util.h 397--- a/src/basic/stdio-util.h
397+++ b/src/basic/stdio-util.h 398+++ b/src/basic/stdio-util.h
398@@ -1,13 +1,13 @@ 399@@ -1,13 +1,13 @@
@@ -411,7 +412,7 @@ index c3b9448d4f..2937aa13b1 100644
411 #define snprintf_ok(buf, len, fmt, ...) \ 412 #define snprintf_ok(buf, len, fmt, ...) \
412 ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len)) 413 ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len))
413diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c 414diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c
414index 5ef11fa1a4..6384ab620c 100644 415index 912ecef73cce..43ed756bda53 100644
415--- a/src/journal/journal-send.c 416--- a/src/journal/journal-send.c
416+++ b/src/journal/journal-send.c 417+++ b/src/journal/journal-send.c
417@@ -2,7 +2,6 @@ 418@@ -2,7 +2,6 @@
@@ -420,9 +421,9 @@ index 5ef11fa1a4..6384ab620c 100644
420 #include <fcntl.h> 421 #include <fcntl.h>
421-#include <printf.h> 422-#include <printf.h>
422 #include <stddef.h> 423 #include <stddef.h>
423 #include <sys/socket.h>
424 #include <sys/un.h> 424 #include <sys/un.h>
425@@ -21,6 +20,7 @@ 425 #include <unistd.h>
426@@ -20,6 +19,7 @@
426 #include "stdio-util.h" 427 #include "stdio-util.h"
427 #include "string-util.h" 428 #include "string-util.h"
428 #include "tmpfile-util.h" 429 #include "tmpfile-util.h"