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/0002-don-t-use-glibc-specific-qsort_r.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/0002-don-t-use-glibc-specific-qsort_r.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch b/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch index c6213ab88e..6b85ff0f89 100644 --- a/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch +++ b/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 1eb84534dea05d41afed1d898cba212ad7d310dd Mon Sep 17 00:00:00 2001 | 1 | From 49501c80d32c1bc5ecb07f40c324feb82af0b057 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:41:41 +0800 | 3 | Date: Mon, 25 Feb 2019 13:41:41 +0800 |
4 | Subject: [PATCH 02/24] don't use glibc-specific qsort_r | 4 | Subject: [PATCH] don't use glibc-specific qsort_r |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [musl specific] | 6 | Upstream-Status: Inappropriate [musl specific] |
7 | 7 | ||
@@ -10,14 +10,15 @@ 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 v242] | 11 | [Rebased for v242] |
12 | Signed-off-by: Andrej Valek <andrej.valek@siemens.com> | 12 | Signed-off-by: Andrej Valek <andrej.valek@siemens.com> |
13 | |||
13 | --- | 14 | --- |
14 | src/basic/sort-util.h | 14 -------------- | 15 | src/basic/sort-util.h | 14 ------------ |
15 | src/libsystemd/sd-hwdb/hwdb-util.c | 19 ++++++++++++++----- | 16 | src/libsystemd/sd-hwdb/hwdb-util.c | 19 +++++++++++----- |
16 | src/shared/format-table.c | 36 ++++++++++++++++++++++++------------ | 17 | src/shared/format-table.c | 36 ++++++++++++++++++++---------- |
17 | 3 files changed, 38 insertions(+), 31 deletions(-) | 18 | 3 files changed, 38 insertions(+), 31 deletions(-) |
18 | 19 | ||
19 | diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h | 20 | diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h |
20 | index e029f8646e..27d68b341c 100644 | 21 | index e029f8646eb0..27d68b341cf3 100644 |
21 | --- a/src/basic/sort-util.h | 22 | --- a/src/basic/sort-util.h |
22 | +++ b/src/basic/sort-util.h | 23 | +++ b/src/basic/sort-util.h |
23 | @@ -54,17 +54,3 @@ static inline void qsort_safe(void *base, size_t nmemb, size_t size, __compar_fn | 24 | @@ -54,17 +54,3 @@ static inline void qsort_safe(void *base, size_t nmemb, size_t size, __compar_fn |
@@ -39,7 +40,7 @@ index e029f8646e..27d68b341c 100644 | |||
39 | - qsort_r_safe((p), (n), sizeof((p)[0]), (__compar_d_fn_t) _func_, userdata); \ | 40 | - qsort_r_safe((p), (n), sizeof((p)[0]), (__compar_d_fn_t) _func_, userdata); \ |
40 | - }) | 41 | - }) |
41 | diff --git a/src/libsystemd/sd-hwdb/hwdb-util.c b/src/libsystemd/sd-hwdb/hwdb-util.c | 42 | diff --git a/src/libsystemd/sd-hwdb/hwdb-util.c b/src/libsystemd/sd-hwdb/hwdb-util.c |
42 | index c83575c7c8..72f8f3a050 100644 | 43 | index c83575c7c876..72f8f3a05048 100644 |
43 | --- a/src/libsystemd/sd-hwdb/hwdb-util.c | 44 | --- a/src/libsystemd/sd-hwdb/hwdb-util.c |
44 | +++ b/src/libsystemd/sd-hwdb/hwdb-util.c | 45 | +++ b/src/libsystemd/sd-hwdb/hwdb-util.c |
45 | @@ -128,9 +128,13 @@ static void trie_free(struct trie *trie) { | 46 | @@ -128,9 +128,13 @@ static void trie_free(struct trie *trie) { |
@@ -83,10 +84,10 @@ index c83575c7c8..72f8f3a050 100644 | |||
83 | } | 84 | } |
84 | 85 | ||
85 | diff --git a/src/shared/format-table.c b/src/shared/format-table.c | 86 | diff --git a/src/shared/format-table.c b/src/shared/format-table.c |
86 | index a5c0a99b08..d595cbe372 100644 | 87 | index 4617ae8badc4..17d6b9616256 100644 |
87 | --- a/src/shared/format-table.c | 88 | --- a/src/shared/format-table.c |
88 | +++ b/src/shared/format-table.c | 89 | +++ b/src/shared/format-table.c |
89 | @@ -850,31 +850,33 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t | 90 | @@ -1109,31 +1109,33 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t |
90 | return CMP(index_a, index_b); | 91 | return CMP(index_a, index_b); |
91 | } | 92 | } |
92 | 93 | ||
@@ -130,7 +131,7 @@ index a5c0a99b08..d595cbe372 100644 | |||
130 | } | 131 | } |
131 | 132 | ||
132 | /* Order identical lines by the order there were originally added in */ | 133 | /* Order identical lines by the order there were originally added in */ |
133 | @@ -1107,7 +1109,12 @@ int table_print(Table *t, FILE *f) { | 134 | @@ -1533,7 +1535,12 @@ int table_print(Table *t, FILE *f) { |
134 | for (i = 0; i < n_rows; i++) | 135 | for (i = 0; i < n_rows; i++) |
135 | sorted[i] = i * t->n_columns; | 136 | sorted[i] = i * t->n_columns; |
136 | 137 | ||
@@ -144,7 +145,7 @@ index a5c0a99b08..d595cbe372 100644 | |||
144 | } | 145 | } |
145 | 146 | ||
146 | if (t->display_map) | 147 | if (t->display_map) |
147 | @@ -1534,7 +1541,12 @@ int table_to_json(Table *t, JsonVariant **ret) { | 148 | @@ -1997,7 +2004,12 @@ int table_to_json(Table *t, JsonVariant **ret) { |
148 | for (i = 0; i < n_rows; i++) | 149 | for (i = 0; i < n_rows; i++) |
149 | sorted[i] = i * t->n_columns; | 150 | sorted[i] = i * t->n_columns; |
150 | 151 | ||
@@ -158,6 +159,3 @@ index a5c0a99b08..d595cbe372 100644 | |||
158 | } | 159 | } |
159 | 160 | ||
160 | if (t->display_map) | 161 | if (t->display_map) |
161 | -- | ||
162 | 2.11.0 | ||
163 | |||