diff options
author | Andrej Valek <andrej.valek@siemens.com> | 2019-04-18 12:19:06 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-26 10:09:08 +0100 |
commit | c814947e03943c305226f17686f34b0c62450680 (patch) | |
tree | f0000576030b9d1d3d0b3f61e57da3daf7f579cf /meta/recipes-core | |
parent | 018be19fbf50dc5d9be9aa1dad5f33023cec1595 (diff) | |
download | poky-c814947e03943c305226f17686f34b0c62450680.tar.gz |
systemd: upgrade to 242
PATCH REBASED:
==============
0001-do-not-disable-buffer-in-writing-files.patch
0002-don-t-use-glibc-specific-qsort_r.patch
0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch
0004-add-fallback-parse_printf_format-implementation.patch
0005-rules-watch-metadata-changes-in-ide-devices.patch
0005-src-basic-missing.h-check-for-missing-strndupa.patch
0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch
0009-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch
0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
0021-avoid-redefinition-of-prctl_mm_map-structure.patch
0024-test-json.c-define-M_PIl.patch
PATCH DROPPED:
==============
0001-meson-declare-version.h-as-dep-for-various-targets-t.patch
0001-meson-declare-version.h-as-dependency-for-systemd.patch
0013-test-hexdecoct.c-Include-missing.h-for-strndupa.patch
PATCH ADDED:
0025-fs-utilh-add-missing-sys-stat-include.patch
(From OE-Core rev: 1d453c9087f92da1ceddc66a887941e4929b3448)
Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
19 files changed, 492 insertions, 452 deletions
diff --git a/meta/recipes-core/systemd/systemd-boot_241.bb b/meta/recipes-core/systemd/systemd-boot_242.bb index 56e68a3d49..56e68a3d49 100644 --- a/meta/recipes-core/systemd/systemd-boot_241.bb +++ b/meta/recipes-core/systemd/systemd-boot_242.bb | |||
diff --git a/meta/recipes-core/systemd/systemd-conf_241.bb b/meta/recipes-core/systemd/systemd-conf_242.bb index 9bb27fd96d..9bb27fd96d 100644 --- a/meta/recipes-core/systemd/systemd-conf_241.bb +++ b/meta/recipes-core/systemd/systemd-conf_242.bb | |||
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 5bd88ed6ed..193087ab05 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 = "c1f8ff8d0de7e303b8004b02a0a47d4cc103a7f8" | 17 | SRCREV = "1e5d2d656420d0e755dbcf72aeba3c3aba54e956" |
18 | SRCBRANCH = "v241-stable" | 18 | SRCBRANCH = "v242-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-do-not-disable-buffer-in-writing-files.patch b/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch index a6857b1f47..68ca604d6d 100644 --- a/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch +++ b/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch | |||
@@ -14,6 +14,8 @@ This is specific to musl. | |||
14 | Upstream-Status: Inappropriate [musl] | 14 | Upstream-Status: Inappropriate [musl] |
15 | 15 | ||
16 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 16 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
17 | [Rebased for v242] | ||
18 | Signed-off-by: Andrej Valek <andrej.valek@siemens.com> | ||
17 | --- | 19 | --- |
18 | src/basic/cgroup-util.c | 14 +++++++------- | 20 | src/basic/cgroup-util.c | 14 +++++++------- |
19 | src/basic/procfs-util.c | 4 ++-- | 21 | src/basic/procfs-util.c | 4 ++-- |
@@ -25,21 +27,20 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
25 | src/hibernate-resume/hibernate-resume.c | 2 +- | 27 | src/hibernate-resume/hibernate-resume.c | 2 +- |
26 | src/libsystemd/sd-device/sd-device.c | 2 +- | 28 | src/libsystemd/sd-device/sd-device.c | 2 +- |
27 | src/login/logind-dbus.c | 2 +- | 29 | src/login/logind-dbus.c | 2 +- |
28 | src/network/networkd-ipv6-proxy-ndp.c | 2 +- | ||
29 | src/network/networkd-link.c | 18 +++++++++--------- | ||
30 | src/nspawn/nspawn-cgroup.c | 2 +- | 30 | src/nspawn/nspawn-cgroup.c | 2 +- |
31 | src/nspawn/nspawn.c | 6 +++--- | 31 | src/nspawn/nspawn.c | 6 +++--- |
32 | src/shared/sysctl-util.c | 2 +- | ||
32 | src/sleep/sleep.c | 12 ++++++------ | 33 | src/sleep/sleep.c | 12 ++++++------ |
33 | src/udev/udevadm-trigger.c | 2 +- | 34 | src/udev/udevadm-trigger.c | 2 +- |
34 | src/udev/udevd.c | 6 +++--- | 35 | src/udev/udevd.c | 6 +++--- |
35 | src/vconsole/vconsole-setup.c | 2 +- | 36 | src/vconsole/vconsole-setup.c | 2 +- |
36 | 18 files changed, 48 insertions(+), 48 deletions(-) | 37 | 17 files changed, 39 insertions(+), 39 deletions(-) |
37 | 38 | ||
38 | diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c | 39 | diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c |
39 | index 8ce7ccb..b633226 100644 | 40 | index fc28109..44fe985 100644 |
40 | --- a/src/basic/cgroup-util.c | 41 | --- a/src/basic/cgroup-util.c |
41 | +++ b/src/basic/cgroup-util.c | 42 | +++ b/src/basic/cgroup-util.c |
42 | @@ -818,7 +818,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { | 43 | @@ -822,7 +822,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { |
43 | 44 | ||
44 | xsprintf(c, PID_FMT "\n", pid); | 45 | xsprintf(c, PID_FMT "\n", pid); |
45 | 46 | ||
@@ -48,7 +49,7 @@ index 8ce7ccb..b633226 100644 | |||
48 | if (r < 0) | 49 | if (r < 0) |
49 | return r; | 50 | return r; |
50 | 51 | ||
51 | @@ -1100,7 +1100,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { | 52 | @@ -1104,7 +1104,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { |
52 | 53 | ||
53 | sc = strstrip(contents); | 54 | sc = strstrip(contents); |
54 | if (isempty(sc)) { | 55 | if (isempty(sc)) { |
@@ -57,7 +58,7 @@ index 8ce7ccb..b633226 100644 | |||
57 | if (r < 0) | 58 | if (r < 0) |
58 | return r; | 59 | return r; |
59 | } else if (!path_equal(sc, agent)) | 60 | } else if (!path_equal(sc, agent)) |
60 | @@ -1118,7 +1118,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { | 61 | @@ -1122,7 +1122,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { |
61 | 62 | ||
62 | sc = strstrip(contents); | 63 | sc = strstrip(contents); |
63 | if (streq(sc, "0")) { | 64 | if (streq(sc, "0")) { |
@@ -66,7 +67,7 @@ index 8ce7ccb..b633226 100644 | |||
66 | if (r < 0) | 67 | if (r < 0) |
67 | return r; | 68 | return r; |
68 | 69 | ||
69 | @@ -1145,7 +1145,7 @@ int cg_uninstall_release_agent(const char *controller) { | 70 | @@ -1149,7 +1149,7 @@ int cg_uninstall_release_agent(const char *controller) { |
70 | if (r < 0) | 71 | if (r < 0) |
71 | return r; | 72 | return r; |
72 | 73 | ||
@@ -75,7 +76,7 @@ index 8ce7ccb..b633226 100644 | |||
75 | if (r < 0) | 76 | if (r < 0) |
76 | return r; | 77 | return r; |
77 | 78 | ||
78 | @@ -1155,7 +1155,7 @@ int cg_uninstall_release_agent(const char *controller) { | 79 | @@ -1159,7 +1159,7 @@ int cg_uninstall_release_agent(const char *controller) { |
79 | if (r < 0) | 80 | if (r < 0) |
80 | return r; | 81 | return r; |
81 | 82 | ||
@@ -84,7 +85,7 @@ index 8ce7ccb..b633226 100644 | |||
84 | if (r < 0) | 85 | if (r < 0) |
85 | return r; | 86 | return r; |
86 | 87 | ||
87 | @@ -2012,7 +2012,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri | 88 | @@ -2016,7 +2016,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri |
88 | if (r < 0) | 89 | if (r < 0) |
89 | return r; | 90 | return r; |
90 | 91 | ||
@@ -93,7 +94,7 @@ index 8ce7ccb..b633226 100644 | |||
93 | } | 94 | } |
94 | 95 | ||
95 | int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) { | 96 | int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) { |
96 | @@ -2660,7 +2660,7 @@ int cg_enable_everywhere( | 97 | @@ -2664,7 +2664,7 @@ int cg_enable_everywhere( |
97 | return log_debug_errno(errno, "Failed to open cgroup.subtree_control file of %s: %m", p); | 98 | return log_debug_errno(errno, "Failed to open cgroup.subtree_control file of %s: %m", p); |
98 | } | 99 | } |
99 | 100 | ||
@@ -103,10 +104,10 @@ index 8ce7ccb..b633226 100644 | |||
103 | log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", | 104 | log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", |
104 | FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); | 105 | FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); |
105 | diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c | 106 | diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c |
106 | index 42ce53d..5751253 100644 | 107 | index 7aaf95b..25fc3de 100644 |
107 | --- a/src/basic/procfs-util.c | 108 | --- a/src/basic/procfs-util.c |
108 | +++ b/src/basic/procfs-util.c | 109 | +++ b/src/basic/procfs-util.c |
109 | @@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limit) { | 110 | @@ -85,13 +85,13 @@ int procfs_tasks_set_limit(uint64_t limit) { |
110 | * decrease it, as threads-max is the much more relevant sysctl. */ | 111 | * decrease it, as threads-max is the much more relevant sysctl. */ |
111 | if (limit > pid_max-1) { | 112 | if (limit > pid_max-1) { |
112 | sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ | 113 | sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ |
@@ -136,10 +137,10 @@ index 123d00e..e7ea78f 100644 | |||
136 | return r; | 137 | return r; |
137 | 138 | ||
138 | diff --git a/src/basic/util.c b/src/basic/util.c | 139 | diff --git a/src/basic/util.c b/src/basic/util.c |
139 | index e577c93..3c64f91 100644 | 140 | index 93d610b..97dca64 100644 |
140 | --- a/src/basic/util.c | 141 | --- a/src/basic/util.c |
141 | +++ b/src/basic/util.c | 142 | +++ b/src/basic/util.c |
142 | @@ -631,7 +631,7 @@ void disable_coredumps(void) { | 143 | @@ -294,7 +294,7 @@ void disable_coredumps(void) { |
143 | if (detect_container() > 0) | 144 | if (detect_container() > 0) |
144 | return; | 145 | return; |
145 | 146 | ||
@@ -149,10 +150,10 @@ index e577c93..3c64f91 100644 | |||
149 | log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); | 150 | log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); |
150 | } | 151 | } |
151 | diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c | 152 | diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c |
152 | index af31f09..eec5738 100644 | 153 | index 66e2f01..5daa43b 100644 |
153 | --- a/src/binfmt/binfmt.c | 154 | --- a/src/binfmt/binfmt.c |
154 | +++ b/src/binfmt/binfmt.c | 155 | +++ b/src/binfmt/binfmt.c |
155 | @@ -47,7 +47,7 @@ static int delete_rule(const char *rule) { | 156 | @@ -48,7 +48,7 @@ static int delete_rule(const char *rule) { |
156 | if (!fn) | 157 | if (!fn) |
157 | return log_oom(); | 158 | return log_oom(); |
158 | 159 | ||
@@ -161,7 +162,7 @@ index af31f09..eec5738 100644 | |||
161 | } | 162 | } |
162 | 163 | ||
163 | static int apply_rule(const char *rule) { | 164 | static int apply_rule(const char *rule) { |
164 | @@ -55,7 +55,7 @@ static int apply_rule(const char *rule) { | 165 | @@ -56,7 +56,7 @@ static int apply_rule(const char *rule) { |
165 | 166 | ||
166 | (void) delete_rule(rule); | 167 | (void) delete_rule(rule); |
167 | 168 | ||
@@ -170,7 +171,7 @@ index af31f09..eec5738 100644 | |||
170 | if (r < 0) | 171 | if (r < 0) |
171 | return log_error_errno(r, "Failed to add binary format: %m"); | 172 | return log_error_errno(r, "Failed to add binary format: %m"); |
172 | 173 | ||
173 | @@ -212,7 +212,7 @@ static int run(int argc, char *argv[]) { | 174 | @@ -213,7 +213,7 @@ static int run(int argc, char *argv[]) { |
174 | } | 175 | } |
175 | 176 | ||
176 | /* Flush out all rules */ | 177 | /* Flush out all rules */ |
@@ -180,10 +181,10 @@ index af31f09..eec5738 100644 | |||
180 | STRV_FOREACH(f, files) { | 181 | STRV_FOREACH(f, files) { |
181 | k = apply_file(*f, true); | 182 | k = apply_file(*f, true); |
182 | diff --git a/src/core/main.c b/src/core/main.c | 183 | diff --git a/src/core/main.c b/src/core/main.c |
183 | index 561f956..db6f113 100644 | 184 | index 46db471..726ccaf 100644 |
184 | --- a/src/core/main.c | 185 | --- a/src/core/main.c |
185 | +++ b/src/core/main.c | 186 | +++ b/src/core/main.c |
186 | @@ -1468,7 +1468,7 @@ static int bump_unix_max_dgram_qlen(void) { | 187 | @@ -1469,7 +1469,7 @@ static int bump_unix_max_dgram_qlen(void) { |
187 | if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN) | 188 | if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN) |
188 | return 0; | 189 | return 0; |
189 | 190 | ||
@@ -192,7 +193,7 @@ index 561f956..db6f113 100644 | |||
192 | if (r < 0) | 193 | if (r < 0) |
193 | return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r, | 194 | return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r, |
194 | "Failed to bump AF_UNIX datagram queue length, ignoring: %m"); | 195 | "Failed to bump AF_UNIX datagram queue length, ignoring: %m"); |
195 | @@ -1683,7 +1683,7 @@ static void initialize_core_pattern(bool skip_setup) { | 196 | @@ -1684,7 +1684,7 @@ static void initialize_core_pattern(bool skip_setup) { |
196 | if (getpid_cached() != 1) | 197 | if (getpid_cached() != 1) |
197 | return; | 198 | return; |
198 | 199 | ||
@@ -202,10 +203,10 @@ index 561f956..db6f113 100644 | |||
202 | log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern); | 203 | log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern); |
203 | } | 204 | } |
204 | diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c | 205 | diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c |
205 | index 49b37ae..c96eedc 100644 | 206 | index cd7fb01..077e861 100644 |
206 | --- a/src/core/smack-setup.c | 207 | --- a/src/core/smack-setup.c |
207 | +++ b/src/core/smack-setup.c | 208 | +++ b/src/core/smack-setup.c |
208 | @@ -350,17 +350,17 @@ int mac_smack_setup(bool *loaded_policy) { | 209 | @@ -351,17 +351,17 @@ int mac_smack_setup(bool *loaded_policy) { |
209 | } | 210 | } |
210 | 211 | ||
211 | #ifdef SMACK_RUN_LABEL | 212 | #ifdef SMACK_RUN_LABEL |
@@ -241,10 +242,10 @@ index 17e7cd1..87a7667 100644 | |||
241 | log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor); | 242 | log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor); |
242 | return EXIT_FAILURE; | 243 | return EXIT_FAILURE; |
243 | diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c | 244 | diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c |
244 | index 2a69f2e..9d55340 100644 | 245 | index c2315c0..00f81b4 100644 |
245 | --- a/src/libsystemd/sd-device/sd-device.c | 246 | --- a/src/libsystemd/sd-device/sd-device.c |
246 | +++ b/src/libsystemd/sd-device/sd-device.c | 247 | +++ b/src/libsystemd/sd-device/sd-device.c |
247 | @@ -1836,7 +1836,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, | 248 | @@ -1852,7 +1852,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, |
248 | if (!value) | 249 | if (!value) |
249 | return -ENOMEM; | 250 | return -ENOMEM; |
250 | 251 | ||
@@ -254,10 +255,10 @@ index 2a69f2e..9d55340 100644 | |||
254 | if (r == -ELOOP) | 255 | if (r == -ELOOP) |
255 | return -EINVAL; | 256 | return -EINVAL; |
256 | diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c | 257 | diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c |
257 | index 8ab498f..d27ef9c 100644 | 258 | index 2cebcce..7111fc1 100644 |
258 | --- a/src/login/logind-dbus.c | 259 | --- a/src/login/logind-dbus.c |
259 | +++ b/src/login/logind-dbus.c | 260 | +++ b/src/login/logind-dbus.c |
260 | @@ -1231,7 +1231,7 @@ static int trigger_device(Manager *m, sd_device *d) { | 261 | @@ -1285,7 +1285,7 @@ static int trigger_device(Manager *m, sd_device *d) { |
261 | if (!t) | 262 | if (!t) |
262 | return -ENOMEM; | 263 | return -ENOMEM; |
263 | 264 | ||
@@ -266,109 +267,11 @@ index 8ab498f..d27ef9c 100644 | |||
266 | } | 267 | } |
267 | 268 | ||
268 | return 0; | 269 | return 0; |
269 | diff --git a/src/network/networkd-ipv6-proxy-ndp.c b/src/network/networkd-ipv6-proxy-ndp.c | ||
270 | index f594b27..c283cc3 100644 | ||
271 | --- a/src/network/networkd-ipv6-proxy-ndp.c | ||
272 | +++ b/src/network/networkd-ipv6-proxy-ndp.c | ||
273 | @@ -43,7 +43,7 @@ static int ipv6_proxy_ndp_set(Link *link) { | ||
274 | v = ipv6_proxy_ndp_is_needed(link); | ||
275 | p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/proxy_ndp"); | ||
276 | |||
277 | - r = write_string_file(p, one_zero(v), WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); | ||
278 | + r = write_string_file(p, one_zero(v), WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0); | ||
279 | if (r < 0) | ||
280 | log_link_warning_errno(link, r, "Cannot configure proxy NDP for interface: %m"); | ||
281 | |||
282 | diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c | ||
283 | index 22392d7..e0ed551 100644 | ||
284 | --- a/src/network/networkd-link.c | ||
285 | +++ b/src/network/networkd-link.c | ||
286 | @@ -274,7 +274,7 @@ static int link_enable_ipv6(Link *link) { | ||
287 | |||
288 | p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/disable_ipv6"); | ||
289 | |||
290 | - r = write_string_file(p, one_zero(disabled), WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); | ||
291 | + r = write_string_file(p, one_zero(disabled), WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0); | ||
292 | if (r < 0) | ||
293 | log_link_warning_errno(link, r, "Cannot %s IPv6 for interface %s: %m", | ||
294 | enable_disable(!disabled), link->ifname); | ||
295 | @@ -1272,7 +1272,7 @@ static int link_set_proxy_arp(Link *link) { | ||
296 | |||
297 | p = strjoina("/proc/sys/net/ipv4/conf/", link->ifname, "/proxy_arp"); | ||
298 | |||
299 | - r = write_string_file(p, one_zero(link->network->proxy_arp), WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); | ||
300 | + r = write_string_file(p, one_zero(link->network->proxy_arp), WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0); | ||
301 | if (r < 0) | ||
302 | log_link_warning_errno(link, r, "Cannot configure proxy ARP for interface: %m"); | ||
303 | |||
304 | @@ -2541,7 +2541,7 @@ static int link_set_ipv4_forward(Link *link) { | ||
305 | * primarily to keep IPv4 and IPv6 packet forwarding behaviour | ||
306 | * somewhat in sync (see below). */ | ||
307 | |||
308 | - r = write_string_file("/proc/sys/net/ipv4/ip_forward", "1", WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); | ||
309 | + r = write_string_file("/proc/sys/net/ipv4/ip_forward", "1", WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0); | ||
310 | if (r < 0) | ||
311 | log_link_warning_errno(link, r, "Cannot turn on IPv4 packet forwarding, ignoring: %m"); | ||
312 | |||
313 | @@ -2563,7 +2563,7 @@ static int link_set_ipv6_forward(Link *link) { | ||
314 | * same behaviour there and also propagate the setting from | ||
315 | * one to all, to keep things simple (see above). */ | ||
316 | |||
317 | - r = write_string_file("/proc/sys/net/ipv6/conf/all/forwarding", "1", WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); | ||
318 | + r = write_string_file("/proc/sys/net/ipv6/conf/all/forwarding", "1", WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0); | ||
319 | if (r < 0) | ||
320 | log_link_warning_errno(link, r, "Cannot configure IPv6 packet forwarding, ignoring: %m"); | ||
321 | |||
322 | @@ -2583,7 +2583,7 @@ static int link_set_ipv6_privacy_extensions(Link *link) { | ||
323 | p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/use_tempaddr"); | ||
324 | xsprintf(buf, "%u", (unsigned) link->network->ipv6_privacy_extensions); | ||
325 | |||
326 | - r = write_string_file(p, buf, WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); | ||
327 | + r = write_string_file(p, buf, WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0); | ||
328 | if (r < 0) | ||
329 | log_link_warning_errno(link, r, "Cannot configure IPv6 privacy extension for interface: %m"); | ||
330 | |||
331 | @@ -2607,7 +2607,7 @@ static int link_set_ipv6_accept_ra(Link *link) { | ||
332 | p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/accept_ra"); | ||
333 | |||
334 | /* We handle router advertisements ourselves, tell the kernel to GTFO */ | ||
335 | - r = write_string_file(p, "0", WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); | ||
336 | + r = write_string_file(p, "0", WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0); | ||
337 | if (r < 0) | ||
338 | log_link_warning_errno(link, r, "Cannot disable kernel IPv6 accept_ra for interface: %m"); | ||
339 | |||
340 | @@ -2635,7 +2635,7 @@ static int link_set_ipv6_dad_transmits(Link *link) { | ||
341 | p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/dad_transmits"); | ||
342 | xsprintf(buf, "%i", link->network->ipv6_dad_transmits); | ||
343 | |||
344 | - r = write_string_file(p, buf, WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); | ||
345 | + r = write_string_file(p, buf, WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0); | ||
346 | if (r < 0) | ||
347 | log_link_warning_errno(link, r, "Cannot set IPv6 dad transmits for interface: %m"); | ||
348 | |||
349 | @@ -2663,7 +2663,7 @@ static int link_set_ipv6_hop_limit(Link *link) { | ||
350 | p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/hop_limit"); | ||
351 | xsprintf(buf, "%i", link->network->ipv6_hop_limit); | ||
352 | |||
353 | - r = write_string_file(p, buf, WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); | ||
354 | + r = write_string_file(p, buf, WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0); | ||
355 | if (r < 0) | ||
356 | log_link_warning_errno(link, r, "Cannot set IPv6 hop limit for interface: %m"); | ||
357 | |||
358 | @@ -2689,7 +2689,7 @@ static int link_set_ipv6_mtu(Link *link) { | ||
359 | |||
360 | xsprintf(buf, "%" PRIu32, link->network->ipv6_mtu); | ||
361 | |||
362 | - r = write_string_file(p, buf, WRITE_STRING_FILE_DISABLE_BUFFER); | ||
363 | + r = write_string_file(p, buf, 0); | ||
364 | if (r < 0) | ||
365 | log_link_warning_errno(link, r, "Cannot set IPv6 MTU for interface: %m"); | ||
366 | |||
367 | diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c | 270 | diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c |
368 | index 97fa092..b841f51 100644 | 271 | index 168125d..dd0ab79 100644 |
369 | --- a/src/nspawn/nspawn-cgroup.c | 272 | --- a/src/nspawn/nspawn-cgroup.c |
370 | +++ b/src/nspawn/nspawn-cgroup.c | 273 | +++ b/src/nspawn/nspawn-cgroup.c |
371 | @@ -123,7 +123,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) { | 274 | @@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) { |
372 | (void) mkdir_parents(fn, 0755); | 275 | (void) mkdir_parents(fn, 0755); |
373 | 276 | ||
374 | sprintf(pid_string, PID_FMT, pid); | 277 | sprintf(pid_string, PID_FMT, pid); |
@@ -378,10 +281,10 @@ index 97fa092..b841f51 100644 | |||
378 | log_error_errno(r, "Failed to move process: %m"); | 281 | log_error_errno(r, "Failed to move process: %m"); |
379 | goto finish; | 282 | goto finish; |
380 | diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c | 283 | diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c |
381 | index e0c2d71..213790c 100644 | 284 | index 3b0ecb1..a1b5240 100644 |
382 | --- a/src/nspawn/nspawn.c | 285 | --- a/src/nspawn/nspawn.c |
383 | +++ b/src/nspawn/nspawn.c | 286 | +++ b/src/nspawn/nspawn.c |
384 | @@ -2117,7 +2117,7 @@ static int reset_audit_loginuid(void) { | 287 | @@ -2341,7 +2341,7 @@ static int reset_audit_loginuid(void) { |
385 | if (streq(p, "4294967295")) | 288 | if (streq(p, "4294967295")) |
386 | return 0; | 289 | return 0; |
387 | 290 | ||
@@ -390,7 +293,7 @@ index e0c2d71..213790c 100644 | |||
390 | if (r < 0) { | 293 | if (r < 0) { |
391 | log_error_errno(r, | 294 | log_error_errno(r, |
392 | "Failed to reset audit login UID. This probably means that your kernel is too\n" | 295 | "Failed to reset audit login UID. This probably means that your kernel is too\n" |
393 | @@ -3195,13 +3195,13 @@ static int setup_uid_map(pid_t pid) { | 296 | @@ -3531,13 +3531,13 @@ static int setup_uid_map(pid_t pid) { |
394 | 297 | ||
395 | xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); | 298 | xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); |
396 | xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, arg_uid_shift, arg_uid_range); | 299 | xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, arg_uid_shift, arg_uid_range); |
@@ -406,11 +309,24 @@ index e0c2d71..213790c 100644 | |||
406 | if (r < 0) | 309 | if (r < 0) |
407 | return log_error_errno(r, "Failed to write GID map: %m"); | 310 | return log_error_errno(r, "Failed to write GID map: %m"); |
408 | 311 | ||
312 | diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c | ||
313 | index 9be4055..f935cde 100644 | ||
314 | --- a/src/shared/sysctl-util.c | ||
315 | +++ b/src/shared/sysctl-util.c | ||
316 | @@ -73,7 +73,7 @@ int sysctl_write_ip_property(int af, const char *ifname, const char *property, c | ||
317 | |||
318 | log_debug("Setting '%s' to '%s'", p, value); | ||
319 | |||
320 | - return write_string_file(p, value, WRITE_STRING_FILE_VERIFY_ON_FAILURE | WRITE_STRING_FILE_DISABLE_BUFFER); | ||
321 | + return write_string_file(p, value, WRITE_STRING_FILE_VERIFY_ON_FAILURE | 0); | ||
322 | } | ||
323 | |||
324 | int sysctl_read(const char *property, char **content) { | ||
409 | diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c | 325 | diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c |
410 | index 5b7984a..bf818aa 100644 | 326 | index 11aabaf..6aa5d37 100644 |
411 | --- a/src/sleep/sleep.c | 327 | --- a/src/sleep/sleep.c |
412 | +++ b/src/sleep/sleep.c | 328 | +++ b/src/sleep/sleep.c |
413 | @@ -43,7 +43,7 @@ static int write_hibernate_location_info(void) { | 329 | @@ -48,7 +48,7 @@ static int write_hibernate_location_info(void) { |
414 | 330 | ||
415 | /* if it's a swap partition, we just write the disk to /sys/power/resume */ | 331 | /* if it's a swap partition, we just write the disk to /sys/power/resume */ |
416 | if (streq(type, "partition")) { | 332 | if (streq(type, "partition")) { |
@@ -419,7 +335,7 @@ index 5b7984a..bf818aa 100644 | |||
419 | if (r < 0) | 335 | if (r < 0) |
420 | return log_debug_errno(r, "Faileed to write partitoin device to /sys/power/resume: %m"); | 336 | return log_debug_errno(r, "Faileed to write partitoin device to /sys/power/resume: %m"); |
421 | 337 | ||
422 | @@ -79,12 +79,12 @@ static int write_hibernate_location_info(void) { | 338 | @@ -84,12 +84,12 @@ static int write_hibernate_location_info(void) { |
423 | 339 | ||
424 | offset = fiemap->fm_extents[0].fe_physical / page_size(); | 340 | offset = fiemap->fm_extents[0].fe_physical / page_size(); |
425 | xsprintf(offset_str, "%" PRIu64, offset); | 341 | xsprintf(offset_str, "%" PRIu64, offset); |
@@ -434,7 +350,7 @@ index 5b7984a..bf818aa 100644 | |||
434 | if (r < 0) | 350 | if (r < 0) |
435 | return log_debug_errno(r, "Failed to write device '%s': %m", device_str); | 351 | return log_debug_errno(r, "Failed to write device '%s': %m", device_str); |
436 | 352 | ||
437 | @@ -98,7 +98,7 @@ static int write_mode(char **modes) { | 353 | @@ -103,7 +103,7 @@ static int write_mode(char **modes) { |
438 | STRV_FOREACH(mode, modes) { | 354 | STRV_FOREACH(mode, modes) { |
439 | int k; | 355 | int k; |
440 | 356 | ||
@@ -443,7 +359,7 @@ index 5b7984a..bf818aa 100644 | |||
443 | if (k >= 0) | 359 | if (k >= 0) |
444 | return 0; | 360 | return 0; |
445 | 361 | ||
446 | @@ -117,7 +117,7 @@ static int write_state(FILE **f, char **states) { | 362 | @@ -122,7 +122,7 @@ static int write_state(FILE **f, char **states) { |
447 | STRV_FOREACH(state, states) { | 363 | STRV_FOREACH(state, states) { |
448 | int k; | 364 | int k; |
449 | 365 | ||
@@ -452,7 +368,7 @@ index 5b7984a..bf818aa 100644 | |||
452 | if (k >= 0) | 368 | if (k >= 0) |
453 | return 0; | 369 | return 0; |
454 | log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state); | 370 | log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state); |
455 | @@ -212,7 +212,7 @@ static int rtc_write_wake_alarm(uint64_t sec) { | 371 | @@ -217,7 +217,7 @@ static int rtc_write_wake_alarm(uint64_t sec) { |
456 | 372 | ||
457 | xsprintf(buf, "%" PRIu64, sec); | 373 | xsprintf(buf, "%" PRIu64, sec); |
458 | 374 | ||
@@ -462,10 +378,10 @@ index 5b7984a..bf818aa 100644 | |||
462 | return log_error_errno(r, "Failed to write '%s' to /sys/class/rtc/rtc0/wakealarm: %m", buf); | 378 | return log_error_errno(r, "Failed to write '%s' to /sys/class/rtc/rtc0/wakealarm: %m", buf); |
463 | 379 | ||
464 | diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c | 380 | diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c |
465 | index 9532946..2e576bb 100644 | 381 | index b7dafb7..bab4907 100644 |
466 | --- a/src/udev/udevadm-trigger.c | 382 | --- a/src/udev/udevadm-trigger.c |
467 | +++ b/src/udev/udevadm-trigger.c | 383 | +++ b/src/udev/udevadm-trigger.c |
468 | @@ -42,7 +42,7 @@ static int exec_list(sd_device_enumerator *e, const char *action, Set *settle_se | 384 | @@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerator *e, const char *action, Set *settle_se |
469 | if (!filename) | 385 | if (!filename) |
470 | return log_oom(); | 386 | return log_oom(); |
471 | 387 | ||
@@ -475,10 +391,10 @@ index 9532946..2e576bb 100644 | |||
475 | log_debug_errno(r, "Failed to write '%s' to '%s', ignoring: %m", action, filename); | 391 | log_debug_errno(r, "Failed to write '%s' to '%s', ignoring: %m", action, filename); |
476 | continue; | 392 | continue; |
477 | diff --git a/src/udev/udevd.c b/src/udev/udevd.c | 393 | diff --git a/src/udev/udevd.c b/src/udev/udevd.c |
478 | index 0303f36..687d009 100644 | 394 | index 140ec35..33063a9 100644 |
479 | --- a/src/udev/udevd.c | 395 | --- a/src/udev/udevd.c |
480 | +++ b/src/udev/udevd.c | 396 | +++ b/src/udev/udevd.c |
481 | @@ -1218,7 +1218,7 @@ static int synthesize_change(sd_device *dev) { | 397 | @@ -1185,7 +1185,7 @@ static int synthesize_change(sd_device *dev) { |
482 | */ | 398 | */ |
483 | log_debug("Device '%s' is closed, synthesising 'change'", devname); | 399 | log_debug("Device '%s' is closed, synthesising 'change'", devname); |
484 | strscpyl(filename, sizeof(filename), syspath, "/uevent", NULL); | 400 | strscpyl(filename, sizeof(filename), syspath, "/uevent", NULL); |
@@ -487,7 +403,7 @@ index 0303f36..687d009 100644 | |||
487 | 403 | ||
488 | FOREACH_DEVICE(e, d) { | 404 | FOREACH_DEVICE(e, d) { |
489 | const char *t, *n, *s; | 405 | const char *t, *n, *s; |
490 | @@ -1233,7 +1233,7 @@ static int synthesize_change(sd_device *dev) { | 406 | @@ -1200,7 +1200,7 @@ static int synthesize_change(sd_device *dev) { |
491 | 407 | ||
492 | log_debug("Device '%s' is closed, synthesising partition '%s' 'change'", devname, n); | 408 | log_debug("Device '%s' is closed, synthesising partition '%s' 'change'", devname, n); |
493 | strscpyl(filename, sizeof(filename), s, "/uevent", NULL); | 409 | strscpyl(filename, sizeof(filename), s, "/uevent", NULL); |
@@ -496,7 +412,7 @@ index 0303f36..687d009 100644 | |||
496 | } | 412 | } |
497 | 413 | ||
498 | return 0; | 414 | return 0; |
499 | @@ -1241,7 +1241,7 @@ static int synthesize_change(sd_device *dev) { | 415 | @@ -1208,7 +1208,7 @@ static int synthesize_change(sd_device *dev) { |
500 | 416 | ||
501 | log_debug("Device %s is closed, synthesising 'change'", devname); | 417 | log_debug("Device %s is closed, synthesising 'change'", devname); |
502 | strscpyl(filename, sizeof(filename), syspath, "/uevent", NULL); | 418 | strscpyl(filename, sizeof(filename), syspath, "/uevent", NULL); |
@@ -506,10 +422,10 @@ index 0303f36..687d009 100644 | |||
506 | return 0; | 422 | return 0; |
507 | } | 423 | } |
508 | diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c | 424 | diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c |
509 | index ebdeba3..aa879e6 100644 | 425 | index 67dc2e4..01b83d0 100644 |
510 | --- a/src/vconsole/vconsole-setup.c | 426 | --- a/src/vconsole/vconsole-setup.c |
511 | +++ b/src/vconsole/vconsole-setup.c | 427 | +++ b/src/vconsole/vconsole-setup.c |
512 | @@ -114,7 +114,7 @@ static int toggle_utf8(const char *name, int fd, bool utf8) { | 428 | @@ -116,7 +116,7 @@ static int toggle_utf8(const char *name, int fd, bool utf8) { |
513 | static int toggle_utf8_sysfs(bool utf8) { | 429 | static int toggle_utf8_sysfs(bool utf8) { |
514 | int r; | 430 | int r; |
515 | 431 | ||
@@ -519,5 +435,5 @@ index ebdeba3..aa879e6 100644 | |||
519 | return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8)); | 435 | return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8)); |
520 | 436 | ||
521 | -- | 437 | -- |
522 | 2.7.4 | 438 | 2.11.0 |
523 | 439 | ||
diff --git a/meta/recipes-core/systemd/systemd/0001-meson-declare-version.h-as-dep-for-various-targets-t.patch b/meta/recipes-core/systemd/systemd/0001-meson-declare-version.h-as-dep-for-various-targets-t.patch deleted file mode 100644 index 01936f2857..0000000000 --- a/meta/recipes-core/systemd/systemd/0001-meson-declare-version.h-as-dep-for-various-targets-t.patch +++ /dev/null | |||
@@ -1,118 +0,0 @@ | |||
1 | From 9f86d8769ab830a724c84f849975b5595e26b47c Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> | ||
3 | Date: Sun, 24 Feb 2019 22:49:38 +0100 | ||
4 | Subject: [PATCH] meson: declare version.h as dep for various targets that | ||
5 | include build.h | ||
6 | |||
7 | Should fix #11565. | ||
8 | |||
9 | Upstream-Status: Backport | ||
10 | |||
11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
12 | --- | ||
13 | meson.build | 19 +++++++++++++------ | ||
14 | src/core/meson.build | 3 ++- | ||
15 | src/udev/meson.build | 1 + | ||
16 | 3 files changed, 16 insertions(+), 7 deletions(-) | ||
17 | |||
18 | diff --git a/meson.build b/meson.build | ||
19 | index 30df834..232f3e1 100644 | ||
20 | --- a/meson.build | ||
21 | +++ b/meson.build | ||
22 | @@ -1637,7 +1637,8 @@ exe = executable('systemd-analyze', | ||
23 | include_directories : includes, | ||
24 | link_with : [libcore, | ||
25 | libshared], | ||
26 | - dependencies : [threads, | ||
27 | + dependencies : [versiondep, | ||
28 | + threads, | ||
29 | librt, | ||
30 | libseccomp, | ||
31 | libselinux, | ||
32 | @@ -2183,7 +2184,8 @@ if conf.get('ENABLE_IMPORTD') == 1 | ||
33 | systemd_pull_sources, | ||
34 | include_directories : includes, | ||
35 | link_with : [libshared], | ||
36 | - dependencies : [libcurl, | ||
37 | + dependencies : [versiondep, | ||
38 | + libcurl, | ||
39 | libz, | ||
40 | libbzip2, | ||
41 | libxz, | ||
42 | @@ -2232,7 +2234,8 @@ if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_LIBCURL') == 1 | ||
43 | systemd_journal_upload_sources, | ||
44 | include_directories : includes, | ||
45 | link_with : [libshared], | ||
46 | - dependencies : [threads, | ||
47 | + dependencies : [versiondep, | ||
48 | + threads, | ||
49 | libcurl, | ||
50 | libgnutls, | ||
51 | libxz, | ||
52 | @@ -2558,6 +2561,7 @@ exe = executable('systemd-stdio-bridge', | ||
53 | 'src/stdio-bridge/stdio-bridge.c', | ||
54 | include_directories : includes, | ||
55 | link_with : [libshared], | ||
56 | + dependencies : [versiondep], | ||
57 | install_rpath : rootlibexecdir, | ||
58 | install : true) | ||
59 | public_programs += exe | ||
60 | @@ -2641,7 +2645,8 @@ exe = executable('systemd-udevd', | ||
61 | link_with : [libudev_core, | ||
62 | libsystemd_network, | ||
63 | libudev_static], | ||
64 | - dependencies : [threads, | ||
65 | + dependencies : [versiondep, | ||
66 | + threads, | ||
67 | libkmod, | ||
68 | libidn, | ||
69 | libacl, | ||
70 | @@ -2658,7 +2663,8 @@ exe = executable('udevadm', | ||
71 | link_with : [libudev_core, | ||
72 | libsystemd_network, | ||
73 | libudev_static], | ||
74 | - dependencies : [threads, | ||
75 | + dependencies : [versiondep, | ||
76 | + threads, | ||
77 | libkmod, | ||
78 | libidn, | ||
79 | libacl, | ||
80 | @@ -2798,7 +2804,8 @@ foreach tuple : tests | ||
81 | sources, | ||
82 | include_directories : incs, | ||
83 | link_with : link_with, | ||
84 | - dependencies : dependencies, | ||
85 | + dependencies : [versiondep, | ||
86 | + dependencies], | ||
87 | c_args : defs, | ||
88 | build_by_default : want_tests != 'false', | ||
89 | install_rpath : rootlibexecdir, | ||
90 | diff --git a/src/core/meson.build b/src/core/meson.build | ||
91 | index 85021bd..88fb093 100644 | ||
92 | --- a/src/core/meson.build | ||
93 | +++ b/src/core/meson.build | ||
94 | @@ -150,7 +150,8 @@ libcore = static_library( | ||
95 | load_fragment_gperf_c, | ||
96 | load_fragment_gperf_nulstr_c, | ||
97 | include_directories : includes, | ||
98 | - dependencies : [threads, | ||
99 | + dependencies : [versiondep, | ||
100 | + threads, | ||
101 | librt, | ||
102 | libseccomp, | ||
103 | libpam, | ||
104 | diff --git a/src/udev/meson.build b/src/udev/meson.build | ||
105 | index 9d3f6d1..973a75e 100644 | ||
106 | --- a/src/udev/meson.build | ||
107 | +++ b/src/udev/meson.build | ||
108 | @@ -180,6 +180,7 @@ foreach prog : [['ata_id/ata_id.c'], | ||
109 | prog, | ||
110 | include_directories : includes, | ||
111 | c_args : ['-DLOG_REALM=LOG_REALM_UDEV'], | ||
112 | + dependencies : [versiondep], | ||
113 | link_with : [libudev_static], | ||
114 | install_rpath : udev_rpath, | ||
115 | install : true, | ||
116 | -- | ||
117 | 2.7.4 | ||
118 | |||
diff --git a/meta/recipes-core/systemd/systemd/0001-meson-declare-version.h-as-dependency-for-systemd.patch b/meta/recipes-core/systemd/systemd/0001-meson-declare-version.h-as-dependency-for-systemd.patch deleted file mode 100644 index 8874dff9a5..0000000000 --- a/meta/recipes-core/systemd/systemd/0001-meson-declare-version.h-as-dependency-for-systemd.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From e14d724a932a255eec4d60b08e128519c33e88ee Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Olbrich <m.olbrich@pengutronix.de> | ||
3 | Date: Mon, 25 Feb 2019 11:59:23 +0100 | ||
4 | Subject: [PATCH] meson: declare version.h as dependency for systemd | ||
5 | |||
6 | This is a followup to #11815 and adds the last missing dependency. | ||
7 | With this #11565 is hopefully really fixed. | ||
8 | |||
9 | Upstream-Status: Backport | ||
10 | |||
11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
12 | --- | ||
13 | meson.build | 3 ++- | ||
14 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/meson.build b/meson.build | ||
17 | index 232f3e1..70148be 100644 | ||
18 | --- a/meson.build | ||
19 | +++ b/meson.build | ||
20 | @@ -1618,7 +1618,8 @@ executable('systemd', | ||
21 | include_directories : includes, | ||
22 | link_with : [libcore, | ||
23 | libshared], | ||
24 | - dependencies : [threads, | ||
25 | + dependencies : [versiondep, | ||
26 | + threads, | ||
27 | librt, | ||
28 | libseccomp, | ||
29 | libselinux, | ||
30 | -- | ||
31 | 2.7.4 | ||
32 | |||
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 36e0699da9..c6213ab88e 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 | |||
@@ -8,20 +8,23 @@ Upstream-Status: Inappropriate [musl specific] | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
9 | [Rebased for v241] | 9 | [Rebased for v241] |
10 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 10 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
11 | [Rebased for v242] | ||
12 | Signed-off-by: Andrej Valek <andrej.valek@siemens.com> | ||
11 | --- | 13 | --- |
12 | src/basic/util.h | 14 -------------- | 14 | src/basic/sort-util.h | 14 -------------- |
13 | src/libsystemd/sd-hwdb/hwdb-util.c | 19 ++++++++++++++----- | 15 | src/libsystemd/sd-hwdb/hwdb-util.c | 19 ++++++++++++++----- |
14 | src/shared/format-table.c | 36 ++++++++++++++++++++++++------------ | 16 | src/shared/format-table.c | 36 ++++++++++++++++++++++++------------ |
15 | 3 files changed, 38 insertions(+), 31 deletions(-) | 17 | 3 files changed, 38 insertions(+), 31 deletions(-) |
16 | 18 | ||
17 | diff --git a/src/basic/util.h b/src/basic/util.h | 19 | diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h |
18 | index dc33d66..9f6a6ce 100644 | 20 | index e029f8646e..27d68b341c 100644 |
19 | --- a/src/basic/util.h | 21 | --- a/src/basic/sort-util.h |
20 | +++ b/src/basic/util.h | 22 | +++ b/src/basic/sort-util.h |
21 | @@ -116,20 +116,6 @@ static inline void qsort_safe(void *base, size_t nmemb, size_t size, __compar_fn | 23 | @@ -54,17 +54,3 @@ static inline void qsort_safe(void *base, size_t nmemb, size_t size, __compar_fn |
24 | int (*_func_)(const typeof(p[0])*, const typeof(p[0])*) = func; \ | ||
22 | qsort_safe((p), (n), sizeof((p)[0]), (__compar_fn_t) _func_); \ | 25 | qsort_safe((p), (n), sizeof((p)[0]), (__compar_fn_t) _func_); \ |
23 | }) | 26 | }) |
24 | 27 | - | |
25 | -static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_d_fn_t compar, void *userdata) { | 28 | -static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, __compar_d_fn_t compar, void *userdata) { |
26 | - if (nmemb <= 1) | 29 | - if (nmemb <= 1) |
27 | - return; | 30 | - return; |
@@ -35,15 +38,11 @@ index dc33d66..9f6a6ce 100644 | |||
35 | - int (*_func_)(const typeof(p[0])*, const typeof(p[0])*, typeof(userdata)) = func; \ | 38 | - int (*_func_)(const typeof(p[0])*, const typeof(p[0])*, typeof(userdata)) = func; \ |
36 | - qsort_r_safe((p), (n), sizeof((p)[0]), (__compar_d_fn_t) _func_, userdata); \ | 39 | - qsort_r_safe((p), (n), sizeof((p)[0]), (__compar_d_fn_t) _func_, userdata); \ |
37 | - }) | 40 | - }) |
38 | - | ||
39 | /* Normal memcpy requires src to be nonnull. We do nothing if n is 0. */ | ||
40 | static inline void memcpy_safe(void *dst, const void *src, size_t n) { | ||
41 | if (n == 0) | ||
42 | diff --git a/src/libsystemd/sd-hwdb/hwdb-util.c b/src/libsystemd/sd-hwdb/hwdb-util.c | 41 | diff --git a/src/libsystemd/sd-hwdb/hwdb-util.c b/src/libsystemd/sd-hwdb/hwdb-util.c |
43 | index f852967..b570ce1 100644 | 42 | index c83575c7c8..72f8f3a050 100644 |
44 | --- a/src/libsystemd/sd-hwdb/hwdb-util.c | 43 | --- a/src/libsystemd/sd-hwdb/hwdb-util.c |
45 | +++ b/src/libsystemd/sd-hwdb/hwdb-util.c | 44 | +++ b/src/libsystemd/sd-hwdb/hwdb-util.c |
46 | @@ -126,9 +126,13 @@ static void trie_free(struct trie *trie) { | 45 | @@ -128,9 +128,13 @@ static void trie_free(struct trie *trie) { |
47 | 46 | ||
48 | DEFINE_TRIVIAL_CLEANUP_FUNC(struct trie*, trie_free); | 47 | DEFINE_TRIVIAL_CLEANUP_FUNC(struct trie*, trie_free); |
49 | 48 | ||
@@ -60,7 +59,7 @@ index f852967..b570ce1 100644 | |||
60 | } | 59 | } |
61 | 60 | ||
62 | static int trie_node_add_value(struct trie *trie, struct trie_node *node, | 61 | static int trie_node_add_value(struct trie *trie, struct trie_node *node, |
63 | @@ -156,7 +160,10 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node, | 62 | @@ -158,7 +162,10 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node, |
64 | .value_off = v, | 63 | .value_off = v, |
65 | }; | 64 | }; |
66 | 65 | ||
@@ -72,7 +71,7 @@ index f852967..b570ce1 100644 | |||
72 | if (val) { | 71 | if (val) { |
73 | /* At this point we have 2 identical properties on the same match-string. | 72 | /* 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. */ | 73 | * Since we process files in order, we just replace the previous value. */ |
75 | @@ -182,7 +189,9 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node, | 74 | @@ -184,7 +191,9 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node, |
76 | .line_number = line_number, | 75 | .line_number = line_number, |
77 | }; | 76 | }; |
78 | node->values_count++; | 77 | node->values_count++; |
@@ -84,10 +83,10 @@ index f852967..b570ce1 100644 | |||
84 | } | 83 | } |
85 | 84 | ||
86 | diff --git a/src/shared/format-table.c b/src/shared/format-table.c | 85 | diff --git a/src/shared/format-table.c b/src/shared/format-table.c |
87 | index 7d52980..75dbfe1 100644 | 86 | index a5c0a99b08..d595cbe372 100644 |
88 | --- a/src/shared/format-table.c | 87 | --- a/src/shared/format-table.c |
89 | +++ b/src/shared/format-table.c | 88 | +++ b/src/shared/format-table.c |
90 | @@ -848,31 +848,33 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t | 89 | @@ -850,31 +850,33 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t |
91 | return CMP(index_a, index_b); | 90 | return CMP(index_a, index_b); |
92 | } | 91 | } |
93 | 92 | ||
@@ -131,7 +130,7 @@ index 7d52980..75dbfe1 100644 | |||
131 | } | 130 | } |
132 | 131 | ||
133 | /* Order identical lines by the order there were originally added in */ | 132 | /* Order identical lines by the order there were originally added in */ |
134 | @@ -1105,7 +1107,12 @@ int table_print(Table *t, FILE *f) { | 133 | @@ -1107,7 +1109,12 @@ int table_print(Table *t, FILE *f) { |
135 | for (i = 0; i < n_rows; i++) | 134 | for (i = 0; i < n_rows; i++) |
136 | sorted[i] = i * t->n_columns; | 135 | sorted[i] = i * t->n_columns; |
137 | 136 | ||
@@ -145,7 +144,7 @@ index 7d52980..75dbfe1 100644 | |||
145 | } | 144 | } |
146 | 145 | ||
147 | if (t->display_map) | 146 | if (t->display_map) |
148 | @@ -1532,7 +1539,12 @@ int table_to_json(Table *t, JsonVariant **ret) { | 147 | @@ -1534,7 +1541,12 @@ int table_to_json(Table *t, JsonVariant **ret) { |
149 | for (i = 0; i < n_rows; i++) | 148 | for (i = 0; i < n_rows; i++) |
150 | sorted[i] = i * t->n_columns; | 149 | sorted[i] = i * t->n_columns; |
151 | 150 | ||
@@ -160,5 +159,5 @@ index 7d52980..75dbfe1 100644 | |||
160 | 159 | ||
161 | if (t->display_map) | 160 | if (t->display_map) |
162 | -- | 161 | -- |
163 | 2.7.4 | 162 | 2.11.0 |
164 | 163 | ||
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 5246b4b26c..2e39f7a2e1 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 | |||
@@ -9,14 +9,16 @@ is not provided. | |||
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 | [Rebased for v242] | ||
13 | Signed-off-by: Andrej Valek <andrej.valek@siemens.com> | ||
12 | --- | 14 | --- |
13 | src/basic/missing_type.h | 9 +++++++++ | 15 | src/basic/missing_type.h | 9 +++++++++ |
14 | src/basic/util.h | 1 + | 16 | src/basic/sort-util.h | 1 + |
15 | src/journal/catalog.c | 1 + | 17 | src/journal/catalog.c | 1 + |
16 | 3 files changed, 11 insertions(+) | 18 | 3 files changed, 11 insertions(+) |
17 | 19 | ||
18 | diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h | 20 | diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h |
19 | index bf8a6ca..c487e65 100644 | 21 | index bf8a6caa1b..2134fe5095 100644 |
20 | --- a/src/basic/missing_type.h | 22 | --- a/src/basic/missing_type.h |
21 | +++ b/src/basic/missing_type.h | 23 | +++ b/src/basic/missing_type.h |
22 | @@ -10,3 +10,12 @@ | 24 | @@ -10,3 +10,12 @@ |
@@ -32,30 +34,30 @@ index bf8a6ca..c487e65 100644 | |||
32 | +#define __COMPAR_FN_T | 34 | +#define __COMPAR_FN_T |
33 | +typedef int (*__compar_fn_t)(const void *, const void *); | 35 | +typedef int (*__compar_fn_t)(const void *, const void *); |
34 | +#endif | 36 | +#endif |
35 | diff --git a/src/basic/util.h b/src/basic/util.h | 37 | diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h |
36 | index 9f6a6ce..2c5dc32 100644 | 38 | index e029f86..7247d40 100644 |
37 | --- a/src/basic/util.h | 39 | --- a/src/basic/sort-util.h |
38 | +++ b/src/basic/util.h | 40 | +++ b/src/basic/sort-util.h |
39 | @@ -26,6 +26,7 @@ | 41 | @@ -4,6 +4,7 @@ |
40 | #include "format-util.h" | 42 | #include <stdlib.h> |
43 | |||
41 | #include "macro.h" | 44 | #include "macro.h" |
42 | #include "time-util.h" | ||
43 | +#include "missing.h" | 45 | +#include "missing.h" |
44 | 46 | ||
45 | size_t page_size(void) _pure_; | 47 | void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size, |
46 | #define PAGE_ALIGN(l) ALIGN_TO((l), page_size()) | 48 | __compar_d_fn_t compar, void *arg); |
47 | diff --git a/src/journal/catalog.c b/src/journal/catalog.c | 49 | diff --git a/src/journal/catalog.c b/src/journal/catalog.c |
48 | index 4062f12..034e00c 100644 | 50 | index 7beffc1e1a..4818a2e5cc 100644 |
49 | --- a/src/journal/catalog.c | 51 | --- a/src/journal/catalog.c |
50 | +++ b/src/journal/catalog.c | 52 | +++ b/src/journal/catalog.c |
51 | @@ -26,6 +26,7 @@ | 53 | @@ -29,6 +29,7 @@ |
54 | #include "string-util.h" | ||
52 | #include "strv.h" | 55 | #include "strv.h" |
53 | #include "tmpfile-util.h" | 56 | #include "tmpfile-util.h" |
54 | #include "util.h" | ||
55 | +#include "missing.h" | 57 | +#include "missing.h" |
56 | 58 | ||
57 | const char * const catalog_file_dirs[] = { | 59 | const char * const catalog_file_dirs[] = { |
58 | "/usr/local/lib/systemd/catalog/", | 60 | "/usr/local/lib/systemd/catalog/", |
59 | -- | 61 | -- |
60 | 2.7.4 | 62 | 2.11.0 |
61 | 63 | ||
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 bb738e22c1..fa8217e3da 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 | |||
@@ -20,10 +20,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
20 | create mode 100644 src/basic/parse-printf-format.h | 20 | create mode 100644 src/basic/parse-printf-format.h |
21 | 21 | ||
22 | diff --git a/meson.build b/meson.build | 22 | diff --git a/meson.build b/meson.build |
23 | index 3386546..44b24ee 100644 | 23 | index 79195c9748..0bffbf29c5 100644 |
24 | --- a/meson.build | 24 | --- a/meson.build |
25 | +++ b/meson.build | 25 | +++ b/meson.build |
26 | @@ -667,6 +667,7 @@ foreach header : ['crypt.h', | 26 | @@ -685,6 +685,7 @@ foreach header : ['crypt.h', |
27 | 'linux/memfd.h', | 27 | 'linux/memfd.h', |
28 | 'linux/vm_sockets.h', | 28 | 'linux/vm_sockets.h', |
29 | 'linux/can/vxcan.h', | 29 | 'linux/can/vxcan.h', |
@@ -32,10 +32,10 @@ index 3386546..44b24ee 100644 | |||
32 | 'valgrind/memcheck.h', | 32 | 'valgrind/memcheck.h', |
33 | 'valgrind/valgrind.h', | 33 | 'valgrind/valgrind.h', |
34 | diff --git a/src/basic/meson.build b/src/basic/meson.build | 34 | diff --git a/src/basic/meson.build b/src/basic/meson.build |
35 | index e5852f3..2192a0c 100644 | 35 | index 91e0df3d2f..a732b554da 100644 |
36 | --- a/src/basic/meson.build | 36 | --- a/src/basic/meson.build |
37 | +++ b/src/basic/meson.build | 37 | +++ b/src/basic/meson.build |
38 | @@ -284,6 +284,11 @@ foreach item : [['af', af_list_txt, 'af', ''], | 38 | @@ -298,6 +298,11 @@ foreach item : [['af', af_list_txt, 'af', ''], |
39 | endforeach | 39 | endforeach |
40 | 40 | ||
41 | basic_sources += generated_gperf_headers | 41 | basic_sources += generated_gperf_headers |
@@ -49,7 +49,7 @@ index e5852f3..2192a0c 100644 | |||
49 | 'gcrypt-util.h') | 49 | 'gcrypt-util.h') |
50 | diff --git a/src/basic/parse-printf-format.c b/src/basic/parse-printf-format.c | 50 | diff --git a/src/basic/parse-printf-format.c b/src/basic/parse-printf-format.c |
51 | new file mode 100644 | 51 | new file mode 100644 |
52 | index 0000000..49437e5 | 52 | index 0000000000..49437e5445 |
53 | --- /dev/null | 53 | --- /dev/null |
54 | +++ b/src/basic/parse-printf-format.c | 54 | +++ b/src/basic/parse-printf-format.c |
55 | @@ -0,0 +1,273 @@ | 55 | @@ -0,0 +1,273 @@ |
@@ -328,7 +328,7 @@ index 0000000..49437e5 | |||
328 | +} | 328 | +} |
329 | diff --git a/src/basic/parse-printf-format.h b/src/basic/parse-printf-format.h | 329 | diff --git a/src/basic/parse-printf-format.h b/src/basic/parse-printf-format.h |
330 | new file mode 100644 | 330 | new file mode 100644 |
331 | index 0000000..47be752 | 331 | index 0000000000..47be7522d7 |
332 | --- /dev/null | 332 | --- /dev/null |
333 | +++ b/src/basic/parse-printf-format.h | 333 | +++ b/src/basic/parse-printf-format.h |
334 | @@ -0,0 +1,57 @@ | 334 | @@ -0,0 +1,57 @@ |
@@ -390,7 +390,7 @@ index 0000000..47be752 | |||
390 | + | 390 | + |
391 | +#endif /* HAVE_PRINTF_H */ | 391 | +#endif /* HAVE_PRINTF_H */ |
392 | diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h | 392 | diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h |
393 | index dc67b6e..cf8d514 100644 | 393 | index c3b9448d4f..2937aa13b1 100644 |
394 | --- a/src/basic/stdio-util.h | 394 | --- a/src/basic/stdio-util.h |
395 | +++ b/src/basic/stdio-util.h | 395 | +++ b/src/basic/stdio-util.h |
396 | @@ -1,13 +1,13 @@ | 396 | @@ -1,13 +1,13 @@ |
@@ -403,13 +403,13 @@ index dc67b6e..cf8d514 100644 | |||
403 | #include <sys/types.h> | 403 | #include <sys/types.h> |
404 | 404 | ||
405 | #include "macro.h" | 405 | #include "macro.h" |
406 | #include "util.h" | 406 | #include "memory-util.h" |
407 | +#include "parse-printf-format.h" | 407 | +#include "parse-printf-format.h" |
408 | 408 | ||
409 | #define snprintf_ok(buf, len, fmt, ...) \ | 409 | #define snprintf_ok(buf, len, fmt, ...) \ |
410 | ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len)) | 410 | ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len)) |
411 | diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c | 411 | diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c |
412 | index 8618454..3fea912 100644 | 412 | index 5ef11fa1a4..6384ab620c 100644 |
413 | --- a/src/journal/journal-send.c | 413 | --- a/src/journal/journal-send.c |
414 | +++ b/src/journal/journal-send.c | 414 | +++ b/src/journal/journal-send.c |
415 | @@ -2,7 +2,6 @@ | 415 | @@ -2,7 +2,6 @@ |
@@ -421,13 +421,13 @@ index 8618454..3fea912 100644 | |||
421 | #include <sys/socket.h> | 421 | #include <sys/socket.h> |
422 | #include <sys/un.h> | 422 | #include <sys/un.h> |
423 | @@ -21,6 +20,7 @@ | 423 | @@ -21,6 +20,7 @@ |
424 | #include "stdio-util.h" | ||
424 | #include "string-util.h" | 425 | #include "string-util.h" |
425 | #include "tmpfile-util.h" | 426 | #include "tmpfile-util.h" |
426 | #include "util.h" | ||
427 | +#include "parse-printf-format.h" | 427 | +#include "parse-printf-format.h" |
428 | 428 | ||
429 | #define SNDBUF_SIZE (8*1024*1024) | 429 | #define SNDBUF_SIZE (8*1024*1024) |
430 | 430 | ||
431 | -- | 431 | -- |
432 | 2.7.4 | 432 | 2.11.0 |
433 | 433 | ||
diff --git a/meta/recipes-core/systemd/systemd/0005-rules-watch-metadata-changes-in-ide-devices.patch b/meta/recipes-core/systemd/systemd/0005-rules-watch-metadata-changes-in-ide-devices.patch index 2123052ff6..5312083fdd 100644 --- a/meta/recipes-core/systemd/systemd/0005-rules-watch-metadata-changes-in-ide-devices.patch +++ b/meta/recipes-core/systemd/systemd/0005-rules-watch-metadata-changes-in-ide-devices.patch | |||
@@ -38,8 +38,8 @@ index a1458e9..3ba4b6b4 100644 | |||
38 | ACTION=="change", SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST=="block", ATTR{block/*/uevent}="change" | 38 | ACTION=="change", SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST=="block", ATTR{block/*/uevent}="change" |
39 | 39 | ||
40 | # watch metadata changes, caused by tools closing the device node which was opened for writing | 40 | # watch metadata changes, caused by tools closing the device node which was opened for writing |
41 | -ACTION!="remove", SUBSYSTEM=="block", KERNEL=="loop*|nvme*|sd*|vd*|xvd*|pmem*|mmcblk*|dasd*", OPTIONS+="watch" | 41 | -ACTION!="remove", SUBSYSTEM=="block", KERNEL=="loop*|nvme*|sd*|vd*|xvd*|pmem*|mmcblk*|dasd*|nbd*", OPTIONS+="watch" |
42 | +ACTION!="remove", SUBSYSTEM=="block", KERNEL=="loop*|nvme*|sd*|vd*|xvd*|pmem*|mmcblk*|dasd*|hd*", OPTIONS+="watch" | 42 | +ACTION!="remove", SUBSYSTEM=="block", KERNEL=="loop*|nvme*|sd*|vd*|xvd*|pmem*|mmcblk*|dasd*|nbd*|hd*", OPTIONS+="watch" |
43 | -- | 43 | -- |
44 | 2.7.4 | 44 | 2.7.4 |
45 | 45 | ||
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 f20897b5f8..a2e25a97df 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 | |||
@@ -9,21 +9,45 @@ Upstream-Status: Inappropriate [musl specific] | |||
9 | 9 | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
12 | [Rebased for v242] | ||
13 | Signed-off-by: Andrej Valek <andrej.valek@siemens.com> | ||
12 | --- | 14 | --- |
13 | meson.build | 1 + | 15 | meson.build | 1 + |
14 | src/basic/missing_stdlib.h | 12 ++++++++++++ | 16 | src/backlight/backlight.c | 1 + |
15 | src/basic/mkdir.c | 1 + | 17 | src/basic/env-util.c | 1 + |
16 | src/basic/parse-util.c | 1 + | 18 | src/basic/missing_stdlib.h | 12 ++++++++++++ |
17 | src/basic/procfs-util.c | 1 + | 19 | src/basic/mkdir.c | 1 + |
18 | src/shared/pager.c | 1 + | 20 | src/basic/parse-util.c | 1 + |
19 | src/shared/uid-range.c | 1 + | 21 | src/basic/proc-cmdline.c | 1 + |
20 | 7 files changed, 18 insertions(+) | 22 | src/basic/procfs-util.c | 1 + |
23 | src/basic/time-util.c | 1 + | ||
24 | src/core/dbus-cgroup.c | 1 + | ||
25 | src/core/dbus-util.c | 1 + | ||
26 | src/core/kmod-setup.c | 1 + | ||
27 | src/core/service.c | 1 + | ||
28 | src/journal/journalctl.c | 1 + | ||
29 | src/libsystemd/sd-bus/bus-message.c | 1 + | ||
30 | src/libsystemd/sd-bus/bus-objects.c | 1 + | ||
31 | src/libsystemd/sd-bus/test-bus-benchmark.c | 1 + | ||
32 | src/locale/keymap-util.c | 1 + | ||
33 | src/nspawn/nspawn-settings.c | 1 + | ||
34 | src/shared/dns-domain.c | 1 + | ||
35 | src/shared/journal-importer.c | 1 + | ||
36 | src/shared/logs-show.c | 1 + | ||
37 | src/shared/pager.c | 1 + | ||
38 | src/shared/path-lookup.c | 1 + | ||
39 | src/shared/uid-range.c | 1 + | ||
40 | src/socket-proxy/socket-proxyd.c | 1 + | ||
41 | src/test/test-hexdecoct.c | 1 + | ||
42 | src/udev/udev-builtin-path_id.c | 1 + | ||
43 | src/udev/udev-rules.c | 1 + | ||
44 | 29 files changed, 40 insertions(+) | ||
21 | 45 | ||
22 | diff --git a/meson.build b/meson.build | 46 | diff --git a/meson.build b/meson.build |
23 | index 44b24ee..70fb218 100644 | 47 | index 79195c9..80d9564 100644 |
24 | --- a/meson.build | 48 | --- a/meson.build |
25 | +++ b/meson.build | 49 | +++ b/meson.build |
26 | @@ -558,6 +558,7 @@ foreach ident : [ | 50 | @@ -572,6 +572,7 @@ foreach ident : [ |
27 | #include <unistd.h>'''], | 51 | #include <unistd.h>'''], |
28 | ['explicit_bzero' , '''#include <string.h>'''], | 52 | ['explicit_bzero' , '''#include <string.h>'''], |
29 | ['reallocarray', '''#include <malloc.h>'''], | 53 | ['reallocarray', '''#include <malloc.h>'''], |
@@ -31,8 +55,32 @@ index 44b24ee..70fb218 100644 | |||
31 | ] | 55 | ] |
32 | 56 | ||
33 | have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE') | 57 | have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE') |
58 | diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c | ||
59 | index dfd6805..c2b2ace 100644 | ||
60 | --- a/src/backlight/backlight.c | ||
61 | +++ b/src/backlight/backlight.c | ||
62 | @@ -17,6 +17,7 @@ | ||
63 | #include "string-util.h" | ||
64 | #include "strv.h" | ||
65 | #include "util.h" | ||
66 | +#include "missing.h" | ||
67 | |||
68 | static int find_pci_or_platform_parent(sd_device *device, sd_device **ret) { | ||
69 | const char *subsystem, *sysname, *value; | ||
70 | diff --git a/src/basic/env-util.c b/src/basic/env-util.c | ||
71 | index fd449dc..e2b0722 100644 | ||
72 | --- a/src/basic/env-util.c | ||
73 | +++ b/src/basic/env-util.c | ||
74 | @@ -16,6 +16,7 @@ | ||
75 | #include "string-util.h" | ||
76 | #include "strv.h" | ||
77 | #include "utf8.h" | ||
78 | +#include "missing.h" | ||
79 | |||
80 | #define VALID_CHARS_ENV_NAME \ | ||
81 | DIGITS LETTERS \ | ||
34 | diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h | 82 | diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h |
35 | index c0ffe86..d50274b 100644 | 83 | index 188a8d4..1e16ec2 100644 |
36 | --- a/src/basic/missing_stdlib.h | 84 | --- a/src/basic/missing_stdlib.h |
37 | +++ b/src/basic/missing_stdlib.h | 85 | +++ b/src/basic/missing_stdlib.h |
38 | @@ -11,3 +11,15 @@ | 86 | @@ -11,3 +11,15 @@ |
@@ -52,10 +100,10 @@ index c0ffe86..d50274b 100644 | |||
52 | + }) | 100 | + }) |
53 | +#endif | 101 | +#endif |
54 | diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c | 102 | diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c |
55 | index 4bb65d5..3038ab9 100644 | 103 | index 6b82eab..51c6b78 100644 |
56 | --- a/src/basic/mkdir.c | 104 | --- a/src/basic/mkdir.c |
57 | +++ b/src/basic/mkdir.c | 105 | +++ b/src/basic/mkdir.c |
58 | @@ -13,6 +13,7 @@ | 106 | @@ -14,6 +14,7 @@ |
59 | #include "stat-util.h" | 107 | #include "stat-util.h" |
60 | #include "stdio-util.h" | 108 | #include "stdio-util.h" |
61 | #include "user-util.h" | 109 | #include "user-util.h" |
@@ -75,6 +123,18 @@ index 87724af..d9c53bc 100644 | |||
75 | 123 | ||
76 | int parse_boolean(const char *v) { | 124 | int parse_boolean(const char *v) { |
77 | if (!v) | 125 | if (!v) |
126 | diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c | ||
127 | index 1670001..b51feaa 100644 | ||
128 | --- a/src/basic/proc-cmdline.c | ||
129 | +++ b/src/basic/proc-cmdline.c | ||
130 | @@ -15,6 +15,7 @@ | ||
131 | #include "string-util.h" | ||
132 | #include "util.h" | ||
133 | #include "virt.h" | ||
134 | +#include "missing.h" | ||
135 | |||
136 | int proc_cmdline(char **ret) { | ||
137 | const char *e; | ||
78 | diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c | 138 | diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c |
79 | index 7aaf95b..42ce53d 100644 | 139 | index 7aaf95b..42ce53d 100644 |
80 | --- a/src/basic/procfs-util.c | 140 | --- a/src/basic/procfs-util.c |
@@ -87,30 +147,258 @@ index 7aaf95b..42ce53d 100644 | |||
87 | 147 | ||
88 | int procfs_tasks_get_limit(uint64_t *ret) { | 148 | int procfs_tasks_get_limit(uint64_t *ret) { |
89 | _cleanup_free_ char *value = NULL; | 149 | _cleanup_free_ char *value = NULL; |
150 | diff --git a/src/basic/time-util.c b/src/basic/time-util.c | ||
151 | index daf952b..374b97f 100644 | ||
152 | --- a/src/basic/time-util.c | ||
153 | +++ b/src/basic/time-util.c | ||
154 | @@ -28,6 +28,7 @@ | ||
155 | #include "string-util.h" | ||
156 | #include "strv.h" | ||
157 | #include "time-util.h" | ||
158 | +#include "missing.h" | ||
159 | |||
160 | static clockid_t map_clock_id(clockid_t c) { | ||
161 | |||
162 | diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c | ||
163 | index 4615aea..bc1364f 100644 | ||
164 | --- a/src/core/dbus-cgroup.c | ||
165 | +++ b/src/core/dbus-cgroup.c | ||
166 | @@ -15,6 +15,7 @@ | ||
167 | #include "fileio.h" | ||
168 | #include "limits-util.h" | ||
169 | #include "path-util.h" | ||
170 | +#include "missing.h" | ||
171 | |||
172 | static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_cgroup_device_policy, cgroup_device_policy, CGroupDevicePolicy); | ||
173 | |||
174 | diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c | ||
175 | index f4fbb72..0a1e3b5 100644 | ||
176 | --- a/src/core/dbus-util.c | ||
177 | +++ b/src/core/dbus-util.c | ||
178 | @@ -7,6 +7,7 @@ | ||
179 | #include "unit-printf.h" | ||
180 | #include "user-util.h" | ||
181 | #include "unit.h" | ||
182 | +#include "missing.h" | ||
183 | |||
184 | int bus_property_get_triggered_unit( | ||
185 | sd_bus *bus, | ||
186 | diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c | ||
187 | index a91cfeb..a459610 100644 | ||
188 | --- a/src/core/kmod-setup.c | ||
189 | +++ b/src/core/kmod-setup.c | ||
190 | @@ -11,6 +11,7 @@ | ||
191 | #include "kmod-setup.h" | ||
192 | #include "macro.h" | ||
193 | #include "string-util.h" | ||
194 | +#include "missing.h" | ||
195 | |||
196 | #if HAVE_KMOD | ||
197 | #include <libkmod.h> | ||
198 | diff --git a/src/core/service.c b/src/core/service.c | ||
199 | index 0289990..0e725b5 100644 | ||
200 | --- a/src/core/service.c | ||
201 | +++ b/src/core/service.c | ||
202 | @@ -42,6 +42,7 @@ | ||
203 | #include "unit.h" | ||
204 | #include "utf8.h" | ||
205 | #include "util.h" | ||
206 | +#include "missing.h" | ||
207 | |||
208 | static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { | ||
209 | [SERVICE_DEAD] = UNIT_INACTIVE, | ||
210 | diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c | ||
211 | index 0048909..0e85eb7 100644 | ||
212 | --- a/src/journal/journalctl.c | ||
213 | +++ b/src/journal/journalctl.c | ||
214 | @@ -67,6 +67,7 @@ | ||
215 | #include "tmpfile-util.h" | ||
216 | #include "unit-name.h" | ||
217 | #include "user-util.h" | ||
218 | +#include "missing.h" | ||
219 | |||
220 | #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) | ||
221 | |||
222 | diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c | ||
223 | index 427d42f..b050568 100644 | ||
224 | --- a/src/libsystemd/sd-bus/bus-message.c | ||
225 | +++ b/src/libsystemd/sd-bus/bus-message.c | ||
226 | @@ -21,6 +21,7 @@ | ||
227 | #include "strv.h" | ||
228 | #include "time-util.h" | ||
229 | #include "utf8.h" | ||
230 | +#include "missing.h" | ||
231 | |||
232 | static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); | ||
233 | |||
234 | diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c | ||
235 | index d9fc256..e9c6932 100644 | ||
236 | --- a/src/libsystemd/sd-bus/bus-objects.c | ||
237 | +++ b/src/libsystemd/sd-bus/bus-objects.c | ||
238 | @@ -13,6 +13,7 @@ | ||
239 | #include "set.h" | ||
240 | #include "string-util.h" | ||
241 | #include "strv.h" | ||
242 | +#include "missing.h" | ||
243 | |||
244 | static int node_vtable_get_userdata( | ||
245 | sd_bus *bus, | ||
246 | diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c | ||
247 | index 8de0a85..4fd0a2e 100644 | ||
248 | --- a/src/libsystemd/sd-bus/test-bus-benchmark.c | ||
249 | +++ b/src/libsystemd/sd-bus/test-bus-benchmark.c | ||
250 | @@ -14,6 +14,7 @@ | ||
251 | #include "missing_resource.h" | ||
252 | #include "time-util.h" | ||
253 | #include "util.h" | ||
254 | +#include "missing.h" | ||
255 | |||
256 | #define MAX_SIZE (2*1024*1024) | ||
257 | |||
258 | diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c | ||
259 | index b8bd181..fe0cae0 100644 | ||
260 | --- a/src/locale/keymap-util.c | ||
261 | +++ b/src/locale/keymap-util.c | ||
262 | @@ -23,6 +23,7 @@ | ||
263 | #include "string-util.h" | ||
264 | #include "strv.h" | ||
265 | #include "tmpfile-util.h" | ||
266 | +#include "missing.h" | ||
267 | |||
268 | static bool startswith_comma(const char *s, const char *prefix) { | ||
269 | s = startswith(s, prefix); | ||
270 | diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c | ||
271 | index 476cb07..91e28de 100644 | ||
272 | --- a/src/nspawn/nspawn-settings.c | ||
273 | +++ b/src/nspawn/nspawn-settings.c | ||
274 | @@ -16,6 +16,7 @@ | ||
275 | #include "strv.h" | ||
276 | #include "user-util.h" | ||
277 | #include "util.h" | ||
278 | +#include "missing.h" | ||
279 | |||
280 | Settings *settings_new(void) { | ||
281 | Settings *s; | ||
282 | diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c | ||
283 | index 4b31cb3..989ebf3 100644 | ||
284 | --- a/src/shared/dns-domain.c | ||
285 | +++ b/src/shared/dns-domain.c | ||
286 | @@ -24,6 +24,7 @@ | ||
287 | #include "string-util.h" | ||
288 | #include "strv.h" | ||
289 | #include "utf8.h" | ||
290 | +#include "missing.h" | ||
291 | |||
292 | int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) { | ||
293 | const char *n; | ||
294 | diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c | ||
295 | index 8638cd3..d03774a 100644 | ||
296 | --- a/src/shared/journal-importer.c | ||
297 | +++ b/src/shared/journal-importer.c | ||
298 | @@ -13,6 +13,7 @@ | ||
299 | #include "parse-util.h" | ||
300 | #include "string-util.h" | ||
301 | #include "unaligned.h" | ||
302 | +#include "missing.h" | ||
303 | |||
304 | enum { | ||
305 | IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */ | ||
306 | diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c | ||
307 | index 5fb736f..19cb165 100644 | ||
308 | --- a/src/shared/logs-show.c | ||
309 | +++ b/src/shared/logs-show.c | ||
310 | @@ -38,6 +38,7 @@ | ||
311 | #include "time-util.h" | ||
312 | #include "utf8.h" | ||
313 | #include "util.h" | ||
314 | +#include "missing.h" | ||
315 | |||
316 | /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */ | ||
317 | #define PRINT_LINE_THRESHOLD 3 | ||
90 | diff --git a/src/shared/pager.c b/src/shared/pager.c | 318 | diff --git a/src/shared/pager.c b/src/shared/pager.c |
91 | index bf2597e..fa9e321 100644 | 319 | index 2abb0f6..a00c95f 100644 |
92 | --- a/src/shared/pager.c | 320 | --- a/src/shared/pager.c |
93 | +++ b/src/shared/pager.c | 321 | +++ b/src/shared/pager.c |
94 | @@ -24,6 +24,7 @@ | 322 | @@ -25,6 +25,7 @@ |
95 | #include "string-util.h" | ||
96 | #include "strv.h" | 323 | #include "strv.h" |
97 | #include "terminal-util.h" | 324 | #include "terminal-util.h" |
325 | #include "util.h" | ||
98 | +#include "missing.h" | 326 | +#include "missing.h" |
99 | 327 | ||
100 | static pid_t pager_pid = 0; | 328 | static pid_t pager_pid = 0; |
101 | 329 | ||
330 | diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c | ||
331 | index 442fde7..0eb1188 100644 | ||
332 | --- a/src/shared/path-lookup.c | ||
333 | +++ b/src/shared/path-lookup.c | ||
334 | @@ -20,6 +20,7 @@ | ||
335 | #include "tmpfile-util.h" | ||
336 | #include "user-util.h" | ||
337 | #include "util.h" | ||
338 | +#include "missing.h" | ||
339 | |||
340 | int xdg_user_runtime_dir(char **ret, const char *suffix) { | ||
341 | const char *e; | ||
102 | diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c | 342 | diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c |
103 | index 5fa7bd2..9c63b9e 100644 | 343 | index 7cb7d8a..8b12b91 100644 |
104 | --- a/src/shared/uid-range.c | 344 | --- a/src/shared/uid-range.c |
105 | +++ b/src/shared/uid-range.c | 345 | +++ b/src/shared/uid-range.c |
106 | @@ -9,6 +9,7 @@ | 346 | @@ -9,6 +9,7 @@ |
347 | #include "sort-util.h" | ||
107 | #include "uid-range.h" | 348 | #include "uid-range.h" |
108 | #include "user-util.h" | 349 | #include "user-util.h" |
109 | #include "util.h" | ||
110 | +#include "missing.h" | 350 | +#include "missing.h" |
111 | 351 | ||
112 | static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) { | 352 | static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) { |
113 | assert(range); | 353 | assert(range); |
354 | diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c | ||
355 | index abbbc9f..6179b58 100644 | ||
356 | --- a/src/socket-proxy/socket-proxyd.c | ||
357 | +++ b/src/socket-proxy/socket-proxyd.c | ||
358 | @@ -28,6 +28,7 @@ | ||
359 | #include "socket-util.h" | ||
360 | #include "string-util.h" | ||
361 | #include "util.h" | ||
362 | +#include "missing.h" | ||
363 | |||
364 | #define BUFFER_SIZE (256 * 1024) | ||
365 | |||
366 | diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c | ||
367 | index 5221742..a05e778 100644 | ||
368 | --- a/src/test/test-hexdecoct.c | ||
369 | +++ b/src/test/test-hexdecoct.c | ||
370 | @@ -6,6 +6,7 @@ | ||
371 | #include "hexdecoct.h" | ||
372 | #include "macro.h" | ||
373 | #include "string-util.h" | ||
374 | +#include "missing.h" | ||
375 | |||
376 | static void test_hexchar(void) { | ||
377 | assert_se(hexchar(0xa) == 'a'); | ||
378 | diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c | ||
379 | index 7ce1c56..cc19b8e 100644 | ||
380 | --- a/src/udev/udev-builtin-path_id.c | ||
381 | +++ b/src/udev/udev-builtin-path_id.c | ||
382 | @@ -23,6 +23,7 @@ | ||
383 | #include "strv.h" | ||
384 | #include "sysexits.h" | ||
385 | #include "udev-builtin.h" | ||
386 | +#include "missing.h" | ||
387 | |||
388 | _printf_(2,3) | ||
389 | static void path_prepend(char **path, const char *fmt, ...) { | ||
390 | diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c | ||
391 | index ee87d7c..9aced10 100644 | ||
392 | --- a/src/udev/udev-rules.c | ||
393 | +++ b/src/udev/udev-rules.c | ||
394 | @@ -40,6 +40,7 @@ | ||
395 | #include "udev.h" | ||
396 | #include "user-util.h" | ||
397 | #include "util.h" | ||
398 | +#include "missing.h" | ||
399 | |||
400 | #define PREALLOC_TOKEN 2048 | ||
401 | #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d") | ||
114 | -- | 402 | -- |
115 | 2.7.4 | 403 | 2.11.0 |
116 | 404 | ||
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 765e4767fd..aa2b4cbcf1 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 | |||
@@ -16,28 +16,29 @@ Upstream-Status: Inappropriate [musl specific] | |||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
17 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 17 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
18 | --- | 18 | --- |
19 | src/basic/glob-util.c | 12 +++++++++++- | 19 | src/basic/glob-util.c | 13 ++++++++++++- |
20 | src/test/test-glob-util.c | 17 +++++++++++++++-- | 20 | src/test/test-glob-util.c | 16 ++++++++++++++++ |
21 | src/tmpfiles/tmpfiles.c | 9 +++++++++ | 21 | src/tmpfiles/tmpfiles.c | 10 ++++++++++ |
22 | 3 files changed, 35 insertions(+), 3 deletions(-) | 22 | 3 files changed, 38 insertions(+), 1 deletion(-) |
23 | 23 | ||
24 | diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c | 24 | diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c |
25 | index 9fac676..962d8b9 100644 | 25 | index 32c53f8..ae358d9 100644 |
26 | --- a/src/basic/glob-util.c | 26 | --- a/src/basic/glob-util.c |
27 | +++ b/src/basic/glob-util.c | 27 | +++ b/src/basic/glob-util.c |
28 | @@ -10,6 +10,11 @@ | 28 | @@ -13,6 +13,12 @@ |
29 | #include "macro.h" | ||
30 | #include "path-util.h" | 29 | #include "path-util.h" |
31 | #include "strv.h" | 30 | #include "strv.h" |
31 | |||
32 | +/* Don't fail if the standard library | 32 | +/* Don't fail if the standard library |
33 | + * doesn't provide brace expansion */ | 33 | + * doesn't provide brace expansion */ |
34 | +#ifndef GLOB_BRACE | 34 | +#ifndef GLOB_BRACE |
35 | +#define GLOB_BRACE 0 | 35 | +#define GLOB_BRACE 0 |
36 | +#endif | 36 | +#endif |
37 | 37 | + | |
38 | static void closedir_wrapper(void* v) { | 38 | static void closedir_wrapper(void* v) { |
39 | (void) closedir(v); | 39 | (void) closedir(v); |
40 | @@ -18,6 +23,7 @@ static void closedir_wrapper(void* v) { | 40 | } |
41 | @@ -20,6 +26,7 @@ static void closedir_wrapper(void* v) { | ||
41 | int safe_glob(const char *path, int flags, glob_t *pglob) { | 42 | int safe_glob(const char *path, int flags, glob_t *pglob) { |
42 | int k; | 43 | int k; |
43 | 44 | ||
@@ -45,7 +46,7 @@ index 9fac676..962d8b9 100644 | |||
45 | /* We want to set GLOB_ALTDIRFUNC ourselves, don't allow it to be set. */ | 46 | /* We want to set GLOB_ALTDIRFUNC ourselves, don't allow it to be set. */ |
46 | assert(!(flags & GLOB_ALTDIRFUNC)); | 47 | assert(!(flags & GLOB_ALTDIRFUNC)); |
47 | 48 | ||
48 | @@ -31,10 +37,14 @@ int safe_glob(const char *path, int flags, glob_t *pglob) { | 49 | @@ -33,10 +40,14 @@ int safe_glob(const char *path, int flags, glob_t *pglob) { |
49 | pglob->gl_lstat = lstat; | 50 | pglob->gl_lstat = lstat; |
50 | if (!pglob->gl_stat) | 51 | if (!pglob->gl_stat) |
51 | pglob->gl_stat = stat; | 52 | pglob->gl_stat = stat; |
@@ -62,26 +63,25 @@ index 9fac676..962d8b9 100644 | |||
62 | return -ENOENT; | 63 | return -ENOENT; |
63 | if (k == GLOB_NOSPACE) | 64 | if (k == GLOB_NOSPACE) |
64 | diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c | 65 | diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c |
65 | index b4f4144..955b3ba 100644 | 66 | index b4f4144..f0d474e 100644 |
66 | --- a/src/test/test-glob-util.c | 67 | --- a/src/test/test-glob-util.c |
67 | +++ b/src/test/test-glob-util.c | 68 | +++ b/src/test/test-glob-util.c |
68 | @@ -12,6 +12,11 @@ | 69 | @@ -13,6 +13,12 @@ |
69 | #include "macro.h" | ||
70 | #include "rm-rf.h" | 70 | #include "rm-rf.h" |
71 | #include "tmpfile-util.h" | 71 | #include "tmpfile-util.h" |
72 | |||
72 | +/* Don't fail if the standard library | 73 | +/* Don't fail if the standard library |
73 | + * doesn't provide brace expansion */ | 74 | + * doesn't provide brace expansion */ |
74 | +#ifndef GLOB_BRACE | 75 | +#ifndef GLOB_BRACE |
75 | +#define GLOB_BRACE 0 | 76 | +#define GLOB_BRACE 0 |
76 | +#endif | 77 | +#endif |
77 | 78 | + | |
78 | static void test_glob_exists(void) { | 79 | static void test_glob_exists(void) { |
79 | char name[] = "/tmp/test-glob_exists.XXXXXX"; | 80 | char name[] = "/tmp/test-glob_exists.XXXXXX"; |
80 | @@ -38,25 +43,33 @@ static void closedir_wrapper(void* v) { | 81 | int fd = -1; |
81 | static void test_glob_no_dot(void) { | 82 | @@ -40,11 +46,13 @@ static void test_glob_no_dot(void) { |
82 | char template[] = "/tmp/test-glob-util.XXXXXXX"; | ||
83 | const char *fn; | 83 | const char *fn; |
84 | - | 84 | |
85 | _cleanup_globfree_ glob_t g = { | 85 | _cleanup_globfree_ glob_t g = { |
86 | +#ifdef GLOB_ALTDIRFUNC | 86 | +#ifdef GLOB_ALTDIRFUNC |
87 | .gl_closedir = closedir_wrapper, | 87 | .gl_closedir = closedir_wrapper, |
@@ -91,9 +91,9 @@ index b4f4144..955b3ba 100644 | |||
91 | .gl_stat = stat, | 91 | .gl_stat = stat, |
92 | +#endif | 92 | +#endif |
93 | }; | 93 | }; |
94 | - | ||
95 | int r; | ||
96 | 94 | ||
95 | int r; | ||
96 | @@ -52,11 +60,19 @@ static void test_glob_no_dot(void) { | ||
97 | assert_se(mkdtemp(template)); | 97 | assert_se(mkdtemp(template)); |
98 | 98 | ||
99 | fn = strjoina(template, "/*"); | 99 | fn = strjoina(template, "/*"); |
@@ -114,22 +114,23 @@ index b4f4144..955b3ba 100644 | |||
114 | 114 | ||
115 | (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL); | 115 | (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL); |
116 | diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c | 116 | diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c |
117 | index b66765b..11dbbf4 100644 | 117 | index d9d1cc1..477d1e3 100644 |
118 | --- a/src/tmpfiles/tmpfiles.c | 118 | --- a/src/tmpfiles/tmpfiles.c |
119 | +++ b/src/tmpfiles/tmpfiles.c | 119 | +++ b/src/tmpfiles/tmpfiles.c |
120 | @@ -60,6 +60,11 @@ | 120 | @@ -63,6 +63,12 @@ |
121 | #include "umask-util.h" | 121 | #include "umask-util.h" |
122 | #include "user-util.h" | 122 | #include "user-util.h" |
123 | #include "util.h" | 123 | |
124 | +/* Don't fail if the standard library | 124 | +/* Don't fail if the standard library |
125 | + * doesn't provide brace expansion */ | 125 | + * doesn't provide brace expansion */ |
126 | +#ifndef GLOB_BRACE | 126 | +#ifndef GLOB_BRACE |
127 | +#define GLOB_BRACE 0 | 127 | +#define GLOB_BRACE 0 |
128 | +#endif | 128 | +#endif |
129 | 129 | + | |
130 | /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates | 130 | /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates |
131 | * them in the file system. This is intended to be used to create | 131 | * them in the file system. This is intended to be used to create |
132 | @@ -1853,7 +1858,9 @@ finish: | 132 | * properly owned directories beneath /tmp, /var/tmp, /run, which are |
133 | @@ -1839,7 +1845,9 @@ finish: | ||
133 | 134 | ||
134 | static int glob_item(Item *i, action_t action) { | 135 | static int glob_item(Item *i, action_t action) { |
135 | _cleanup_globfree_ glob_t g = { | 136 | _cleanup_globfree_ glob_t g = { |
@@ -139,7 +140,7 @@ index b66765b..11dbbf4 100644 | |||
139 | }; | 140 | }; |
140 | int r = 0, k; | 141 | int r = 0, k; |
141 | char **fn; | 142 | char **fn; |
142 | @@ -1873,7 +1880,9 @@ static int glob_item(Item *i, action_t action) { | 143 | @@ -1859,7 +1867,9 @@ static int glob_item(Item *i, action_t action) { |
143 | 144 | ||
144 | static int glob_item_recursively(Item *i, fdaction_t action) { | 145 | static int glob_item_recursively(Item *i, fdaction_t action) { |
145 | _cleanup_globfree_ glob_t g = { | 146 | _cleanup_globfree_ glob_t g = { |
@@ -150,5 +151,5 @@ index b66765b..11dbbf4 100644 | |||
150 | int r = 0, k; | 151 | int r = 0, k; |
151 | char **fn; | 152 | char **fn; |
152 | -- | 153 | -- |
153 | 2.7.4 | 154 | 2.11.0 |
154 | 155 | ||
diff --git a/meta/recipes-core/systemd/systemd/0009-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch b/meta/recipes-core/systemd/systemd/0009-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch index 57cb5f3734..1dedbd3b9b 100644 --- a/meta/recipes-core/systemd/systemd/0009-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch +++ b/meta/recipes-core/systemd/systemd/0009-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch | |||
@@ -13,12 +13,12 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
13 | 1 file changed, 10 insertions(+) | 13 | 1 file changed, 10 insertions(+) |
14 | 14 | ||
15 | diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c | 15 | diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c |
16 | index 91bf801..c445fea 100644 | 16 | index 904bafb..a7a009d 100644 |
17 | --- a/src/basic/socket-util.c | 17 | --- a/src/basic/socket-util.c |
18 | +++ b/src/basic/socket-util.c | 18 | +++ b/src/basic/socket-util.c |
19 | @@ -33,6 +33,16 @@ | 19 | @@ -34,6 +34,16 @@ |
20 | #include "user-util.h" | ||
20 | #include "utf8.h" | 21 | #include "utf8.h" |
21 | #include "util.h" | ||
22 | 22 | ||
23 | +/* Don't fail if the standard library | 23 | +/* Don't fail if the standard library |
24 | + * doesn't support IDN */ | 24 | + * doesn't support IDN */ |
@@ -34,5 +34,5 @@ index 91bf801..c445fea 100644 | |||
34 | # define IDN_FLAGS NI_IDN | 34 | # define IDN_FLAGS NI_IDN |
35 | #else | 35 | #else |
36 | -- | 36 | -- |
37 | 2.7.4 | 37 | 2.11.0 |
38 | 38 | ||
diff --git a/meta/recipes-core/systemd/systemd/0013-test-hexdecoct.c-Include-missing.h-for-strndupa.patch b/meta/recipes-core/systemd/systemd/0013-test-hexdecoct.c-Include-missing.h-for-strndupa.patch deleted file mode 100644 index 874c17c420..0000000000 --- a/meta/recipes-core/systemd/systemd/0013-test-hexdecoct.c-Include-missing.h-for-strndupa.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From e5a48f84db58ffb9128383eaefc123b5829523e5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 23 Oct 2017 12:33:22 -0700 | ||
4 | Subject: [PATCH 13/24] test-hexdecoct.c: Include missing.h for strndupa | ||
5 | |||
6 | Upstream-Status: Inappropriate [musl specific] | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
10 | --- | ||
11 | src/test/test-hexdecoct.c | 1 + | ||
12 | 1 file changed, 1 insertion(+) | ||
13 | |||
14 | diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c | ||
15 | index 5221742..a05e778 100644 | ||
16 | --- a/src/test/test-hexdecoct.c | ||
17 | +++ b/src/test/test-hexdecoct.c | ||
18 | @@ -6,6 +6,7 @@ | ||
19 | #include "hexdecoct.h" | ||
20 | #include "macro.h" | ||
21 | #include "string-util.h" | ||
22 | +#include "missing.h" | ||
23 | |||
24 | static void test_hexchar(void) { | ||
25 | assert_se(hexchar(0xa) == 'a'); | ||
26 | -- | ||
27 | 2.7.4 | ||
28 | |||
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/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch index 05e6ded71d..b54635e8a9 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/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch | |||
@@ -22,10 +22,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
22 | 1 file changed, 1 insertion(+), 1 deletion(-) | 22 | 1 file changed, 1 insertion(+), 1 deletion(-) |
23 | 23 | ||
24 | diff --git a/src/basic/process-util.c b/src/basic/process-util.c | 24 | diff --git a/src/basic/process-util.c b/src/basic/process-util.c |
25 | index aec2daf..7b4aabf 100644 | 25 | index f773eea..79af915 100644 |
26 | --- a/src/basic/process-util.c | 26 | --- a/src/basic/process-util.c |
27 | +++ b/src/basic/process-util.c | 27 | +++ b/src/basic/process-util.c |
28 | @@ -1538,7 +1538,7 @@ int set_oom_score_adjust(int value) { | 28 | @@ -1546,7 +1546,7 @@ int set_oom_score_adjust(int value) { |
29 | sprintf(t, "%i", value); | 29 | sprintf(t, "%i", value); |
30 | 30 | ||
31 | return write_string_file("/proc/self/oom_score_adj", t, | 31 | return write_string_file("/proc/self/oom_score_adj", t, |
@@ -33,7 +33,8 @@ index aec2daf..7b4aabf 100644 | |||
33 | + WRITE_STRING_FILE_VERIFY_ON_FAILURE); | 33 | + WRITE_STRING_FILE_VERIFY_ON_FAILURE); |
34 | } | 34 | } |
35 | 35 | ||
36 | static const char *const ioprio_class_table[] = { | 36 | int cpus_in_affinity_mask(void) { |
37 | -- | 37 | -- |
38 | 2.7.4 | 38 | 2.11.0 |
39 | |||
39 | 40 | ||
diff --git a/meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch b/meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch index a8c53c9314..cdddf83890 100644 --- a/meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch +++ b/meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch | |||
@@ -11,8 +11,7 @@ Upstream-Status: Inappropriate [musl specific] | |||
11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
12 | --- | 12 | --- |
13 | src/basic/missing_prctl.h | 2 ++ | 13 | src/basic/missing_prctl.h | 2 ++ |
14 | src/basic/util.h | 3 ++- | 14 | 1 file changed, 2 insertions(+) |
15 | 2 files changed, 4 insertions(+), 1 deletion(-) | ||
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 f80cd17..47e4893 100644 | 17 | index f80cd17..47e4893 100644 |
@@ -28,20 +27,6 @@ index f80cd17..47e4893 100644 | |||
28 | 27 | ||
29 | /* 58319057b7847667f0c9585b9de0e8932b0fdb08 (4.3) */ | 28 | /* 58319057b7847667f0c9585b9de0e8932b0fdb08 (4.3) */ |
30 | #ifndef PR_CAP_AMBIENT | 29 | #ifndef PR_CAP_AMBIENT |
31 | diff --git a/src/basic/util.h b/src/basic/util.h | ||
32 | index 2c5dc32..f721184 100644 | ||
33 | --- a/src/basic/util.h | ||
34 | +++ b/src/basic/util.h | ||
35 | @@ -26,7 +26,8 @@ | ||
36 | #include "format-util.h" | ||
37 | #include "macro.h" | ||
38 | #include "time-util.h" | ||
39 | -#include "missing.h" | ||
40 | +#include "missing_stdlib.h" | ||
41 | +#include "missing_type.h" | ||
42 | |||
43 | size_t page_size(void) _pure_; | ||
44 | #define PAGE_ALIGN(l) ALIGN_TO((l), page_size()) | ||
45 | -- | 30 | -- |
46 | 2.7.4 | 31 | 2.11.0 |
47 | 32 | ||
diff --git a/meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch b/meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch index c2ae2bbb7b..0e5629d37b 100644 --- a/meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch +++ b/meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch | |||
@@ -14,11 +14,11 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
14 | 1 file changed, 4 insertions(+) | 14 | 1 file changed, 4 insertions(+) |
15 | 15 | ||
16 | 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 |
17 | index fdf1b4f..fa541f8 100644 | 17 | index 9b8a2a9..efc746c 100644 |
18 | --- a/src/test/test-json.c | 18 | --- a/src/test/test-json.c |
19 | +++ b/src/test/test-json.c | 19 | +++ b/src/test/test-json.c |
20 | @@ -10,6 +10,10 @@ | 20 | @@ -11,6 +11,10 @@ |
21 | #include "strv.h" | 21 | #include "tests.h" |
22 | #include "util.h" | 22 | #include "util.h" |
23 | 23 | ||
24 | +#ifndef M_PIl | 24 | +#ifndef M_PIl |
@@ -29,5 +29,5 @@ index fdf1b4f..fa541f8 100644 | |||
29 | unsigned line = 0, column = 0; | 29 | unsigned line = 0, column = 0; |
30 | void *state = NULL; | 30 | void *state = NULL; |
31 | -- | 31 | -- |
32 | 2.7.4 | 32 | 2.11.0 |
33 | 33 | ||
diff --git a/meta/recipes-core/systemd/systemd/0025-fs-utilh-add-missing-sys-stat-include.patch b/meta/recipes-core/systemd/systemd/0025-fs-utilh-add-missing-sys-stat-include.patch new file mode 100644 index 0000000000..1c6a6f50de --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0025-fs-utilh-add-missing-sys-stat-include.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From 2560a6b7b9adc5bd5dec0f87c2e3025ced8a2af2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andrej Valek <andrej.valek@siemens.com> | ||
3 | Date: Thu, 18 Apr 2019 10:47:11 +0200 | ||
4 | Subject: [PATCH] fs-utilh: add missing sys/stat include | ||
5 | |||
6 | fix error: | ||
7 | | error: passing argument 5 of 'chase_symlinks_and_stat' from incompatible pointer type [-Werror=incompatible-pointer-types] | ||
8 | |||
9 | Signed-off-by: Andrej Valek <andrej.valek@siemens.com> | ||
10 | --- | ||
11 | src/basic/fs-util.h | 1 + | ||
12 | 1 file changed, 1 insertion(+) | ||
13 | |||
14 | diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h | ||
15 | index b965120..e2fdfff 100644 | ||
16 | --- a/src/basic/fs-util.h | ||
17 | +++ b/src/basic/fs-util.h | ||
18 | @@ -8,6 +8,7 @@ | ||
19 | #include <stdint.h> | ||
20 | #include <sys/inotify.h> | ||
21 | #include <sys/types.h> | ||
22 | +#include <sys/stat.h> | ||
23 | #include <unistd.h> | ||
24 | |||
25 | #include "errno-util.h" | ||
26 | -- | ||
27 | 2.11.0 | ||
28 | |||
diff --git a/meta/recipes-core/systemd/systemd_241.bb b/meta/recipes-core/systemd/systemd_242.bb index a6deaf96c2..a559fa0d75 100644 --- a/meta/recipes-core/systemd/systemd_241.bb +++ b/meta/recipes-core/systemd/systemd_242.bb | |||
@@ -22,8 +22,6 @@ SRC_URI += "file://touchscreen.rules \ | |||
22 | file://0003-implment-systemd-sysv-install-for-OE.patch \ | 22 | file://0003-implment-systemd-sysv-install-for-OE.patch \ |
23 | file://0004-rules-whitelist-hd-devices.patch \ | 23 | file://0004-rules-whitelist-hd-devices.patch \ |
24 | file://0005-rules-watch-metadata-changes-in-ide-devices.patch \ | 24 | file://0005-rules-watch-metadata-changes-in-ide-devices.patch \ |
25 | file://0001-meson-declare-version.h-as-dep-for-various-targets-t.patch \ | ||
26 | file://0001-meson-declare-version.h-as-dependency-for-systemd.patch \ | ||
27 | " | 25 | " |
28 | 26 | ||
29 | # patches needed by musl | 27 | # patches needed by musl |
@@ -40,7 +38,6 @@ SRC_URI_MUSL = "file://0001-Use-getenv-when-secure-versions-are-not-available.pa | |||
40 | file://0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch \ | 38 | file://0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch \ |
41 | file://0011-Use-uintmax_t-for-handling-rlim_t.patch \ | 39 | file://0011-Use-uintmax_t-for-handling-rlim_t.patch \ |
42 | file://0012-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch \ | 40 | file://0012-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch \ |
43 | file://0013-test-hexdecoct.c-Include-missing.h-for-strndupa.patch \ | ||
44 | file://0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch \ | 41 | file://0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch \ |
45 | file://0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch \ | 42 | file://0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch \ |
46 | file://0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch \ | 43 | file://0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch \ |
@@ -52,6 +49,7 @@ SRC_URI_MUSL = "file://0001-Use-getenv-when-secure-versions-are-not-available.pa | |||
52 | file://0022-include-sys-wait.h-to-avoid-compile-failure.patch \ | 49 | file://0022-include-sys-wait.h-to-avoid-compile-failure.patch \ |
53 | file://0023-socket-util.h-include-string.h.patch \ | 50 | file://0023-socket-util.h-include-string.h.patch \ |
54 | file://0024-test-json.c-define-M_PIl.patch \ | 51 | file://0024-test-json.c-define-M_PIl.patch \ |
52 | file://0025-fs-utilh-add-missing-sys-stat-include.patch \ | ||
55 | file://0001-do-not-disable-buffer-in-writing-files.patch \ | 53 | file://0001-do-not-disable-buffer-in-writing-files.patch \ |
56 | " | 54 | " |
57 | 55 | ||