diff options
author | Luca Boccassi <luca.boccassi@microsoft.com> | 2020-12-18 09:42:52 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-20 00:03:04 +0000 |
commit | 754d05fffebb69b6abcbe0cac39541aaee551f90 (patch) | |
tree | 1b74251f6b1edf0d1e77490112078b6a9349711d /meta/recipes-core | |
parent | fae7b0ddba4836d7b1b1d642bd4514ceab50ca09 (diff) | |
download | poky-754d05fffebb69b6abcbe0cac39541aaee551f90.tar.gz |
systemd: update 246 -> 247
Update systemd to v247.2.
Add rule for new oomd dbus conf and for new pam.d
conf directory in /usr/lib|lib64.
Drop selinux-hook-handling-to-enumerate-nexthop.patch,
merged upstream.
Drop 0001-meson-Fix-reallocarray-check.patch,
merged upstream.
Refresh musl patches.
(From OE-Core rev: 1e1d26de68ed13fd53c1a16b9662ac9860dca714)
Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
33 files changed, 647 insertions, 608 deletions
diff --git a/meta/recipes-core/systemd/systemd-boot_246.6.bb b/meta/recipes-core/systemd/systemd-boot_247.2.bb index 249e620f4e..249e620f4e 100644 --- a/meta/recipes-core/systemd/systemd-boot_246.6.bb +++ b/meta/recipes-core/systemd/systemd-boot_247.2.bb | |||
diff --git a/meta/recipes-core/systemd/systemd-conf_246.1.bb b/meta/recipes-core/systemd/systemd-conf_247.2.bb index 944b56ff82..944b56ff82 100644 --- a/meta/recipes-core/systemd/systemd-conf_246.1.bb +++ b/meta/recipes-core/systemd/systemd-conf_247.2.bb | |||
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 1733565fc0..cb7d782b76 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc | |||
@@ -14,8 +14,8 @@ LICENSE = "GPLv2 & LGPLv2.1" | |||
14 | LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ | 14 | LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ |
15 | file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" | 15 | file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" |
16 | 16 | ||
17 | SRCREV = "2ee1c57c4ff4fd3349cf03c2e89fbd18ca0b3a4a" | 17 | SRCREV = "937118a5b2f27a7913c421ad76893cdda01c5566" |
18 | SRCBRANCH = "v246-stable" | 18 | SRCBRANCH = "v247-stable" |
19 | SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" | 19 | SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" |
20 | 20 | ||
21 | S = "${WORKDIR}/git" | 21 | S = "${WORKDIR}/git" |
diff --git a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch index 2676c144f2..8dd22eeb7b 100644 --- a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch +++ b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch | |||
@@ -29,7 +29,7 @@ Index: systemd-stable/units/meson.build | |||
29 | =================================================================== | 29 | =================================================================== |
30 | --- systemd-stable.orig/units/meson.build | 30 | --- systemd-stable.orig/units/meson.build |
31 | +++ systemd-stable/units/meson.build | 31 | +++ systemd-stable/units/meson.build |
32 | @@ -54,8 +54,7 @@ units = [ | 32 | @@ -55,8 +55,7 @@ units = [ |
33 | ['poweroff.target', '', | 33 | ['poweroff.target', '', |
34 | (with_runlevels ? 'runlevel0.target' : '')], | 34 | (with_runlevels ? 'runlevel0.target' : '')], |
35 | ['printer.target', ''], | 35 | ['printer.target', ''], |
@@ -38,8 +38,8 @@ Index: systemd-stable/units/meson.build | |||
38 | + ['proc-sys-fs-binfmt_misc.automount', 'ENABLE_BINFMT'], | 38 | + ['proc-sys-fs-binfmt_misc.automount', 'ENABLE_BINFMT'], |
39 | ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'], | 39 | ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'], |
40 | ['reboot.target', '', | 40 | ['reboot.target', '', |
41 | (with_runlevels ? 'runlevel6.target ctrl-alt-del.target' : 'ctrl-alt-del.target')], | 41 | 'ctrl-alt-del.target' + (with_runlevels ? ' runlevel6.target' : '')], |
42 | @@ -162,8 +161,7 @@ in_units = [ | 42 | @@ -166,8 +165,7 @@ in_units = [ |
43 | ['rc-local.service', 'HAVE_SYSV_COMPAT'], | 43 | ['rc-local.service', 'HAVE_SYSV_COMPAT'], |
44 | ['rescue.service', ''], | 44 | ['rescue.service', ''], |
45 | ['systemd-backlight@.service', 'ENABLE_BACKLIGHT'], | 45 | ['systemd-backlight@.service', 'ENABLE_BACKLIGHT'], |
@@ -64,7 +64,7 @@ Index: systemd-stable/units/systemd-binfmt.service.in | |||
64 | =================================================================== | 64 | =================================================================== |
65 | --- systemd-stable.orig/units/systemd-binfmt.service.in | 65 | --- systemd-stable.orig/units/systemd-binfmt.service.in |
66 | +++ systemd-stable/units/systemd-binfmt.service.in | 66 | +++ systemd-stable/units/systemd-binfmt.service.in |
67 | @@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc | 67 | @@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm |
68 | Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems | 68 | Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems |
69 | DefaultDependencies=no | 69 | DefaultDependencies=no |
70 | Conflicts=shutdown.target | 70 | Conflicts=shutdown.target |
diff --git a/meta/recipes-core/systemd/systemd/0001-meson-Fix-reallocarray-check.patch b/meta/recipes-core/systemd/systemd/0001-meson-Fix-reallocarray-check.patch deleted file mode 100644 index 1229dd6e17..0000000000 --- a/meta/recipes-core/systemd/systemd/0001-meson-Fix-reallocarray-check.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From 1ebf1a1df17afd8b89f84b1928a89069035bf20b Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 12 Dec 2020 16:15:57 -0800 | ||
4 | Subject: [PATCH] meson: Fix reallocarray check | ||
5 | |||
6 | reallocarray() is defined in stdlib.h, so that would be right header to | ||
7 | check for its presense. | ||
8 | |||
9 | Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/17951] | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | meson.build | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/meson.build b/meson.build | ||
16 | index d205f846c7..e0a3c53529 100644 | ||
17 | --- a/meson.build | ||
18 | +++ b/meson.build | ||
19 | @@ -517,7 +517,7 @@ foreach ident : [ | ||
20 | #include <sys/stat.h> | ||
21 | #include <unistd.h>'''], | ||
22 | ['explicit_bzero' , '''#include <string.h>'''], | ||
23 | - ['reallocarray', '''#include <malloc.h>'''], | ||
24 | + ['reallocarray', '''#include <stdlib.h>'''], | ||
25 | ['set_mempolicy', '''#include <stdlib.h> | ||
26 | #include <unistd.h>'''], | ||
27 | ['get_mempolicy', '''#include <stdlib.h> | ||
28 | -- | ||
29 | 2.29.2 | ||
30 | |||
diff --git a/meta/recipes-core/systemd/systemd/0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch b/meta/recipes-core/systemd/systemd/0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch index 622a4108bb..e49e06672e 100644 --- a/meta/recipes-core/systemd/systemd/0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch +++ b/meta/recipes-core/systemd/systemd/0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch | |||
@@ -14,8 +14,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
14 | 14 | ||
15 | --- a/src/core/systemd.pc.in | 15 | --- a/src/core/systemd.pc.in |
16 | +++ b/src/core/systemd.pc.in | 16 | +++ b/src/core/systemd.pc.in |
17 | @@ -65,16 +65,16 @@ systemdshutdowndir=${systemd_shutdown_di | 17 | @@ -65,16 +65,16 @@ systemdshutdowndir=${systemd_shutdown_dir} |
18 | tmpfiles_dir=${prefix}/lib/tmpfiles.d | 18 | tmpfiles_dir=/usr/lib/tmpfiles.d |
19 | tmpfilesdir=${tmpfiles_dir} | 19 | tmpfilesdir=${tmpfiles_dir} |
20 | 20 | ||
21 | -sysusers_dir=${rootprefix}/lib/sysusers.d | 21 | -sysusers_dir=${rootprefix}/lib/sysusers.d |
@@ -34,4 +34,4 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
34 | +modules_load_dir=${prefix}/lib/modules-load.d | 34 | +modules_load_dir=${prefix}/lib/modules-load.d |
35 | modulesloaddir=${modules_load_dir} | 35 | modulesloaddir=${modules_load_dir} |
36 | 36 | ||
37 | catalog_dir=${prefix}/lib/systemd/catalog | 37 | catalog_dir=/usr/lib/systemd/catalog |
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 30fe9a14df..d856bcb583 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 3eb12a6ba0bce149717eaabeb1505d379b3d705a Mon Sep 17 00:00:00 2001 | 1 | From 66ece0b870b3a34fdabc48b88437e6cc354e9fce 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 02/26] don't use glibc-specific qsort_r |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [musl specific] | 6 | Upstream-Status: Inappropriate [musl specific] |
7 | 7 | ||
@@ -10,18 +10,19 @@ 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 | [Rebased for v247] | |
14 | Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | ||
14 | --- | 15 | --- |
15 | src/basic/sort-util.h | 14 ------------ | 16 | src/basic/sort-util.h | 14 ------------ |
16 | src/libsystemd/sd-hwdb/hwdb-util.c | 19 +++++++++++----- | 17 | src/libsystemd/sd-hwdb/hwdb-util.c | 19 +++++++++++----- |
17 | src/shared/format-table.c | 36 ++++++++++++++++++++---------- | 18 | src/shared/format-table.c | 36 ++++++++++++++++++++---------- |
18 | 3 files changed, 38 insertions(+), 31 deletions(-) | 19 | 3 files changed, 38 insertions(+), 31 deletions(-) |
19 | 20 | ||
20 | Index: systemd-stable/src/basic/sort-util.h | 21 | diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h |
21 | =================================================================== | 22 | index 1d194a1f04..3394c9eb72 100644 |
22 | --- systemd-stable.orig/src/basic/sort-util.h | 23 | --- a/src/basic/sort-util.h |
23 | +++ systemd-stable/src/basic/sort-util.h | 24 | +++ b/src/basic/sort-util.h |
24 | @@ -54,17 +54,3 @@ static inline void _qsort_safe(void *bas | 25 | @@ -54,17 +54,3 @@ static inline void _qsort_safe(void *base, size_t nmemb, size_t size, __compar_f |
25 | int (*_func_)(const typeof(p[0])*, const typeof(p[0])*) = func; \ | 26 | int (*_func_)(const typeof(p[0])*, const typeof(p[0])*) = func; \ |
26 | _qsort_safe((p), (n), sizeof((p)[0]), (__compar_fn_t) _func_); \ | 27 | _qsort_safe((p), (n), sizeof((p)[0]), (__compar_fn_t) _func_); \ |
27 | }) | 28 | }) |
@@ -39,11 +40,11 @@ Index: systemd-stable/src/basic/sort-util.h | |||
39 | - int (*_func_)(const typeof(p[0])*, const typeof(p[0])*, typeof(userdata)) = func; \ | 40 | - int (*_func_)(const typeof(p[0])*, const typeof(p[0])*, typeof(userdata)) = func; \ |
40 | - qsort_r_safe((p), (n), sizeof((p)[0]), (__compar_d_fn_t) _func_, userdata); \ | 41 | - qsort_r_safe((p), (n), sizeof((p)[0]), (__compar_d_fn_t) _func_, userdata); \ |
41 | - }) | 42 | - }) |
42 | Index: systemd-stable/src/libsystemd/sd-hwdb/hwdb-util.c | 43 | diff --git a/src/libsystemd/sd-hwdb/hwdb-util.c b/src/libsystemd/sd-hwdb/hwdb-util.c |
43 | =================================================================== | 44 | index 4c94ba9c88..95495dba6d 100644 |
44 | --- systemd-stable.orig/src/libsystemd/sd-hwdb/hwdb-util.c | 45 | --- a/src/libsystemd/sd-hwdb/hwdb-util.c |
45 | +++ systemd-stable/src/libsystemd/sd-hwdb/hwdb-util.c | 46 | +++ b/src/libsystemd/sd-hwdb/hwdb-util.c |
46 | @@ -128,9 +128,13 @@ static void trie_free(struct trie *trie) | 47 | @@ -126,9 +126,13 @@ static void trie_free(struct trie *trie) { |
47 | 48 | ||
48 | DEFINE_TRIVIAL_CLEANUP_FUNC(struct trie*, trie_free); | 49 | DEFINE_TRIVIAL_CLEANUP_FUNC(struct trie*, trie_free); |
49 | 50 | ||
@@ -60,7 +61,7 @@ Index: systemd-stable/src/libsystemd/sd-hwdb/hwdb-util.c | |||
60 | } | 61 | } |
61 | 62 | ||
62 | static int trie_node_add_value(struct trie *trie, struct trie_node *node, | 63 | static int trie_node_add_value(struct trie *trie, struct trie_node *node, |
63 | @@ -158,7 +162,10 @@ static int trie_node_add_value(struct tr | 64 | @@ -156,7 +160,10 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node, |
64 | .value_off = v, | 65 | .value_off = v, |
65 | }; | 66 | }; |
66 | 67 | ||
@@ -72,7 +73,7 @@ Index: systemd-stable/src/libsystemd/sd-hwdb/hwdb-util.c | |||
72 | if (val) { | 73 | if (val) { |
73 | /* At this point we have 2 identical properties on the same match-string. | 74 | /* At this point we have 2 identical properties on the same match-string. |
74 | * Since we process files in order, we just replace the previous value. */ | 75 | * Since we process files in order, we just replace the previous value. */ |
75 | @@ -184,7 +191,9 @@ static int trie_node_add_value(struct tr | 76 | @@ -182,7 +189,9 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node, |
76 | .line_number = line_number, | 77 | .line_number = line_number, |
77 | }; | 78 | }; |
78 | node->values_count++; | 79 | node->values_count++; |
@@ -83,11 +84,11 @@ Index: systemd-stable/src/libsystemd/sd-hwdb/hwdb-util.c | |||
83 | return 0; | 84 | return 0; |
84 | } | 85 | } |
85 | 86 | ||
86 | Index: systemd-stable/src/shared/format-table.c | 87 | diff --git a/src/shared/format-table.c b/src/shared/format-table.c |
87 | =================================================================== | 88 | index a13a198b7a..bce10bc607 100644 |
88 | --- systemd-stable.orig/src/shared/format-table.c | 89 | --- a/src/shared/format-table.c |
89 | +++ systemd-stable/src/shared/format-table.c | 90 | +++ b/src/shared/format-table.c |
90 | @@ -1246,31 +1246,33 @@ static int cell_data_compare(TableData * | 91 | @@ -1243,30 +1243,32 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t |
91 | return CMP(index_a, index_b); | 92 | return CMP(index_a, index_b); |
92 | } | 93 | } |
93 | 94 | ||
@@ -95,7 +96,6 @@ Index: systemd-stable/src/shared/format-table.c | |||
95 | +static Table *user_table; | 96 | +static Table *user_table; |
96 | +static int table_data_compare(const void *x, const void *y) { | 97 | +static int table_data_compare(const void *x, const void *y) { |
97 | + const size_t *a = x, *b=y; | 98 | + const size_t *a = x, *b=y; |
98 | size_t i; | ||
99 | int r; | 99 | int r; |
100 | 100 | ||
101 | - assert(t); | 101 | - assert(t); |
@@ -115,8 +115,8 @@ Index: systemd-stable/src/shared/format-table.c | |||
115 | return 1; | 115 | return 1; |
116 | 116 | ||
117 | /* Order other lines by the sorting map */ | 117 | /* Order other lines by the sorting map */ |
118 | - for (i = 0; i < t->n_sort_map; i++) { | 118 | - for (size_t i = 0; i < t->n_sort_map; i++) { |
119 | + for (i = 0; i < user_table->n_sort_map; i++) { | 119 | + for (size_t i = 0; i < user_table->n_sort_map; i++) { |
120 | TableData *d, *dd; | 120 | TableData *d, *dd; |
121 | 121 | ||
122 | - d = t->data[*a + t->sort_map[i]]; | 122 | - d = t->data[*a + t->sort_map[i]]; |
@@ -131,8 +131,8 @@ Index: systemd-stable/src/shared/format-table.c | |||
131 | } | 131 | } |
132 | 132 | ||
133 | /* Order identical lines by the order there were originally added in */ | 133 | /* Order identical lines by the order there were originally added in */ |
134 | @@ -1798,7 +1800,12 @@ int table_print(Table *t, FILE *f) { | 134 | @@ -1844,7 +1846,12 @@ int table_print(Table *t, FILE *f) { |
135 | for (i = 0; i < n_rows; i++) | 135 | for (size_t i = 0; i < n_rows; i++) |
136 | sorted[i] = i * t->n_columns; | 136 | sorted[i] = i * t->n_columns; |
137 | 137 | ||
138 | - typesafe_qsort_r(sorted, n_rows, table_data_compare, t); | 138 | - typesafe_qsort_r(sorted, n_rows, table_data_compare, t); |
@@ -145,8 +145,8 @@ Index: systemd-stable/src/shared/format-table.c | |||
145 | } | 145 | } |
146 | 146 | ||
147 | if (t->display_map) | 147 | if (t->display_map) |
148 | @@ -2375,7 +2382,12 @@ int table_to_json(Table *t, JsonVariant | 148 | @@ -2440,7 +2447,12 @@ int table_to_json(Table *t, JsonVariant **ret) { |
149 | for (i = 0; i < n_rows; i++) | 149 | for (size_t i = 0; i < n_rows; i++) |
150 | sorted[i] = i * t->n_columns; | 150 | sorted[i] = i * t->n_columns; |
151 | 151 | ||
152 | - typesafe_qsort_r(sorted, n_rows, table_data_compare, t); | 152 | - typesafe_qsort_r(sorted, n_rows, table_data_compare, t); |
@@ -159,3 +159,6 @@ Index: systemd-stable/src/shared/format-table.c | |||
159 | } | 159 | } |
160 | 160 | ||
161 | if (t->display_map) | 161 | if (t->display_map) |
162 | -- | ||
163 | 2.27.0 | ||
164 | |||
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 1404895143..f43a22aa8b 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,7 +1,7 @@ | |||
1 | From 233de872b9b033ec842c2135152d2e006ac44c16 Mon Sep 17 00:00:00 2001 | 1 | From 9f0d5996bbb2db3679a4075fa8301750b786c03b 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] missing_type.h: add __compare_fn_t and comparison_fn_t | 4 | Subject: [PATCH 03/26] 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. |
@@ -13,7 +13,6 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
13 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 13 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
14 | [Rebased for v242] | 14 | [Rebased for v242] |
15 | Signed-off-by: Andrej Valek <andrej.valek@siemens.com> | 15 | Signed-off-by: Andrej Valek <andrej.valek@siemens.com> |
16 | |||
17 | --- | 16 | --- |
18 | src/basic/missing_type.h | 9 +++++++++ | 17 | src/basic/missing_type.h | 9 +++++++++ |
19 | src/basic/sort-util.h | 1 + | 18 | src/basic/sort-util.h | 1 + |
@@ -22,7 +21,7 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com> | |||
22 | 4 files changed, 12 insertions(+) | 21 | 4 files changed, 12 insertions(+) |
23 | 22 | ||
24 | diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h | 23 | diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h |
25 | index bf8a6caa1b46..c487e65e7bde 100644 | 24 | index f6233090a9..aeaf6ad5ec 100644 |
26 | --- a/src/basic/missing_type.h | 25 | --- a/src/basic/missing_type.h |
27 | +++ b/src/basic/missing_type.h | 26 | +++ b/src/basic/missing_type.h |
28 | @@ -10,3 +10,12 @@ | 27 | @@ -10,3 +10,12 @@ |
@@ -39,7 +38,7 @@ index bf8a6caa1b46..c487e65e7bde 100644 | |||
39 | +typedef int (*__compar_fn_t)(const void *, const void *); | 38 | +typedef int (*__compar_fn_t)(const void *, const void *); |
40 | +#endif | 39 | +#endif |
41 | diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h | 40 | diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h |
42 | index 27d68b341cf3..307ea4ac0e8e 100644 | 41 | index 3394c9eb72..d9cb2aecb6 100644 |
43 | --- a/src/basic/sort-util.h | 42 | --- a/src/basic/sort-util.h |
44 | +++ b/src/basic/sort-util.h | 43 | +++ b/src/basic/sort-util.h |
45 | @@ -4,6 +4,7 @@ | 44 | @@ -4,6 +4,7 @@ |
@@ -51,7 +50,7 @@ index 27d68b341cf3..307ea4ac0e8e 100644 | |||
51 | void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size, | 50 | void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size, |
52 | __compar_d_fn_t compar, void *arg); | 51 | __compar_d_fn_t compar, void *arg); |
53 | diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c | 52 | diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c |
54 | index 128674327362..09ccd613e32c 100644 | 53 | index 8a7f82812a..a56f12f47f 100644 |
55 | --- a/src/core/kmod-setup.c | 54 | --- a/src/core/kmod-setup.c |
56 | +++ b/src/core/kmod-setup.c | 55 | +++ b/src/core/kmod-setup.c |
57 | @@ -10,6 +10,7 @@ | 56 | @@ -10,6 +10,7 @@ |
@@ -63,7 +62,7 @@ index 128674327362..09ccd613e32c 100644 | |||
63 | #if HAVE_KMOD | 62 | #if HAVE_KMOD |
64 | #include "module-util.h" | 63 | #include "module-util.h" |
65 | diff --git a/src/journal/catalog.c b/src/journal/catalog.c | 64 | diff --git a/src/journal/catalog.c b/src/journal/catalog.c |
66 | index 70b2c8b46c4e..d574a64586f1 100644 | 65 | index 0f6ad8a29e..4e1077ade4 100644 |
67 | --- a/src/journal/catalog.c | 66 | --- a/src/journal/catalog.c |
68 | +++ b/src/journal/catalog.c | 67 | +++ b/src/journal/catalog.c |
69 | @@ -28,6 +28,7 @@ | 68 | @@ -28,6 +28,7 @@ |
@@ -74,3 +73,6 @@ index 70b2c8b46c4e..d574a64586f1 100644 | |||
74 | 73 | ||
75 | const char * const catalog_file_dirs[] = { | 74 | const char * const catalog_file_dirs[] = { |
76 | "/usr/local/lib/systemd/catalog/", | 75 | "/usr/local/lib/systemd/catalog/", |
76 | -- | ||
77 | 2.27.0 | ||
78 | |||
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 e65c543614..bdd64a0252 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 8af168cefca01f8f2da336f1c82620c284dc74f2 Mon Sep 17 00:00:00 2001 | 1 | From f3dbe29f7620a063af4d8eb3ea7c48ecd410200d 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 14:04:21 +0800 | 3 | Date: Mon, 25 Feb 2019 14:04:21 +0800 |
4 | Subject: [PATCH] add fallback parse_printf_format implementation | 4 | Subject: [PATCH 04/26] add fallback parse_printf_format implementation |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [musl specific] | 6 | Upstream-Status: Inappropriate [musl specific] |
7 | 7 | ||
@@ -10,7 +10,6 @@ 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 | |||
14 | --- | 13 | --- |
15 | meson.build | 1 + | 14 | meson.build | 1 + |
16 | src/basic/meson.build | 5 + | 15 | src/basic/meson.build | 5 + |
@@ -22,11 +21,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
22 | create mode 100644 src/basic/parse-printf-format.c | 21 | create mode 100644 src/basic/parse-printf-format.c |
23 | create mode 100644 src/basic/parse-printf-format.h | 22 | create mode 100644 src/basic/parse-printf-format.h |
24 | 23 | ||
25 | Index: systemd-stable/meson.build | 24 | diff --git a/meson.build b/meson.build |
26 | =================================================================== | 25 | index f406d595e6..6aa47fc755 100644 |
27 | --- systemd-stable.orig/meson.build | 26 | --- a/meson.build |
28 | +++ systemd-stable/meson.build | 27 | +++ b/meson.build |
29 | @@ -638,6 +638,7 @@ endif | 28 | @@ -646,6 +646,7 @@ endif |
30 | foreach header : ['crypt.h', | 29 | foreach header : ['crypt.h', |
31 | 'linux/memfd.h', | 30 | 'linux/memfd.h', |
32 | 'linux/vm_sockets.h', | 31 | 'linux/vm_sockets.h', |
@@ -34,11 +33,11 @@ Index: systemd-stable/meson.build | |||
34 | 'sys/auxv.h', | 33 | 'sys/auxv.h', |
35 | 'valgrind/memcheck.h', | 34 | 'valgrind/memcheck.h', |
36 | 'valgrind/valgrind.h', | 35 | 'valgrind/valgrind.h', |
37 | Index: systemd-stable/src/basic/meson.build | 36 | diff --git a/src/basic/meson.build b/src/basic/meson.build |
38 | =================================================================== | 37 | index 1183ea83ad..aa5c958850 100644 |
39 | --- systemd-stable.orig/src/basic/meson.build | 38 | --- a/src/basic/meson.build |
40 | +++ systemd-stable/src/basic/meson.build | 39 | +++ b/src/basic/meson.build |
41 | @@ -317,6 +317,11 @@ foreach item : [['af', af_list_txt, | 40 | @@ -322,6 +322,11 @@ foreach item : [['af', af_list_txt, 'af', ''], |
42 | endforeach | 41 | endforeach |
43 | 42 | ||
44 | basic_sources += generated_gperf_headers | 43 | basic_sources += generated_gperf_headers |
@@ -50,10 +49,11 @@ Index: systemd-stable/src/basic/meson.build | |||
50 | basic_gcrypt_sources = files( | 49 | basic_gcrypt_sources = files( |
51 | 'gcrypt-util.c', | 50 | 'gcrypt-util.c', |
52 | 'gcrypt-util.h') | 51 | 'gcrypt-util.h') |
53 | Index: systemd-stable/src/basic/parse-printf-format.c | 52 | diff --git a/src/basic/parse-printf-format.c b/src/basic/parse-printf-format.c |
54 | =================================================================== | 53 | new file mode 100644 |
54 | index 0000000000..49437e5445 | ||
55 | --- /dev/null | 55 | --- /dev/null |
56 | +++ systemd-stable/src/basic/parse-printf-format.c | 56 | +++ b/src/basic/parse-printf-format.c |
57 | @@ -0,0 +1,273 @@ | 57 | @@ -0,0 +1,273 @@ |
58 | +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ | 58 | +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ |
59 | + | 59 | + |
@@ -328,10 +328,11 @@ Index: systemd-stable/src/basic/parse-printf-format.c | |||
328 | + | 328 | + |
329 | + return last; | 329 | + return last; |
330 | +} | 330 | +} |
331 | Index: systemd-stable/src/basic/parse-printf-format.h | 331 | diff --git a/src/basic/parse-printf-format.h b/src/basic/parse-printf-format.h |
332 | =================================================================== | 332 | new file mode 100644 |
333 | index 0000000000..47be7522d7 | ||
333 | --- /dev/null | 334 | --- /dev/null |
334 | +++ systemd-stable/src/basic/parse-printf-format.h | 335 | +++ b/src/basic/parse-printf-format.h |
335 | @@ -0,0 +1,57 @@ | 336 | @@ -0,0 +1,57 @@ |
336 | +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ | 337 | +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ |
337 | + | 338 | + |
@@ -390,12 +391,12 @@ Index: systemd-stable/src/basic/parse-printf-format.h | |||
390 | +size_t parse_printf_format(const char *fmt, size_t n, int *types); | 391 | +size_t parse_printf_format(const char *fmt, size_t n, int *types); |
391 | + | 392 | + |
392 | +#endif /* HAVE_PRINTF_H */ | 393 | +#endif /* HAVE_PRINTF_H */ |
393 | Index: systemd-stable/src/basic/stdio-util.h | 394 | diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h |
394 | =================================================================== | 395 | index 6dc1e72312..cea76b36cf 100644 |
395 | --- systemd-stable.orig/src/basic/stdio-util.h | 396 | --- a/src/basic/stdio-util.h |
396 | +++ systemd-stable/src/basic/stdio-util.h | 397 | +++ b/src/basic/stdio-util.h |
397 | @@ -1,13 +1,13 @@ | 398 | @@ -1,13 +1,13 @@ |
398 | /* SPDX-License-Identifier: LGPL-2.1+ */ | 399 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
399 | #pragma once | 400 | #pragma once |
400 | 401 | ||
401 | -#include <printf.h> | 402 | -#include <printf.h> |
@@ -409,10 +410,10 @@ Index: systemd-stable/src/basic/stdio-util.h | |||
409 | 410 | ||
410 | #define snprintf_ok(buf, len, fmt, ...) \ | 411 | #define snprintf_ok(buf, len, fmt, ...) \ |
411 | ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len)) | 412 | ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len)) |
412 | Index: systemd-stable/src/journal/journal-send.c | 413 | diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c |
413 | =================================================================== | 414 | index fd3fd7ef9c..e8e6ad555b 100644 |
414 | --- systemd-stable.orig/src/journal/journal-send.c | 415 | --- a/src/journal/journal-send.c |
415 | +++ systemd-stable/src/journal/journal-send.c | 416 | +++ b/src/journal/journal-send.c |
416 | @@ -2,7 +2,6 @@ | 417 | @@ -2,7 +2,6 @@ |
417 | 418 | ||
418 | #include <errno.h> | 419 | #include <errno.h> |
@@ -429,3 +430,6 @@ Index: systemd-stable/src/journal/journal-send.c | |||
429 | 430 | ||
430 | #define SNDBUF_SIZE (8*1024*1024) | 431 | #define SNDBUF_SIZE (8*1024*1024) |
431 | 432 | ||
433 | -- | ||
434 | 2.27.0 | ||
435 | |||
diff --git a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch index 8e7a2fb6e4..154e57b540 100644 --- a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch +++ b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 7e771de87cf728a8678f1f28f391bba3589e2496 Mon Sep 17 00:00:00 2001 | 1 | From 5aeae0ea89f5af74ed5d95bed1d87a03b3801ff0 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 14:18:21 +0800 | 3 | Date: Mon, 25 Feb 2019 14:18:21 +0800 |
4 | Subject: [PATCH] src/basic/missing.h: check for missing strndupa | 4 | Subject: [PATCH 05/26] src/basic/missing.h: check for missing strndupa |
5 | 5 | ||
6 | include missing.h for definition of strndupa | 6 | include missing.h for definition of strndupa |
7 | 7 | ||
@@ -15,7 +15,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com> | |||
15 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> | 15 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> |
16 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | 16 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> |
17 | [rebased for systemd 244] | 17 | [rebased for systemd 244] |
18 | 18 | [Rebased for v247] | |
19 | Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | ||
19 | --- | 20 | --- |
20 | meson.build | 1 + | 21 | meson.build | 1 + |
21 | src/backlight/backlight.c | 1 + | 22 | src/backlight/backlight.c | 1 + |
@@ -70,31 +71,31 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
70 | 50 files changed, 61 insertions(+) | 71 | 50 files changed, 61 insertions(+) |
71 | 72 | ||
72 | diff --git a/meson.build b/meson.build | 73 | diff --git a/meson.build b/meson.build |
73 | index 9187439bdd..bea9935a91 100644 | 74 | index 6aa47fc755..0d0fa4963c 100644 |
74 | --- a/meson.build | 75 | --- a/meson.build |
75 | +++ b/meson.build | 76 | +++ b/meson.build |
76 | @@ -527,6 +527,7 @@ foreach ident : [ | 77 | @@ -535,6 +535,7 @@ foreach ident : [ |
77 | #include <unistd.h> | ||
78 | #include <signal.h> | ||
79 | #include <sys/wait.h>'''], | 78 | #include <sys/wait.h>'''], |
79 | ['mallinfo', '''#include <malloc.h>'''], | ||
80 | ['close_range', '''#include <unistd.h>'''], | ||
80 | + ['strndupa' , '''#include <string.h>'''], | 81 | + ['strndupa' , '''#include <string.h>'''], |
81 | ] | 82 | ] |
82 | 83 | ||
83 | have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE') | 84 | have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE') |
84 | diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c | 85 | diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c |
85 | index 3a644363e1..73946a829b 100644 | 86 | index d1b6a81e33..38b7008371 100644 |
86 | --- a/src/backlight/backlight.c | 87 | --- a/src/backlight/backlight.c |
87 | +++ b/src/backlight/backlight.c | 88 | +++ b/src/backlight/backlight.c |
88 | @@ -17,6 +17,7 @@ | 89 | @@ -19,6 +19,7 @@ |
89 | #include "string-util.h" | 90 | #include "string-util.h" |
90 | #include "strv.h" | 91 | #include "strv.h" |
91 | #include "util.h" | 92 | #include "util.h" |
92 | +#include "missing_stdlib.h" | 93 | +#include "missing_stdlib.h" |
93 | 94 | ||
94 | static int find_pci_or_platform_parent(sd_device *device, sd_device **ret) { | 95 | static int help(void) { |
95 | const char *subsystem, *sysname, *value; | 96 | _cleanup_free_ char *link = NULL; |
96 | diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c | 97 | diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c |
97 | index e94fcfad02..856a7068b0 100644 | 98 | index f28bf1866a..bb960f183c 100644 |
98 | --- a/src/basic/cgroup-util.c | 99 | --- a/src/basic/cgroup-util.c |
99 | +++ b/src/basic/cgroup-util.c | 100 | +++ b/src/basic/cgroup-util.c |
100 | @@ -38,6 +38,7 @@ | 101 | @@ -38,6 +38,7 @@ |
@@ -106,7 +107,7 @@ index e94fcfad02..856a7068b0 100644 | |||
106 | static int cg_enumerate_items(const char *controller, const char *path, FILE **_f, const char *item) { | 107 | static int cg_enumerate_items(const char *controller, const char *path, FILE **_f, const char *item) { |
107 | _cleanup_free_ char *fs = NULL; | 108 | _cleanup_free_ char *fs = NULL; |
108 | diff --git a/src/basic/env-util.c b/src/basic/env-util.c | 109 | diff --git a/src/basic/env-util.c b/src/basic/env-util.c |
109 | index b8dc98915f..5049b37594 100644 | 110 | index a84863ff22..d4f5d57231 100644 |
110 | --- a/src/basic/env-util.c | 111 | --- a/src/basic/env-util.c |
111 | +++ b/src/basic/env-util.c | 112 | +++ b/src/basic/env-util.c |
112 | @@ -15,6 +15,7 @@ | 113 | @@ -15,6 +15,7 @@ |
@@ -115,13 +116,13 @@ index b8dc98915f..5049b37594 100644 | |||
115 | #include "utf8.h" | 116 | #include "utf8.h" |
116 | +#include "missing_stdlib.h" | 117 | +#include "missing_stdlib.h" |
117 | 118 | ||
118 | #define VALID_CHARS_ENV_NAME \ | 119 | /* We follow bash for the character set. Different shells have different rules. */ |
119 | DIGITS LETTERS \ | 120 | #define VALID_BASH_ENV_NAME_CHARS \ |
120 | diff --git a/src/basic/log.c b/src/basic/log.c | 121 | diff --git a/src/basic/log.c b/src/basic/log.c |
121 | index c6fe203808..b7ef932d28 100644 | 122 | index d4054cf46a..b608863e45 100644 |
122 | --- a/src/basic/log.c | 123 | --- a/src/basic/log.c |
123 | +++ b/src/basic/log.c | 124 | +++ b/src/basic/log.c |
124 | @@ -35,6 +35,7 @@ | 125 | @@ -36,6 +36,7 @@ |
125 | #include "terminal-util.h" | 126 | #include "terminal-util.h" |
126 | #include "time-util.h" | 127 | #include "time-util.h" |
127 | #include "utf8.h" | 128 | #include "utf8.h" |
@@ -130,7 +131,7 @@ index c6fe203808..b7ef932d28 100644 | |||
130 | #define SNDBUF_SIZE (8*1024*1024) | 131 | #define SNDBUF_SIZE (8*1024*1024) |
131 | 132 | ||
132 | diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h | 133 | diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h |
133 | index 188a8d4406..1e16ec287a 100644 | 134 | index 8c76f93eb2..9068bfb4f0 100644 |
134 | --- a/src/basic/missing_stdlib.h | 135 | --- a/src/basic/missing_stdlib.h |
135 | +++ b/src/basic/missing_stdlib.h | 136 | +++ b/src/basic/missing_stdlib.h |
136 | @@ -11,3 +11,15 @@ | 137 | @@ -11,3 +11,15 @@ |
@@ -150,10 +151,10 @@ index 188a8d4406..1e16ec287a 100644 | |||
150 | + }) | 151 | + }) |
151 | +#endif | 152 | +#endif |
152 | diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c | 153 | diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c |
153 | index 6ebc2b95fd..88f4359bab 100644 | 154 | index f91f8f7a08..fb31596216 100644 |
154 | --- a/src/basic/mkdir.c | 155 | --- a/src/basic/mkdir.c |
155 | +++ b/src/basic/mkdir.c | 156 | +++ b/src/basic/mkdir.c |
156 | @@ -13,6 +13,7 @@ | 157 | @@ -14,6 +14,7 @@ |
157 | #include "stat-util.h" | 158 | #include "stat-util.h" |
158 | #include "stdio-util.h" | 159 | #include "stdio-util.h" |
159 | #include "user-util.h" | 160 | #include "user-util.h" |
@@ -162,10 +163,10 @@ index 6ebc2b95fd..88f4359bab 100644 | |||
162 | int mkdir_safe_internal( | 163 | int mkdir_safe_internal( |
163 | const char *path, | 164 | const char *path, |
164 | diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c | 165 | diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c |
165 | index 44f0438cf4..54b4133343 100644 | 166 | index 5d4dafe3a5..70749750d4 100644 |
166 | --- a/src/basic/parse-util.c | 167 | --- a/src/basic/parse-util.c |
167 | +++ b/src/basic/parse-util.c | 168 | +++ b/src/basic/parse-util.c |
168 | @@ -19,6 +19,7 @@ | 169 | @@ -22,6 +22,7 @@ |
169 | #include "stat-util.h" | 170 | #include "stat-util.h" |
170 | #include "string-util.h" | 171 | #include "string-util.h" |
171 | #include "strv.h" | 172 | #include "strv.h" |
@@ -174,7 +175,7 @@ index 44f0438cf4..54b4133343 100644 | |||
174 | int parse_boolean(const char *v) { | 175 | int parse_boolean(const char *v) { |
175 | if (!v) | 176 | if (!v) |
176 | diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c | 177 | diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c |
177 | index 52968dee34..2f4f7e3dcd 100644 | 178 | index 96b82170d0..71342b46af 100644 |
178 | --- a/src/basic/path-lookup.c | 179 | --- a/src/basic/path-lookup.c |
179 | +++ b/src/basic/path-lookup.c | 180 | +++ b/src/basic/path-lookup.c |
180 | @@ -15,6 +15,7 @@ | 181 | @@ -15,6 +15,7 @@ |
@@ -186,7 +187,7 @@ index 52968dee34..2f4f7e3dcd 100644 | |||
186 | int xdg_user_runtime_dir(char **ret, const char *suffix) { | 187 | int xdg_user_runtime_dir(char **ret, const char *suffix) { |
187 | const char *e; | 188 | const char *e; |
188 | diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c | 189 | diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c |
189 | index ba47ca5812..8baf728fde 100644 | 190 | index 0b6fb137bd..e8e8c7b270 100644 |
190 | --- a/src/basic/proc-cmdline.c | 191 | --- a/src/basic/proc-cmdline.c |
191 | +++ b/src/basic/proc-cmdline.c | 192 | +++ b/src/basic/proc-cmdline.c |
192 | @@ -15,6 +15,7 @@ | 193 | @@ -15,6 +15,7 @@ |
@@ -198,7 +199,7 @@ index ba47ca5812..8baf728fde 100644 | |||
198 | int proc_cmdline(char **ret) { | 199 | int proc_cmdline(char **ret) { |
199 | const char *e; | 200 | const char *e; |
200 | diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c | 201 | diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c |
201 | index 7aaf95bfce..da7e836f14 100644 | 202 | index ccab71f7d2..8f9eee8d36 100644 |
202 | --- a/src/basic/procfs-util.c | 203 | --- a/src/basic/procfs-util.c |
203 | +++ b/src/basic/procfs-util.c | 204 | +++ b/src/basic/procfs-util.c |
204 | @@ -11,6 +11,7 @@ | 205 | @@ -11,6 +11,7 @@ |
@@ -210,7 +211,7 @@ index 7aaf95bfce..da7e836f14 100644 | |||
210 | int procfs_tasks_get_limit(uint64_t *ret) { | 211 | int procfs_tasks_get_limit(uint64_t *ret) { |
211 | _cleanup_free_ char *value = NULL; | 212 | _cleanup_free_ char *value = NULL; |
212 | diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c | 213 | diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c |
213 | index c94ee26bd9..14e35b4653 100644 | 214 | index 4989f4f37c..ca00bf99d8 100644 |
214 | --- a/src/basic/selinux-util.c | 215 | --- a/src/basic/selinux-util.c |
215 | +++ b/src/basic/selinux-util.c | 216 | +++ b/src/basic/selinux-util.c |
216 | @@ -27,6 +27,7 @@ | 217 | @@ -27,6 +27,7 @@ |
@@ -222,10 +223,10 @@ index c94ee26bd9..14e35b4653 100644 | |||
222 | #if HAVE_SELINUX | 223 | #if HAVE_SELINUX |
223 | DEFINE_TRIVIAL_CLEANUP_FUNC(context_t, context_free); | 224 | DEFINE_TRIVIAL_CLEANUP_FUNC(context_t, context_free); |
224 | diff --git a/src/basic/time-util.c b/src/basic/time-util.c | 225 | diff --git a/src/basic/time-util.c b/src/basic/time-util.c |
225 | index 15cc1b8851..02bb3f01f9 100644 | 226 | index 5318d6378d..23c2f77675 100644 |
226 | --- a/src/basic/time-util.c | 227 | --- a/src/basic/time-util.c |
227 | +++ b/src/basic/time-util.c | 228 | +++ b/src/basic/time-util.c |
228 | @@ -26,6 +26,7 @@ | 229 | @@ -27,6 +27,7 @@ |
229 | #include "string-util.h" | 230 | #include "string-util.h" |
230 | #include "strv.h" | 231 | #include "strv.h" |
231 | #include "time-util.h" | 232 | #include "time-util.h" |
@@ -234,7 +235,7 @@ index 15cc1b8851..02bb3f01f9 100644 | |||
234 | static clockid_t map_clock_id(clockid_t c) { | 235 | static clockid_t map_clock_id(clockid_t c) { |
235 | 236 | ||
236 | diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c | 237 | diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c |
237 | index b96e1f927f..cba979baca 100644 | 238 | index cd34f88bb9..3a77b6f2ca 100644 |
238 | --- a/src/boot/bless-boot.c | 239 | --- a/src/boot/bless-boot.c |
239 | +++ b/src/boot/bless-boot.c | 240 | +++ b/src/boot/bless-boot.c |
240 | @@ -18,6 +18,7 @@ | 241 | @@ -18,6 +18,7 @@ |
@@ -246,10 +247,10 @@ index b96e1f927f..cba979baca 100644 | |||
246 | static char **arg_path = NULL; | 247 | static char **arg_path = NULL; |
247 | 248 | ||
248 | diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c | 249 | diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c |
249 | index b7d2e32639..fdbc1df95e 100644 | 250 | index 37c581fb22..e02789d689 100644 |
250 | --- a/src/core/dbus-cgroup.c | 251 | --- a/src/core/dbus-cgroup.c |
251 | +++ b/src/core/dbus-cgroup.c | 252 | +++ b/src/core/dbus-cgroup.c |
252 | @@ -15,6 +15,7 @@ | 253 | @@ -16,6 +16,7 @@ |
253 | #include "fileio.h" | 254 | #include "fileio.h" |
254 | #include "limits-util.h" | 255 | #include "limits-util.h" |
255 | #include "path-util.h" | 256 | #include "path-util.h" |
@@ -258,7 +259,7 @@ index b7d2e32639..fdbc1df95e 100644 | |||
258 | BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", TasksMax, tasks_max_resolve); | 259 | BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", TasksMax, tasks_max_resolve); |
259 | 260 | ||
260 | diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c | 261 | diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c |
261 | index 50f7ada8ce..5c760ee487 100644 | 262 | index abe009c395..0451e58d1c 100644 |
262 | --- a/src/core/dbus-execute.c | 263 | --- a/src/core/dbus-execute.c |
263 | +++ b/src/core/dbus-execute.c | 264 | +++ b/src/core/dbus-execute.c |
264 | @@ -41,6 +41,7 @@ | 265 | @@ -41,6 +41,7 @@ |
@@ -270,7 +271,7 @@ index 50f7ada8ce..5c760ee487 100644 | |||
270 | BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput); | 271 | BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput); |
271 | static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input, exec_input, ExecInput); | 272 | static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input, exec_input, ExecInput); |
272 | diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c | 273 | diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c |
273 | index 951450e53d..50d134e9a1 100644 | 274 | index d6223db305..3654c344ee 100644 |
274 | --- a/src/core/dbus-util.c | 275 | --- a/src/core/dbus-util.c |
275 | +++ b/src/core/dbus-util.c | 276 | +++ b/src/core/dbus-util.c |
276 | @@ -7,6 +7,7 @@ | 277 | @@ -7,6 +7,7 @@ |
@@ -282,10 +283,10 @@ index 951450e53d..50d134e9a1 100644 | |||
282 | int bus_property_get_triggered_unit( | 283 | int bus_property_get_triggered_unit( |
283 | sd_bus *bus, | 284 | sd_bus *bus, |
284 | diff --git a/src/core/execute.c b/src/core/execute.c | 285 | diff --git a/src/core/execute.c b/src/core/execute.c |
285 | index 2a4840a3a9..d3f1e0e0f8 100644 | 286 | index c992b8d5d3..89632e0582 100644 |
286 | --- a/src/core/execute.c | 287 | --- a/src/core/execute.c |
287 | +++ b/src/core/execute.c | 288 | +++ b/src/core/execute.c |
288 | @@ -89,6 +89,7 @@ | 289 | @@ -96,6 +96,7 @@ |
289 | #include "unit.h" | 290 | #include "unit.h" |
290 | #include "user-util.h" | 291 | #include "user-util.h" |
291 | #include "utmp-wtmp.h" | 292 | #include "utmp-wtmp.h" |
@@ -294,7 +295,7 @@ index 2a4840a3a9..d3f1e0e0f8 100644 | |||
294 | #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC) | 295 | #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC) |
295 | #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC) | 296 | #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC) |
296 | diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c | 297 | diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c |
297 | index 09ccd613e3..f4e64fa283 100644 | 298 | index a56f12f47f..6b8729ef67 100644 |
298 | --- a/src/core/kmod-setup.c | 299 | --- a/src/core/kmod-setup.c |
299 | +++ b/src/core/kmod-setup.c | 300 | +++ b/src/core/kmod-setup.c |
300 | @@ -11,6 +11,7 @@ | 301 | @@ -11,6 +11,7 @@ |
@@ -306,7 +307,7 @@ index 09ccd613e3..f4e64fa283 100644 | |||
306 | #if HAVE_KMOD | 307 | #if HAVE_KMOD |
307 | #include "module-util.h" | 308 | #include "module-util.h" |
308 | diff --git a/src/core/service.c b/src/core/service.c | 309 | diff --git a/src/core/service.c b/src/core/service.c |
309 | index 00e61945ba..1ecab28354 100644 | 310 | index d7bdeb7cca..bfd483b2c0 100644 |
310 | --- a/src/core/service.c | 311 | --- a/src/core/service.c |
311 | +++ b/src/core/service.c | 312 | +++ b/src/core/service.c |
312 | @@ -41,6 +41,7 @@ | 313 | @@ -41,6 +41,7 @@ |
@@ -318,7 +319,7 @@ index 00e61945ba..1ecab28354 100644 | |||
318 | static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { | 319 | static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { |
319 | [SERVICE_DEAD] = UNIT_INACTIVE, | 320 | [SERVICE_DEAD] = UNIT_INACTIVE, |
320 | diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c | 321 | diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c |
321 | index 35885dfb47..bb9f0660a6 100644 | 322 | index 30c67ffe7c..595bc30726 100644 |
322 | --- a/src/coredump/coredump-vacuum.c | 323 | --- a/src/coredump/coredump-vacuum.c |
323 | +++ b/src/coredump/coredump-vacuum.c | 324 | +++ b/src/coredump/coredump-vacuum.c |
324 | @@ -16,6 +16,7 @@ | 325 | @@ -16,6 +16,7 @@ |
@@ -330,7 +331,7 @@ index 35885dfb47..bb9f0660a6 100644 | |||
330 | #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL) /* 1 MiB */ | 331 | #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL) /* 1 MiB */ |
331 | #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */ | 332 | #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */ |
332 | diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c | 333 | diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c |
333 | index 77dfdefd64..e21ecbeff8 100644 | 334 | index d2aa1815c2..a851aa203f 100644 |
334 | --- a/src/journal-remote/journal-remote-main.c | 335 | --- a/src/journal-remote/journal-remote-main.c |
335 | +++ b/src/journal-remote/journal-remote-main.c | 336 | +++ b/src/journal-remote/journal-remote-main.c |
336 | @@ -22,6 +22,7 @@ | 337 | @@ -22,6 +22,7 @@ |
@@ -342,10 +343,10 @@ index 77dfdefd64..e21ecbeff8 100644 | |||
342 | #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" | 343 | #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" |
343 | #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" | 344 | #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" |
344 | diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c | 345 | diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c |
345 | index 8d4897b942..15476b3c83 100644 | 346 | index bcf2e01d5c..5394d1dc01 100644 |
346 | --- a/src/journal/journalctl.c | 347 | --- a/src/journal/journalctl.c |
347 | +++ b/src/journal/journalctl.c | 348 | +++ b/src/journal/journalctl.c |
348 | @@ -69,6 +69,7 @@ | 349 | @@ -73,6 +73,7 @@ |
349 | #include "unit-name.h" | 350 | #include "unit-name.h" |
350 | #include "user-util.h" | 351 | #include "user-util.h" |
351 | #include "varlink.h" | 352 | #include "varlink.h" |
@@ -354,7 +355,7 @@ index 8d4897b942..15476b3c83 100644 | |||
354 | #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) | 355 | #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) |
355 | #define PROCESS_INOTIFY_INTERVAL 1024 /* Every 1,024 messages processed */ | 356 | #define PROCESS_INOTIFY_INTERVAL 1024 /* Every 1,024 messages processed */ |
356 | diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c | 357 | diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c |
357 | index 6fb0abb419..2d94d9938e 100644 | 358 | index cb1ab88ca5..7f35759540 100644 |
358 | --- a/src/journal/sd-journal.c | 359 | --- a/src/journal/sd-journal.c |
359 | +++ b/src/journal/sd-journal.c | 360 | +++ b/src/journal/sd-journal.c |
360 | @@ -40,6 +40,7 @@ | 361 | @@ -40,6 +40,7 @@ |
@@ -366,7 +367,7 @@ index 6fb0abb419..2d94d9938e 100644 | |||
366 | #define JOURNAL_FILES_MAX 7168 | 367 | #define JOURNAL_FILES_MAX 7168 |
367 | 368 | ||
368 | diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c | 369 | diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c |
369 | index 55e35cd902..0ed98f9224 100644 | 370 | index 86ff5bdfa2..3fd053a358 100644 |
370 | --- a/src/libsystemd/sd-bus/bus-message.c | 371 | --- a/src/libsystemd/sd-bus/bus-message.c |
371 | +++ b/src/libsystemd/sd-bus/bus-message.c | 372 | +++ b/src/libsystemd/sd-bus/bus-message.c |
372 | @@ -21,6 +21,7 @@ | 373 | @@ -21,6 +21,7 @@ |
@@ -378,7 +379,7 @@ index 55e35cd902..0ed98f9224 100644 | |||
378 | static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); | 379 | static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); |
379 | 380 | ||
380 | diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c | 381 | diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c |
381 | index 6abac8822c..c74c9cd7fa 100644 | 382 | index 275c4318a1..5ffee59d17 100644 |
382 | --- a/src/libsystemd/sd-bus/bus-objects.c | 383 | --- a/src/libsystemd/sd-bus/bus-objects.c |
383 | +++ b/src/libsystemd/sd-bus/bus-objects.c | 384 | +++ b/src/libsystemd/sd-bus/bus-objects.c |
384 | @@ -13,6 +13,7 @@ | 385 | @@ -13,6 +13,7 @@ |
@@ -390,7 +391,7 @@ index 6abac8822c..c74c9cd7fa 100644 | |||
390 | static int node_vtable_get_userdata( | 391 | static int node_vtable_get_userdata( |
391 | sd_bus *bus, | 392 | sd_bus *bus, |
392 | diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c | 393 | diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c |
393 | index fc7e8e844a..7af4dd2712 100644 | 394 | index 4881fd0d32..c865f1133b 100644 |
394 | --- a/src/libsystemd/sd-bus/bus-socket.c | 395 | --- a/src/libsystemd/sd-bus/bus-socket.c |
395 | +++ b/src/libsystemd/sd-bus/bus-socket.c | 396 | +++ b/src/libsystemd/sd-bus/bus-socket.c |
396 | @@ -28,6 +28,7 @@ | 397 | @@ -28,6 +28,7 @@ |
@@ -402,7 +403,7 @@ index fc7e8e844a..7af4dd2712 100644 | |||
402 | #define SNDBUF_SIZE (8*1024*1024) | 403 | #define SNDBUF_SIZE (8*1024*1024) |
403 | 404 | ||
404 | diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c | 405 | diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c |
405 | index 9de5e454a6..fe86c93c63 100644 | 406 | index b8d4dc8d95..a8bac2665d 100644 |
406 | --- a/src/libsystemd/sd-bus/sd-bus.c | 407 | --- a/src/libsystemd/sd-bus/sd-bus.c |
407 | +++ b/src/libsystemd/sd-bus/sd-bus.c | 408 | +++ b/src/libsystemd/sd-bus/sd-bus.c |
408 | @@ -41,6 +41,7 @@ | 409 | @@ -41,6 +41,7 @@ |
@@ -414,7 +415,7 @@ index 9de5e454a6..fe86c93c63 100644 | |||
414 | #define log_debug_bus_message(m) \ | 415 | #define log_debug_bus_message(m) \ |
415 | do { \ | 416 | do { \ |
416 | diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c | 417 | diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c |
417 | index 8de0a859ee..58044b6ba9 100644 | 418 | index 8c6711797a..fac178823a 100644 |
418 | --- a/src/libsystemd/sd-bus/test-bus-benchmark.c | 419 | --- a/src/libsystemd/sd-bus/test-bus-benchmark.c |
419 | +++ b/src/libsystemd/sd-bus/test-bus-benchmark.c | 420 | +++ b/src/libsystemd/sd-bus/test-bus-benchmark.c |
420 | @@ -14,6 +14,7 @@ | 421 | @@ -14,6 +14,7 @@ |
@@ -426,7 +427,7 @@ index 8de0a859ee..58044b6ba9 100644 | |||
426 | #define MAX_SIZE (2*1024*1024) | 427 | #define MAX_SIZE (2*1024*1024) |
427 | 428 | ||
428 | diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c | 429 | diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c |
429 | index 233d081300..40a32b9700 100644 | 430 | index cb8153f4fe..d52a56019d 100644 |
430 | --- a/src/locale/keymap-util.c | 431 | --- a/src/locale/keymap-util.c |
431 | +++ b/src/locale/keymap-util.c | 432 | +++ b/src/locale/keymap-util.c |
432 | @@ -21,6 +21,7 @@ | 433 | @@ -21,6 +21,7 @@ |
@@ -438,7 +439,7 @@ index 233d081300..40a32b9700 100644 | |||
438 | static bool startswith_comma(const char *s, const char *prefix) { | 439 | static bool startswith_comma(const char *s, const char *prefix) { |
439 | s = startswith(s, prefix); | 440 | s = startswith(s, prefix); |
440 | diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c | 441 | diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c |
441 | index 16f4289585..6c5e438b36 100644 | 442 | index 8e7a94db55..b5c368c6d1 100644 |
442 | --- a/src/login/pam_systemd.c | 443 | --- a/src/login/pam_systemd.c |
443 | +++ b/src/login/pam_systemd.c | 444 | +++ b/src/login/pam_systemd.c |
444 | @@ -31,6 +31,7 @@ | 445 | @@ -31,6 +31,7 @@ |
@@ -450,7 +451,7 @@ index 16f4289585..6c5e438b36 100644 | |||
450 | #include "parse-util.h" | 451 | #include "parse-util.h" |
451 | #include "path-util.h" | 452 | #include "path-util.h" |
452 | diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c | 453 | diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c |
453 | index bed1e42697..e4847c2bee 100644 | 454 | index 2fa21a067a..2e9995aa62 100644 |
454 | --- a/src/network/generator/network-generator.c | 455 | --- a/src/network/generator/network-generator.c |
455 | +++ b/src/network/generator/network-generator.c | 456 | +++ b/src/network/generator/network-generator.c |
456 | @@ -13,6 +13,7 @@ | 457 | @@ -13,6 +13,7 @@ |
@@ -462,7 +463,7 @@ index bed1e42697..e4847c2bee 100644 | |||
462 | /* | 463 | /* |
463 | # .network | 464 | # .network |
464 | diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c | 465 | diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c |
465 | index d341fa25aa..91646bc2c2 100644 | 466 | index 92bb5120ab..eeca905c75 100644 |
466 | --- a/src/nspawn/nspawn-settings.c | 467 | --- a/src/nspawn/nspawn-settings.c |
467 | +++ b/src/nspawn/nspawn-settings.c | 468 | +++ b/src/nspawn/nspawn-settings.c |
468 | @@ -16,6 +16,7 @@ | 469 | @@ -16,6 +16,7 @@ |
@@ -474,7 +475,7 @@ index d341fa25aa..91646bc2c2 100644 | |||
474 | Settings *settings_new(void) { | 475 | Settings *settings_new(void) { |
475 | Settings *s; | 476 | Settings *s; |
476 | diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c | 477 | diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c |
477 | index 5db0dcef76..681f8677e4 100644 | 478 | index 53f0492116..c71941fdd7 100644 |
478 | --- a/src/nss-mymachines/nss-mymachines.c | 479 | --- a/src/nss-mymachines/nss-mymachines.c |
479 | +++ b/src/nss-mymachines/nss-mymachines.c | 480 | +++ b/src/nss-mymachines/nss-mymachines.c |
480 | @@ -19,6 +19,7 @@ | 481 | @@ -19,6 +19,7 @@ |
@@ -486,7 +487,7 @@ index 5db0dcef76..681f8677e4 100644 | |||
486 | NSS_GETHOSTBYNAME_PROTOTYPES(mymachines); | 487 | NSS_GETHOSTBYNAME_PROTOTYPES(mymachines); |
487 | NSS_GETPW_PROTOTYPES(mymachines); | 488 | NSS_GETPW_PROTOTYPES(mymachines); |
488 | diff --git a/src/portable/portable.c b/src/portable/portable.c | 489 | diff --git a/src/portable/portable.c b/src/portable/portable.c |
489 | index 3a1367ec2b..f29336cb1e 100644 | 490 | index ed7eac0291..78986977f8 100644 |
490 | --- a/src/portable/portable.c | 491 | --- a/src/portable/portable.c |
491 | +++ b/src/portable/portable.c | 492 | +++ b/src/portable/portable.c |
492 | @@ -31,6 +31,7 @@ | 493 | @@ -31,6 +31,7 @@ |
@@ -498,31 +499,31 @@ index 3a1367ec2b..f29336cb1e 100644 | |||
498 | static const char profile_dirs[] = CONF_PATHS_NULSTR("systemd/portable/profile"); | 499 | static const char profile_dirs[] = CONF_PATHS_NULSTR("systemd/portable/profile"); |
499 | 500 | ||
500 | diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c | 501 | diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c |
501 | index 3072b984e5..c46ae374bf 100644 | 502 | index b479335769..212d0bed20 100644 |
502 | --- a/src/resolve/resolvectl.c | 503 | --- a/src/resolve/resolvectl.c |
503 | +++ b/src/resolve/resolvectl.c | 504 | +++ b/src/resolve/resolvectl.c |
504 | @@ -36,6 +36,7 @@ | 505 | @@ -37,6 +37,7 @@ |
505 | #include "strv.h" | ||
506 | #include "terminal-util.h" | 506 | #include "terminal-util.h" |
507 | #include "utf8.h" | ||
507 | #include "verbs.h" | 508 | #include "verbs.h" |
508 | +#include "missing_stdlib.h" | 509 | +#include "missing_stdlib.h" |
509 | 510 | ||
510 | static int arg_family = AF_UNSPEC; | 511 | static int arg_family = AF_UNSPEC; |
511 | static int arg_ifindex = 0; | 512 | static int arg_ifindex = 0; |
512 | diff --git a/src/shared/bus-get-properties.c b/src/shared/bus-get-properties.c | 513 | diff --git a/src/shared/bus-get-properties.c b/src/shared/bus-get-properties.c |
513 | index 8ad4694046..da5082c02a 100644 | 514 | index 32f68d5e6a..bda1e1ef4f 100644 |
514 | --- a/src/shared/bus-get-properties.c | 515 | --- a/src/shared/bus-get-properties.c |
515 | +++ b/src/shared/bus-get-properties.c | 516 | +++ b/src/shared/bus-get-properties.c |
516 | @@ -3,6 +3,7 @@ | 517 | @@ -4,6 +4,7 @@ |
517 | #include "bus-get-properties.h" | ||
518 | #include "rlimit-util.h" | 518 | #include "rlimit-util.h" |
519 | #include "stdio-util.h" | ||
519 | #include "string-util.h" | 520 | #include "string-util.h" |
520 | +#include "missing_stdlib.h" | 521 | +#include "missing_stdlib.h" |
521 | 522 | ||
522 | int bus_property_get_bool( | 523 | int bus_property_get_bool( |
523 | sd_bus *bus, | 524 | sd_bus *bus, |
524 | diff --git a/src/shared/bus-unit-procs.c b/src/shared/bus-unit-procs.c | 525 | diff --git a/src/shared/bus-unit-procs.c b/src/shared/bus-unit-procs.c |
525 | index b21fe39326..af2640005c 100644 | 526 | index 3e97be9671..2b8ca838f7 100644 |
526 | --- a/src/shared/bus-unit-procs.c | 527 | --- a/src/shared/bus-unit-procs.c |
527 | +++ b/src/shared/bus-unit-procs.c | 528 | +++ b/src/shared/bus-unit-procs.c |
528 | @@ -10,6 +10,7 @@ | 529 | @@ -10,6 +10,7 @@ |
@@ -534,10 +535,10 @@ index b21fe39326..af2640005c 100644 | |||
534 | struct CGroupInfo { | 535 | struct CGroupInfo { |
535 | char *cgroup_path; | 536 | char *cgroup_path; |
536 | diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c | 537 | diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c |
537 | index f2652ed9a5..eb019fc89f 100644 | 538 | index 2bab2299fb..62afdc7973 100644 |
538 | --- a/src/shared/bus-unit-util.c | 539 | --- a/src/shared/bus-unit-util.c |
539 | +++ b/src/shared/bus-unit-util.c | 540 | +++ b/src/shared/bus-unit-util.c |
540 | @@ -39,6 +39,7 @@ | 541 | @@ -44,6 +44,7 @@ |
541 | #include "unit-def.h" | 542 | #include "unit-def.h" |
542 | #include "user-util.h" | 543 | #include "user-util.h" |
543 | #include "utf8.h" | 544 | #include "utf8.h" |
@@ -546,22 +547,22 @@ index f2652ed9a5..eb019fc89f 100644 | |||
546 | int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) { | 547 | int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) { |
547 | assert(message); | 548 | assert(message); |
548 | diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c | 549 | diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c |
549 | index 77c1c62182..5cd31f3c15 100644 | 550 | index fbda218b3b..aae0be75c6 100644 |
550 | --- a/src/shared/bus-util.c | 551 | --- a/src/shared/bus-util.c |
551 | +++ b/src/shared/bus-util.c | 552 | +++ b/src/shared/bus-util.c |
552 | @@ -22,6 +22,7 @@ | 553 | @@ -21,6 +21,7 @@ |
554 | #include "path-util.h" | ||
553 | #include "socket-util.h" | 555 | #include "socket-util.h" |
554 | #include "stdio-util.h" | 556 | #include "stdio-util.h" |
555 | /* #include "string-util.h" */ | ||
556 | +#include "missing_stdlib.h" | 557 | +#include "missing_stdlib.h" |
557 | 558 | ||
558 | static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { | 559 | static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { |
559 | sd_event *e = userdata; | 560 | sd_event *e = userdata; |
560 | diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c | 561 | diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c |
561 | index b812665315..8e68f7f8fc 100644 | 562 | index 8bd1e3a6ac..f8d6eab9bd 100644 |
562 | --- a/src/shared/dns-domain.c | 563 | --- a/src/shared/dns-domain.c |
563 | +++ b/src/shared/dns-domain.c | 564 | +++ b/src/shared/dns-domain.c |
564 | @@ -23,6 +23,7 @@ | 565 | @@ -17,6 +17,7 @@ |
565 | #include "string-util.h" | 566 | #include "string-util.h" |
566 | #include "strv.h" | 567 | #include "strv.h" |
567 | #include "utf8.h" | 568 | #include "utf8.h" |
@@ -570,7 +571,7 @@ index b812665315..8e68f7f8fc 100644 | |||
570 | int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) { | 571 | int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) { |
571 | const char *n; | 572 | const char *n; |
572 | diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c | 573 | diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c |
573 | index 7c4fc7021d..3fbaf5a639 100644 | 574 | index e95b638f4d..a1bf15baa8 100644 |
574 | --- a/src/shared/journal-importer.c | 575 | --- a/src/shared/journal-importer.c |
575 | +++ b/src/shared/journal-importer.c | 576 | +++ b/src/shared/journal-importer.c |
576 | @@ -14,6 +14,7 @@ | 577 | @@ -14,6 +14,7 @@ |
@@ -582,7 +583,7 @@ index 7c4fc7021d..3fbaf5a639 100644 | |||
582 | enum { | 583 | enum { |
583 | IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */ | 584 | IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */ |
584 | diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c | 585 | diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c |
585 | index 899e894ab7..628854ac9c 100644 | 586 | index bf574d32a5..a09c79d2fb 100644 |
586 | --- a/src/shared/logs-show.c | 587 | --- a/src/shared/logs-show.c |
587 | +++ b/src/shared/logs-show.c | 588 | +++ b/src/shared/logs-show.c |
588 | @@ -41,6 +41,7 @@ | 589 | @@ -41,6 +41,7 @@ |
@@ -594,10 +595,10 @@ index 899e894ab7..628854ac9c 100644 | |||
594 | /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */ | 595 | /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */ |
595 | #define PRINT_LINE_THRESHOLD 3 | 596 | #define PRINT_LINE_THRESHOLD 3 |
596 | diff --git a/src/shared/pager.c b/src/shared/pager.c | 597 | diff --git a/src/shared/pager.c b/src/shared/pager.c |
597 | index e03be6d23b..50e3d1f75c 100644 | 598 | index f689d9f28f..aae3957c2f 100644 |
598 | --- a/src/shared/pager.c | 599 | --- a/src/shared/pager.c |
599 | +++ b/src/shared/pager.c | 600 | +++ b/src/shared/pager.c |
600 | @@ -23,6 +23,7 @@ | 601 | @@ -26,6 +26,7 @@ |
601 | #include "strv.h" | 602 | #include "strv.h" |
602 | #include "terminal-util.h" | 603 | #include "terminal-util.h" |
603 | #include "util.h" | 604 | #include "util.h" |
@@ -606,7 +607,7 @@ index e03be6d23b..50e3d1f75c 100644 | |||
606 | static pid_t pager_pid = 0; | 607 | static pid_t pager_pid = 0; |
607 | 608 | ||
608 | diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c | 609 | diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c |
609 | index 7cb7d8a477..8e7d7f9e7c 100644 | 610 | index 5d5bf7f21d..f1002ffa6c 100644 |
610 | --- a/src/shared/uid-range.c | 611 | --- a/src/shared/uid-range.c |
611 | +++ b/src/shared/uid-range.c | 612 | +++ b/src/shared/uid-range.c |
612 | @@ -9,6 +9,7 @@ | 613 | @@ -9,6 +9,7 @@ |
@@ -618,7 +619,7 @@ index 7cb7d8a477..8e7d7f9e7c 100644 | |||
618 | static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) { | 619 | static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) { |
619 | assert(range); | 620 | assert(range); |
620 | diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c | 621 | diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c |
621 | index b461aead60..9941695ed9 100644 | 622 | index 4391d9f1f5..9b73cd0aeb 100644 |
622 | --- a/src/socket-proxy/socket-proxyd.c | 623 | --- a/src/socket-proxy/socket-proxyd.c |
623 | +++ b/src/socket-proxy/socket-proxyd.c | 624 | +++ b/src/socket-proxy/socket-proxyd.c |
624 | @@ -26,6 +26,7 @@ | 625 | @@ -26,6 +26,7 @@ |
@@ -630,7 +631,7 @@ index b461aead60..9941695ed9 100644 | |||
630 | #define BUFFER_SIZE (256 * 1024) | 631 | #define BUFFER_SIZE (256 * 1024) |
631 | 632 | ||
632 | diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c | 633 | diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c |
633 | index 52217429b1..70708dedf3 100644 | 634 | index f0f9679769..128fc164da 100644 |
634 | --- a/src/test/test-hexdecoct.c | 635 | --- a/src/test/test-hexdecoct.c |
635 | +++ b/src/test/test-hexdecoct.c | 636 | +++ b/src/test/test-hexdecoct.c |
636 | @@ -6,6 +6,7 @@ | 637 | @@ -6,6 +6,7 @@ |
@@ -642,7 +643,7 @@ index 52217429b1..70708dedf3 100644 | |||
642 | static void test_hexchar(void) { | 643 | static void test_hexchar(void) { |
643 | assert_se(hexchar(0xa) == 'a'); | 644 | assert_se(hexchar(0xa) == 'a'); |
644 | diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c | 645 | diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c |
645 | index 6c020ac0ed..10723ec46c 100644 | 646 | index 0da59e2c75..66da3741ee 100644 |
646 | --- a/src/udev/udev-builtin-path_id.c | 647 | --- a/src/udev/udev-builtin-path_id.c |
647 | +++ b/src/udev/udev-builtin-path_id.c | 648 | +++ b/src/udev/udev-builtin-path_id.c |
648 | @@ -22,6 +22,7 @@ | 649 | @@ -22,6 +22,7 @@ |
@@ -654,7 +655,7 @@ index 6c020ac0ed..10723ec46c 100644 | |||
654 | _printf_(2,3) | 655 | _printf_(2,3) |
655 | static void path_prepend(char **path, const char *fmt, ...) { | 656 | static void path_prepend(char **path, const char *fmt, ...) { |
656 | diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c | 657 | diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c |
657 | index e1c2baf7f2..62d4086802 100644 | 658 | index 5159d19a38..0ed5b65844 100644 |
658 | --- a/src/udev/udev-event.c | 659 | --- a/src/udev/udev-event.c |
659 | +++ b/src/udev/udev-event.c | 660 | +++ b/src/udev/udev-event.c |
660 | @@ -34,6 +34,7 @@ | 661 | @@ -34,6 +34,7 @@ |
@@ -666,7 +667,7 @@ index e1c2baf7f2..62d4086802 100644 | |||
666 | typedef struct Spawn { | 667 | typedef struct Spawn { |
667 | sd_device *device; | 668 | sd_device *device; |
668 | diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c | 669 | diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c |
669 | index c36f032f66..36970813d8 100644 | 670 | index ef6a0c112c..422fc19127 100644 |
670 | --- a/src/udev/udev-rules.c | 671 | --- a/src/udev/udev-rules.c |
671 | +++ b/src/udev/udev-rules.c | 672 | +++ b/src/udev/udev-rules.c |
672 | @@ -30,6 +30,7 @@ | 673 | @@ -30,6 +30,7 @@ |
@@ -677,3 +678,6 @@ index c36f032f66..36970813d8 100644 | |||
677 | 678 | ||
678 | #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d") | 679 | #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d") |
679 | 680 | ||
681 | -- | ||
682 | 2.27.0 | ||
683 | |||
diff --git a/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch b/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch index abc438e4ba..b689cf1297 100644 --- a/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch +++ b/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 47818052121d135632f5e46c369e3e4706a0f9e0 Mon Sep 17 00:00:00 2001 | 1 | From d3ed0da271738fd0fc3d3e4d82d6f5810334b05e Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Thu, 26 Oct 2017 22:10:42 -0700 | 3 | Date: Thu, 26 Oct 2017 22:10:42 -0700 |
4 | Subject: [PATCH] Include netinet/if_ether.h | 4 | Subject: [PATCH 06/26] Include netinet/if_ether.h |
5 | 5 | ||
6 | Fixes | 6 | Fixes |
7 | /path/to/systemd/recipe-sysroot/usr/include/netinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr' | 7 | /path/to/systemd/recipe-sysroot/usr/include/netinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr' |
@@ -29,7 +29,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
29 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 29 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
30 | [rebased for systemd 243] | 30 | [rebased for systemd 243] |
31 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> | 31 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> |
32 | 32 | [rebased for systemd 247] | |
33 | Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | ||
33 | --- | 34 | --- |
34 | src/libsystemd-network/sd-dhcp6-client.c | 1 - | 35 | src/libsystemd-network/sd-dhcp6-client.c | 1 - |
35 | src/libsystemd/sd-netlink/netlink-types.c | 1 + | 36 | src/libsystemd/sd-netlink/netlink-types.c | 1 + |
@@ -52,10 +53,10 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
52 | src/udev/udev-builtin-net_setup_link.c | 1 + | 53 | src/udev/udev-builtin-net_setup_link.c | 1 + |
53 | 19 files changed, 18 insertions(+), 4 deletions(-) | 54 | 19 files changed, 18 insertions(+), 4 deletions(-) |
54 | 55 | ||
55 | Index: systemd-stable/src/libsystemd-network/sd-dhcp6-client.c | 56 | diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c |
56 | =================================================================== | 57 | index 30ac526fc9..126077e13c 100644 |
57 | --- systemd-stable.orig/src/libsystemd-network/sd-dhcp6-client.c | 58 | --- a/src/libsystemd-network/sd-dhcp6-client.c |
58 | +++ systemd-stable/src/libsystemd-network/sd-dhcp6-client.c | 59 | +++ b/src/libsystemd-network/sd-dhcp6-client.c |
59 | @@ -5,7 +5,6 @@ | 60 | @@ -5,7 +5,6 @@ |
60 | 61 | ||
61 | #include <errno.h> | 62 | #include <errno.h> |
@@ -64,10 +65,10 @@ Index: systemd-stable/src/libsystemd-network/sd-dhcp6-client.c | |||
64 | #include <linux/if_infiniband.h> | 65 | #include <linux/if_infiniband.h> |
65 | 66 | ||
66 | #include "sd-dhcp6-client.h" | 67 | #include "sd-dhcp6-client.h" |
67 | Index: systemd-stable/src/libsystemd/sd-netlink/netlink-types.c | 68 | diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c |
68 | =================================================================== | 69 | index 6fb6c147d9..8eda02d202 100644 |
69 | --- systemd-stable.orig/src/libsystemd/sd-netlink/netlink-types.c | 70 | --- a/src/libsystemd/sd-netlink/netlink-types.c |
70 | +++ systemd-stable/src/libsystemd/sd-netlink/netlink-types.c | 71 | +++ b/src/libsystemd/sd-netlink/netlink-types.c |
71 | @@ -3,6 +3,7 @@ | 72 | @@ -3,6 +3,7 @@ |
72 | #include <netinet/in.h> | 73 | #include <netinet/in.h> |
73 | #include <stdint.h> | 74 | #include <stdint.h> |
@@ -76,10 +77,10 @@ Index: systemd-stable/src/libsystemd/sd-netlink/netlink-types.c | |||
76 | #include <linux/can/vxcan.h> | 77 | #include <linux/can/vxcan.h> |
77 | #include <linux/netlink.h> | 78 | #include <linux/netlink.h> |
78 | #include <linux/rtnetlink.h> | 79 | #include <linux/rtnetlink.h> |
79 | Index: systemd-stable/src/machine/machine-dbus.c | 80 | diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c |
80 | =================================================================== | 81 | index bb67beb665..f5780f1aec 100644 |
81 | --- systemd-stable.orig/src/machine/machine-dbus.c | 82 | --- a/src/machine/machine-dbus.c |
82 | +++ systemd-stable/src/machine/machine-dbus.c | 83 | +++ b/src/machine/machine-dbus.c |
83 | @@ -3,6 +3,7 @@ | 84 | @@ -3,6 +3,7 @@ |
84 | #include <errno.h> | 85 | #include <errno.h> |
85 | #include <sys/mount.h> | 86 | #include <sys/mount.h> |
@@ -88,66 +89,66 @@ Index: systemd-stable/src/machine/machine-dbus.c | |||
88 | 89 | ||
89 | /* When we include libgen.h because we need dirname() we immediately | 90 | /* When we include libgen.h because we need dirname() we immediately |
90 | * undefine basename() since libgen.h defines it as a macro to the POSIX | 91 | * undefine basename() since libgen.h defines it as a macro to the POSIX |
91 | Index: systemd-stable/src/network/netdev/bond.c | 92 | diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c |
92 | =================================================================== | 93 | index e27f36067b..8868f1da5d 100644 |
93 | --- systemd-stable.orig/src/network/netdev/bond.c | 94 | --- a/src/network/netdev/bond.c |
94 | +++ systemd-stable/src/network/netdev/bond.c | 95 | +++ b/src/network/netdev/bond.c |
95 | @@ -1,5 +1,6 @@ | 96 | @@ -1,5 +1,6 @@ |
96 | /* SPDX-License-Identifier: LGPL-2.1+ */ | 97 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
97 | 98 | ||
98 | +#include <netinet/if_ether.h> | 99 | +#include <netinet/if_ether.h> |
99 | #include "alloc-util.h" | 100 | #include "alloc-util.h" |
100 | #include "bond.h" | 101 | #include "bond.h" |
101 | #include "bond-util.h" | 102 | #include "bond-util.h" |
102 | Index: systemd-stable/src/network/netdev/bridge.c | 103 | diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c |
103 | =================================================================== | 104 | index 1f59cd8b42..5fdbae7e99 100644 |
104 | --- systemd-stable.orig/src/network/netdev/bridge.c | 105 | --- a/src/network/netdev/bridge.c |
105 | +++ systemd-stable/src/network/netdev/bridge.c | 106 | +++ b/src/network/netdev/bridge.c |
106 | @@ -1,5 +1,6 @@ | 107 | @@ -1,5 +1,6 @@ |
107 | /* SPDX-License-Identifier: LGPL-2.1+ */ | 108 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
108 | 109 | ||
109 | +#include <netinet/if_ether.h> | 110 | +#include <netinet/if_ether.h> |
110 | #include <net/if.h> | 111 | #include <net/if.h> |
111 | 112 | ||
112 | #include "bridge.h" | 113 | #include "bridge.h" |
113 | Index: systemd-stable/src/network/netdev/macsec.c | 114 | diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c |
114 | =================================================================== | 115 | index 82e71c3920..fbae86e216 100644 |
115 | --- systemd-stable.orig/src/network/netdev/macsec.c | 116 | --- a/src/network/netdev/macsec.c |
116 | +++ systemd-stable/src/network/netdev/macsec.c | 117 | +++ b/src/network/netdev/macsec.c |
117 | @@ -1,5 +1,6 @@ | 118 | @@ -1,5 +1,6 @@ |
118 | /* SPDX-License-Identifier: LGPL-2.1+ */ | 119 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
119 | 120 | ||
120 | +#include <netinet/if_ether.h> | 121 | +#include <netinet/if_ether.h> |
121 | #include <netinet/in.h> | 122 | #include <netinet/in.h> |
122 | #include <linux/if_ether.h> | 123 | #include <linux/if_ether.h> |
123 | #include <linux/if_macsec.h> | 124 | #include <linux/if_macsec.h> |
124 | Index: systemd-stable/src/network/netdev/netdev-gperf.gperf | 125 | diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf |
125 | =================================================================== | 126 | index 4e89761f2c..91251fa6ec 100644 |
126 | --- systemd-stable.orig/src/network/netdev/netdev-gperf.gperf | 127 | --- a/src/network/netdev/netdev-gperf.gperf |
127 | +++ systemd-stable/src/network/netdev/netdev-gperf.gperf | 128 | +++ b/src/network/netdev/netdev-gperf.gperf |
128 | @@ -2,6 +2,7 @@ | 129 | @@ -2,6 +2,7 @@ |
129 | #if __GNUC__ >= 7 | 130 | #if __GNUC__ >= 7 |
130 | _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"") | 131 | _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"") |
131 | #endif | 132 | #endif |
132 | +#include <netinet/if_ether.h> | 133 | +#include <netinet/if_ether.h> |
133 | #include <stddef.h> | 134 | #include <stddef.h> |
135 | #include "bareudp.h" | ||
134 | #include "bond.h" | 136 | #include "bond.h" |
135 | #include "bridge.h" | 137 | diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c |
136 | Index: systemd-stable/src/network/netdev/netdev.c | 138 | index 9f390b5781..62aeafb1e4 100644 |
137 | =================================================================== | 139 | --- a/src/network/netdev/netdev.c |
138 | --- systemd-stable.orig/src/network/netdev/netdev.c | 140 | +++ b/src/network/netdev/netdev.c |
139 | +++ systemd-stable/src/network/netdev/netdev.c | ||
140 | @@ -1,5 +1,6 @@ | 141 | @@ -1,5 +1,6 @@ |
141 | /* SPDX-License-Identifier: LGPL-2.1+ */ | 142 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
142 | 143 | ||
143 | +#include <netinet/if_ether.h> | 144 | +#include <netinet/if_ether.h> |
144 | #include <net/if.h> | 145 | #include <net/if.h> |
145 | #include <netinet/in.h> | 146 | #include <netinet/in.h> |
146 | #include <unistd.h> | 147 | #include <unistd.h> |
147 | Index: systemd-stable/src/network/networkd-brvlan.c | 148 | diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c |
148 | =================================================================== | 149 | index e53c73c30c..9bf0771b84 100644 |
149 | --- systemd-stable.orig/src/network/networkd-brvlan.c | 150 | --- a/src/network/networkd-brvlan.c |
150 | +++ systemd-stable/src/network/networkd-brvlan.c | 151 | +++ b/src/network/networkd-brvlan.c |
151 | @@ -4,6 +4,7 @@ | 152 | @@ -4,6 +4,7 @@ |
152 | ***/ | 153 | ***/ |
153 | 154 | ||
@@ -156,24 +157,49 @@ Index: systemd-stable/src/network/networkd-brvlan.c | |||
156 | #include <linux/if_bridge.h> | 157 | #include <linux/if_bridge.h> |
157 | #include <stdbool.h> | 158 | #include <stdbool.h> |
158 | 159 | ||
159 | Index: systemd-stable/src/network/networkd-dhcp-common.c | 160 | diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c |
160 | =================================================================== | 161 | index c338c775a7..ab35d65c53 100644 |
161 | --- systemd-stable.orig/src/network/networkd-dhcp-common.c | 162 | --- a/src/network/networkd-dhcp-common.c |
162 | +++ systemd-stable/src/network/networkd-dhcp-common.c | 163 | +++ b/src/network/networkd-dhcp-common.c |
163 | @@ -5,6 +5,7 @@ | 164 | @@ -1,7 +1,8 @@ |
164 | #include "escape.h" | 165 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
165 | #include "in-addr-util.h" | 166 | |
167 | #include <netinet/in.h> | ||
168 | -#include <linux/if_arp.h> | ||
169 | +#include <net/if_arp.h> | ||
170 | +#include <net/if.h> | ||
171 | |||
172 | #include "dhcp-internal.h" | ||
173 | #include "dhcp6-internal.h" | ||
174 | @@ -10,6 +10,7 @@ | ||
166 | #include "networkd-dhcp-common.h" | 175 | #include "networkd-dhcp-common.h" |
176 | #include "networkd-link.h" | ||
177 | #include "networkd-manager.h" | ||
167 | +#include <netinet/if_ether.h> | 178 | +#include <netinet/if_ether.h> |
168 | #include "networkd-network.h" | 179 | #include "networkd-network.h" |
169 | #include "parse-util.h" | 180 | #include "parse-util.h" |
170 | #include "string-table.h" | 181 | #include "socket-util.h" |
171 | Index: systemd-stable/src/network/networkd-dhcp4.c | 182 | diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c |
172 | =================================================================== | 183 | index cf279c640d..bae541029b 100644 |
173 | --- systemd-stable.orig/src/network/networkd-dhcp4.c | 184 | --- a/src/network/networkd-dhcp-server.c |
174 | +++ systemd-stable/src/network/networkd-dhcp4.c | 185 | +++ b/src/network/networkd-dhcp-server.c |
186 | @@ -1,8 +1,8 @@ | ||
187 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ | ||
188 | |||
189 | #include <netinet/in.h> | ||
190 | -#include <linux/if_arp.h> | ||
191 | -#include <linux/if.h> | ||
192 | +#include <net/if_arp.h> | ||
193 | +#include <net/if.h> | ||
194 | |||
195 | #include "sd-dhcp-server.h" | ||
196 | |||
197 | diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c | ||
198 | index 02d33841b6..a30d8dd82c 100644 | ||
199 | --- a/src/network/networkd-dhcp4.c | ||
200 | +++ b/src/network/networkd-dhcp4.c | ||
175 | @@ -1,9 +1,9 @@ | 201 | @@ -1,9 +1,9 @@ |
176 | /* SPDX-License-Identifier: LGPL-2.1+ */ | 202 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
177 | 203 | ||
178 | +#include <netinet/if_ether.h> | 204 | +#include <netinet/if_ether.h> |
179 | #include <netinet/in.h> | 205 | #include <netinet/in.h> |
@@ -183,10 +209,10 @@ Index: systemd-stable/src/network/networkd-dhcp4.c | |||
183 | 209 | ||
184 | #include "escape.h" | 210 | #include "escape.h" |
185 | #include "alloc-util.h" | 211 | #include "alloc-util.h" |
186 | Index: systemd-stable/src/network/networkd-dhcp6.c | 212 | diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c |
187 | =================================================================== | 213 | index d4d4182ee5..635d08f7d5 100644 |
188 | --- systemd-stable.orig/src/network/networkd-dhcp6.c | 214 | --- a/src/network/networkd-dhcp6.c |
189 | +++ systemd-stable/src/network/networkd-dhcp6.c | 215 | +++ b/src/network/networkd-dhcp6.c |
190 | @@ -3,9 +3,9 @@ | 216 | @@ -3,9 +3,9 @@ |
191 | Copyright © 2014 Intel Corporation. All rights reserved. | 217 | Copyright © 2014 Intel Corporation. All rights reserved. |
192 | ***/ | 218 | ***/ |
@@ -198,12 +224,12 @@ Index: systemd-stable/src/network/networkd-dhcp6.c | |||
198 | 224 | ||
199 | #include "sd-dhcp6-client.h" | 225 | #include "sd-dhcp6-client.h" |
200 | 226 | ||
201 | Index: systemd-stable/src/network/networkd-link.c | 227 | diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c |
202 | =================================================================== | 228 | index ced18de425..07b43770de 100644 |
203 | --- systemd-stable.orig/src/network/networkd-link.c | 229 | --- a/src/network/networkd-link.c |
204 | +++ systemd-stable/src/network/networkd-link.c | 230 | +++ b/src/network/networkd-link.c |
205 | @@ -1,8 +1,8 @@ | 231 | @@ -1,8 +1,8 @@ |
206 | /* SPDX-License-Identifier: LGPL-2.1+ */ | 232 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
207 | 233 | ||
208 | +#include <netinet/if_ether.h> | 234 | +#include <netinet/if_ether.h> |
209 | #include <netinet/in.h> | 235 | #include <netinet/in.h> |
@@ -212,41 +238,59 @@ Index: systemd-stable/src/network/networkd-link.c | |||
212 | #include <linux/if_link.h> | 238 | #include <linux/if_link.h> |
213 | #include <unistd.h> | 239 | #include <unistd.h> |
214 | 240 | ||
215 | Index: systemd-stable/src/network/networkd-network.c | 241 | diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c |
216 | =================================================================== | 242 | index 3254641461..f0ada419fd 100644 |
217 | --- systemd-stable.orig/src/network/networkd-network.c | 243 | --- a/src/network/networkd-network.c |
218 | +++ systemd-stable/src/network/networkd-network.c | 244 | +++ b/src/network/networkd-network.c |
219 | @@ -1,5 +1,6 @@ | 245 | @@ -1,5 +1,6 @@ |
220 | /* SPDX-License-Identifier: LGPL-2.1+ */ | 246 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
221 | 247 | ||
222 | +#include <netinet/if_ether.h> | 248 | +#include <netinet/if_ether.h> |
223 | #include <net/if.h> | 249 | #include <net/if.h> |
224 | #include <netinet/in.h> | 250 | #include <netinet/in.h> |
225 | #include <linux/netdevice.h> | 251 | #include <linux/netdevice.h> |
226 | Index: systemd-stable/src/network/test-network-tables.c | 252 | diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c |
227 | =================================================================== | 253 | index 10f30c1a7e..579885726c 100644 |
228 | --- systemd-stable.orig/src/network/test-network-tables.c | 254 | --- a/src/network/networkd-route.c |
229 | +++ systemd-stable/src/network/test-network-tables.c | 255 | +++ b/src/network/networkd-route.c |
230 | @@ -1,3 +1,4 @@ | 256 | @@ -1,7 +1,10 @@ |
257 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ | ||
258 | |||
259 | #include <linux/icmpv6.h> | ||
260 | -#include <linux/ipv6_route.h> | ||
261 | +/* linux/ipv6_route.h conflicts with netinet/in.h so define manually */ | ||
262 | +#ifndef IP6_RT_PRIO_USER | ||
263 | +#define IP6_RT_PRIO_USER 1024 | ||
264 | +#endif | ||
265 | |||
266 | #include "alloc-util.h" | ||
267 | #include "netlink-util.h" | ||
268 | diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c | ||
269 | index 475cac7527..9bae6eda16 100644 | ||
270 | --- a/src/network/test-network-tables.c | ||
271 | +++ b/src/network/test-network-tables.c | ||
272 | @@ -1,5 +1,6 @@ | ||
273 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ | ||
274 | |||
231 | +#include <netinet/if_ether.h> | 275 | +#include <netinet/if_ether.h> |
232 | #include "bond.h" | 276 | #include "bond.h" |
233 | #include "dhcp6-internal.h" | 277 | #include "dhcp6-internal.h" |
234 | #include "dhcp6-protocol.h" | 278 | #include "dhcp6-protocol.h" |
235 | Index: systemd-stable/src/shared/ethtool-util.c | 279 | diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c |
236 | =================================================================== | 280 | index e6fab262f2..41dd3d7df7 100644 |
237 | --- systemd-stable.orig/src/shared/ethtool-util.c | 281 | --- a/src/shared/ethtool-util.c |
238 | +++ systemd-stable/src/shared/ethtool-util.c | 282 | +++ b/src/shared/ethtool-util.c |
239 | @@ -1,5 +1,6 @@ | 283 | @@ -1,5 +1,6 @@ |
240 | /* SPDX-License-Identifier: LGPL-2.1+ */ | 284 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
241 | 285 | ||
242 | +#include <netinet/if_ether.h> | 286 | +#include <netinet/if_ether.h> |
243 | #include <net/if.h> | 287 | #include <net/if.h> |
244 | #include <sys/ioctl.h> | 288 | #include <sys/ioctl.h> |
245 | #include <linux/ethtool.h> | 289 | #include <linux/ethtool.h> |
246 | Index: systemd-stable/src/shared/ethtool-util.h | 290 | diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h |
247 | =================================================================== | 291 | index f94b3e15bf..08a7e4fa09 100644 |
248 | --- systemd-stable.orig/src/shared/ethtool-util.h | 292 | --- a/src/shared/ethtool-util.h |
249 | +++ systemd-stable/src/shared/ethtool-util.h | 293 | +++ b/src/shared/ethtool-util.h |
250 | @@ -3,6 +3,7 @@ | 294 | @@ -3,6 +3,7 @@ |
251 | 295 | ||
252 | #include <macro.h> | 296 | #include <macro.h> |
@@ -255,25 +299,28 @@ Index: systemd-stable/src/shared/ethtool-util.h | |||
255 | #include <linux/ethtool.h> | 299 | #include <linux/ethtool.h> |
256 | 300 | ||
257 | #include "conf-parser.h" | 301 | #include "conf-parser.h" |
258 | Index: systemd-stable/src/udev/net/link-config.c | 302 | diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c |
259 | =================================================================== | 303 | index d12fd0e299..636806dc23 100644 |
260 | --- systemd-stable.orig/src/udev/net/link-config.c | 304 | --- a/src/udev/net/link-config.c |
261 | +++ systemd-stable/src/udev/net/link-config.c | 305 | +++ b/src/udev/net/link-config.c |
262 | @@ -1,5 +1,6 @@ | 306 | @@ -1,5 +1,6 @@ |
263 | /* SPDX-License-Identifier: LGPL-2.1+ */ | 307 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
264 | 308 | ||
265 | +#include <netinet/if_ether.h> | 309 | +#include <netinet/if_ether.h> |
266 | #include <linux/netdevice.h> | 310 | #include <linux/netdevice.h> |
267 | #include <netinet/ether.h> | 311 | #include <netinet/ether.h> |
268 | #include <unistd.h> | 312 | #include <unistd.h> |
269 | Index: systemd-stable/src/udev/udev-builtin-net_setup_link.c | 313 | diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c |
270 | =================================================================== | 314 | index cb12b943fe..5a28c8b563 100644 |
271 | --- systemd-stable.orig/src/udev/udev-builtin-net_setup_link.c | 315 | --- a/src/udev/udev-builtin-net_setup_link.c |
272 | +++ systemd-stable/src/udev/udev-builtin-net_setup_link.c | 316 | +++ b/src/udev/udev-builtin-net_setup_link.c |
273 | @@ -1,5 +1,6 @@ | 317 | @@ -1,5 +1,6 @@ |
274 | /* SPDX-License-Identifier: LGPL-2.1+ */ | 318 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
275 | 319 | ||
276 | +#include <netinet/if_ether.h> | 320 | +#include <netinet/if_ether.h> |
277 | #include "device-util.h" | 321 | #include "device-util.h" |
278 | #include "alloc-util.h" | 322 | #include "alloc-util.h" |
279 | #include "link-config.h" | 323 | #include "link-config.h" |
324 | -- | ||
325 | 2.27.0 | ||
326 | |||
diff --git a/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch b/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch index dd6ecebeb4..6865421586 100644 --- a/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch +++ b/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch | |||
@@ -1,7 +1,8 @@ | |||
1 | From 77f98727f1d19a8fb327b55c92f1a9ee7b859e9f Mon Sep 17 00:00:00 2001 | 1 | From 87a14dde13c8fa68239a4ab62914a093062b3b29 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 14:56:21 +0800 | 3 | Date: Mon, 25 Feb 2019 14:56:21 +0800 |
4 | Subject: [PATCH] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not defined | 4 | Subject: [PATCH 07/26] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not |
5 | defined | ||
5 | 6 | ||
6 | If the standard library doesn't provide brace | 7 | If the standard library doesn't provide brace |
7 | expansion users just won't get it. | 8 | expansion users just won't get it. |
@@ -16,17 +17,16 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
16 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 17 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
17 | [rebased for systemd 243] | 18 | [rebased for systemd 243] |
18 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> | 19 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> |
19 | |||
20 | --- | 20 | --- |
21 | src/basic/glob-util.c | 12 ++++++++++++ | 21 | src/basic/glob-util.c | 12 ++++++++++++ |
22 | src/test/test-glob-util.c | 16 ++++++++++++++++ | 22 | src/test/test-glob-util.c | 16 ++++++++++++++++ |
23 | src/tmpfiles/tmpfiles.c | 10 ++++++++++ | 23 | src/tmpfiles/tmpfiles.c | 10 ++++++++++ |
24 | 3 files changed, 38 insertions(+) | 24 | 3 files changed, 38 insertions(+) |
25 | 25 | ||
26 | Index: systemd-stable/src/basic/glob-util.c | 26 | diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c |
27 | =================================================================== | 27 | index bc0278e57f..c973f82e54 100644 |
28 | --- systemd-stable.orig/src/basic/glob-util.c | 28 | --- a/src/basic/glob-util.c |
29 | +++ systemd-stable/src/basic/glob-util.c | 29 | +++ b/src/basic/glob-util.c |
30 | @@ -12,6 +12,12 @@ | 30 | @@ -12,6 +12,12 @@ |
31 | #include "path-util.h" | 31 | #include "path-util.h" |
32 | #include "strv.h" | 32 | #include "strv.h" |
@@ -48,7 +48,7 @@ Index: systemd-stable/src/basic/glob-util.c | |||
48 | /* We want to set GLOB_ALTDIRFUNC ourselves, don't allow it to be set. */ | 48 | /* We want to set GLOB_ALTDIRFUNC ourselves, don't allow it to be set. */ |
49 | assert(!(flags & GLOB_ALTDIRFUNC)); | 49 | assert(!(flags & GLOB_ALTDIRFUNC)); |
50 | 50 | ||
51 | @@ -32,9 +39,14 @@ int safe_glob(const char *path, int flag | 51 | @@ -32,9 +39,14 @@ int safe_glob(const char *path, int flags, glob_t *pglob) { |
52 | pglob->gl_lstat = lstat; | 52 | pglob->gl_lstat = lstat; |
53 | if (!pglob->gl_stat) | 53 | if (!pglob->gl_stat) |
54 | pglob->gl_stat = stat; | 54 | pglob->gl_stat = stat; |
@@ -63,10 +63,10 @@ Index: systemd-stable/src/basic/glob-util.c | |||
63 | if (k == GLOB_NOMATCH) | 63 | if (k == GLOB_NOMATCH) |
64 | return -ENOENT; | 64 | return -ENOENT; |
65 | if (k == GLOB_NOSPACE) | 65 | if (k == GLOB_NOSPACE) |
66 | Index: systemd-stable/src/test/test-glob-util.c | 66 | diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c |
67 | =================================================================== | 67 | index df6444c433..79a692046e 100644 |
68 | --- systemd-stable.orig/src/test/test-glob-util.c | 68 | --- a/src/test/test-glob-util.c |
69 | +++ systemd-stable/src/test/test-glob-util.c | 69 | +++ b/src/test/test-glob-util.c |
70 | @@ -12,6 +12,12 @@ | 70 | @@ -12,6 +12,12 @@ |
71 | #include "rm-rf.h" | 71 | #include "rm-rf.h" |
72 | #include "tmpfile-util.h" | 72 | #include "tmpfile-util.h" |
@@ -114,11 +114,11 @@ Index: systemd-stable/src/test/test-glob-util.c | |||
114 | assert_se(r == GLOB_NOMATCH); | 114 | assert_se(r == GLOB_NOMATCH); |
115 | 115 | ||
116 | (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL); | 116 | (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL); |
117 | Index: systemd-stable/src/tmpfiles/tmpfiles.c | 117 | diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c |
118 | =================================================================== | 118 | index 9906c70eef..5eb63b1d57 100644 |
119 | --- systemd-stable.orig/src/tmpfiles/tmpfiles.c | 119 | --- a/src/tmpfiles/tmpfiles.c |
120 | +++ systemd-stable/src/tmpfiles/tmpfiles.c | 120 | +++ b/src/tmpfiles/tmpfiles.c |
121 | @@ -59,6 +59,12 @@ | 121 | @@ -63,6 +63,12 @@ |
122 | #include "umask-util.h" | 122 | #include "umask-util.h" |
123 | #include "user-util.h" | 123 | #include "user-util.h" |
124 | 124 | ||
@@ -131,7 +131,7 @@ Index: systemd-stable/src/tmpfiles/tmpfiles.c | |||
131 | /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates | 131 | /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates |
132 | * them in the file system. This is intended to be used to create | 132 | * them in the file system. This is intended to be used to create |
133 | * properly owned directories beneath /tmp, /var/tmp, /run, which are | 133 | * properly owned directories beneath /tmp, /var/tmp, /run, which are |
134 | @@ -1867,7 +1873,9 @@ finish: | 134 | @@ -1936,7 +1942,9 @@ finish: |
135 | 135 | ||
136 | static int glob_item(Item *i, action_t action) { | 136 | static int glob_item(Item *i, action_t action) { |
137 | _cleanup_globfree_ glob_t g = { | 137 | _cleanup_globfree_ glob_t g = { |
@@ -141,7 +141,7 @@ Index: systemd-stable/src/tmpfiles/tmpfiles.c | |||
141 | }; | 141 | }; |
142 | int r = 0, k; | 142 | int r = 0, k; |
143 | char **fn; | 143 | char **fn; |
144 | @@ -1887,7 +1895,9 @@ static int glob_item(Item *i, action_t a | 144 | @@ -1956,7 +1964,9 @@ static int glob_item(Item *i, action_t action) { |
145 | 145 | ||
146 | static int glob_item_recursively(Item *i, fdaction_t action) { | 146 | static int glob_item_recursively(Item *i, fdaction_t action) { |
147 | _cleanup_globfree_ glob_t g = { | 147 | _cleanup_globfree_ glob_t g = { |
@@ -151,3 +151,6 @@ Index: systemd-stable/src/tmpfiles/tmpfiles.c | |||
151 | }; | 151 | }; |
152 | int r = 0, k; | 152 | int r = 0, k; |
153 | char **fn; | 153 | char **fn; |
154 | -- | ||
155 | 2.27.0 | ||
156 | |||
diff --git a/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch b/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch index 1f618932ea..94cdc2efde 100644 --- a/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch +++ b/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 7c440cfc53aa52c9dc91c3a8c105bcf314c53af6 Mon Sep 17 00:00:00 2001 | 1 | From 8caea3fe87d55fd16de7d1b8266239fa954cb498 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 15:00:06 +0800 | 3 | Date: Mon, 25 Feb 2019 15:00:06 +0800 |
4 | Subject: [PATCH] add missing FTW_ macros for musl | 4 | Subject: [PATCH 08/26] add missing FTW_ macros for musl |
5 | 5 | ||
6 | This is to avoid build failures like below for musl. | 6 | This is to avoid build failures like below for musl. |
7 | 7 | ||
@@ -10,13 +10,12 @@ This is to avoid build failures like below for musl. | |||
10 | Upstream-Status: Inappropriate [musl specific] | 10 | Upstream-Status: Inappropriate [musl specific] |
11 | 11 | ||
12 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 12 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
13 | |||
14 | --- | 13 | --- |
15 | src/basic/missing_type.h | 20 ++++++++++++++++++++ | 14 | src/basic/missing_type.h | 20 ++++++++++++++++++++ |
16 | 1 file changed, 20 insertions(+) | 15 | 1 file changed, 20 insertions(+) |
17 | 16 | ||
18 | diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h | 17 | diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h |
19 | index c487e65e7bde..23602ebbd533 100644 | 18 | index aeaf6ad5ec..3df1084ef2 100644 |
20 | --- a/src/basic/missing_type.h | 19 | --- a/src/basic/missing_type.h |
21 | +++ b/src/basic/missing_type.h | 20 | +++ b/src/basic/missing_type.h |
22 | @@ -19,3 +19,23 @@ typedef int (*comparison_fn_t)(const void *, const void *); | 21 | @@ -19,3 +19,23 @@ typedef int (*comparison_fn_t)(const void *, const void *); |
@@ -43,3 +42,6 @@ index c487e65e7bde..23602ebbd533 100644 | |||
43 | +#ifndef FTW_SKIP_SIBLINGS | 42 | +#ifndef FTW_SKIP_SIBLINGS |
44 | +#define FTW_SKIP_SIBLINGS 3 | 43 | +#define FTW_SKIP_SIBLINGS 3 |
45 | +#endif | 44 | +#endif |
45 | -- | ||
46 | 2.27.0 | ||
47 | |||
diff --git a/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch b/meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch index 15055161fc..76cc75cf6a 100644 --- a/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch +++ b/meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch | |||
@@ -1,20 +1,19 @@ | |||
1 | From eed7427db98cc01db7e9b3479655d68b044bc85b Mon Sep 17 00:00:00 2001 | 1 | From d8e4f0aa1760e4c7bb8476beecd35025c9cbb95a 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 15:03:47 +0800 | 3 | Date: Mon, 25 Feb 2019 15:03:47 +0800 |
4 | Subject: [PATCH] fix missing of __register_atfork for non-glibc builds | 4 | Subject: [PATCH 09/26] fix missing of __register_atfork for non-glibc builds |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [musl specific] | 6 | Upstream-Status: Inappropriate [musl specific] |
7 | 7 | ||
8 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 8 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
9 | |||
10 | --- | 9 | --- |
11 | src/basic/process-util.c | 7 +++++++ | 10 | src/basic/process-util.c | 7 +++++++ |
12 | 1 file changed, 7 insertions(+) | 11 | 1 file changed, 7 insertions(+) |
13 | 12 | ||
14 | Index: systemd-stable/src/basic/process-util.c | 13 | diff --git a/src/basic/process-util.c b/src/basic/process-util.c |
15 | =================================================================== | 14 | index 0851613fc9..4417101569 100644 |
16 | --- systemd-stable.orig/src/basic/process-util.c | 15 | --- a/src/basic/process-util.c |
17 | +++ systemd-stable/src/basic/process-util.c | 16 | +++ b/src/basic/process-util.c |
18 | @@ -18,6 +18,9 @@ | 17 | @@ -18,6 +18,9 @@ |
19 | #if HAVE_VALGRIND_VALGRIND_H | 18 | #if HAVE_VALGRIND_VALGRIND_H |
20 | #include <valgrind/valgrind.h> | 19 | #include <valgrind/valgrind.h> |
@@ -41,3 +40,6 @@ Index: systemd-stable/src/basic/process-util.c | |||
41 | 40 | ||
42 | pid_t getpid_cached(void) { | 41 | pid_t getpid_cached(void) { |
43 | static bool installed = false; | 42 | static bool installed = false; |
43 | -- | ||
44 | 2.27.0 | ||
45 | |||
diff --git a/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch b/meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch index a6fcd2f5da..aeacd865ae 100644 --- a/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch +++ b/meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 4aa91347ae975051dbe4dd2f98a1f4f459f2604f Mon Sep 17 00:00:00 2001 | 1 | From e45bb02174812e4935214f42a18725be320770d5 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 15:12:41 +0800 | 3 | Date: Mon, 25 Feb 2019 15:12:41 +0800 |
4 | Subject: [PATCH] Use uintmax_t for handling rlim_t | 4 | Subject: [PATCH 10/26] Use uintmax_t for handling rlim_t |
5 | 5 | ||
6 | PRIu{32,64} is not right format to represent rlim_t type | 6 | PRIu{32,64} is not right format to represent rlim_t type |
7 | therefore use %ju and typecast the rlim_t variables to | 7 | therefore use %ju and typecast the rlim_t variables to |
@@ -20,18 +20,17 @@ Upstream-Status: Denied [https://github.com/systemd/systemd/pull/7199] | |||
20 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 20 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
21 | [Rebased for v241] | 21 | [Rebased for v241] |
22 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 22 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
23 | |||
24 | --- | 23 | --- |
25 | src/basic/format-util.h | 8 +------- | 24 | src/basic/format-util.h | 8 +------- |
26 | src/basic/rlimit-util.c | 10 +++++----- | 25 | src/basic/rlimit-util.c | 10 +++++----- |
27 | src/core/execute.c | 4 ++-- | 26 | src/core/execute.c | 4 ++-- |
28 | 3 files changed, 8 insertions(+), 14 deletions(-) | 27 | 3 files changed, 8 insertions(+), 14 deletions(-) |
29 | 28 | ||
30 | Index: systemd-stable/src/basic/format-util.h | 29 | diff --git a/src/basic/format-util.h b/src/basic/format-util.h |
31 | =================================================================== | 30 | index b7e18768e3..3195ab205d 100644 |
32 | --- systemd-stable.orig/src/basic/format-util.h | 31 | --- a/src/basic/format-util.h |
33 | +++ systemd-stable/src/basic/format-util.h | 32 | +++ b/src/basic/format-util.h |
34 | @@ -32,13 +32,7 @@ assert_cc(sizeof(gid_t) == sizeof(uint32 | 33 | @@ -32,13 +32,7 @@ assert_cc(sizeof(gid_t) == sizeof(uint32_t)); |
35 | # define PRI_TIMEX "li" | 34 | # define PRI_TIMEX "li" |
36 | #endif | 35 | #endif |
37 | 36 | ||
@@ -46,11 +45,11 @@ Index: systemd-stable/src/basic/format-util.h | |||
46 | 45 | ||
47 | #if SIZEOF_DEV_T == 8 | 46 | #if SIZEOF_DEV_T == 8 |
48 | # define DEV_FMT "%" PRIu64 | 47 | # define DEV_FMT "%" PRIu64 |
49 | Index: systemd-stable/src/basic/rlimit-util.c | 48 | diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c |
50 | =================================================================== | 49 | index 880976312c..9e1b61cd4a 100644 |
51 | --- systemd-stable.orig/src/basic/rlimit-util.c | 50 | --- a/src/basic/rlimit-util.c |
52 | +++ systemd-stable/src/basic/rlimit-util.c | 51 | +++ b/src/basic/rlimit-util.c |
53 | @@ -306,13 +306,13 @@ int rlimit_format(const struct rlimit *r | 52 | @@ -306,13 +306,13 @@ int rlimit_format(const struct rlimit *rl, char **ret) { |
54 | if (rl->rlim_cur >= RLIM_INFINITY && rl->rlim_max >= RLIM_INFINITY) | 53 | if (rl->rlim_cur >= RLIM_INFINITY && rl->rlim_max >= RLIM_INFINITY) |
55 | s = strdup("infinity"); | 54 | s = strdup("infinity"); |
56 | else if (rl->rlim_cur >= RLIM_INFINITY) | 55 | else if (rl->rlim_cur >= RLIM_INFINITY) |
@@ -77,12 +76,12 @@ Index: systemd-stable/src/basic/rlimit-util.c | |||
77 | 76 | ||
78 | return 1; | 77 | return 1; |
79 | } | 78 | } |
80 | Index: systemd-stable/src/core/execute.c | 79 | diff --git a/src/core/execute.c b/src/core/execute.c |
81 | =================================================================== | 80 | index 89632e0582..335283776c 100644 |
82 | --- systemd-stable.orig/src/core/execute.c | 81 | --- a/src/core/execute.c |
83 | +++ systemd-stable/src/core/execute.c | 82 | +++ b/src/core/execute.c |
84 | @@ -4686,9 +4686,9 @@ void exec_context_dump(const ExecContext | 83 | @@ -5288,9 +5288,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) { |
85 | for (i = 0; i < RLIM_NLIMITS; i++) | 84 | for (unsigned i = 0; i < RLIM_NLIMITS; i++) |
86 | if (c->rlimit[i]) { | 85 | if (c->rlimit[i]) { |
87 | fprintf(f, "%sLimit%s: " RLIM_FMT "\n", | 86 | fprintf(f, "%sLimit%s: " RLIM_FMT "\n", |
88 | - prefix, rlimit_to_string(i), c->rlimit[i]->rlim_max); | 87 | - prefix, rlimit_to_string(i), c->rlimit[i]->rlim_max); |
@@ -93,3 +92,6 @@ Index: systemd-stable/src/core/execute.c | |||
93 | } | 92 | } |
94 | 93 | ||
95 | if (c->ioprio_set) { | 94 | if (c->ioprio_set) { |
95 | -- | ||
96 | 2.27.0 | ||
97 | |||
diff --git a/meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch b/meta/recipes-core/systemd/systemd/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch index 049096d2a9..6d7fdbcb64 100644 --- a/meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch +++ b/meta/recipes-core/systemd/systemd/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch | |||
@@ -1,22 +1,22 @@ | |||
1 | From 62fac5e3ff0fccd329cdc49605258b6d0e573a3e Mon Sep 17 00:00:00 2001 | 1 | From d1db531ddd3bbf94d5e764b7917bcc8684ff6357 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: Wed, 28 Feb 2018 21:25:22 -0800 | 3 | Date: Wed, 28 Feb 2018 21:25:22 -0800 |
4 | Subject: [PATCH] test-sizeof.c: Disable tests for missing typedefs in musl | 4 | Subject: [PATCH 11/26] test-sizeof.c: Disable tests for missing typedefs in |
5 | musl | ||
5 | 6 | ||
6 | Upstream-Status: Inappropriate [musl specific] | 7 | Upstream-Status: Inappropriate [musl specific] |
7 | 8 | ||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
9 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 10 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
10 | |||
11 | --- | 11 | --- |
12 | src/test/test-sizeof.c | 4 ++++ | 12 | src/test/test-sizeof.c | 4 ++++ |
13 | 1 file changed, 4 insertions(+) | 13 | 1 file changed, 4 insertions(+) |
14 | 14 | ||
15 | diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c | 15 | diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c |
16 | index 1020e0cb3153..c65062d2562c 100644 | 16 | index 3c9dc180fa..e1a59d408c 100644 |
17 | --- a/src/test/test-sizeof.c | 17 | --- a/src/test/test-sizeof.c |
18 | +++ b/src/test/test-sizeof.c | 18 | +++ b/src/test/test-sizeof.c |
19 | @@ -44,8 +44,10 @@ int main(void) { | 19 | @@ -55,8 +55,10 @@ int main(void) { |
20 | info(unsigned); | 20 | info(unsigned); |
21 | info(long unsigned); | 21 | info(long unsigned); |
22 | info(long long unsigned); | 22 | info(long long unsigned); |
@@ -27,7 +27,7 @@ index 1020e0cb3153..c65062d2562c 100644 | |||
27 | 27 | ||
28 | info(float); | 28 | info(float); |
29 | info(double); | 29 | info(double); |
30 | @@ -63,7 +65,9 @@ int main(void) { | 30 | @@ -74,7 +76,9 @@ int main(void) { |
31 | info(ssize_t); | 31 | info(ssize_t); |
32 | info(time_t); | 32 | info(time_t); |
33 | info(usec_t); | 33 | info(usec_t); |
@@ -37,3 +37,6 @@ index 1020e0cb3153..c65062d2562c 100644 | |||
37 | info(pid_t); | 37 | info(pid_t); |
38 | info(uid_t); | 38 | info(uid_t); |
39 | info(gid_t); | 39 | info(gid_t); |
40 | -- | ||
41 | 2.27.0 | ||
42 | |||
diff --git a/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch b/meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch index 0a7594c068..c15b6e7d82 100644 --- a/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch +++ b/meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From e6f871078d8d6f076c84f908fa57af15417ab87d Mon Sep 17 00:00:00 2001 | 1 | From 03e89da266edf70121a19ffc32a78cc3b97585ef Mon Sep 17 00:00:00 2001 |
2 | From: Andre McCurdy <armccurdy@gmail.com> | 2 | From: Andre McCurdy <armccurdy@gmail.com> |
3 | Date: Tue, 10 Oct 2017 14:33:30 -0700 | 3 | Date: Tue, 10 Oct 2017 14:33:30 -0700 |
4 | Subject: [PATCH] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() | 4 | Subject: [PATCH 12/26] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() |
5 | 5 | ||
6 | Avoid using AT_SYMLINK_NOFOLLOW flag. It doesn't seem like the right | 6 | Avoid using AT_SYMLINK_NOFOLLOW flag. It doesn't seem like the right |
7 | thing to do and it's not portable (not supported by musl). See: | 7 | thing to do and it's not portable (not supported by musl). See: |
@@ -25,17 +25,16 @@ just historical and not actually necessary or desired behaviour? | |||
25 | Upstream-Status: Inappropriate [musl specific] | 25 | Upstream-Status: Inappropriate [musl specific] |
26 | 26 | ||
27 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | 27 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> |
28 | |||
29 | --- | 28 | --- |
30 | src/basic/fs-util.h | 22 +++++++++++++++++++++- | 29 | src/basic/fs-util.h | 22 +++++++++++++++++++++- |
31 | src/shared/base-filesystem.c | 6 +++--- | 30 | src/shared/base-filesystem.c | 6 +++--- |
32 | 2 files changed, 24 insertions(+), 4 deletions(-) | 31 | 2 files changed, 24 insertions(+), 4 deletions(-) |
33 | 32 | ||
34 | Index: systemd-stable/src/basic/fs-util.h | 33 | diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h |
35 | =================================================================== | 34 | index 5dc8853eac..0491b3dae2 100644 |
36 | --- systemd-stable.orig/src/basic/fs-util.h | 35 | --- a/src/basic/fs-util.h |
37 | +++ systemd-stable/src/basic/fs-util.h | 36 | +++ b/src/basic/fs-util.h |
38 | @@ -42,7 +42,27 @@ int fchmod_opath(int fd, mode_t m); | 37 | @@ -43,7 +43,27 @@ int futimens_opath(int fd, const struct timespec ts[2]); |
39 | int fd_warn_permissions(const char *path, int fd); | 38 | int fd_warn_permissions(const char *path, int fd); |
40 | int stat_warn_permissions(const char *path, const struct stat *st); | 39 | int stat_warn_permissions(const char *path, const struct stat *st); |
41 | 40 | ||
@@ -64,11 +63,11 @@ Index: systemd-stable/src/basic/fs-util.h | |||
64 | 63 | ||
65 | int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode); | 64 | int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode); |
66 | int touch(const char *path); | 65 | int touch(const char *path); |
67 | Index: systemd-stable/src/shared/base-filesystem.c | 66 | diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c |
68 | =================================================================== | 67 | index 1d05409086..1ed06c31ab 100644 |
69 | --- systemd-stable.orig/src/shared/base-filesystem.c | 68 | --- a/src/shared/base-filesystem.c |
70 | +++ systemd-stable/src/shared/base-filesystem.c | 69 | +++ b/src/shared/base-filesystem.c |
71 | @@ -54,7 +54,7 @@ int base_filesystem_create(const char *r | 70 | @@ -54,7 +54,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { |
72 | return log_error_errno(errno, "Failed to open root file system: %m"); | 71 | return log_error_errno(errno, "Failed to open root file system: %m"); |
73 | 72 | ||
74 | for (i = 0; i < ELEMENTSOF(table); i ++) { | 73 | for (i = 0; i < ELEMENTSOF(table); i ++) { |
@@ -77,7 +76,7 @@ Index: systemd-stable/src/shared/base-filesystem.c | |||
77 | continue; | 76 | continue; |
78 | 77 | ||
79 | if (table[i].target) { | 78 | if (table[i].target) { |
80 | @@ -62,7 +62,7 @@ int base_filesystem_create(const char *r | 79 | @@ -62,7 +62,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { |
81 | 80 | ||
82 | /* check if one of the targets exists */ | 81 | /* check if one of the targets exists */ |
83 | NULSTR_FOREACH(s, table[i].target) { | 82 | NULSTR_FOREACH(s, table[i].target) { |
@@ -86,7 +85,7 @@ Index: systemd-stable/src/shared/base-filesystem.c | |||
86 | continue; | 85 | continue; |
87 | 86 | ||
88 | /* check if a specific file exists at the target path */ | 87 | /* check if a specific file exists at the target path */ |
89 | @@ -73,7 +73,7 @@ int base_filesystem_create(const char *r | 88 | @@ -73,7 +73,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { |
90 | if (!p) | 89 | if (!p) |
91 | return log_oom(); | 90 | return log_oom(); |
92 | 91 | ||
@@ -95,3 +94,6 @@ Index: systemd-stable/src/shared/base-filesystem.c | |||
95 | continue; | 94 | continue; |
96 | } | 95 | } |
97 | 96 | ||
97 | -- | ||
98 | 2.27.0 | ||
99 | |||
diff --git a/meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch b/meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch index 67d5041917..89736bcfde 100644 --- a/meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch +++ b/meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch | |||
@@ -1,7 +1,8 @@ | |||
1 | From ec335ef3bb903a7eaf054103cc51411e71e6448c Mon Sep 17 00:00:00 2001 | 1 | From dd134880e9a16595ab473934577e873c748e9c7a Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sun, 27 May 2018 08:36:44 -0700 | 3 | Date: Sun, 27 May 2018 08:36:44 -0700 |
4 | Subject: [PATCH] Define glibc compatible basename() for non-glibc systems | 4 | Subject: [PATCH 13/26] Define glibc compatible basename() for non-glibc |
5 | systems | ||
5 | 6 | ||
6 | Fixes builds with musl, even though systemd is adamant about | 7 | Fixes builds with musl, even though systemd is adamant about |
7 | using non-posix basename implementation, we have a way out | 8 | using non-posix basename implementation, we have a way out |
@@ -9,15 +10,14 @@ using non-posix basename implementation, we have a way out | |||
9 | Upstream-Status: Inappropriate [musl specific] | 10 | Upstream-Status: Inappropriate [musl specific] |
10 | 11 | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
12 | |||
13 | --- | 13 | --- |
14 | src/machine/machine-dbus.c | 5 +++++ | 14 | src/machine/machine-dbus.c | 5 +++++ |
15 | 1 file changed, 5 insertions(+) | 15 | 1 file changed, 5 insertions(+) |
16 | 16 | ||
17 | Index: systemd-stable/src/machine/machine-dbus.c | 17 | diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c |
18 | =================================================================== | 18 | index f5780f1aec..aec5825b3e 100644 |
19 | --- systemd-stable.orig/src/machine/machine-dbus.c | 19 | --- a/src/machine/machine-dbus.c |
20 | +++ systemd-stable/src/machine/machine-dbus.c | 20 | +++ b/src/machine/machine-dbus.c |
21 | @@ -11,6 +11,11 @@ | 21 | @@ -11,6 +11,11 @@ |
22 | #include <libgen.h> | 22 | #include <libgen.h> |
23 | #undef basename | 23 | #undef basename |
@@ -30,3 +30,6 @@ Index: systemd-stable/src/machine/machine-dbus.c | |||
30 | #include "alloc-util.h" | 30 | #include "alloc-util.h" |
31 | #include "bus-common-errors.h" | 31 | #include "bus-common-errors.h" |
32 | #include "bus-get-properties.h" | 32 | #include "bus-get-properties.h" |
33 | -- | ||
34 | 2.27.0 | ||
35 | |||
diff --git a/meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch b/meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch index 3d456ec83a..e95d2ae078 100644 --- a/meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch +++ b/meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From bb28a9c870bb47dcdb1ccebaa8e3a5a86730a244 Mon Sep 17 00:00:00 2001 | 1 | From 55af446156da863b5b36a1109845858956a4c274 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: Wed, 4 Jul 2018 15:00:44 +0800 | 3 | Date: Wed, 4 Jul 2018 15:00:44 +0800 |
4 | Subject: [PATCH] Do not disable buffering when writing to oom_score_adj | 4 | Subject: [PATCH 14/26] Do not disable buffering when writing to oom_score_adj |
5 | 5 | ||
6 | On musl, disabling buffering when writing to oom_score_adj will | 6 | On musl, disabling buffering when writing to oom_score_adj will |
7 | cause the following error. | 7 | cause the following error. |
@@ -19,15 +19,14 @@ Upstream-Status: Inappropriate [musl specific] | |||
19 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 19 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
20 | [rebased for systemd 243] | 20 | [rebased for systemd 243] |
21 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> | 21 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> |
22 | |||
23 | --- | 22 | --- |
24 | src/basic/process-util.c | 2 +- | 23 | src/basic/process-util.c | 2 +- |
25 | 1 file changed, 1 insertion(+), 1 deletion(-) | 24 | 1 file changed, 1 insertion(+), 1 deletion(-) |
26 | 25 | ||
27 | Index: systemd-stable/src/basic/process-util.c | 26 | diff --git a/src/basic/process-util.c b/src/basic/process-util.c |
28 | =================================================================== | 27 | index 4417101569..556dab8ebf 100644 |
29 | --- systemd-stable.orig/src/basic/process-util.c | 28 | --- a/src/basic/process-util.c |
30 | +++ systemd-stable/src/basic/process-util.c | 29 | +++ b/src/basic/process-util.c |
31 | @@ -1536,7 +1536,7 @@ int set_oom_score_adjust(int value) { | 30 | @@ -1536,7 +1536,7 @@ int set_oom_score_adjust(int value) { |
32 | sprintf(t, "%i", value); | 31 | sprintf(t, "%i", value); |
33 | 32 | ||
@@ -37,3 +36,6 @@ Index: systemd-stable/src/basic/process-util.c | |||
37 | } | 36 | } |
38 | 37 | ||
39 | int pidfd_get_pid(int fd, pid_t *ret) { | 38 | int pidfd_get_pid(int fd, pid_t *ret) { |
39 | -- | ||
40 | 2.27.0 | ||
41 | |||
diff --git a/meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch b/meta/recipes-core/systemd/systemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch index 48fd007e11..5cdcf84dc1 100644 --- a/meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch +++ b/meta/recipes-core/systemd/systemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 4938705454cf46cfe8deac8ce457d5d2432cbead Mon Sep 17 00:00:00 2001 | 1 | From e382845aed90cfe4496a8351d57d4466dd2e9a9c 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: Tue, 10 Jul 2018 15:40:17 +0800 | 3 | Date: Tue, 10 Jul 2018 15:40:17 +0800 |
4 | Subject: [PATCH] distinguish XSI-compliant strerror_r from GNU-specifi | 4 | Subject: [PATCH 15/26] distinguish XSI-compliant strerror_r from GNU-specifi |
5 | strerror_r | 5 | strerror_r |
6 | 6 | ||
7 | XSI-compliant strerror_r and GNU-specifi strerror_r are different. | 7 | XSI-compliant strerror_r and GNU-specifi strerror_r are different. |
@@ -18,17 +18,16 @@ assigned to (char *) variable, resulting in segment fault. | |||
18 | Upstream-Status: Inappropriate [musl specific] | 18 | Upstream-Status: Inappropriate [musl specific] |
19 | 19 | ||
20 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 20 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
21 | |||
22 | --- | 21 | --- |
23 | src/journal/journal-send.c | 5 +++++ | 22 | src/journal/journal-send.c | 5 +++++ |
24 | src/libsystemd/sd-bus/bus-error.c | 5 +++++ | 23 | src/libsystemd/sd-bus/bus-error.c | 5 +++++ |
25 | 2 files changed, 10 insertions(+) | 24 | 2 files changed, 10 insertions(+) |
26 | 25 | ||
27 | Index: systemd-stable/src/journal/journal-send.c | 26 | diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c |
28 | =================================================================== | 27 | index e8e6ad555b..8ca5271d02 100644 |
29 | --- systemd-stable.orig/src/journal/journal-send.c | 28 | --- a/src/journal/journal-send.c |
30 | +++ systemd-stable/src/journal/journal-send.c | 29 | +++ b/src/journal/journal-send.c |
31 | @@ -348,7 +348,12 @@ static int fill_iovec_perror_and_send(co | 30 | @@ -348,7 +348,12 @@ static int fill_iovec_perror_and_send(const char *message, int skip, struct iove |
32 | char* j; | 31 | char* j; |
33 | 32 | ||
34 | errno = 0; | 33 | errno = 0; |
@@ -41,11 +40,11 @@ Index: systemd-stable/src/journal/journal-send.c | |||
41 | if (errno == 0) { | 40 | if (errno == 0) { |
42 | char error[STRLEN("ERRNO=") + DECIMAL_STR_MAX(int) + 1]; | 41 | char error[STRLEN("ERRNO=") + DECIMAL_STR_MAX(int) + 1]; |
43 | 42 | ||
44 | Index: systemd-stable/src/libsystemd/sd-bus/bus-error.c | 43 | diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c |
45 | =================================================================== | 44 | index 8da2024a50..9605a9b869 100644 |
46 | --- systemd-stable.orig/src/libsystemd/sd-bus/bus-error.c | 45 | --- a/src/libsystemd/sd-bus/bus-error.c |
47 | +++ systemd-stable/src/libsystemd/sd-bus/bus-error.c | 46 | +++ b/src/libsystemd/sd-bus/bus-error.c |
48 | @@ -379,7 +379,12 @@ static void bus_error_strerror(sd_bus_er | 47 | @@ -392,7 +392,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) { |
49 | return; | 48 | return; |
50 | 49 | ||
51 | errno = 0; | 50 | errno = 0; |
@@ -58,3 +57,6 @@ Index: systemd-stable/src/libsystemd/sd-bus/bus-error.c | |||
58 | if (errno == ERANGE || strlen(x) >= k - 1) { | 57 | if (errno == ERANGE || strlen(x) >= k - 1) { |
59 | free(m); | 58 | free(m); |
60 | k *= 2; | 59 | k *= 2; |
60 | -- | ||
61 | 2.27.0 | ||
62 | |||
diff --git a/meta/recipes-core/systemd/systemd/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch b/meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch index 3b8064677f..9a125de638 100644 --- a/meta/recipes-core/systemd/systemd/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch +++ b/meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 1c4c73a7cc0fb59eb68ab70699f7f51af5c163b2 Mon Sep 17 00:00:00 2001 | 1 | From 0c7af5f288231a8c0545e169e01ba5ee173cafe7 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 15:18:00 +0800 | 3 | Date: Mon, 25 Feb 2019 15:18:00 +0800 |
4 | Subject: [PATCH] Hide __start_BUS_ERROR_MAP and __stop_BUS_ERROR_MAP | 4 | Subject: [PATCH 16/26] Hide __start_BUS_ERROR_MAP and __stop_BUS_ERROR_MAP |
5 | 5 | ||
6 | for currently unknown reasons they get exported to the shared libries | 6 | for currently unknown reasons they get exported to the shared libries |
7 | even without being listed in the sym file | 7 | even without being listed in the sym file |
@@ -11,16 +11,15 @@ Upstream-Status: Pending | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
12 | [Rebased for v241] | 12 | [Rebased for v241] |
13 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 13 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
14 | |||
15 | --- | 14 | --- |
16 | src/libsystemd/sd-bus/bus-error.c | 4 ++-- | 15 | src/libsystemd/sd-bus/bus-error.c | 4 ++-- |
17 | 1 file changed, 2 insertions(+), 2 deletions(-) | 16 | 1 file changed, 2 insertions(+), 2 deletions(-) |
18 | 17 | ||
19 | diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c | 18 | diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c |
20 | index 28a5159c4480..962a4de10c56 100644 | 19 | index 9605a9b869..38b6cf90c3 100644 |
21 | --- a/src/libsystemd/sd-bus/bus-error.c | 20 | --- a/src/libsystemd/sd-bus/bus-error.c |
22 | +++ b/src/libsystemd/sd-bus/bus-error.c | 21 | +++ b/src/libsystemd/sd-bus/bus-error.c |
23 | @@ -54,8 +54,8 @@ BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_standard_errors[] = { | 22 | @@ -55,8 +55,8 @@ BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_standard_errors[] = { |
24 | }; | 23 | }; |
25 | 24 | ||
26 | /* GCC maps this magically to the beginning and end of the BUS_ERROR_MAP section */ | 25 | /* GCC maps this magically to the beginning and end of the BUS_ERROR_MAP section */ |
@@ -31,3 +30,6 @@ index 28a5159c4480..962a4de10c56 100644 | |||
31 | 30 | ||
32 | /* Additional maps registered with sd_bus_error_add_map() are in this | 31 | /* Additional maps registered with sd_bus_error_add_map() are in this |
33 | * NULL terminated array */ | 32 | * NULL terminated array */ |
33 | -- | ||
34 | 2.27.0 | ||
35 | |||
diff --git a/meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch b/meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch index db4041bbb1..31747c6b40 100644 --- a/meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch +++ b/meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 8303d49cabaf3ab8890ba1d266972c721dfe6ee8 Mon Sep 17 00:00:00 2001 | 1 | From 32dd7a47b87793cd836ab4bb776d1524f24c2d58 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 15:27:54 +0800 | 3 | Date: Mon, 25 Feb 2019 15:27:54 +0800 |
4 | Subject: [PATCH] missing_type.h: add __compar_d_fn_t definition | 4 | Subject: [PATCH 17/26] missing_type.h: add __compar_d_fn_t definition |
5 | 5 | ||
6 | Fix the following compile failure: | 6 | Fix the following compile failure: |
7 | src/basic/util.h:71:18: error: unknown type name '__compar_d_fn_t'; did you mean '__compar_fn_t'? | 7 | src/basic/util.h:71:18: error: unknown type name '__compar_d_fn_t'; did you mean '__compar_fn_t'? |
@@ -9,13 +9,12 @@ src/basic/util.h:71:18: error: unknown type name '__compar_d_fn_t'; did you mean | |||
9 | Upstream-Status: Inappropriate [musl specific] | 9 | Upstream-Status: Inappropriate [musl specific] |
10 | 10 | ||
11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
12 | |||
13 | --- | 12 | --- |
14 | src/basic/missing_type.h | 1 + | 13 | src/basic/missing_type.h | 1 + |
15 | 1 file changed, 1 insertion(+) | 14 | 1 file changed, 1 insertion(+) |
16 | 15 | ||
17 | diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h | 16 | diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h |
18 | index 23602ebbd533..917d314a81bf 100644 | 17 | index 3df1084ef2..697aa7f58a 100644 |
19 | --- a/src/basic/missing_type.h | 18 | --- a/src/basic/missing_type.h |
20 | +++ b/src/basic/missing_type.h | 19 | +++ b/src/basic/missing_type.h |
21 | @@ -13,6 +13,7 @@ | 20 | @@ -13,6 +13,7 @@ |
@@ -26,3 +25,6 @@ index 23602ebbd533..917d314a81bf 100644 | |||
26 | #endif | 25 | #endif |
27 | 26 | ||
28 | #ifndef __COMPAR_FN_T | 27 | #ifndef __COMPAR_FN_T |
28 | -- | ||
29 | 2.27.0 | ||
30 | |||
diff --git a/meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch b/meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch index 7dacc36837..56d361a213 100644 --- a/meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch +++ b/meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 6364ff5534678c158a7fb8d4e50d0a6ce72c1ad8 Mon Sep 17 00:00:00 2001 | 1 | From bfc3416edeb69082ac9b9c9e844f12d7b45bb006 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 15:44:54 +0800 | 3 | Date: Mon, 25 Feb 2019 15:44:54 +0800 |
4 | Subject: [PATCH] avoid redefinition of prctl_mm_map structure | 4 | Subject: [PATCH 18/26] avoid redefinition of prctl_mm_map structure |
5 | 5 | ||
6 | Fix the following compile failure: | 6 | Fix the following compile failure: |
7 | error: redefinition of 'struct prctl_mm_map' | 7 | error: redefinition of 'struct prctl_mm_map' |
@@ -9,17 +9,16 @@ error: redefinition of 'struct prctl_mm_map' | |||
9 | Upstream-Status: Inappropriate [musl specific] | 9 | Upstream-Status: Inappropriate [musl specific] |
10 | 10 | ||
11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
12 | |||
13 | --- | 12 | --- |
14 | src/basic/missing_prctl.h | 2 ++ | 13 | src/basic/missing_prctl.h | 2 ++ |
15 | 1 file changed, 2 insertions(+) | 14 | 1 file changed, 2 insertions(+) |
16 | 15 | ||
17 | diff --git a/src/basic/missing_prctl.h b/src/basic/missing_prctl.h | 16 | diff --git a/src/basic/missing_prctl.h b/src/basic/missing_prctl.h |
18 | index f80cd17f346b..47e489354053 100644 | 17 | index ab851306ba..5547cad875 100644 |
19 | --- a/src/basic/missing_prctl.h | 18 | --- a/src/basic/missing_prctl.h |
20 | +++ b/src/basic/missing_prctl.h | 19 | +++ b/src/basic/missing_prctl.h |
21 | @@ -1,7 +1,9 @@ | 20 | @@ -1,7 +1,9 @@ |
22 | /* SPDX-License-Identifier: LGPL-2.1+ */ | 21 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
23 | #pragma once | 22 | #pragma once |
24 | 23 | ||
25 | +#ifdef __GLIBC__ | 24 | +#ifdef __GLIBC__ |
@@ -28,3 +27,6 @@ index f80cd17f346b..47e489354053 100644 | |||
28 | 27 | ||
29 | /* 58319057b7847667f0c9585b9de0e8932b0fdb08 (4.3) */ | 28 | /* 58319057b7847667f0c9585b9de0e8932b0fdb08 (4.3) */ |
30 | #ifndef PR_CAP_AMBIENT | 29 | #ifndef PR_CAP_AMBIENT |
30 | -- | ||
31 | 2.27.0 | ||
32 | |||
diff --git a/meta/recipes-core/systemd/systemd/0021-Handle-missing-LOCK_EX.patch b/meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch index 67d9162c08..6ca196489b 100644 --- a/meta/recipes-core/systemd/systemd/0021-Handle-missing-LOCK_EX.patch +++ b/meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 190854c2114dc6e74c8859dc251e3737e3c0f353 Mon Sep 17 00:00:00 2001 | 1 | From e427f03de2c56e868bb0f24aa231315b2dae1b71 Mon Sep 17 00:00:00 2001 |
2 | From: Alex Kiernan <alex.kiernan@gmail.com> | 2 | From: Alex Kiernan <alex.kiernan@gmail.com> |
3 | Date: Fri, 7 Aug 2020 15:19:27 +0000 | 3 | Date: Fri, 7 Aug 2020 15:19:27 +0000 |
4 | Subject: [PATCH] Handle missing LOCK_EX | 4 | Subject: [PATCH 19/26] Handle missing LOCK_EX |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [musl specific] | 6 | Upstream-Status: Inappropriate [musl specific] |
7 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | 7 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> |
@@ -10,10 +10,10 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
10 | 1 file changed, 1 insertion(+) | 10 | 1 file changed, 1 insertion(+) |
11 | 11 | ||
12 | diff --git a/src/partition/makefs.c b/src/partition/makefs.c | 12 | diff --git a/src/partition/makefs.c b/src/partition/makefs.c |
13 | index 97f50c9033..7f55acd229 100644 | 13 | index fd924d2231..b97580fdcc 100644 |
14 | --- a/src/partition/makefs.c | 14 | --- a/src/partition/makefs.c |
15 | +++ b/src/partition/makefs.c | 15 | +++ b/src/partition/makefs.c |
16 | @@ -5,6 +5,7 @@ | 16 | @@ -6,6 +6,7 @@ |
17 | #include <sys/stat.h> | 17 | #include <sys/stat.h> |
18 | #include <sys/types.h> | 18 | #include <sys/types.h> |
19 | #include <unistd.h> | 19 | #include <unistd.h> |
@@ -21,3 +21,6 @@ index 97f50c9033..7f55acd229 100644 | |||
21 | 21 | ||
22 | #include "alloc-util.h" | 22 | #include "alloc-util.h" |
23 | #include "blockdev-util.h" | 23 | #include "blockdev-util.h" |
24 | -- | ||
25 | 2.27.0 | ||
26 | |||
diff --git a/meta/recipes-core/systemd/systemd/0022-Fix-incompatible-pointer-type-struct-sockaddr_un.patch b/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch index d57ca1fd39..f74de43849 100644 --- a/meta/recipes-core/systemd/systemd/0022-Fix-incompatible-pointer-type-struct-sockaddr_un.patch +++ b/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 328c39fae2631deb5737dd56f46159dd6b4cdbed Mon Sep 17 00:00:00 2001 | 1 | From 9abbc5e69e21aef0d4d4567e69302fa660b76c53 Mon Sep 17 00:00:00 2001 |
2 | From: Alex Kiernan <alex.kiernan@gmail.com> | 2 | From: Alex Kiernan <alex.kiernan@gmail.com> |
3 | Date: Fri, 7 Aug 2020 15:20:17 +0000 | 3 | Date: Fri, 7 Aug 2020 15:20:17 +0000 |
4 | Subject: [PATCH] Fix incompatible pointer type struct sockaddr_un * | 4 | Subject: [PATCH 20/26] Fix incompatible pointer type struct sockaddr_un * |
5 | 5 | ||
6 | | ../../../../../../workspace/sources/systemd/src/nspawn/nspawn.c: In function 'cant_be_in_netns': | 6 | | ../../../../../../workspace/sources/systemd/src/nspawn/nspawn.c: In function 'cant_be_in_netns': |
7 | | ../../../../../../workspace/sources/systemd/src/nspawn/nspawn.c:4893:25: error: passing argument 2 of 'connect' from incompatible pointer type [-Werror=incompatible-pointer-types] | 7 | | ../../../../../../workspace/sources/systemd/src/nspawn/nspawn.c:4893:25: error: passing argument 2 of 'connect' from incompatible pointer type [-Werror=incompatible-pointer-types] |
@@ -23,10 +23,10 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
23 | 1 file changed, 1 insertion(+), 1 deletion(-) | 23 | 1 file changed, 1 insertion(+), 1 deletion(-) |
24 | 24 | ||
25 | diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c | 25 | diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c |
26 | index 0450c9f795..7305db04ef 100644 | 26 | index 0842731c18..3528b7ff14 100644 |
27 | --- a/src/nspawn/nspawn.c | 27 | --- a/src/nspawn/nspawn.c |
28 | +++ b/src/nspawn/nspawn.c | 28 | +++ b/src/nspawn/nspawn.c |
29 | @@ -4890,7 +4890,7 @@ static int cant_be_in_netns(void) { | 29 | @@ -5084,7 +5084,7 @@ static int cant_be_in_netns(void) { |
30 | if (fd < 0) | 30 | if (fd < 0) |
31 | return log_error_errno(errno, "Failed to allocate udev control socket: %m"); | 31 | return log_error_errno(errno, "Failed to allocate udev control socket: %m"); |
32 | 32 | ||
@@ -35,3 +35,6 @@ index 0450c9f795..7305db04ef 100644 | |||
35 | 35 | ||
36 | if (errno == ENOENT || ERRNO_IS_DISCONNECT(errno)) | 36 | if (errno == ENOENT || ERRNO_IS_DISCONNECT(errno)) |
37 | return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), | 37 | return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), |
38 | -- | ||
39 | 2.27.0 | ||
40 | |||
diff --git a/meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch b/meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch index 80beada3d3..fa6652a5bf 100644 --- a/meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch +++ b/meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From a05cc5fb3dc0e51682c40196285cdda34ec90783 Mon Sep 17 00:00:00 2001 | 1 | From 1f5bc54bed0b365e7e448c26f6c792dbe8b3b198 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 16:53:06 +0800 | 3 | Date: Mon, 25 Feb 2019 16:53:06 +0800 |
4 | Subject: [PATCH] test-json.c: define M_PIl | 4 | Subject: [PATCH 21/26] test-json.c: define M_PIl |
5 | 5 | ||
6 | Fix the following compile failure: | 6 | Fix the following compile failure: |
7 | src/test/test-json.c:305:50: error: 'M_PIl' undeclared (first use in this function); did you mean 'M_PI'? | 7 | src/test/test-json.c:305:50: error: 'M_PIl' undeclared (first use in this function); did you mean 'M_PI'? |
@@ -9,16 +9,15 @@ src/test/test-json.c:305:50: error: 'M_PIl' undeclared (first use in this functi | |||
9 | Upstream-Status: Inappropriate [musl specific] | 9 | Upstream-Status: Inappropriate [musl specific] |
10 | 10 | ||
11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
12 | |||
13 | --- | 12 | --- |
14 | src/test/test-json.c | 4 ++++ | 13 | src/test/test-json.c | 4 ++++ |
15 | 1 file changed, 4 insertions(+) | 14 | 1 file changed, 4 insertions(+) |
16 | 15 | ||
17 | diff --git a/src/test/test-json.c b/src/test/test-json.c | 16 | diff --git a/src/test/test-json.c b/src/test/test-json.c |
18 | index a6613043b924..ca823ea79f05 100644 | 17 | index 1d4b11945e..572c8cf9d0 100644 |
19 | --- a/src/test/test-json.c | 18 | --- a/src/test/test-json.c |
20 | +++ b/src/test/test-json.c | 19 | +++ b/src/test/test-json.c |
21 | @@ -12,6 +12,10 @@ | 20 | @@ -13,6 +13,10 @@ |
22 | #include "tests.h" | 21 | #include "tests.h" |
23 | #include "util.h" | 22 | #include "util.h" |
24 | 23 | ||
@@ -29,3 +28,6 @@ index a6613043b924..ca823ea79f05 100644 | |||
29 | static void test_tokenizer(const char *data, ...) { | 28 | static void test_tokenizer(const char *data, ...) { |
30 | unsigned line = 0, column = 0; | 29 | unsigned line = 0, column = 0; |
31 | void *state = NULL; | 30 | void *state = NULL; |
31 | -- | ||
32 | 2.27.0 | ||
33 | |||
diff --git a/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch b/meta/recipes-core/systemd/systemd/0022-do-not-disable-buffer-in-writing-files.patch index 39a975319b..675fd20f11 100644 --- a/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch +++ b/meta/recipes-core/systemd/systemd/0022-do-not-disable-buffer-in-writing-files.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From f92fd7e77ed5aab2dda01a20e6891c37f09415d3 Mon Sep 17 00:00:00 2001 | 1 | From 564dba5ad0cd884e3f69fa19ca64095413578ea5 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: Fri, 1 Mar 2019 15:22:15 +0800 | 3 | Date: Fri, 1 Mar 2019 15:22:15 +0800 |
4 | Subject: [PATCH] do not disable buffer in writing files | 4 | Subject: [PATCH 22/26] do not disable buffer in writing files |
5 | 5 | ||
6 | Do not disable buffer in writing files, otherwise we get | 6 | Do not disable buffer in writing files, otherwise we get |
7 | failure at boot for musl like below. | 7 | failure at boot for musl like below. |
@@ -18,7 +18,6 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
18 | Signed-off-by: Andrej Valek <andrej.valek@siemens.com> | 18 | Signed-off-by: Andrej Valek <andrej.valek@siemens.com> |
19 | [rebased for systemd 243] | 19 | [rebased for systemd 243] |
20 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> | 20 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> |
21 | |||
22 | --- | 21 | --- |
23 | src/basic/cgroup-util.c | 10 +++++----- | 22 | src/basic/cgroup-util.c | 10 +++++----- |
24 | src/basic/procfs-util.c | 4 ++-- | 23 | src/basic/procfs-util.c | 4 ++-- |
@@ -40,11 +39,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
40 | src/vconsole/vconsole-setup.c | 2 +- | 39 | src/vconsole/vconsole-setup.c | 2 +- |
41 | 18 files changed, 35 insertions(+), 35 deletions(-) | 40 | 18 files changed, 35 insertions(+), 35 deletions(-) |
42 | 41 | ||
43 | Index: systemd-stable/src/basic/cgroup-util.c | 42 | diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c |
44 | =================================================================== | 43 | index bb960f183c..cb804c5f4b 100644 |
45 | --- systemd-stable.orig/src/basic/cgroup-util.c | 44 | --- a/src/basic/cgroup-util.c |
46 | +++ systemd-stable/src/basic/cgroup-util.c | 45 | +++ b/src/basic/cgroup-util.c |
47 | @@ -769,7 +769,7 @@ int cg_install_release_agent(const char | 46 | @@ -759,7 +759,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { |
48 | 47 | ||
49 | sc = strstrip(contents); | 48 | sc = strstrip(contents); |
50 | if (isempty(sc)) { | 49 | if (isempty(sc)) { |
@@ -53,7 +52,7 @@ Index: systemd-stable/src/basic/cgroup-util.c | |||
53 | if (r < 0) | 52 | if (r < 0) |
54 | return r; | 53 | return r; |
55 | } else if (!path_equal(sc, agent)) | 54 | } else if (!path_equal(sc, agent)) |
56 | @@ -787,7 +787,7 @@ int cg_install_release_agent(const char | 55 | @@ -777,7 +777,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { |
57 | 56 | ||
58 | sc = strstrip(contents); | 57 | sc = strstrip(contents); |
59 | if (streq(sc, "0")) { | 58 | if (streq(sc, "0")) { |
@@ -62,7 +61,7 @@ Index: systemd-stable/src/basic/cgroup-util.c | |||
62 | if (r < 0) | 61 | if (r < 0) |
63 | return r; | 62 | return r; |
64 | 63 | ||
65 | @@ -814,7 +814,7 @@ int cg_uninstall_release_agent(const cha | 64 | @@ -804,7 +804,7 @@ int cg_uninstall_release_agent(const char *controller) { |
66 | if (r < 0) | 65 | if (r < 0) |
67 | return r; | 66 | return r; |
68 | 67 | ||
@@ -71,7 +70,7 @@ Index: systemd-stable/src/basic/cgroup-util.c | |||
71 | if (r < 0) | 70 | if (r < 0) |
72 | return r; | 71 | return r; |
73 | 72 | ||
74 | @@ -824,7 +824,7 @@ int cg_uninstall_release_agent(const cha | 73 | @@ -814,7 +814,7 @@ int cg_uninstall_release_agent(const char *controller) { |
75 | if (r < 0) | 74 | if (r < 0) |
76 | return r; | 75 | return r; |
77 | 76 | ||
@@ -80,7 +79,7 @@ Index: systemd-stable/src/basic/cgroup-util.c | |||
80 | if (r < 0) | 79 | if (r < 0) |
81 | return r; | 80 | return r; |
82 | 81 | ||
83 | @@ -1656,7 +1656,7 @@ int cg_set_attribute(const char *control | 82 | @@ -1646,7 +1646,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri |
84 | if (r < 0) | 83 | if (r < 0) |
85 | return r; | 84 | return r; |
86 | 85 | ||
@@ -89,11 +88,11 @@ Index: systemd-stable/src/basic/cgroup-util.c | |||
89 | } | 88 | } |
90 | 89 | ||
91 | int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) { | 90 | int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) { |
92 | Index: systemd-stable/src/basic/procfs-util.c | 91 | diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c |
93 | =================================================================== | 92 | index 8f9eee8d36..480f8cc0b4 100644 |
94 | --- systemd-stable.orig/src/basic/procfs-util.c | 93 | --- a/src/basic/procfs-util.c |
95 | +++ systemd-stable/src/basic/procfs-util.c | 94 | +++ b/src/basic/procfs-util.c |
96 | @@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limi | 95 | @@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limit) { |
97 | * decrease it, as threads-max is the much more relevant sysctl. */ | 96 | * decrease it, as threads-max is the much more relevant sysctl. */ |
98 | if (limit > pid_max-1) { | 97 | if (limit > pid_max-1) { |
99 | sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ | 98 | sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ |
@@ -109,11 +108,11 @@ Index: systemd-stable/src/basic/procfs-util.c | |||
109 | if (r < 0) { | 108 | if (r < 0) { |
110 | uint64_t threads_max; | 109 | uint64_t threads_max; |
111 | 110 | ||
112 | Index: systemd-stable/src/basic/smack-util.c | 111 | diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c |
113 | =================================================================== | 112 | index 3362ee3924..80c0f2a52e 100644 |
114 | --- systemd-stable.orig/src/basic/smack-util.c | 113 | --- a/src/basic/smack-util.c |
115 | +++ systemd-stable/src/basic/smack-util.c | 114 | +++ b/src/basic/smack-util.c |
116 | @@ -114,7 +114,7 @@ int mac_smack_apply_pid(pid_t pid, const | 115 | @@ -114,7 +114,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) { |
117 | return 0; | 116 | return 0; |
118 | 117 | ||
119 | p = procfs_file_alloca(pid, "attr/current"); | 118 | p = procfs_file_alloca(pid, "attr/current"); |
@@ -122,10 +121,10 @@ Index: systemd-stable/src/basic/smack-util.c | |||
122 | if (r < 0) | 121 | if (r < 0) |
123 | return r; | 122 | return r; |
124 | 123 | ||
125 | Index: systemd-stable/src/basic/util.c | 124 | diff --git a/src/basic/util.c b/src/basic/util.c |
126 | =================================================================== | 125 | index f98ecf3858..13e0f7431f 100644 |
127 | --- systemd-stable.orig/src/basic/util.c | 126 | --- a/src/basic/util.c |
128 | +++ systemd-stable/src/basic/util.c | 127 | +++ b/src/basic/util.c |
129 | @@ -267,7 +267,7 @@ void disable_coredumps(void) { | 128 | @@ -267,7 +267,7 @@ void disable_coredumps(void) { |
130 | if (detect_container() > 0) | 129 | if (detect_container() > 0) |
131 | return; | 130 | return; |
@@ -135,11 +134,11 @@ Index: systemd-stable/src/basic/util.c | |||
135 | if (r < 0) | 134 | if (r < 0) |
136 | log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); | 135 | log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); |
137 | } | 136 | } |
138 | Index: systemd-stable/src/binfmt/binfmt.c | 137 | diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c |
139 | =================================================================== | 138 | index 43ed2f385b..37a6f578f7 100644 |
140 | --- systemd-stable.orig/src/binfmt/binfmt.c | 139 | --- a/src/binfmt/binfmt.c |
141 | +++ systemd-stable/src/binfmt/binfmt.c | 140 | +++ b/src/binfmt/binfmt.c |
142 | @@ -48,7 +48,7 @@ static int delete_rule(const char *rule) | 141 | @@ -48,7 +48,7 @@ static int delete_rule(const char *rule) { |
143 | if (!fn) | 142 | if (!fn) |
144 | return log_oom(); | 143 | return log_oom(); |
145 | 144 | ||
@@ -148,7 +147,7 @@ Index: systemd-stable/src/binfmt/binfmt.c | |||
148 | } | 147 | } |
149 | 148 | ||
150 | static int apply_rule(const char *rule) { | 149 | static int apply_rule(const char *rule) { |
151 | @@ -56,7 +56,7 @@ static int apply_rule(const char *rule) | 150 | @@ -56,7 +56,7 @@ static int apply_rule(const char *rule) { |
152 | 151 | ||
153 | (void) delete_rule(rule); | 152 | (void) delete_rule(rule); |
154 | 153 | ||
@@ -166,11 +165,11 @@ Index: systemd-stable/src/binfmt/binfmt.c | |||
166 | 165 | ||
167 | STRV_FOREACH(f, files) { | 166 | STRV_FOREACH(f, files) { |
168 | k = apply_file(*f, true); | 167 | k = apply_file(*f, true); |
169 | Index: systemd-stable/src/core/main.c | 168 | diff --git a/src/core/main.c b/src/core/main.c |
170 | =================================================================== | 169 | index a280b756ff..334532cd42 100644 |
171 | --- systemd-stable.orig/src/core/main.c | 170 | --- a/src/core/main.c |
172 | +++ systemd-stable/src/core/main.c | 171 | +++ b/src/core/main.c |
173 | @@ -1382,7 +1382,7 @@ static int bump_unix_max_dgram_qlen(void | 172 | @@ -1382,7 +1382,7 @@ static int bump_unix_max_dgram_qlen(void) { |
174 | if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN) | 173 | if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN) |
175 | return 0; | 174 | return 0; |
176 | 175 | ||
@@ -179,7 +178,7 @@ Index: systemd-stable/src/core/main.c | |||
179 | if (r < 0) | 178 | if (r < 0) |
180 | return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r, | 179 | return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r, |
181 | "Failed to bump AF_UNIX datagram queue length, ignoring: %m"); | 180 | "Failed to bump AF_UNIX datagram queue length, ignoring: %m"); |
182 | @@ -1668,7 +1668,7 @@ static void initialize_core_pattern(bool | 181 | @@ -1666,7 +1666,7 @@ static void initialize_core_pattern(bool skip_setup) { |
183 | if (getpid_cached() != 1) | 182 | if (getpid_cached() != 1) |
184 | return; | 183 | return; |
185 | 184 | ||
@@ -188,11 +187,11 @@ Index: systemd-stable/src/core/main.c | |||
188 | if (r < 0) | 187 | if (r < 0) |
189 | log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern); | 188 | log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern); |
190 | } | 189 | } |
191 | Index: systemd-stable/src/core/smack-setup.c | 190 | diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c |
192 | =================================================================== | 191 | index 1fe592af70..603942a000 100644 |
193 | --- systemd-stable.orig/src/core/smack-setup.c | 192 | --- a/src/core/smack-setup.c |
194 | +++ systemd-stable/src/core/smack-setup.c | 193 | +++ b/src/core/smack-setup.c |
195 | @@ -325,17 +325,17 @@ int mac_smack_setup(bool *loaded_policy) | 194 | @@ -325,17 +325,17 @@ int mac_smack_setup(bool *loaded_policy) { |
196 | } | 195 | } |
197 | 196 | ||
198 | #ifdef SMACK_RUN_LABEL | 197 | #ifdef SMACK_RUN_LABEL |
@@ -214,10 +213,10 @@ Index: systemd-stable/src/core/smack-setup.c | |||
214 | if (r < 0) | 213 | if (r < 0) |
215 | log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); | 214 | log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); |
216 | #endif | 215 | #endif |
217 | Index: systemd-stable/src/hibernate-resume/hibernate-resume.c | 216 | diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c |
218 | =================================================================== | 217 | index d8f91f4e66..a088e6e2d8 100644 |
219 | --- systemd-stable.orig/src/hibernate-resume/hibernate-resume.c | 218 | --- a/src/hibernate-resume/hibernate-resume.c |
220 | +++ systemd-stable/src/hibernate-resume/hibernate-resume.c | 219 | +++ b/src/hibernate-resume/hibernate-resume.c |
221 | @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) { | 220 | @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) { |
222 | return EXIT_FAILURE; | 221 | return EXIT_FAILURE; |
223 | } | 222 | } |
@@ -227,11 +226,11 @@ Index: systemd-stable/src/hibernate-resume/hibernate-resume.c | |||
227 | if (r < 0) { | 226 | if (r < 0) { |
228 | log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor); | 227 | log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor); |
229 | return EXIT_FAILURE; | 228 | return EXIT_FAILURE; |
230 | Index: systemd-stable/src/libsystemd/sd-device/sd-device.c | 229 | diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c |
231 | =================================================================== | 230 | index d06f90ce1d..43d0a58750 100644 |
232 | --- systemd-stable.orig/src/libsystemd/sd-device/sd-device.c | 231 | --- a/src/libsystemd/sd-device/sd-device.c |
233 | +++ systemd-stable/src/libsystemd/sd-device/sd-device.c | 232 | +++ b/src/libsystemd/sd-device/sd-device.c |
234 | @@ -1877,7 +1877,7 @@ _public_ int sd_device_set_sysattr_value | 233 | @@ -1976,7 +1976,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, |
235 | if (!value) | 234 | if (!value) |
236 | return -ENOMEM; | 235 | return -ENOMEM; |
237 | 236 | ||
@@ -240,11 +239,11 @@ Index: systemd-stable/src/libsystemd/sd-device/sd-device.c | |||
240 | if (r < 0) { | 239 | if (r < 0) { |
241 | if (r == -ELOOP) | 240 | if (r == -ELOOP) |
242 | return -EINVAL; | 241 | return -EINVAL; |
243 | Index: systemd-stable/src/login/logind-dbus.c | 242 | diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c |
244 | =================================================================== | 243 | index 7d757aa286..a5d9da5b7e 100644 |
245 | --- systemd-stable.orig/src/login/logind-dbus.c | 244 | --- a/src/login/logind-dbus.c |
246 | +++ systemd-stable/src/login/logind-dbus.c | 245 | +++ b/src/login/logind-dbus.c |
247 | @@ -1341,7 +1341,7 @@ static int trigger_device(Manager *m, sd | 246 | @@ -1330,7 +1330,7 @@ static int trigger_device(Manager *m, sd_device *d) { |
248 | if (!t) | 247 | if (!t) |
249 | return -ENOMEM; | 248 | return -ENOMEM; |
250 | 249 | ||
@@ -253,11 +252,11 @@ Index: systemd-stable/src/login/logind-dbus.c | |||
253 | } | 252 | } |
254 | 253 | ||
255 | return 0; | 254 | return 0; |
256 | Index: systemd-stable/src/nspawn/nspawn-cgroup.c | 255 | diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c |
257 | =================================================================== | 256 | index cb01b25bc6..e92051268b 100644 |
258 | --- systemd-stable.orig/src/nspawn/nspawn-cgroup.c | 257 | --- a/src/nspawn/nspawn-cgroup.c |
259 | +++ systemd-stable/src/nspawn/nspawn-cgroup.c | 258 | +++ b/src/nspawn/nspawn-cgroup.c |
260 | @@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified | 259 | @@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) { |
261 | fn = strjoina(tree, cgroup, "/cgroup.procs"); | 260 | fn = strjoina(tree, cgroup, "/cgroup.procs"); |
262 | 261 | ||
263 | sprintf(pid_string, PID_FMT, pid); | 262 | sprintf(pid_string, PID_FMT, pid); |
@@ -266,11 +265,11 @@ Index: systemd-stable/src/nspawn/nspawn-cgroup.c | |||
266 | if (r < 0) { | 265 | if (r < 0) { |
267 | log_error_errno(r, "Failed to move process: %m"); | 266 | log_error_errno(r, "Failed to move process: %m"); |
268 | goto finish; | 267 | goto finish; |
269 | Index: systemd-stable/src/nspawn/nspawn.c | 268 | diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c |
270 | =================================================================== | 269 | index 3528b7ff14..11b0c20f95 100644 |
271 | --- systemd-stable.orig/src/nspawn/nspawn.c | 270 | --- a/src/nspawn/nspawn.c |
272 | +++ systemd-stable/src/nspawn/nspawn.c | 271 | +++ b/src/nspawn/nspawn.c |
273 | @@ -2493,7 +2493,7 @@ static int reset_audit_loginuid(void) { | 272 | @@ -2667,7 +2667,7 @@ static int reset_audit_loginuid(void) { |
274 | if (streq(p, "4294967295")) | 273 | if (streq(p, "4294967295")) |
275 | return 0; | 274 | return 0; |
276 | 275 | ||
@@ -279,7 +278,7 @@ Index: systemd-stable/src/nspawn/nspawn.c | |||
279 | if (r < 0) { | 278 | if (r < 0) { |
280 | log_error_errno(r, | 279 | log_error_errno(r, |
281 | "Failed to reset audit login UID. This probably means that your kernel is too\n" | 280 | "Failed to reset audit login UID. This probably means that your kernel is too\n" |
282 | @@ -3726,13 +3726,13 @@ static int setup_uid_map(pid_t pid) { | 281 | @@ -3920,13 +3920,13 @@ static int setup_uid_map(pid_t pid) { |
283 | 282 | ||
284 | xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); | 283 | xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); |
285 | xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, arg_uid_shift, arg_uid_range); | 284 | xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, arg_uid_shift, arg_uid_range); |
@@ -295,11 +294,11 @@ Index: systemd-stable/src/nspawn/nspawn.c | |||
295 | if (r < 0) | 294 | if (r < 0) |
296 | return log_error_errno(r, "Failed to write GID map: %m"); | 295 | return log_error_errno(r, "Failed to write GID map: %m"); |
297 | 296 | ||
298 | Index: systemd-stable/src/shared/cgroup-setup.c | 297 | diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c |
299 | =================================================================== | 298 | index f197f715c7..077f893177 100644 |
300 | --- systemd-stable.orig/src/shared/cgroup-setup.c | 299 | --- a/src/shared/cgroup-setup.c |
301 | +++ systemd-stable/src/shared/cgroup-setup.c | 300 | +++ b/src/shared/cgroup-setup.c |
302 | @@ -267,7 +267,7 @@ int cg_attach(const char *controller, co | 301 | @@ -267,7 +267,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { |
303 | 302 | ||
304 | xsprintf(c, PID_FMT "\n", pid); | 303 | xsprintf(c, PID_FMT "\n", pid); |
305 | 304 | ||
@@ -308,7 +307,7 @@ Index: systemd-stable/src/shared/cgroup-setup.c | |||
308 | if (r < 0) | 307 | if (r < 0) |
309 | return r; | 308 | return r; |
310 | 309 | ||
311 | @@ -817,7 +817,7 @@ int cg_enable_everywhere( | 310 | @@ -799,7 +799,7 @@ int cg_enable_everywhere( |
312 | return log_debug_errno(errno, "Failed to open cgroup.subtree_control file of %s: %m", p); | 311 | return log_debug_errno(errno, "Failed to open cgroup.subtree_control file of %s: %m", p); |
313 | } | 312 | } |
314 | 313 | ||
@@ -317,11 +316,11 @@ Index: systemd-stable/src/shared/cgroup-setup.c | |||
317 | if (r < 0) { | 316 | if (r < 0) { |
318 | log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", | 317 | log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", |
319 | FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); | 318 | FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); |
320 | Index: systemd-stable/src/shared/sysctl-util.c | 319 | diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c |
321 | =================================================================== | 320 | index 670c33108b..7c7c3dcfb6 100644 |
322 | --- systemd-stable.orig/src/shared/sysctl-util.c | 321 | --- a/src/shared/sysctl-util.c |
323 | +++ systemd-stable/src/shared/sysctl-util.c | 322 | +++ b/src/shared/sysctl-util.c |
324 | @@ -93,7 +93,7 @@ int sysctl_write_ip_property(int af, con | 323 | @@ -93,7 +93,7 @@ int sysctl_write_ip_property(int af, const char *ifname, const char *property, c |
325 | 324 | ||
326 | log_debug("Setting '%s' to '%s'", p, value); | 325 | log_debug("Setting '%s' to '%s'", p, value); |
327 | 326 | ||
@@ -330,11 +329,11 @@ Index: systemd-stable/src/shared/sysctl-util.c | |||
330 | } | 329 | } |
331 | 330 | ||
332 | int sysctl_read(const char *property, char **content) { | 331 | int sysctl_read(const char *property, char **content) { |
333 | Index: systemd-stable/src/sleep/sleep.c | 332 | diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c |
334 | =================================================================== | 333 | index 39ab554290..d0e566645d 100644 |
335 | --- systemd-stable.orig/src/sleep/sleep.c | 334 | --- a/src/sleep/sleep.c |
336 | +++ systemd-stable/src/sleep/sleep.c | 335 | +++ b/src/sleep/sleep.c |
337 | @@ -48,7 +48,7 @@ static int write_hibernate_location_info | 336 | @@ -48,7 +48,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca |
338 | assert(hibernate_location->swap); | 337 | assert(hibernate_location->swap); |
339 | 338 | ||
340 | xsprintf(resume_str, "%u:%u", major(hibernate_location->devno), minor(hibernate_location->devno)); | 339 | xsprintf(resume_str, "%u:%u", major(hibernate_location->devno), minor(hibernate_location->devno)); |
@@ -343,7 +342,7 @@ Index: systemd-stable/src/sleep/sleep.c | |||
343 | if (r < 0) | 342 | if (r < 0) |
344 | return log_debug_errno(r, "Failed to write partition device to /sys/power/resume for '%s': '%s': %m", | 343 | return log_debug_errno(r, "Failed to write partition device to /sys/power/resume for '%s': '%s': %m", |
345 | hibernate_location->swap->device, resume_str); | 344 | hibernate_location->swap->device, resume_str); |
346 | @@ -75,7 +75,7 @@ static int write_hibernate_location_info | 345 | @@ -75,7 +75,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca |
347 | } | 346 | } |
348 | 347 | ||
349 | xsprintf(offset_str, "%" PRIu64, hibernate_location->offset); | 348 | xsprintf(offset_str, "%" PRIu64, hibernate_location->offset); |
@@ -361,7 +360,7 @@ Index: systemd-stable/src/sleep/sleep.c | |||
361 | if (k >= 0) | 360 | if (k >= 0) |
362 | return 0; | 361 | return 0; |
363 | 362 | ||
364 | @@ -114,7 +114,7 @@ static int write_state(FILE **f, char ** | 363 | @@ -114,7 +114,7 @@ static int write_state(FILE **f, char **states) { |
365 | STRV_FOREACH(state, states) { | 364 | STRV_FOREACH(state, states) { |
366 | int k; | 365 | int k; |
367 | 366 | ||
@@ -370,24 +369,24 @@ Index: systemd-stable/src/sleep/sleep.c | |||
370 | if (k >= 0) | 369 | if (k >= 0) |
371 | return 0; | 370 | return 0; |
372 | log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state); | 371 | log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state); |
373 | Index: systemd-stable/src/udev/udevadm-trigger.c | 372 | diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c |
374 | =================================================================== | 373 | index 5c74184c33..65f528314e 100644 |
375 | --- systemd-stable.orig/src/udev/udevadm-trigger.c | 374 | --- a/src/udev/udevadm-trigger.c |
376 | +++ systemd-stable/src/udev/udevadm-trigger.c | 375 | +++ b/src/udev/udevadm-trigger.c |
377 | @@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerato | 376 | @@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerator *e, const char *action, Set **settle_s |
378 | if (!filename) | 377 | if (!filename) |
379 | return log_oom(); | 378 | return log_oom(); |
380 | 379 | ||
381 | - r = write_string_file(filename, action, WRITE_STRING_FILE_DISABLE_BUFFER); | 380 | - r = write_string_file(filename, action, WRITE_STRING_FILE_DISABLE_BUFFER); |
382 | + r = write_string_file(filename, action, 0); | 381 | + r = write_string_file(filename, action, 0); |
383 | if (r < 0) { | 382 | if (r < 0) { |
384 | bool ignore = IN_SET(r, -ENOENT, -EACCES, -ENODEV, -EROFS); | 383 | bool ignore = IN_SET(r, -ENOENT, -ENODEV); |
385 | 384 | ||
386 | Index: systemd-stable/src/udev/udevd.c | 385 | diff --git a/src/udev/udevd.c b/src/udev/udevd.c |
387 | =================================================================== | 386 | index d24b8d4398..d123a43904 100644 |
388 | --- systemd-stable.orig/src/udev/udevd.c | 387 | --- a/src/udev/udevd.c |
389 | +++ systemd-stable/src/udev/udevd.c | 388 | +++ b/src/udev/udevd.c |
390 | @@ -1153,7 +1153,7 @@ static int synthesize_change_one(sd_devi | 389 | @@ -1192,7 +1192,7 @@ static int synthesize_change_one(sd_device *dev, const char *syspath) { |
391 | 390 | ||
392 | filename = strjoina(syspath, "/uevent"); | 391 | filename = strjoina(syspath, "/uevent"); |
393 | log_device_debug(dev, "device is closed, synthesising 'change' on %s", syspath); | 392 | log_device_debug(dev, "device is closed, synthesising 'change' on %s", syspath); |
@@ -396,11 +395,11 @@ Index: systemd-stable/src/udev/udevd.c | |||
396 | if (r < 0) | 395 | if (r < 0) |
397 | return log_device_debug_errno(dev, r, "Failed to write 'change' to %s: %m", filename); | 396 | return log_device_debug_errno(dev, r, "Failed to write 'change' to %s: %m", filename); |
398 | return 0; | 397 | return 0; |
399 | Index: systemd-stable/src/vconsole/vconsole-setup.c | 398 | diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c |
400 | =================================================================== | 399 | index b28e2853e1..115b7233a0 100644 |
401 | --- systemd-stable.orig/src/vconsole/vconsole-setup.c | 400 | --- a/src/vconsole/vconsole-setup.c |
402 | +++ systemd-stable/src/vconsole/vconsole-setup.c | 401 | +++ b/src/vconsole/vconsole-setup.c |
403 | @@ -116,7 +116,7 @@ static int toggle_utf8_vc(const char *na | 402 | @@ -116,7 +116,7 @@ static int toggle_utf8_vc(const char *name, int fd, bool utf8) { |
404 | static int toggle_utf8_sysfs(bool utf8) { | 403 | static int toggle_utf8_sysfs(bool utf8) { |
405 | int r; | 404 | int r; |
406 | 405 | ||
@@ -409,3 +408,6 @@ Index: systemd-stable/src/vconsole/vconsole-setup.c | |||
409 | if (r < 0) | 408 | if (r < 0) |
410 | return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8)); | 409 | return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8)); |
411 | 410 | ||
411 | -- | ||
412 | 2.27.0 | ||
413 | |||
diff --git a/meta/recipes-core/systemd/systemd/0002-src-login-brightness.c-include-sys-wait.h.patch b/meta/recipes-core/systemd/systemd/0023-Include-sys-wait.h.patch index ba7424d876..ea4a024b82 100644 --- a/meta/recipes-core/systemd/systemd/0002-src-login-brightness.c-include-sys-wait.h.patch +++ b/meta/recipes-core/systemd/systemd/0023-Include-sys-wait.h.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 106922335ec502bcb4451c54a89be49f88fa54de Mon Sep 17 00:00:00 2001 | 1 | From 359e7a38824a906b0a24f5775f41a2ae3358bf06 Mon Sep 17 00:00:00 2001 |
2 | From: Scott Murray <scott.murray@konsulko.com> | 2 | From: Scott Murray <scott.murray@konsulko.com> |
3 | Date: Fri, 13 Sep 2019 19:26:27 -0400 | 3 | Date: Fri, 13 Sep 2019 19:26:27 -0400 |
4 | Subject: [PATCH] Include sys/wait.h | 4 | Subject: [PATCH 23/26] Include sys/wait.h |
5 | 5 | ||
6 | Fixes: | 6 | Fixes: |
7 | src/login/logind-brightness.c:158:85: error: 'WEXITED' undeclared (first use in this function); did you mean 'WIFEXITED'? | 7 | src/login/logind-brightness.c:158:85: error: 'WEXITED' undeclared (first use in this function); did you mean 'WIFEXITED'? |
@@ -11,19 +11,21 @@ src/login/logind-brightness.c:158:85: error: 'WEXITED' undeclared (first use in | |||
11 | Upstream-Status: Pending | 11 | Upstream-Status: Pending |
12 | 12 | ||
13 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> | 13 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> |
14 | |||
15 | --- | 14 | --- |
16 | src/login/logind-brightness.c | 1 + | 15 | src/login/logind-brightness.c | 1 + |
17 | 1 file changed, 1 insertion(+) | 16 | 1 file changed, 1 insertion(+) |
18 | 17 | ||
19 | diff --git a/src/login/logind-brightness.c b/src/login/logind-brightness.c | 18 | diff --git a/src/login/logind-brightness.c b/src/login/logind-brightness.c |
20 | index 3f4b65e1fdf1..5af7e3d5ce3f 100644 | 19 | index a6a1603396..54848ce209 100644 |
21 | --- a/src/login/logind-brightness.c | 20 | --- a/src/login/logind-brightness.c |
22 | +++ b/src/login/logind-brightness.c | 21 | +++ b/src/login/logind-brightness.c |
23 | @@ -1,5 +1,6 @@ | 22 | @@ -1,5 +1,6 @@ |
24 | /* SPDX-License-Identifier: LGPL-2.1+ */ | 23 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
25 | 24 | ||
26 | +#include <sys/wait.h> | 25 | +#include <sys/wait.h> |
27 | #include "bus-util.h" | 26 | #include "bus-util.h" |
28 | #include "device-util.h" | 27 | #include "device-util.h" |
29 | #include "hash-funcs.h" | 28 | #include "hash-funcs.h" |
29 | -- | ||
30 | 2.27.0 | ||
31 | |||
diff --git a/meta/recipes-core/systemd/systemd/0003-src-basic-copy.c-include-signal.h.patch b/meta/recipes-core/systemd/systemd/0024-Include-signal.h.patch index 538a99c7d7..2820d7b322 100644 --- a/meta/recipes-core/systemd/systemd/0003-src-basic-copy.c-include-signal.h.patch +++ b/meta/recipes-core/systemd/systemd/0024-Include-signal.h.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 082d2eb2a65525890a913723764e67a36ee75384 Mon Sep 17 00:00:00 2001 | 1 | From 0592da08e16a17ceef0949ec9901397d8ec5af92 Mon Sep 17 00:00:00 2001 |
2 | From: Scott Murray <scott.murray@konsulko.com> | 2 | From: Scott Murray <scott.murray@konsulko.com> |
3 | Date: Fri, 13 Sep 2019 19:26:27 -0400 | 3 | Date: Fri, 13 Sep 2019 19:26:27 -0400 |
4 | Subject: [PATCH] Include signal.h | 4 | Subject: [PATCH 24/26] Include signal.h |
5 | 5 | ||
6 | Fixes several signal set related errors: | 6 | Fixes several signal set related errors: |
7 | src/basic/copy.c:92:19: error: implicit declaration of function 'sigemptyset' [-Werror=implicit-function-declaration] | 7 | src/basic/copy.c:92:19: error: implicit declaration of function 'sigemptyset' [-Werror=implicit-function-declaration] |
@@ -12,13 +12,12 @@ src/basic/copy.c:95:13: error: implicit declaration of function 'sigtimedwait' [ | |||
12 | Upstream-Status: Pending | 12 | Upstream-Status: Pending |
13 | 13 | ||
14 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> | 14 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> |
15 | |||
16 | --- | 15 | --- |
17 | src/basic/copy.c | 1 + | 16 | src/basic/copy.c | 1 + |
18 | 1 file changed, 1 insertion(+) | 17 | 1 file changed, 1 insertion(+) |
19 | 18 | ||
20 | diff --git a/src/basic/copy.c b/src/basic/copy.c | 19 | diff --git a/src/basic/copy.c b/src/basic/copy.c |
21 | index 9028868f696d..5168586fa522 100644 | 20 | index 6a9c3a396f..8948bb4013 100644 |
22 | --- a/src/basic/copy.c | 21 | --- a/src/basic/copy.c |
23 | +++ b/src/basic/copy.c | 22 | +++ b/src/basic/copy.c |
24 | @@ -8,6 +8,7 @@ | 23 | @@ -8,6 +8,7 @@ |
@@ -29,3 +28,6 @@ index 9028868f696d..5168586fa522 100644 | |||
29 | 28 | ||
30 | #include "alloc-util.h" | 29 | #include "alloc-util.h" |
31 | #include "btrfs-util.h" | 30 | #include "btrfs-util.h" |
31 | -- | ||
32 | 2.27.0 | ||
33 | |||
diff --git a/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch b/meta/recipes-core/systemd/systemd/0025-Handle-__cpu_mask-usage.patch index d394444c1c..1cc3985d12 100644 --- a/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch +++ b/meta/recipes-core/systemd/systemd/0025-Handle-__cpu_mask-usage.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From dbe8b3ee45580defeefcac929b897c5437ffc50b Mon Sep 17 00:00:00 2001 | 1 | From bbda4a48a34662393117fc677c3a678d4ce4c2ec Mon Sep 17 00:00:00 2001 |
2 | From: Scott Murray <scott.murray@konsulko.com> | 2 | From: Scott Murray <scott.murray@konsulko.com> |
3 | Date: Fri, 13 Sep 2019 19:26:27 -0400 | 3 | Date: Fri, 13 Sep 2019 19:26:27 -0400 |
4 | Subject: [PATCH] Handle __cpu_mask usage | 4 | Subject: [PATCH 25/26] Handle __cpu_mask usage |
5 | 5 | ||
6 | Fixes errors: | 6 | Fixes errors: |
7 | 7 | ||
@@ -18,14 +18,13 @@ add a typedef to cpu-set-util.h defining __cpu_mask appropriately. | |||
18 | Upstream-Status: Inappropriate [musl specific] | 18 | Upstream-Status: Inappropriate [musl specific] |
19 | 19 | ||
20 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> | 20 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> |
21 | |||
22 | --- | 21 | --- |
23 | src/shared/cpu-set-util.h | 2 ++ | 22 | src/shared/cpu-set-util.h | 2 ++ |
24 | src/test/test-sizeof.c | 2 +- | 23 | src/test/test-sizeof.c | 2 +- |
25 | 2 files changed, 3 insertions(+), 1 deletion(-) | 24 | 2 files changed, 3 insertions(+), 1 deletion(-) |
26 | 25 | ||
27 | diff --git a/src/shared/cpu-set-util.h b/src/shared/cpu-set-util.h | 26 | diff --git a/src/shared/cpu-set-util.h b/src/shared/cpu-set-util.h |
28 | index 27812dfd5923..0ab40731ea93 100644 | 27 | index 3c63a58826..4c2d4347fc 100644 |
29 | --- a/src/shared/cpu-set-util.h | 28 | --- a/src/shared/cpu-set-util.h |
30 | +++ b/src/shared/cpu-set-util.h | 29 | +++ b/src/shared/cpu-set-util.h |
31 | @@ -6,6 +6,8 @@ | 30 | @@ -6,6 +6,8 @@ |
@@ -38,11 +37,11 @@ index 27812dfd5923..0ab40731ea93 100644 | |||
38 | typedef struct CPUSet { | 37 | typedef struct CPUSet { |
39 | cpu_set_t *set; | 38 | cpu_set_t *set; |
40 | diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c | 39 | diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c |
41 | index c65062d2562c..8b6eefa9cdae 100644 | 40 | index e1a59d408c..c269ea6e8c 100644 |
42 | --- a/src/test/test-sizeof.c | 41 | --- a/src/test/test-sizeof.c |
43 | +++ b/src/test/test-sizeof.c | 42 | +++ b/src/test/test-sizeof.c |
44 | @@ -1,6 +1,5 @@ | 43 | @@ -1,6 +1,5 @@ |
45 | /* SPDX-License-Identifier: LGPL-2.1+ */ | 44 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ |
46 | 45 | ||
47 | -#include <sched.h> | 46 | -#include <sched.h> |
48 | #include <stdio.h> | 47 | #include <stdio.h> |
@@ -56,3 +55,6 @@ index c65062d2562c..8b6eefa9cdae 100644 | |||
56 | 55 | ||
57 | /* Print information about various types. Useful when diagnosing | 56 | /* Print information about various types. Useful when diagnosing |
58 | * gcc diagnostics on an unfamiliar architecture. */ | 57 | * gcc diagnostics on an unfamiliar architecture. */ |
58 | -- | ||
59 | 2.27.0 | ||
60 | |||
diff --git a/meta/recipes-core/systemd/systemd/0001-Handle-missing-gshadow.patch b/meta/recipes-core/systemd/systemd/0026-Handle-missing-gshadow.patch index c5960a0d60..4180afb08e 100644 --- a/meta/recipes-core/systemd/systemd/0001-Handle-missing-gshadow.patch +++ b/meta/recipes-core/systemd/systemd/0026-Handle-missing-gshadow.patch | |||
@@ -1,22 +1,26 @@ | |||
1 | From ef9580ea1e2f1e57af3c7dcb0ec392ba8dbb5c8d Mon Sep 17 00:00:00 2001 | 1 | From 47bf88f74717b417e4adbcc04256334b2335c873 Mon Sep 17 00:00:00 2001 |
2 | From: Alex Kiernan <alex.kiernan@gmail.com> | 2 | From: Alex Kiernan <alex.kiernan@gmail.com> |
3 | Date: Tue, 10 Mar 2020 11:05:20 +0000 | 3 | Date: Tue, 10 Mar 2020 11:05:20 +0000 |
4 | Subject: [PATCH] Handle missing gshadow | 4 | Subject: [PATCH 26/26] Handle missing gshadow |
5 | 5 | ||
6 | gshadow usage is now present in the userdb code. Mask all uses of it to | 6 | gshadow usage is now present in the userdb code. Mask all uses of it to |
7 | allow compilation on musl | 7 | allow compilation on musl |
8 | 8 | ||
9 | Upstream-Status: Inappropriate [musl specific] | 9 | Upstream-Status: Inappropriate [musl specific] |
10 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | 10 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> |
11 | [Rebased for v247] | ||
12 | Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> | ||
11 | --- | 13 | --- |
12 | src/shared/group-record-nss.c | 20 ++++++++++++++++++++ | 14 | src/shared/user-record-nss.c | 20 ++++++++++++++++++++ |
13 | src/shared/group-record-nss.h | 4 ++++ | 15 | src/shared/user-record-nss.h | 4 ++++ |
14 | src/shared/userdb.c | 6 ++++++ | 16 | src/shared/userdb.c | 6 ++++++ |
15 | 3 files changed, 30 insertions(+) | 17 | 3 files changed, 30 insertions(+) |
16 | 18 | ||
17 | --- a/src/shared/group-record-nss.c | 19 | diff --git a/src/shared/user-record-nss.c b/src/shared/user-record-nss.c |
18 | +++ b/src/shared/group-record-nss.c | 20 | index 88b8fc2f8f..a819d41bac 100644 |
19 | @@ -19,8 +19,10 @@ int nss_group_to_group_record( | 21 | --- a/src/shared/user-record-nss.c |
22 | +++ b/src/shared/user-record-nss.c | ||
23 | @@ -331,8 +331,10 @@ int nss_group_to_group_record( | ||
20 | if (isempty(grp->gr_name)) | 24 | if (isempty(grp->gr_name)) |
21 | return -EINVAL; | 25 | return -EINVAL; |
22 | 26 | ||
@@ -27,23 +31,23 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
27 | 31 | ||
28 | g = group_record_new(); | 32 | g = group_record_new(); |
29 | if (!g) | 33 | if (!g) |
30 | @@ -36,6 +38,7 @@ int nss_group_to_group_record( | 34 | @@ -348,6 +350,7 @@ int nss_group_to_group_record( |
31 | 35 | ||
32 | g->gid = grp->gr_gid; | 36 | g->gid = grp->gr_gid; |
33 | 37 | ||
34 | +#if ENABLE_GSHADOW | 38 | +#if ENABLE_GSHADOW |
35 | if (sgrp) { | 39 | if (sgrp) { |
36 | if (looks_like_hashed_password(sgrp->sg_passwd)) { | 40 | if (looks_like_hashed_password(utf8_only(sgrp->sg_passwd))) { |
37 | g->hashed_password = strv_new(sgrp->sg_passwd); | 41 | g->hashed_password = strv_new(sgrp->sg_passwd); |
38 | @@ -51,6 +54,7 @@ int nss_group_to_group_record( | 42 | @@ -363,6 +366,7 @@ int nss_group_to_group_record( |
39 | if (!g->administrators) | 43 | if (r < 0) |
40 | return -ENOMEM; | 44 | return r; |
41 | } | 45 | } |
42 | +#endif | 46 | +#endif |
43 | 47 | ||
44 | r = json_build(&g->json, JSON_BUILD_OBJECT( | 48 | r = json_build(&g->json, JSON_BUILD_OBJECT( |
45 | JSON_BUILD_PAIR("groupName", JSON_BUILD_STRING(g->group_name)), | 49 | JSON_BUILD_PAIR("groupName", JSON_BUILD_STRING(g->group_name)), |
46 | @@ -76,6 +80,7 @@ int nss_sgrp_for_group(const struct grou | 50 | @@ -388,6 +392,7 @@ int nss_sgrp_for_group(const struct group *grp, struct sgrp *ret_sgrp, char **re |
47 | assert(ret_sgrp); | 51 | assert(ret_sgrp); |
48 | assert(ret_buffer); | 52 | assert(ret_buffer); |
49 | 53 | ||
@@ -51,7 +55,7 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
51 | for (;;) { | 55 | for (;;) { |
52 | _cleanup_free_ char *buf = NULL; | 56 | _cleanup_free_ char *buf = NULL; |
53 | struct sgrp sgrp, *result; | 57 | struct sgrp sgrp, *result; |
54 | @@ -104,6 +109,9 @@ int nss_sgrp_for_group(const struct grou | 58 | @@ -416,6 +421,9 @@ int nss_sgrp_for_group(const struct group *grp, struct sgrp *ret_sgrp, char **re |
55 | buflen *= 2; | 59 | buflen *= 2; |
56 | buf = mfree(buf); | 60 | buf = mfree(buf); |
57 | } | 61 | } |
@@ -61,7 +65,7 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
61 | } | 65 | } |
62 | 66 | ||
63 | int nss_group_record_by_name( | 67 | int nss_group_record_by_name( |
64 | @@ -115,7 +123,9 @@ int nss_group_record_by_name( | 68 | @@ -427,7 +435,9 @@ int nss_group_record_by_name( |
65 | struct group grp, *result; | 69 | struct group grp, *result; |
66 | bool incomplete = false; | 70 | bool incomplete = false; |
67 | size_t buflen = 4096; | 71 | size_t buflen = 4096; |
@@ -71,7 +75,7 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
71 | int r; | 75 | int r; |
72 | 76 | ||
73 | assert(name); | 77 | assert(name); |
74 | @@ -145,6 +155,7 @@ int nss_group_record_by_name( | 78 | @@ -457,6 +467,7 @@ int nss_group_record_by_name( |
75 | buf = mfree(buf); | 79 | buf = mfree(buf); |
76 | } | 80 | } |
77 | 81 | ||
@@ -79,7 +83,7 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
79 | if (with_shadow) { | 83 | if (with_shadow) { |
80 | r = nss_sgrp_for_group(result, &sgrp, &sbuf); | 84 | r = nss_sgrp_for_group(result, &sgrp, &sbuf); |
81 | if (r < 0) { | 85 | if (r < 0) { |
82 | @@ -156,6 +167,9 @@ int nss_group_record_by_name( | 86 | @@ -468,6 +479,9 @@ int nss_group_record_by_name( |
83 | incomplete = true; | 87 | incomplete = true; |
84 | 88 | ||
85 | r = nss_group_to_group_record(result, sresult, ret); | 89 | r = nss_group_to_group_record(result, sresult, ret); |
@@ -89,7 +93,7 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
89 | if (r < 0) | 93 | if (r < 0) |
90 | return r; | 94 | return r; |
91 | 95 | ||
92 | @@ -172,7 +186,9 @@ int nss_group_record_by_gid( | 96 | @@ -484,7 +498,9 @@ int nss_group_record_by_gid( |
93 | struct group grp, *result; | 97 | struct group grp, *result; |
94 | bool incomplete = false; | 98 | bool incomplete = false; |
95 | size_t buflen = 4096; | 99 | size_t buflen = 4096; |
@@ -99,7 +103,7 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
99 | int r; | 103 | int r; |
100 | 104 | ||
101 | assert(ret); | 105 | assert(ret); |
102 | @@ -200,6 +216,7 @@ int nss_group_record_by_gid( | 106 | @@ -512,6 +528,7 @@ int nss_group_record_by_gid( |
103 | buf = mfree(buf); | 107 | buf = mfree(buf); |
104 | } | 108 | } |
105 | 109 | ||
@@ -107,7 +111,7 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
107 | if (with_shadow) { | 111 | if (with_shadow) { |
108 | r = nss_sgrp_for_group(result, &sgrp, &sbuf); | 112 | r = nss_sgrp_for_group(result, &sgrp, &sbuf); |
109 | if (r < 0) { | 113 | if (r < 0) { |
110 | @@ -211,6 +228,9 @@ int nss_group_record_by_gid( | 114 | @@ -523,6 +540,9 @@ int nss_group_record_by_gid( |
111 | incomplete = true; | 115 | incomplete = true; |
112 | 116 | ||
113 | r = nss_group_to_group_record(result, sresult, ret); | 117 | r = nss_group_to_group_record(result, sresult, ret); |
@@ -117,8 +121,10 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
117 | if (r < 0) | 121 | if (r < 0) |
118 | return r; | 122 | return r; |
119 | 123 | ||
120 | --- a/src/shared/group-record-nss.h | 124 | diff --git a/src/shared/user-record-nss.h b/src/shared/user-record-nss.h |
121 | +++ b/src/shared/group-record-nss.h | 125 | index 22ab04d6ee..4e52e7a911 100644 |
126 | --- a/src/shared/user-record-nss.h | ||
127 | +++ b/src/shared/user-record-nss.h | ||
122 | @@ -2,7 +2,11 @@ | 128 | @@ -2,7 +2,11 @@ |
123 | #pragma once | 129 | #pragma once |
124 | 130 | ||
@@ -128,12 +134,14 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
128 | +#else | 134 | +#else |
129 | +struct sgrp; | 135 | +struct sgrp; |
130 | +#endif | 136 | +#endif |
137 | #include <pwd.h> | ||
138 | #include <shadow.h> | ||
131 | 139 | ||
132 | #include "group-record.h" | 140 | diff --git a/src/shared/userdb.c b/src/shared/userdb.c |
133 | 141 | index 2d480283d1..0d19764f2e 100644 | |
134 | --- a/src/shared/userdb.c | 142 | --- a/src/shared/userdb.c |
135 | +++ b/src/shared/userdb.c | 143 | +++ b/src/shared/userdb.c |
136 | @@ -930,13 +930,16 @@ int groupdb_iterator_get(UserDBIterator | 144 | @@ -929,13 +929,16 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) { |
137 | if (gr) { | 145 | if (gr) { |
138 | _cleanup_free_ char *buffer = NULL; | 146 | _cleanup_free_ char *buffer = NULL; |
139 | bool incomplete = false; | 147 | bool incomplete = false; |
@@ -150,7 +158,7 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
150 | r = nss_sgrp_for_group(gr, &sgrp, &buffer); | 158 | r = nss_sgrp_for_group(gr, &sgrp, &buffer); |
151 | if (r < 0) { | 159 | if (r < 0) { |
152 | log_debug_errno(r, "Failed to acquire shadow entry for group %s, ignoring: %m", gr->gr_name); | 160 | log_debug_errno(r, "Failed to acquire shadow entry for group %s, ignoring: %m", gr->gr_name); |
153 | @@ -944,6 +947,9 @@ int groupdb_iterator_get(UserDBIterator | 161 | @@ -943,6 +946,9 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) { |
154 | } | 162 | } |
155 | 163 | ||
156 | r = nss_group_to_group_record(gr, r >= 0 ? &sgrp : NULL, ret); | 164 | r = nss_group_to_group_record(gr, r >= 0 ? &sgrp : NULL, ret); |
@@ -160,3 +168,6 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
160 | if (r < 0) | 168 | if (r < 0) |
161 | return r; | 169 | return r; |
162 | 170 | ||
171 | -- | ||
172 | 2.27.0 | ||
173 | |||
diff --git a/meta/recipes-core/systemd/systemd/selinux-hook-handling-to-enumerate-nexthop.patch b/meta/recipes-core/systemd/systemd/selinux-hook-handling-to-enumerate-nexthop.patch deleted file mode 100644 index b1c92ed713..0000000000 --- a/meta/recipes-core/systemd/systemd/selinux-hook-handling-to-enumerate-nexthop.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | From 92b555aaabf710e0a672a7244e8c0e3963075133 Mon Sep 17 00:00:00 2001 | ||
2 | From: Purushottam choudhary <purushottam.choudhary@kpit.com> | ||
3 | Date: Wed, 28 Oct 2020 22:11:49 +0530 | ||
4 | Subject: [PATCH] network: selinux hook handling to enumerate nexthop | ||
5 | |||
6 | When selinux is enabled, the call of | ||
7 | manager_rtnl_enumerate_nexthop() fails. | ||
8 | |||
9 | This fix is to facilitate selinux hook handling for enumerating | ||
10 | nexthop. | ||
11 | |||
12 | In manager_rtnl_enumerate_nexthop() there is a check | ||
13 | if "Not supported" is returned by the send_netlink() call. | ||
14 | |||
15 | This check expects that -EOPNOTSUPP is returned, | ||
16 | the selinux hook seems to return -EINVAL instead. | ||
17 | |||
18 | This happens in kernel older than 5.3 | ||
19 | (more specificallytorvalds/linux@65ee00a) as it does not support | ||
20 | nexthop handling through netlink. | ||
21 | |||
22 | And if SELinux is enforced in the order kernel, callingRTM_GETNEXTHOP | ||
23 | returns -EINVAL. | ||
24 | |||
25 | Thus adding a call in the manager_rtnl_enumerate_nexthop for the | ||
26 | extra return -EINVAL. | ||
27 | |||
28 | Upstream-Status: Backport | ||
29 | https://github.com/systemd/systemd/commit/92b555aaabf710e0a672a7244e8c0e3963075133 | ||
30 | --- | ||
31 | src/network/networkd-manager.c | 3 ++- | ||
32 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
33 | |||
34 | diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c | ||
35 | index a6c1a39..2a9be85 100644 | ||
36 | --- a/src/network/networkd-manager.c | ||
37 | +++ b/src/network/networkd-manager.c | ||
38 | @@ -2121,7 +2121,7 @@ int manager_rtnl_enumerate_nexthop(Manager *m) { | ||
39 | |||
40 | r = sd_netlink_call(m->rtnl, req, 0, &reply); | ||
41 | if (r < 0) { | ||
42 | - if (r == -EOPNOTSUPP) { | ||
43 | + if (r == -EOPNOTSUPP || r == -EINVAL) { | ||
44 | log_debug("Nexthop are not supported by the kernel. Ignoring."); | ||
45 | return 0; | ||
46 | } | ||
diff --git a/meta/recipes-core/systemd/systemd_246.6.bb b/meta/recipes-core/systemd/systemd_247.2.bb index b89eff6be2..d621d0442e 100644 --- a/meta/recipes-core/systemd/systemd_246.6.bb +++ b/meta/recipes-core/systemd/systemd_247.2.bb | |||
@@ -22,9 +22,7 @@ SRC_URI += "file://touchscreen.rules \ | |||
22 | file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ | 22 | file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ |
23 | file://0003-implment-systemd-sysv-install-for-OE.patch \ | 23 | file://0003-implment-systemd-sysv-install-for-OE.patch \ |
24 | file://0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch \ | 24 | file://0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch \ |
25 | file://selinux-hook-handling-to-enumerate-nexthop.patch \ | ||
26 | file://0001-logind-Restore-chvt-as-non-root-user-without-polkit.patch \ | 25 | file://0001-logind-Restore-chvt-as-non-root-user-without-polkit.patch \ |
27 | file://0001-meson-Fix-reallocarray-check.patch \ | ||
28 | " | 26 | " |
29 | 27 | ||
30 | # patches needed by musl | 28 | # patches needed by musl |
@@ -35,26 +33,26 @@ SRC_URI_MUSL = "\ | |||
35 | file://0004-add-fallback-parse_printf_format-implementation.patch \ | 33 | file://0004-add-fallback-parse_printf_format-implementation.patch \ |
36 | file://0005-src-basic-missing.h-check-for-missing-strndupa.patch \ | 34 | file://0005-src-basic-missing.h-check-for-missing-strndupa.patch \ |
37 | file://0006-Include-netinet-if_ether.h.patch \ | 35 | file://0006-Include-netinet-if_ether.h.patch \ |
38 | file://0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch \ | 36 | file://0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch \ |
39 | file://0008-add-missing-FTW_-macros-for-musl.patch \ | 37 | file://0008-add-missing-FTW_-macros-for-musl.patch \ |
40 | file://0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch \ | 38 | file://0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch \ |
41 | file://0011-Use-uintmax_t-for-handling-rlim_t.patch \ | 39 | file://0010-Use-uintmax_t-for-handling-rlim_t.patch \ |
42 | file://0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch \ | 40 | file://0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch \ |
43 | file://0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch \ | 41 | file://0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch \ |
44 | file://0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch \ | 42 | file://0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch \ |
45 | file://0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch \ | 43 | file://0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch \ |
46 | file://0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch \ | 44 | file://0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch \ |
47 | file://0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch \ | 45 | file://0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch \ |
48 | file://0020-missing_type.h-add-__compar_d_fn_t-definition.patch \ | 46 | file://0017-missing_type.h-add-__compar_d_fn_t-definition.patch \ |
49 | file://0021-avoid-redefinition-of-prctl_mm_map-structure.patch \ | 47 | file://0018-avoid-redefinition-of-prctl_mm_map-structure.patch \ |
50 | file://0021-Handle-missing-LOCK_EX.patch \ | 48 | file://0019-Handle-missing-LOCK_EX.patch \ |
51 | file://0022-Fix-incompatible-pointer-type-struct-sockaddr_un.patch \ | 49 | file://0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch \ |
52 | file://0024-test-json.c-define-M_PIl.patch \ | 50 | file://0021-test-json.c-define-M_PIl.patch \ |
53 | file://0001-do-not-disable-buffer-in-writing-files.patch \ | 51 | file://0022-do-not-disable-buffer-in-writing-files.patch \ |
54 | file://0002-src-login-brightness.c-include-sys-wait.h.patch \ | 52 | file://0023-Include-sys-wait.h.patch \ |
55 | file://0003-src-basic-copy.c-include-signal.h.patch \ | 53 | file://0024-Include-signal.h.patch \ |
56 | file://0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch \ | 54 | file://0025-Handle-__cpu_mask-usage.patch \ |
57 | file://0001-Handle-missing-gshadow.patch \ | 55 | file://0026-Handle-missing-gshadow.patch \ |
58 | " | 56 | " |
59 | 57 | ||
60 | PAM_PLUGINS = " \ | 58 | PAM_PLUGINS = " \ |
@@ -554,6 +552,8 @@ FILES_${PN} = " ${base_bindir}/* \ | |||
554 | ${sysconfdir}/resolv-conf.systemd \ | 552 | ${sysconfdir}/resolv-conf.systemd \ |
555 | ${sysconfdir}/X11/xinit/xinitrc.d/* \ | 553 | ${sysconfdir}/X11/xinit/xinitrc.d/* \ |
556 | ${rootlibexecdir}/systemd/* \ | 554 | ${rootlibexecdir}/systemd/* \ |
555 | ${libdir}/pam.d \ | ||
556 | ${nonarch_libdir}/pam.d \ | ||
557 | ${systemd_unitdir}/* \ | 557 | ${systemd_unitdir}/* \ |
558 | ${base_libdir}/security/*.so \ | 558 | ${base_libdir}/security/*.so \ |
559 | /cgroup \ | 559 | /cgroup \ |
@@ -582,6 +582,7 @@ FILES_${PN} = " ${base_bindir}/* \ | |||
582 | ${datadir}/dbus-1/system.d/org.freedesktop.login1.conf \ | 582 | ${datadir}/dbus-1/system.d/org.freedesktop.login1.conf \ |
583 | ${datadir}/dbus-1/system.d/org.freedesktop.timesync1.conf \ | 583 | ${datadir}/dbus-1/system.d/org.freedesktop.timesync1.conf \ |
584 | ${datadir}/dbus-1/system.d/org.freedesktop.portable1.conf \ | 584 | ${datadir}/dbus-1/system.d/org.freedesktop.portable1.conf \ |
585 | ${datadir}/dbus-1/system.d/org.freedesktop.oom1.conf \ | ||
585 | " | 586 | " |
586 | 587 | ||
587 | FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd" | 588 | FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd" |