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 | 15 |
1 files changed, 7 insertions, 8 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 fa8217e3da..a2aad40ac2 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 | |||
@@ -8,6 +8,8 @@ Upstream-Status: Inappropriate [musl specific] | |||
8 | Signed-off-by: Emil Renner Berthing <systemd@esmil.dk> | 8 | Signed-off-by: Emil Renner Berthing <systemd@esmil.dk> |
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
10 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 10 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
11 | [rebased for systemd 243] | ||
12 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> | ||
11 | --- | 13 | --- |
12 | meson.build | 1 + | 14 | meson.build | 1 + |
13 | src/basic/meson.build | 5 + | 15 | src/basic/meson.build | 5 + |
@@ -20,22 +22,22 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
20 | create mode 100644 src/basic/parse-printf-format.h | 22 | create mode 100644 src/basic/parse-printf-format.h |
21 | 23 | ||
22 | diff --git a/meson.build b/meson.build | 24 | diff --git a/meson.build b/meson.build |
23 | index 79195c9748..0bffbf29c5 100644 | 25 | index 79b762faeb..7f8c679411 100644 |
24 | --- a/meson.build | 26 | --- a/meson.build |
25 | +++ b/meson.build | 27 | +++ b/meson.build |
26 | @@ -685,6 +685,7 @@ foreach header : ['crypt.h', | 28 | @@ -613,6 +613,7 @@ endif |
29 | foreach header : ['crypt.h', | ||
27 | 'linux/memfd.h', | 30 | 'linux/memfd.h', |
28 | 'linux/vm_sockets.h', | 31 | 'linux/vm_sockets.h', |
29 | 'linux/can/vxcan.h', | ||
30 | + 'printf.h', | 32 | + 'printf.h', |
31 | 'sys/auxv.h', | 33 | 'sys/auxv.h', |
32 | 'valgrind/memcheck.h', | 34 | 'valgrind/memcheck.h', |
33 | 'valgrind/valgrind.h', | 35 | 'valgrind/valgrind.h', |
34 | diff --git a/src/basic/meson.build b/src/basic/meson.build | 36 | diff --git a/src/basic/meson.build b/src/basic/meson.build |
35 | index 91e0df3d2f..a732b554da 100644 | 37 | index d6caf28f14..32c1acf349 100644 |
36 | --- a/src/basic/meson.build | 38 | --- a/src/basic/meson.build |
37 | +++ b/src/basic/meson.build | 39 | +++ b/src/basic/meson.build |
38 | @@ -298,6 +298,11 @@ foreach item : [['af', af_list_txt, 'af', ''], | 40 | @@ -312,6 +312,11 @@ foreach item : [['af', af_list_txt, 'af', ''], |
39 | endforeach | 41 | endforeach |
40 | 42 | ||
41 | basic_sources += generated_gperf_headers | 43 | basic_sources += generated_gperf_headers |
@@ -428,6 +430,3 @@ index 5ef11fa1a4..6384ab620c 100644 | |||
428 | 430 | ||
429 | #define SNDBUF_SIZE (8*1024*1024) | 431 | #define SNDBUF_SIZE (8*1024*1024) |
430 | 432 | ||
431 | -- | ||
432 | 2.11.0 | ||
433 | |||