diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-08-22 14:50:13 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-23 08:25:52 +0100 |
commit | 1e9e5d6c31469ecd10360db0ab9252fb248127aa (patch) | |
tree | cdd4e7d0f455f19cbb2bdbbaa3e687d9b352fb0e /meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch | |
parent | 800f86a32f06bf5d7fa519cacead6d94f804bdc2 (diff) | |
download | poky-1e9e5d6c31469ecd10360db0ab9252fb248127aa.tar.gz |
systemd: upgrade 249.1 -> 249.3
The patch changes are all git rearranging chunks on rebase; there are no functional changes.
(From OE-Core rev: 88cfba0762fe3bb6f593901f9a673b373534b756)
Signed-off-by: Alexander Kanavin <alex.kanavin@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.patch | 16 |
1 files changed, 7 insertions, 9 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 dc40a2fe8d..1d61367da4 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 6c18e5f9373da3e3b38f2c5727e2aefe07fcbbd9 Mon Sep 17 00:00:00 2001 | 1 | From b19f800e178516d4f4d344457647e4a018bd6855 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Sat, 22 May 2021 20:26:24 +0200 | 3 | Date: Sat, 22 May 2021 20:26:24 +0200 |
4 | Subject: [PATCH] [PATCH] add fallback parse_printf_format implementation | 4 | Subject: [PATCH] add fallback parse_printf_format implementation |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [musl specific] | 6 | Upstream-Status: Inappropriate [musl specific] |
7 | 7 | ||
@@ -10,6 +10,7 @@ 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] | 11 | [rebased for systemd 243] |
12 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> | 12 | Signed-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 + |
@@ -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 | ||
24 | diff --git a/meson.build b/meson.build | 25 | diff --git a/meson.build b/meson.build |
25 | index 27186d63a3..2abb7b3188 100644 | 26 | index 738879eb21..1aa20b8246 100644 |
26 | --- a/meson.build | 27 | --- a/meson.build |
27 | +++ b/meson.build | 28 | +++ b/meson.build |
28 | @@ -675,6 +675,7 @@ endif | 29 | @@ -656,6 +656,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 27186d63a3..2abb7b3188 100644 | |||
34 | 'valgrind/memcheck.h', | 35 | 'valgrind/memcheck.h', |
35 | 'valgrind/valgrind.h', | 36 | 'valgrind/valgrind.h', |
36 | diff --git a/src/basic/meson.build b/src/basic/meson.build | 37 | diff --git a/src/basic/meson.build b/src/basic/meson.build |
37 | index 60ef801a25..aba2172edd 100644 | 38 | index 9b016ce5e8..a9ce21b02e 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 | @@ -341,6 +341,11 @@ endforeach | 41 | @@ -322,6 +322,11 @@ endforeach |
41 | 42 | ||
42 | basic_sources += generated_gperf_headers | 43 | basic_sources += generated_gperf_headers |
43 | 44 | ||
@@ -430,6 +431,3 @@ index fd3fd7ef9c..e8e6ad555b 100644 | |||
430 | 431 | ||
431 | #define SNDBUF_SIZE (8*1024*1024) | 432 | #define SNDBUF_SIZE (8*1024*1024) |
432 | 433 | ||
433 | -- | ||
434 | 2.24.0 | ||
435 | |||