diff options
author | Alex Kiernan <alex.kiernan@gmail.com> | 2020-02-06 16:48:13 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-08 13:20:02 +0000 |
commit | 306820bad60c62a8096df8d1e4c7cc8e00dc38b7 (patch) | |
tree | 78fe9e9d90e19ca52f2cc462e1368e90484d4b4d /meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch | |
parent | cc7164836097a4100dce65e93b24a3a8874f65b3 (diff) | |
download | poky-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/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch | 37 |
1 files changed, 25 insertions, 12 deletions
diff --git a/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch b/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch index 2e39f7a2e1..1404895143 100644 --- a/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch +++ b/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch | |||
@@ -1,24 +1,28 @@ | |||
1 | From a9421d55102fc84f77f7c21a2479fcd00652b896 Mon Sep 17 00:00:00 2001 | 1 | From 233de872b9b033ec842c2135152d2e006ac44c16 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: Mon, 25 Feb 2019 13:55:12 +0800 | 3 | Date: Mon, 25 Feb 2019 13:55:12 +0800 |
4 | Subject: [PATCH 03/24] missing_type.h: add __compare_fn_t and comparison_fn_t | 4 | Subject: [PATCH] missing_type.h: add __compare_fn_t and comparison_fn_t |
5 | 5 | ||
6 | Make it work with musl where comparison_fn_t and __compare_fn_t | 6 | Make it work with musl where comparison_fn_t and __compare_fn_t |
7 | is not provided. | 7 | is not provided. |
8 | 8 | ||
9 | Upstream-Status: Inappropriate [musl specific] | 9 | Upstream-Status: Inappropriate [musl specific] |
10 | 10 | ||
11 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | ||
12 | [Rebased for v244] | ||
11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 13 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
12 | [Rebased for v242] | 14 | [Rebased for v242] |
13 | Signed-off-by: Andrej Valek <andrej.valek@siemens.com> | 15 | Signed-off-by: Andrej Valek <andrej.valek@siemens.com> |
16 | |||
14 | --- | 17 | --- |
15 | src/basic/missing_type.h | 9 +++++++++ | 18 | src/basic/missing_type.h | 9 +++++++++ |
16 | src/basic/sort-util.h | 1 + | 19 | src/basic/sort-util.h | 1 + |
20 | src/core/kmod-setup.c | 1 + | ||
17 | src/journal/catalog.c | 1 + | 21 | src/journal/catalog.c | 1 + |
18 | 3 files changed, 11 insertions(+) | 22 | 4 files changed, 12 insertions(+) |
19 | 23 | ||
20 | diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h | 24 | diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h |
21 | index bf8a6caa1b..2134fe5095 100644 | 25 | index bf8a6caa1b46..c487e65e7bde 100644 |
22 | --- a/src/basic/missing_type.h | 26 | --- a/src/basic/missing_type.h |
23 | +++ b/src/basic/missing_type.h | 27 | +++ b/src/basic/missing_type.h |
24 | @@ -10,3 +10,12 @@ | 28 | @@ -10,3 +10,12 @@ |
@@ -35,29 +39,38 @@ index bf8a6caa1b..2134fe5095 100644 | |||
35 | +typedef int (*__compar_fn_t)(const void *, const void *); | 39 | +typedef int (*__compar_fn_t)(const void *, const void *); |
36 | +#endif | 40 | +#endif |
37 | diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h | 41 | diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h |
38 | index e029f86..7247d40 100644 | 42 | index 27d68b341cf3..307ea4ac0e8e 100644 |
39 | --- a/src/basic/sort-util.h | 43 | --- a/src/basic/sort-util.h |
40 | +++ b/src/basic/sort-util.h | 44 | +++ b/src/basic/sort-util.h |
41 | @@ -4,6 +4,7 @@ | 45 | @@ -4,6 +4,7 @@ |
42 | #include <stdlib.h> | 46 | #include <stdlib.h> |
43 | 47 | ||
44 | #include "macro.h" | 48 | #include "macro.h" |
45 | +#include "missing.h" | 49 | +#include "missing_type.h" |
46 | 50 | ||
47 | void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size, | 51 | void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size, |
48 | __compar_d_fn_t compar, void *arg); | 52 | __compar_d_fn_t compar, void *arg); |
53 | diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c | ||
54 | index 128674327362..09ccd613e32c 100644 | ||
55 | --- a/src/core/kmod-setup.c | ||
56 | +++ b/src/core/kmod-setup.c | ||
57 | @@ -10,6 +10,7 @@ | ||
58 | #include "kmod-setup.h" | ||
59 | #include "macro.h" | ||
60 | #include "string-util.h" | ||
61 | +#include "missing_type.h" | ||
62 | |||
63 | #if HAVE_KMOD | ||
64 | #include "module-util.h" | ||
49 | diff --git a/src/journal/catalog.c b/src/journal/catalog.c | 65 | diff --git a/src/journal/catalog.c b/src/journal/catalog.c |
50 | index 7beffc1e1a..4818a2e5cc 100644 | 66 | index 70b2c8b46c4e..d574a64586f1 100644 |
51 | --- a/src/journal/catalog.c | 67 | --- a/src/journal/catalog.c |
52 | +++ b/src/journal/catalog.c | 68 | +++ b/src/journal/catalog.c |
53 | @@ -29,6 +29,7 @@ | 69 | @@ -28,6 +28,7 @@ |
54 | #include "string-util.h" | 70 | #include "string-util.h" |
55 | #include "strv.h" | 71 | #include "strv.h" |
56 | #include "tmpfile-util.h" | 72 | #include "tmpfile-util.h" |
57 | +#include "missing.h" | 73 | +#include "missing_type.h" |
58 | 74 | ||
59 | const char * const catalog_file_dirs[] = { | 75 | const char * const catalog_file_dirs[] = { |
60 | "/usr/local/lib/systemd/catalog/", | 76 | "/usr/local/lib/systemd/catalog/", |
61 | -- | ||
62 | 2.11.0 | ||
63 | |||