diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-05-05 07:04:45 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-05 21:17:37 +0100 |
commit | 990b07108707a1b7c252b7d7e2e4c92410943859 (patch) | |
tree | 6a1ea2d60b821a194173011f7a854b07440580b9 /meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch | |
parent | 4eba2c38d7ea200fed9479abed336496cc1c3e1f (diff) | |
download | poky-990b07108707a1b7c252b7d7e2e4c92410943859.tar.gz |
systemd: upgrade 250.4 -> 250.5
Drop 0029-network-enable-KeepConfiguration-when-running-on-net.patch as
patch merged upstream.
(From OE-Core rev: e07ba76fc78b44f338e574644a8ae3b6cddc9f08)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.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 | 20 |
1 files changed, 13 insertions, 7 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 5027682df2..d109860e1a 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,4 +1,4 @@ | |||
1 | From 5d730902f47498a2866b46875352f6810a01d67c Mon Sep 17 00:00:00 2001 | 1 | From c542d2d93cf536e91d4edb8791fdc0de732b0a52 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] don't use glibc-specific qsort_r | 4 | Subject: [PATCH] don't use glibc-specific qsort_r |
@@ -19,9 +19,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
19 | src/shared/hwdb-util.c | 19 ++++++++++++++----- | 19 | src/shared/hwdb-util.c | 19 ++++++++++++++----- |
20 | 3 files changed, 38 insertions(+), 31 deletions(-) | 20 | 3 files changed, 38 insertions(+), 31 deletions(-) |
21 | 21 | ||
22 | diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h | ||
23 | index 02a6784d99..cb448df109 100644 | ||
22 | --- a/src/basic/sort-util.h | 24 | --- a/src/basic/sort-util.h |
23 | +++ b/src/basic/sort-util.h | 25 | +++ b/src/basic/sort-util.h |
24 | @@ -61,18 +61,4 @@ static inline void _qsort_safe(void *bas | 26 | @@ -61,18 +61,4 @@ static inline void _qsort_safe(void *base, size_t nmemb, size_t size, comparison |
25 | _qsort_safe((p), (n), sizeof((p)[0]), (comparison_fn_t) _func_); \ | 27 | _qsort_safe((p), (n), sizeof((p)[0]), (comparison_fn_t) _func_); \ |
26 | }) | 28 | }) |
27 | 29 | ||
@@ -40,9 +42,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
40 | - }) | 42 | - }) |
41 | - | 43 | - |
42 | int cmp_int(const int *a, const int *b); | 44 | int cmp_int(const int *a, const int *b); |
45 | diff --git a/src/shared/format-table.c b/src/shared/format-table.c | ||
46 | index b95680b365..5ffa208615 100644 | ||
43 | --- a/src/shared/format-table.c | 47 | --- a/src/shared/format-table.c |
44 | +++ b/src/shared/format-table.c | 48 | +++ b/src/shared/format-table.c |
45 | @@ -1324,30 +1324,32 @@ static int cell_data_compare(TableData * | 49 | @@ -1324,30 +1324,32 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t |
46 | return CMP(index_a, index_b); | 50 | return CMP(index_a, index_b); |
47 | } | 51 | } |
48 | 52 | ||
@@ -99,7 +103,7 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
99 | } | 103 | } |
100 | 104 | ||
101 | if (t->display_map) | 105 | if (t->display_map) |
102 | @@ -2647,7 +2654,12 @@ int table_to_json(Table *t, JsonVariant | 106 | @@ -2647,7 +2654,12 @@ int table_to_json(Table *t, JsonVariant **ret) { |
103 | for (size_t i = 0; i < n_rows; i++) | 107 | for (size_t i = 0; i < n_rows; i++) |
104 | sorted[i] = i * t->n_columns; | 108 | sorted[i] = i * t->n_columns; |
105 | 109 | ||
@@ -113,9 +117,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
113 | } | 117 | } |
114 | 118 | ||
115 | if (t->display_map) | 119 | if (t->display_map) |
120 | diff --git a/src/shared/hwdb-util.c b/src/shared/hwdb-util.c | ||
121 | index fe4785f3e5..827e1639c3 100644 | ||
116 | --- a/src/shared/hwdb-util.c | 122 | --- a/src/shared/hwdb-util.c |
117 | +++ b/src/shared/hwdb-util.c | 123 | +++ b/src/shared/hwdb-util.c |
118 | @@ -127,9 +127,13 @@ static struct trie* trie_free(struct tri | 124 | @@ -127,9 +127,13 @@ static struct trie* trie_free(struct trie *trie) { |
119 | 125 | ||
120 | DEFINE_TRIVIAL_CLEANUP_FUNC(struct trie*, trie_free); | 126 | DEFINE_TRIVIAL_CLEANUP_FUNC(struct trie*, trie_free); |
121 | 127 | ||
@@ -132,7 +138,7 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
132 | } | 138 | } |
133 | 139 | ||
134 | static int trie_node_add_value(struct trie *trie, struct trie_node *node, | 140 | static int trie_node_add_value(struct trie *trie, struct trie_node *node, |
135 | @@ -157,7 +161,10 @@ static int trie_node_add_value(struct tr | 141 | @@ -157,7 +161,10 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node, |
136 | .value_off = v, | 142 | .value_off = v, |
137 | }; | 143 | }; |
138 | 144 | ||
@@ -144,7 +150,7 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | |||
144 | if (val) { | 150 | if (val) { |
145 | /* At this point we have 2 identical properties on the same match-string. | 151 | /* At this point we have 2 identical properties on the same match-string. |
146 | * Since we process files in order, we just replace the previous value. */ | 152 | * Since we process files in order, we just replace the previous value. */ |
147 | @@ -183,7 +190,9 @@ static int trie_node_add_value(struct tr | 153 | @@ -183,7 +190,9 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node, |
148 | .line_number = line_number, | 154 | .line_number = line_number, |
149 | }; | 155 | }; |
150 | node->values_count++; | 156 | node->values_count++; |