diff options
16 files changed, 317 insertions, 125 deletions
diff --git a/meta/recipes-core/systemd/systemd-boot_244.3.bb b/meta/recipes-core/systemd/systemd-boot_245.5.bb index f92c639810..f92c639810 100644 --- a/meta/recipes-core/systemd/systemd-boot_244.3.bb +++ b/meta/recipes-core/systemd/systemd-boot_245.5.bb | |||
diff --git a/meta/recipes-core/systemd/systemd-conf_244.3.bb b/meta/recipes-core/systemd/systemd-conf_245.5.bb index d9ec023bfd..d9ec023bfd 100644 --- a/meta/recipes-core/systemd/systemd-conf_244.3.bb +++ b/meta/recipes-core/systemd/systemd-conf_245.5.bb | |||
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index e73b397b5d..0f82580361 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 = "b7ed902b2394f94e7f1fbe6c3194b5cd9a9429e6" | 17 | SRCREV = "9a506b7e9291d997a920af9ac299e7b834368119" |
18 | SRCBRANCH = "v244-stable" | 18 | SRCBRANCH = "v245-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-Handle-missing-gshadow.patch b/meta/recipes-core/systemd/systemd/0001-Handle-missing-gshadow.patch new file mode 100644 index 0000000000..26a597d45b --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-Handle-missing-gshadow.patch | |||
@@ -0,0 +1,171 @@ | |||
1 | From ef9580ea1e2f1e57af3c7dcb0ec392ba8dbb5c8d Mon Sep 17 00:00:00 2001 | ||
2 | From: Alex Kiernan <alex.kiernan@gmail.com> | ||
3 | Date: Tue, 10 Mar 2020 11:05:20 +0000 | ||
4 | Subject: [PATCH] Handle missing gshadow | ||
5 | |||
6 | gshadow usage is now present in the userdb code. Mask all uses of it to | ||
7 | allow compilation on musl | ||
8 | |||
9 | Upstream-Status: Inappropriate [musl specific] | ||
10 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | ||
11 | --- | ||
12 | src/shared/group-record-nss.c | 20 ++++++++++++++++++++ | ||
13 | src/shared/group-record-nss.h | 4 ++++ | ||
14 | src/shared/userdb.c | 6 ++++++ | ||
15 | 3 files changed, 30 insertions(+) | ||
16 | |||
17 | diff --git a/src/shared/group-record-nss.c b/src/shared/group-record-nss.c | ||
18 | index 77924f1c4067..c64490253ff3 100644 | ||
19 | --- a/src/shared/group-record-nss.c | ||
20 | +++ b/src/shared/group-record-nss.c | ||
21 | @@ -19,8 +19,10 @@ int nss_group_to_group_record( | ||
22 | if (isempty(grp->gr_name)) | ||
23 | return -EINVAL; | ||
24 | |||
25 | +#if ENABLE_GSHADOW | ||
26 | if (sgrp && !streq_ptr(sgrp->sg_namp, grp->gr_name)) | ||
27 | return -EINVAL; | ||
28 | +#endif | ||
29 | |||
30 | g = group_record_new(); | ||
31 | if (!g) | ||
32 | @@ -36,6 +38,7 @@ int nss_group_to_group_record( | ||
33 | |||
34 | g->gid = grp->gr_gid; | ||
35 | |||
36 | +#if ENABLE_GSHADOW | ||
37 | if (sgrp) { | ||
38 | if (hashed_password_valid(sgrp->sg_passwd)) { | ||
39 | g->hashed_password = strv_new(sgrp->sg_passwd); | ||
40 | @@ -51,6 +54,7 @@ int nss_group_to_group_record( | ||
41 | if (!g->administrators) | ||
42 | return -ENOMEM; | ||
43 | } | ||
44 | +#endif | ||
45 | |||
46 | r = json_build(&g->json, JSON_BUILD_OBJECT( | ||
47 | JSON_BUILD_PAIR("groupName", JSON_BUILD_STRING(g->group_name)), | ||
48 | @@ -76,6 +80,7 @@ int nss_sgrp_for_group(const struct group *grp, struct sgrp *ret_sgrp, char **re | ||
49 | assert(ret_sgrp); | ||
50 | assert(ret_buffer); | ||
51 | |||
52 | +#if ENABLE_GSHADOW | ||
53 | for (;;) { | ||
54 | _cleanup_free_ char *buf = NULL; | ||
55 | struct sgrp sgrp, *result; | ||
56 | @@ -104,6 +109,9 @@ int nss_sgrp_for_group(const struct group *grp, struct sgrp *ret_sgrp, char **re | ||
57 | buflen *= 2; | ||
58 | buf = mfree(buf); | ||
59 | } | ||
60 | +#else | ||
61 | + return -ESRCH; | ||
62 | +#endif | ||
63 | } | ||
64 | |||
65 | int nss_group_record_by_name(const char *name, GroupRecord **ret) { | ||
66 | @@ -111,7 +119,9 @@ int nss_group_record_by_name(const char *name, GroupRecord **ret) { | ||
67 | struct group grp, *result; | ||
68 | bool incomplete = false; | ||
69 | size_t buflen = 4096; | ||
70 | +#if ENABLE_GSHADOW | ||
71 | struct sgrp sgrp; | ||
72 | +#endif | ||
73 | int r; | ||
74 | |||
75 | assert(name); | ||
76 | @@ -141,6 +151,7 @@ int nss_group_record_by_name(const char *name, GroupRecord **ret) { | ||
77 | buf = mfree(buf); | ||
78 | } | ||
79 | |||
80 | +#if ENABLE_GSHADOW | ||
81 | r = nss_sgrp_for_group(result, &sgrp, &sbuf); | ||
82 | if (r < 0) { | ||
83 | log_debug_errno(r, "Failed to do shadow lookup for group %s, ignoring: %m", result->gr_name); | ||
84 | @@ -148,6 +159,9 @@ int nss_group_record_by_name(const char *name, GroupRecord **ret) { | ||
85 | } | ||
86 | |||
87 | r = nss_group_to_group_record(result, r >= 0 ? &sgrp : NULL, ret); | ||
88 | +#else | ||
89 | + r = nss_group_to_group_record(result, NULL, ret); | ||
90 | +#endif | ||
91 | if (r < 0) | ||
92 | return r; | ||
93 | |||
94 | @@ -160,7 +174,9 @@ int nss_group_record_by_gid(gid_t gid, GroupRecord **ret) { | ||
95 | struct group grp, *result; | ||
96 | bool incomplete = false; | ||
97 | size_t buflen = 4096; | ||
98 | +#if ENABLE_GSHADOW | ||
99 | struct sgrp sgrp; | ||
100 | +#endif | ||
101 | int r; | ||
102 | |||
103 | assert(ret); | ||
104 | @@ -188,6 +204,7 @@ int nss_group_record_by_gid(gid_t gid, GroupRecord **ret) { | ||
105 | buf = mfree(buf); | ||
106 | } | ||
107 | |||
108 | +#if ENABLE_GSHADOW | ||
109 | r = nss_sgrp_for_group(result, &sgrp, &sbuf); | ||
110 | if (r < 0) { | ||
111 | log_debug_errno(r, "Failed to do shadow lookup for group %s, ignoring: %m", result->gr_name); | ||
112 | @@ -195,6 +212,9 @@ int nss_group_record_by_gid(gid_t gid, GroupRecord **ret) { | ||
113 | } | ||
114 | |||
115 | r = nss_group_to_group_record(result, r >= 0 ? &sgrp : NULL, ret); | ||
116 | +#else | ||
117 | + r = nss_group_to_group_record(result, NULL, ret); | ||
118 | +#endif | ||
119 | if (r < 0) | ||
120 | return r; | ||
121 | |||
122 | diff --git a/src/shared/group-record-nss.h b/src/shared/group-record-nss.h | ||
123 | index 38b2995178ff..d7d95c44cf11 100644 | ||
124 | --- a/src/shared/group-record-nss.h | ||
125 | +++ b/src/shared/group-record-nss.h | ||
126 | @@ -2,7 +2,11 @@ | ||
127 | #pragma once | ||
128 | |||
129 | #include <grp.h> | ||
130 | +#if ENABLE_GSHADOW | ||
131 | #include <gshadow.h> | ||
132 | +#else | ||
133 | +struct sgrp; | ||
134 | +#endif | ||
135 | |||
136 | #include "group-record.h" | ||
137 | |||
138 | diff --git a/src/shared/userdb.c b/src/shared/userdb.c | ||
139 | index 92f8796768d7..5d912862f85c 100644 | ||
140 | --- a/src/shared/userdb.c | ||
141 | +++ b/src/shared/userdb.c | ||
142 | @@ -924,13 +924,16 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) { | ||
143 | if (gr) { | ||
144 | _cleanup_free_ char *buffer = NULL; | ||
145 | bool incomplete = false; | ||
146 | +#if ENABLE_GSHADOW | ||
147 | struct sgrp sgrp; | ||
148 | +#endif | ||
149 | |||
150 | if (streq_ptr(gr->gr_name, "root")) | ||
151 | iterator->synthesize_root = false; | ||
152 | if (gr->gr_gid == GID_NOBODY) | ||
153 | iterator->synthesize_nobody = false; | ||
154 | |||
155 | +#if ENABLE_GSHADOW | ||
156 | r = nss_sgrp_for_group(gr, &sgrp, &buffer); | ||
157 | if (r < 0) { | ||
158 | log_debug_errno(r, "Failed to acquire shadow entry for group %s, ignoring: %m", gr->gr_name); | ||
159 | @@ -938,6 +941,9 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) { | ||
160 | } | ||
161 | |||
162 | r = nss_group_to_group_record(gr, r >= 0 ? &sgrp : NULL, ret); | ||
163 | +#else | ||
164 | + r = nss_group_to_group_record(gr, NULL, ret); | ||
165 | +#endif | ||
166 | if (r < 0) | ||
167 | return r; | ||
168 | |||
169 | -- | ||
170 | 2.17.1 | ||
171 | |||
diff --git a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch index 6eaaec71c5..d098084b2e 100644 --- a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch +++ b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c73a87871df31b4f8d96c9d443759c6f702935f6 Mon Sep 17 00:00:00 2001 | 1 | From e9c993816077c1ae67d25d464f2ece2a090f30b8 Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Thu, 21 Feb 2019 16:23:24 +0800 | 3 | Date: Thu, 21 Feb 2019 16:23:24 +0800 |
4 | Subject: [PATCH] binfmt: Don't install dependency links at install time for | 4 | Subject: [PATCH] binfmt: Don't install dependency links at install time for |
@@ -26,10 +26,10 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
26 | 3 files changed, 9 insertions(+), 4 deletions(-) | 26 | 3 files changed, 9 insertions(+), 4 deletions(-) |
27 | 27 | ||
28 | diff --git a/units/meson.build b/units/meson.build | 28 | diff --git a/units/meson.build b/units/meson.build |
29 | index 6a3a0d0dea22..bbb1b78618c3 100644 | 29 | index ea91f0cc9ea7..25186f88dfeb 100644 |
30 | --- a/units/meson.build | 30 | --- a/units/meson.build |
31 | +++ b/units/meson.build | 31 | +++ b/units/meson.build |
32 | @@ -46,8 +46,7 @@ units = [ | 32 | @@ -52,8 +52,7 @@ units = [ |
33 | ['poweroff.target', '', | 33 | ['poweroff.target', '', |
34 | 'runlevel0.target'], | 34 | 'runlevel0.target'], |
35 | ['printer.target', ''], | 35 | ['printer.target', ''], |
@@ -39,16 +39,16 @@ index 6a3a0d0dea22..bbb1b78618c3 100644 | |||
39 | ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'], | 39 | ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'], |
40 | ['reboot.target', '', | 40 | ['reboot.target', '', |
41 | 'runlevel6.target ctrl-alt-del.target'], | 41 | 'runlevel6.target ctrl-alt-del.target'], |
42 | @@ -130,8 +129,7 @@ in_units = [ | 42 | @@ -161,8 +160,7 @@ in_units = [ |
43 | ['systemd-ask-password-console.service', ''], | 43 | ['rc-local.service', 'HAVE_SYSV_COMPAT'], |
44 | ['systemd-ask-password-wall.service', ''], | 44 | ['rescue.service', ''], |
45 | ['systemd-backlight@.service', 'ENABLE_BACKLIGHT'], | 45 | ['systemd-backlight@.service', 'ENABLE_BACKLIGHT'], |
46 | - ['systemd-binfmt.service', 'ENABLE_BINFMT', | 46 | - ['systemd-binfmt.service', 'ENABLE_BINFMT', |
47 | - 'sysinit.target.wants/'], | 47 | - 'sysinit.target.wants/'], |
48 | + ['systemd-binfmt.service', 'ENABLE_BINFMT'], | 48 | + ['systemd-binfmt.service', 'ENABLE_BINFMT'], |
49 | ['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'], | 49 | ['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'], |
50 | ['systemd-boot-check-no-failures.service', ''], | 50 | ['systemd-boot-check-no-failures.service', ''], |
51 | ['systemd-boot-system-token.service', 'ENABLE_EFI', | 51 | ['systemd-coredump@.service', 'ENABLE_COREDUMP'], |
52 | diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount | 52 | diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount |
53 | index 30a6bc991844..4231f3b70fe9 100644 | 53 | index 30a6bc991844..4231f3b70fe9 100644 |
54 | --- a/units/proc-sys-fs-binfmt_misc.automount | 54 | --- a/units/proc-sys-fs-binfmt_misc.automount |
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 f1c7181ef9..4eeec7b7da 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From f4a0caaea346b70cf5064f9159a53a1b8020071e Mon Sep 17 00:00:00 2001 | 1 | From f92fd7e77ed5aab2dda01a20e6891c37f09415d3 Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Fri, 1 Mar 2019 15:22:15 +0800 | 3 | Date: Fri, 1 Mar 2019 15:22:15 +0800 |
4 | Subject: [PATCH] do not disable buffer in writing files | 4 | Subject: [PATCH] do not disable buffer in writing files |
@@ -167,10 +167,10 @@ index 7ff844c78c3a..5c5721d7c2f7 100644 | |||
167 | STRV_FOREACH(f, files) { | 167 | STRV_FOREACH(f, files) { |
168 | k = apply_file(*f, true); | 168 | k = apply_file(*f, true); |
169 | diff --git a/src/core/main.c b/src/core/main.c | 169 | diff --git a/src/core/main.c b/src/core/main.c |
170 | index c24b696b1663..195be7d2df0d 100644 | 170 | index 3c6b66e89c8e..c39ebe56a5b3 100644 |
171 | --- a/src/core/main.c | 171 | --- a/src/core/main.c |
172 | +++ b/src/core/main.c | 172 | +++ b/src/core/main.c |
173 | @@ -1303,7 +1303,7 @@ static int bump_unix_max_dgram_qlen(void) { | 173 | @@ -1312,7 +1312,7 @@ static int bump_unix_max_dgram_qlen(void) { |
174 | if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN) | 174 | if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN) |
175 | return 0; | 175 | return 0; |
176 | 176 | ||
@@ -179,7 +179,7 @@ index c24b696b1663..195be7d2df0d 100644 | |||
179 | if (r < 0) | 179 | if (r < 0) |
180 | return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r, | 180 | return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r, |
181 | "Failed to bump AF_UNIX datagram queue length, ignoring: %m"); | 181 | "Failed to bump AF_UNIX datagram queue length, ignoring: %m"); |
182 | @@ -1527,7 +1527,7 @@ static void initialize_core_pattern(bool skip_setup) { | 182 | @@ -1536,7 +1536,7 @@ static void initialize_core_pattern(bool skip_setup) { |
183 | if (getpid_cached() != 1) | 183 | if (getpid_cached() != 1) |
184 | return; | 184 | return; |
185 | 185 | ||
@@ -228,7 +228,7 @@ index 17e7cd1a009b..87a766771663 100644 | |||
228 | log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor); | 228 | log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor); |
229 | return EXIT_FAILURE; | 229 | return EXIT_FAILURE; |
230 | diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c | 230 | diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c |
231 | index f35612fe12bc..20351bf7fa70 100644 | 231 | index 1f2451f8e1b4..3f676ec2841a 100644 |
232 | --- a/src/libsystemd/sd-device/sd-device.c | 232 | --- a/src/libsystemd/sd-device/sd-device.c |
233 | +++ b/src/libsystemd/sd-device/sd-device.c | 233 | +++ b/src/libsystemd/sd-device/sd-device.c |
234 | @@ -1849,7 +1849,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, | 234 | @@ -1849,7 +1849,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, |
@@ -241,10 +241,10 @@ index f35612fe12bc..20351bf7fa70 100644 | |||
241 | if (r == -ELOOP) | 241 | if (r == -ELOOP) |
242 | return -EINVAL; | 242 | return -EINVAL; |
243 | diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c | 243 | diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c |
244 | index 69b59948786f..b4973c596d48 100644 | 244 | index 52a7ea3c77e9..9703de0dabee 100644 |
245 | --- a/src/login/logind-dbus.c | 245 | --- a/src/login/logind-dbus.c |
246 | +++ b/src/login/logind-dbus.c | 246 | +++ b/src/login/logind-dbus.c |
247 | @@ -1322,7 +1322,7 @@ static int trigger_device(Manager *m, sd_device *d) { | 247 | @@ -1339,7 +1339,7 @@ static int trigger_device(Manager *m, sd_device *d) { |
248 | if (!t) | 248 | if (!t) |
249 | return -ENOMEM; | 249 | return -ENOMEM; |
250 | 250 | ||
@@ -267,10 +267,10 @@ index f5048d9473cb..b6383ab5c97e 100644 | |||
267 | log_error_errno(r, "Failed to move process: %m"); | 267 | log_error_errno(r, "Failed to move process: %m"); |
268 | goto finish; | 268 | goto finish; |
269 | diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c | 269 | diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c |
270 | index 873a76596f0b..4e496548bb94 100644 | 270 | index 734dee1130e0..71add9a055d2 100644 |
271 | --- a/src/nspawn/nspawn.c | 271 | --- a/src/nspawn/nspawn.c |
272 | +++ b/src/nspawn/nspawn.c | 272 | +++ b/src/nspawn/nspawn.c |
273 | @@ -2425,7 +2425,7 @@ static int reset_audit_loginuid(void) { | 273 | @@ -2440,7 +2440,7 @@ static int reset_audit_loginuid(void) { |
274 | if (streq(p, "4294967295")) | 274 | if (streq(p, "4294967295")) |
275 | return 0; | 275 | return 0; |
276 | 276 | ||
@@ -279,7 +279,7 @@ index 873a76596f0b..4e496548bb94 100644 | |||
279 | if (r < 0) { | 279 | if (r < 0) { |
280 | log_error_errno(r, | 280 | log_error_errno(r, |
281 | "Failed to reset audit login UID. This probably means that your kernel is too\n" | 281 | "Failed to reset audit login UID. This probably means that your kernel is too\n" |
282 | @@ -3633,13 +3633,13 @@ static int setup_uid_map(pid_t pid) { | 282 | @@ -3665,13 +3665,13 @@ static int setup_uid_map(pid_t pid) { |
283 | 283 | ||
284 | xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); | 284 | xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); |
285 | xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, arg_uid_shift, arg_uid_range); | 285 | xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, arg_uid_shift, arg_uid_range); |
@@ -318,10 +318,10 @@ index e8398cbde5ba..ba682ec0c9e7 100644 | |||
318 | log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", | 318 | log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", |
319 | FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); | 319 | FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); |
320 | diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c | 320 | diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c |
321 | index 12fb3ef7ea0e..132ac847c091 100644 | 321 | index 8543dbd2d05f..76162599817e 100644 |
322 | --- a/src/shared/sysctl-util.c | 322 | --- a/src/shared/sysctl-util.c |
323 | +++ b/src/shared/sysctl-util.c | 323 | +++ b/src/shared/sysctl-util.c |
324 | @@ -87,7 +87,7 @@ int sysctl_write_ip_property(int af, const char *ifname, const char *property, c | 324 | @@ -93,7 +93,7 @@ int sysctl_write_ip_property(int af, const char *ifname, const char *property, c |
325 | 325 | ||
326 | log_debug("Setting '%s' to '%s'", p, value); | 326 | log_debug("Setting '%s' to '%s'", p, value); |
327 | 327 | ||
@@ -331,28 +331,28 @@ index 12fb3ef7ea0e..132ac847c091 100644 | |||
331 | 331 | ||
332 | int sysctl_read(const char *property, char **content) { | 332 | int sysctl_read(const char *property, char **content) { |
333 | diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c | 333 | diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c |
334 | index 89b80367f8f4..33dbb21364d0 100644 | 334 | index fbfddc0262fc..7cc2902154e9 100644 |
335 | --- a/src/sleep/sleep.c | 335 | --- a/src/sleep/sleep.c |
336 | +++ b/src/sleep/sleep.c | 336 | +++ b/src/sleep/sleep.c |
337 | @@ -45,7 +45,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca | 337 | @@ -47,7 +47,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca |
338 | assert(hibernate_location->swap); | 338 | assert(hibernate_location->swap); |
339 | assert(hibernate_location->resume); | ||
340 | 339 | ||
341 | - r = write_string_file("/sys/power/resume", hibernate_location->resume, WRITE_STRING_FILE_DISABLE_BUFFER); | 340 | xsprintf(resume_str, "%u:%u", major(hibernate_location->devno), minor(hibernate_location->devno)); |
342 | + r = write_string_file("/sys/power/resume", hibernate_location->resume, 0); | 341 | - r = write_string_file("/sys/power/resume", resume_str, WRITE_STRING_FILE_DISABLE_BUFFER); |
342 | + r = write_string_file("/sys/power/resume", resume_str, 0); | ||
343 | if (r < 0) | 343 | if (r < 0) |
344 | return log_debug_errno(r, "Failed to write partition device to /sys/power/resume for '%s': '%s': %m", | 344 | return log_debug_errno(r, "Failed to write partition device to /sys/power/resume for '%s': '%s': %m", |
345 | hibernate_location->swap->device, hibernate_location->resume); | 345 | hibernate_location->swap->device, resume_str); |
346 | @@ -72,7 +72,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca | 346 | @@ -74,7 +74,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca |
347 | } | 347 | } |
348 | 348 | ||
349 | xsprintf(offset_str, "%" PRIu64, hibernate_location->resume_offset); | 349 | xsprintf(offset_str, "%" PRIu64, hibernate_location->offset); |
350 | - r = write_string_file("/sys/power/resume_offset", offset_str, WRITE_STRING_FILE_DISABLE_BUFFER); | 350 | - r = write_string_file("/sys/power/resume_offset", offset_str, WRITE_STRING_FILE_DISABLE_BUFFER); |
351 | + r = write_string_file("/sys/power/resume_offset", offset_str, 0); | 351 | + r = write_string_file("/sys/power/resume_offset", offset_str, 0); |
352 | if (r < 0) | 352 | if (r < 0) |
353 | return log_debug_errno(r, "Failed to write swap file offset to /sys/power/resume_offset for '%s': '%s': %m", | 353 | return log_debug_errno(r, "Failed to write swap file offset to /sys/power/resume_offset for '%s': '%s': %m", |
354 | hibernate_location->swap->device, offset_str); | 354 | hibernate_location->swap->device, offset_str); |
355 | @@ -89,7 +89,7 @@ static int write_mode(char **modes) { | 355 | @@ -91,7 +91,7 @@ static int write_mode(char **modes) { |
356 | STRV_FOREACH(mode, modes) { | 356 | STRV_FOREACH(mode, modes) { |
357 | int k; | 357 | int k; |
358 | 358 | ||
@@ -361,7 +361,7 @@ index 89b80367f8f4..33dbb21364d0 100644 | |||
361 | if (k >= 0) | 361 | if (k >= 0) |
362 | return 0; | 362 | return 0; |
363 | 363 | ||
364 | @@ -108,7 +108,7 @@ static int write_state(FILE **f, char **states) { | 364 | @@ -110,7 +110,7 @@ static int write_state(FILE **f, char **states) { |
365 | STRV_FOREACH(state, states) { | 365 | STRV_FOREACH(state, states) { |
366 | int k; | 366 | int k; |
367 | 367 | ||
@@ -384,7 +384,7 @@ index 60c68b5029cf..fdca03d3d42c 100644 | |||
384 | bool ignore = IN_SET(r, -ENOENT, -EACCES, -ENODEV, -EROFS); | 384 | bool ignore = IN_SET(r, -ENOENT, -EACCES, -ENODEV, -EROFS); |
385 | 385 | ||
386 | diff --git a/src/udev/udevd.c b/src/udev/udevd.c | 386 | diff --git a/src/udev/udevd.c b/src/udev/udevd.c |
387 | index 7678331897f5..6871cde7aa65 100644 | 387 | index ca65474f2763..38780681431a 100644 |
388 | --- a/src/udev/udevd.c | 388 | --- a/src/udev/udevd.c |
389 | +++ b/src/udev/udevd.c | 389 | +++ b/src/udev/udevd.c |
390 | @@ -1089,7 +1089,7 @@ static int synthesize_change_one(sd_device *dev, const char *syspath) { | 390 | @@ -1089,7 +1089,7 @@ static int synthesize_change_one(sd_device *dev, const char *syspath) { |
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 6b85ff0f89..a5e41bfabf 100644 --- a/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch +++ b/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 49501c80d32c1bc5ecb07f40c324feb82af0b057 Mon Sep 17 00:00:00 2001 | 1 | From 3eb12a6ba0bce149717eaabeb1505d379b3d705a Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Mon, 25 Feb 2019 13:41:41 +0800 | 3 | Date: Mon, 25 Feb 2019 13:41:41 +0800 |
4 | Subject: [PATCH] don't use glibc-specific qsort_r | 4 | Subject: [PATCH] don't use glibc-specific qsort_r |
@@ -40,7 +40,7 @@ index e029f8646eb0..27d68b341cf3 100644 | |||
40 | - qsort_r_safe((p), (n), sizeof((p)[0]), (__compar_d_fn_t) _func_, userdata); \ | 40 | - qsort_r_safe((p), (n), sizeof((p)[0]), (__compar_d_fn_t) _func_, userdata); \ |
41 | - }) | 41 | - }) |
42 | diff --git a/src/libsystemd/sd-hwdb/hwdb-util.c b/src/libsystemd/sd-hwdb/hwdb-util.c | 42 | diff --git a/src/libsystemd/sd-hwdb/hwdb-util.c b/src/libsystemd/sd-hwdb/hwdb-util.c |
43 | index c83575c7c876..72f8f3a05048 100644 | 43 | index d790e8fd0b19..42e0fd7c9b3c 100644 |
44 | --- a/src/libsystemd/sd-hwdb/hwdb-util.c | 44 | --- a/src/libsystemd/sd-hwdb/hwdb-util.c |
45 | +++ b/src/libsystemd/sd-hwdb/hwdb-util.c | 45 | +++ b/src/libsystemd/sd-hwdb/hwdb-util.c |
46 | @@ -128,9 +128,13 @@ static void trie_free(struct trie *trie) { | 46 | @@ -128,9 +128,13 @@ static void trie_free(struct trie *trie) { |
@@ -84,10 +84,10 @@ index c83575c7c876..72f8f3a05048 100644 | |||
84 | } | 84 | } |
85 | 85 | ||
86 | diff --git a/src/shared/format-table.c b/src/shared/format-table.c | 86 | diff --git a/src/shared/format-table.c b/src/shared/format-table.c |
87 | index 4617ae8badc4..17d6b9616256 100644 | 87 | index 425013046491..33c1c5a12d43 100644 |
88 | --- a/src/shared/format-table.c | 88 | --- a/src/shared/format-table.c |
89 | +++ b/src/shared/format-table.c | 89 | +++ b/src/shared/format-table.c |
90 | @@ -1109,31 +1109,33 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t | 90 | @@ -1164,31 +1164,33 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t |
91 | return CMP(index_a, index_b); | 91 | return CMP(index_a, index_b); |
92 | } | 92 | } |
93 | 93 | ||
@@ -131,7 +131,7 @@ index 4617ae8badc4..17d6b9616256 100644 | |||
131 | } | 131 | } |
132 | 132 | ||
133 | /* Order identical lines by the order there were originally added in */ | 133 | /* Order identical lines by the order there were originally added in */ |
134 | @@ -1533,7 +1535,12 @@ int table_print(Table *t, FILE *f) { | 134 | @@ -1690,7 +1692,12 @@ int table_print(Table *t, FILE *f) { |
135 | for (i = 0; i < n_rows; i++) | 135 | for (i = 0; i < n_rows; i++) |
136 | sorted[i] = i * t->n_columns; | 136 | sorted[i] = i * t->n_columns; |
137 | 137 | ||
@@ -145,7 +145,7 @@ index 4617ae8badc4..17d6b9616256 100644 | |||
145 | } | 145 | } |
146 | 146 | ||
147 | if (t->display_map) | 147 | if (t->display_map) |
148 | @@ -1997,7 +2004,12 @@ int table_to_json(Table *t, JsonVariant **ret) { | 148 | @@ -2236,7 +2243,12 @@ int table_to_json(Table *t, JsonVariant **ret) { |
149 | for (i = 0; i < n_rows; i++) | 149 | for (i = 0; i < n_rows; i++) |
150 | sorted[i] = i * t->n_columns; | 150 | sorted[i] = i * t->n_columns; |
151 | 151 | ||
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 71e52c4967..0dea933270 100644 --- a/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch +++ b/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 142dcaef0d24a78d3c0c94168b66fdf234497e97 Mon Sep 17 00:00:00 2001 | 1 | From 8af168cefca01f8f2da336f1c82620c284dc74f2 Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Mon, 25 Feb 2019 14:04:21 +0800 | 3 | Date: Mon, 25 Feb 2019 14:04:21 +0800 |
4 | Subject: [PATCH] add fallback parse_printf_format implementation | 4 | Subject: [PATCH] add fallback parse_printf_format implementation |
@@ -23,10 +23,10 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
23 | create mode 100644 src/basic/parse-printf-format.h | 23 | create mode 100644 src/basic/parse-printf-format.h |
24 | 24 | ||
25 | diff --git a/meson.build b/meson.build | 25 | diff --git a/meson.build b/meson.build |
26 | index 21d6968abdf4..bab0bf84806c 100644 | 26 | index fc216d22da24..a25996803d64 100644 |
27 | --- a/meson.build | 27 | --- a/meson.build |
28 | +++ b/meson.build | 28 | +++ b/meson.build |
29 | @@ -628,6 +628,7 @@ endif | 29 | @@ -640,6 +640,7 @@ endif |
30 | foreach header : ['crypt.h', | 30 | foreach header : ['crypt.h', |
31 | 'linux/memfd.h', | 31 | 'linux/memfd.h', |
32 | 'linux/vm_sockets.h', | 32 | 'linux/vm_sockets.h', |
@@ -35,10 +35,10 @@ index 21d6968abdf4..bab0bf84806c 100644 | |||
35 | 'valgrind/memcheck.h', | 35 | 'valgrind/memcheck.h', |
36 | 'valgrind/valgrind.h', | 36 | 'valgrind/valgrind.h', |
37 | diff --git a/src/basic/meson.build b/src/basic/meson.build | 37 | diff --git a/src/basic/meson.build b/src/basic/meson.build |
38 | index f70d1b8bf8a0..4cd57373e10d 100644 | 38 | index ccb22e159505..25c77ea6bc0e 100644 |
39 | --- a/src/basic/meson.build | 39 | --- a/src/basic/meson.build |
40 | +++ b/src/basic/meson.build | 40 | +++ b/src/basic/meson.build |
41 | @@ -311,6 +311,11 @@ foreach item : [['af', af_list_txt, 'af', ''], | 41 | @@ -313,6 +313,11 @@ foreach item : [['af', af_list_txt, 'af', ''], |
42 | endforeach | 42 | endforeach |
43 | 43 | ||
44 | basic_sources += generated_gperf_headers | 44 | basic_sources += generated_gperf_headers |
diff --git a/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch b/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch index 685df01a10..d394444c1c 100644 --- a/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch +++ b/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6883ffc99168056101c667c6421f8353d5ad675a Mon Sep 17 00:00:00 2001 | 1 | From dbe8b3ee45580defeefcac929b897c5437ffc50b Mon Sep 17 00:00:00 2001 |
2 | From: Scott Murray <scott.murray@konsulko.com> | 2 | From: Scott Murray <scott.murray@konsulko.com> |
3 | Date: Fri, 13 Sep 2019 19:26:27 -0400 | 3 | Date: Fri, 13 Sep 2019 19:26:27 -0400 |
4 | Subject: [PATCH] Handle __cpu_mask usage | 4 | Subject: [PATCH] Handle __cpu_mask usage |
@@ -38,7 +38,7 @@ index 27812dfd5923..0ab40731ea93 100644 | |||
38 | typedef struct CPUSet { | 38 | typedef struct CPUSet { |
39 | cpu_set_t *set; | 39 | cpu_set_t *set; |
40 | diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c | 40 | diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c |
41 | index a710db5370b8..d1601ad9292d 100644 | 41 | index c65062d2562c..8b6eefa9cdae 100644 |
42 | --- a/src/test/test-sizeof.c | 42 | --- a/src/test/test-sizeof.c |
43 | +++ b/src/test/test-sizeof.c | 43 | +++ b/src/test/test-sizeof.c |
44 | @@ -1,6 +1,5 @@ | 44 | @@ -1,6 +1,5 @@ |
@@ -47,8 +47,8 @@ index a710db5370b8..d1601ad9292d 100644 | |||
47 | -#include <sched.h> | 47 | -#include <sched.h> |
48 | #include <stdio.h> | 48 | #include <stdio.h> |
49 | #include <string.h> | 49 | #include <string.h> |
50 | 50 | #include <sys/types.h> | |
51 | @@ -8,6 +7,7 @@ | 51 | @@ -10,6 +9,7 @@ |
52 | #include <float.h> | 52 | #include <float.h> |
53 | 53 | ||
54 | #include "time-util.h" | 54 | #include "time-util.h" |
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 aa4bb063c9..ca4f0d5d62 100644 --- a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch +++ b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9597196234a0ccf30d7f65cf185a8c24cb3158b3 Mon Sep 17 00:00:00 2001 | 1 | From 85dcaad8f38521ec3dc580794072b601900eed84 Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Mon, 25 Feb 2019 14:18:21 +0800 | 3 | Date: Mon, 25 Feb 2019 14:18:21 +0800 |
4 | Subject: [PATCH] src/basic/missing.h: check for missing strndupa | 4 | Subject: [PATCH] src/basic/missing.h: check for missing strndupa |
@@ -39,6 +39,7 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
39 | src/coredump/coredump-vacuum.c | 1 + | 39 | src/coredump/coredump-vacuum.c | 1 + |
40 | src/journal-remote/journal-remote-main.c | 1 + | 40 | src/journal-remote/journal-remote-main.c | 1 + |
41 | src/journal/journalctl.c | 1 + | 41 | src/journal/journalctl.c | 1 + |
42 | src/journal/sd-journal.c | 1 + | ||
42 | src/libsystemd/sd-bus/bus-message.c | 1 + | 43 | src/libsystemd/sd-bus/bus-message.c | 1 + |
43 | src/libsystemd/sd-bus/bus-objects.c | 1 + | 44 | src/libsystemd/sd-bus/bus-objects.c | 1 + |
44 | src/libsystemd/sd-bus/bus-socket.c | 1 + | 45 | src/libsystemd/sd-bus/bus-socket.c | 1 + |
@@ -65,16 +66,16 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | |||
65 | src/udev/udev-builtin-path_id.c | 1 + | 66 | src/udev/udev-builtin-path_id.c | 1 + |
66 | src/udev/udev-event.c | 1 + | 67 | src/udev/udev-event.c | 1 + |
67 | src/udev/udev-rules.c | 1 + | 68 | src/udev/udev-rules.c | 1 + |
68 | 48 files changed, 59 insertions(+) | 69 | 49 files changed, 60 insertions(+) |
69 | 70 | ||
70 | diff --git a/meson.build b/meson.build | 71 | diff --git a/meson.build b/meson.build |
71 | index bab0bf84806c..f4e1736cf09e 100644 | 72 | index a25996803d64..72b305b5ab58 100644 |
72 | --- a/meson.build | 73 | --- a/meson.build |
73 | +++ b/meson.build | 74 | +++ b/meson.build |
74 | @@ -517,6 +517,7 @@ foreach ident : [ | 75 | @@ -529,6 +529,7 @@ foreach ident : [ |
75 | #include <unistd.h>'''], | 76 | #include <unistd.h> |
76 | ['get_mempolicy', '''#include <stdlib.h> | 77 | #include <signal.h> |
77 | #include <unistd.h>'''], | 78 | #include <sys/wait.h>'''], |
78 | + ['strndupa' , '''#include <string.h>'''], | 79 | + ['strndupa' , '''#include <string.h>'''], |
79 | ] | 80 | ] |
80 | 81 | ||
@@ -160,7 +161,7 @@ index fa682d4c438e..37902551490a 100644 | |||
160 | int mkdir_safe_internal(const char *path, mode_t mode, uid_t uid, gid_t gid, MkdirFlags flags, mkdir_func_t _mkdir) { | 161 | int mkdir_safe_internal(const char *path, mode_t mode, uid_t uid, gid_t gid, MkdirFlags flags, mkdir_func_t _mkdir) { |
161 | struct stat st; | 162 | struct stat st; |
162 | diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c | 163 | diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c |
163 | index aec6099c9cc1..744b9b134ce4 100644 | 164 | index e0094b0f370a..00da6518124b 100644 |
164 | --- a/src/basic/parse-util.c | 165 | --- a/src/basic/parse-util.c |
165 | +++ b/src/basic/parse-util.c | 166 | +++ b/src/basic/parse-util.c |
166 | @@ -18,6 +18,7 @@ | 167 | @@ -18,6 +18,7 @@ |
@@ -172,7 +173,7 @@ index aec6099c9cc1..744b9b134ce4 100644 | |||
172 | int parse_boolean(const char *v) { | 173 | int parse_boolean(const char *v) { |
173 | if (!v) | 174 | if (!v) |
174 | diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c | 175 | diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c |
175 | index d3d99d9a7f90..e0b9efad03a2 100644 | 176 | index 1af58717c686..c1020f4611d4 100644 |
176 | --- a/src/basic/proc-cmdline.c | 177 | --- a/src/basic/proc-cmdline.c |
177 | +++ b/src/basic/proc-cmdline.c | 178 | +++ b/src/basic/proc-cmdline.c |
178 | @@ -15,6 +15,7 @@ | 179 | @@ -15,6 +15,7 @@ |
@@ -196,7 +197,7 @@ index 7aaf95bfced2..da7e836f143e 100644 | |||
196 | int procfs_tasks_get_limit(uint64_t *ret) { | 197 | int procfs_tasks_get_limit(uint64_t *ret) { |
197 | _cleanup_free_ char *value = NULL; | 198 | _cleanup_free_ char *value = NULL; |
198 | diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c | 199 | diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c |
199 | index f35e760233be..e4b0a8aa445e 100644 | 200 | index 1095cb426cce..806ef4bd97a9 100644 |
200 | --- a/src/basic/selinux-util.c | 201 | --- a/src/basic/selinux-util.c |
201 | +++ b/src/basic/selinux-util.c | 202 | +++ b/src/basic/selinux-util.c |
202 | @@ -26,6 +26,7 @@ | 203 | @@ -26,6 +26,7 @@ |
@@ -206,9 +207,9 @@ index f35e760233be..e4b0a8aa445e 100644 | |||
206 | +#include "missing_stdlib.h" | 207 | +#include "missing_stdlib.h" |
207 | 208 | ||
208 | #if HAVE_SELINUX | 209 | #if HAVE_SELINUX |
209 | DEFINE_TRIVIAL_CLEANUP_FUNC(char*, freecon); | 210 | DEFINE_TRIVIAL_CLEANUP_FUNC(context_t, context_free); |
210 | diff --git a/src/basic/time-util.c b/src/basic/time-util.c | 211 | diff --git a/src/basic/time-util.c b/src/basic/time-util.c |
211 | index bfe2c60da173..d7ef30d2fe52 100644 | 212 | index 105584e2e72f..eb0bed47dac3 100644 |
212 | --- a/src/basic/time-util.c | 213 | --- a/src/basic/time-util.c |
213 | +++ b/src/basic/time-util.c | 214 | +++ b/src/basic/time-util.c |
214 | @@ -26,6 +26,7 @@ | 215 | @@ -26,6 +26,7 @@ |
@@ -244,7 +245,7 @@ index 27dc9e43c3e2..b1a83023600b 100644 | |||
244 | BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", TasksMax, tasks_max_resolve); | 245 | BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", TasksMax, tasks_max_resolve); |
245 | 246 | ||
246 | diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c | 247 | diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c |
247 | index 1d0bc1ede3cb..313654913345 100644 | 248 | index d8ba3e5d9241..729e13fda64c 100644 |
248 | --- a/src/core/dbus-execute.c | 249 | --- a/src/core/dbus-execute.c |
249 | +++ b/src/core/dbus-execute.c | 250 | +++ b/src/core/dbus-execute.c |
250 | @@ -41,6 +41,7 @@ | 251 | @@ -41,6 +41,7 @@ |
@@ -268,7 +269,7 @@ index 7862beaacb6d..3b1ea53a5f0d 100644 | |||
268 | int bus_property_get_triggered_unit( | 269 | int bus_property_get_triggered_unit( |
269 | sd_bus *bus, | 270 | sd_bus *bus, |
270 | diff --git a/src/core/execute.c b/src/core/execute.c | 271 | diff --git a/src/core/execute.c b/src/core/execute.c |
271 | index abc164ff5bef..f04b8ba05002 100644 | 272 | index 89dbf6fbd2c1..9762dc57443c 100644 |
272 | --- a/src/core/execute.c | 273 | --- a/src/core/execute.c |
273 | +++ b/src/core/execute.c | 274 | +++ b/src/core/execute.c |
274 | @@ -88,6 +88,7 @@ | 275 | @@ -88,6 +88,7 @@ |
@@ -292,7 +293,7 @@ index 09ccd613e32c..f4e64fa283e9 100644 | |||
292 | #if HAVE_KMOD | 293 | #if HAVE_KMOD |
293 | #include "module-util.h" | 294 | #include "module-util.h" |
294 | diff --git a/src/core/service.c b/src/core/service.c | 295 | diff --git a/src/core/service.c b/src/core/service.c |
295 | index 49ad166c2604..c3b14067e201 100644 | 296 | index 17f27a4abce3..e5dcc532d0ce 100644 |
296 | --- a/src/core/service.c | 297 | --- a/src/core/service.c |
297 | +++ b/src/core/service.c | 298 | +++ b/src/core/service.c |
298 | @@ -41,6 +41,7 @@ | 299 | @@ -41,6 +41,7 @@ |
@@ -316,10 +317,10 @@ index 35885dfb47c4..bb9f0660a6a0 100644 | |||
316 | #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL) /* 1 MiB */ | 317 | #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL) /* 1 MiB */ |
317 | #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */ | 318 | #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */ |
318 | diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c | 319 | diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c |
319 | index ac2bf648d2af..06c86f0201af 100644 | 320 | index 88e42d3a984b..0f08376e5399 100644 |
320 | --- a/src/journal-remote/journal-remote-main.c | 321 | --- a/src/journal-remote/journal-remote-main.c |
321 | +++ b/src/journal-remote/journal-remote-main.c | 322 | +++ b/src/journal-remote/journal-remote-main.c |
322 | @@ -21,6 +21,7 @@ | 323 | @@ -22,6 +22,7 @@ |
323 | #include "stat-util.h" | 324 | #include "stat-util.h" |
324 | #include "string-table.h" | 325 | #include "string-table.h" |
325 | #include "strv.h" | 326 | #include "strv.h" |
@@ -328,19 +329,31 @@ index ac2bf648d2af..06c86f0201af 100644 | |||
328 | #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" | 329 | #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" |
329 | #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" | 330 | #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" |
330 | diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c | 331 | diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c |
331 | index 95b6bfee172a..e0bcfb9d4233 100644 | 332 | index e5feec83bce6..c3aec1e219d7 100644 |
332 | --- a/src/journal/journalctl.c | 333 | --- a/src/journal/journalctl.c |
333 | +++ b/src/journal/journalctl.c | 334 | +++ b/src/journal/journalctl.c |
334 | @@ -68,6 +68,7 @@ | 335 | @@ -69,6 +69,7 @@ |
335 | #include "unit-name.h" | 336 | #include "unit-name.h" |
336 | #include "user-util.h" | 337 | #include "user-util.h" |
337 | #include "varlink.h" | 338 | #include "varlink.h" |
338 | +#include "missing_stdlib.h" | 339 | +#include "missing_stdlib.h" |
339 | 340 | ||
340 | #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) | 341 | #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) |
342 | #define PROCESS_INOTIFY_INTERVAL 1024 /* Every 1,024 messages processed */ | ||
343 | diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c | ||
344 | index 3fa98dfda237..e655d77e714a 100644 | ||
345 | --- a/src/journal/sd-journal.c | ||
346 | +++ b/src/journal/sd-journal.c | ||
347 | @@ -40,6 +40,7 @@ | ||
348 | #include "string-util.h" | ||
349 | #include "strv.h" | ||
350 | #include "syslog-util.h" | ||
351 | +#include "missing_stdlib.h" | ||
352 | |||
353 | #define JOURNAL_FILES_MAX 7168 | ||
341 | 354 | ||
342 | diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c | 355 | diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c |
343 | index eb029e445326..8da2c5d51a75 100644 | 356 | index 73127dfe0253..cc8635dea591 100644 |
344 | --- a/src/libsystemd/sd-bus/bus-message.c | 357 | --- a/src/libsystemd/sd-bus/bus-message.c |
345 | +++ b/src/libsystemd/sd-bus/bus-message.c | 358 | +++ b/src/libsystemd/sd-bus/bus-message.c |
346 | @@ -21,6 +21,7 @@ | 359 | @@ -21,6 +21,7 @@ |
@@ -352,7 +365,7 @@ index eb029e445326..8da2c5d51a75 100644 | |||
352 | static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); | 365 | static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); |
353 | 366 | ||
354 | diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c | 367 | diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c |
355 | index ae643cacc740..f766e235206d 100644 | 368 | index 6d140348ec4c..9126b8801bc5 100644 |
356 | --- a/src/libsystemd/sd-bus/bus-objects.c | 369 | --- a/src/libsystemd/sd-bus/bus-objects.c |
357 | +++ b/src/libsystemd/sd-bus/bus-objects.c | 370 | +++ b/src/libsystemd/sd-bus/bus-objects.c |
358 | @@ -13,6 +13,7 @@ | 371 | @@ -13,6 +13,7 @@ |
@@ -376,7 +389,7 @@ index 18d30d010a20..be2ab703f8ed 100644 | |||
376 | #define SNDBUF_SIZE (8*1024*1024) | 389 | #define SNDBUF_SIZE (8*1024*1024) |
377 | 390 | ||
378 | diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c | 391 | diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c |
379 | index 058492a83eec..54c896f572b9 100644 | 392 | index 7ad03680f48d..b9d2181e4910 100644 |
380 | --- a/src/libsystemd/sd-bus/sd-bus.c | 393 | --- a/src/libsystemd/sd-bus/sd-bus.c |
381 | +++ b/src/libsystemd/sd-bus/sd-bus.c | 394 | +++ b/src/libsystemd/sd-bus/sd-bus.c |
382 | @@ -41,6 +41,7 @@ | 395 | @@ -41,6 +41,7 @@ |
@@ -400,7 +413,7 @@ index 8de0a859ee94..58044b6ba908 100644 | |||
400 | #define MAX_SIZE (2*1024*1024) | 413 | #define MAX_SIZE (2*1024*1024) |
401 | 414 | ||
402 | diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c | 415 | diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c |
403 | index 519dd0d188cf..a8f536915bb2 100644 | 416 | index 30669a9359e5..6544b3722099 100644 |
404 | --- a/src/locale/keymap-util.c | 417 | --- a/src/locale/keymap-util.c |
405 | +++ b/src/locale/keymap-util.c | 418 | +++ b/src/locale/keymap-util.c |
406 | @@ -21,6 +21,7 @@ | 419 | @@ -21,6 +21,7 @@ |
@@ -412,19 +425,19 @@ index 519dd0d188cf..a8f536915bb2 100644 | |||
412 | static bool startswith_comma(const char *s, const char *prefix) { | 425 | static bool startswith_comma(const char *s, const char *prefix) { |
413 | s = startswith(s, prefix); | 426 | s = startswith(s, prefix); |
414 | diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c | 427 | diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c |
415 | index aa6e5ea7aca8..c439c21b2872 100644 | 428 | index 84bea21ab7be..49720c7f742e 100644 |
416 | --- a/src/login/pam_systemd.c | 429 | --- a/src/login/pam_systemd.c |
417 | +++ b/src/login/pam_systemd.c | 430 | +++ b/src/login/pam_systemd.c |
418 | @@ -28,6 +28,7 @@ | 431 | @@ -31,6 +31,7 @@ |
419 | #include "hostname-util.h" | 432 | #include "locale-util.h" |
420 | #include "login-util.h" | 433 | #include "login-util.h" |
421 | #include "macro.h" | 434 | #include "macro.h" |
422 | +#include "missing_stdlib.h" | 435 | +#include "missing_stdlib.h" |
436 | #include "pam-util.h" | ||
423 | #include "parse-util.h" | 437 | #include "parse-util.h" |
424 | #include "path-util.h" | 438 | #include "path-util.h" |
425 | #include "process-util.h" | ||
426 | diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c | 439 | diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c |
427 | index 81afa9530762..2c5328f97c63 100644 | 440 | index bed1e42697c4..e4847c2beea2 100644 |
428 | --- a/src/network/generator/network-generator.c | 441 | --- a/src/network/generator/network-generator.c |
429 | +++ b/src/network/generator/network-generator.c | 442 | +++ b/src/network/generator/network-generator.c |
430 | @@ -13,6 +13,7 @@ | 443 | @@ -13,6 +13,7 @@ |
@@ -460,10 +473,10 @@ index 364356da5622..47d4ea44e40f 100644 | |||
460 | NSS_GETHOSTBYNAME_PROTOTYPES(mymachines); | 473 | NSS_GETHOSTBYNAME_PROTOTYPES(mymachines); |
461 | NSS_GETPW_PROTOTYPES(mymachines); | 474 | NSS_GETPW_PROTOTYPES(mymachines); |
462 | diff --git a/src/portable/portable.c b/src/portable/portable.c | 475 | diff --git a/src/portable/portable.c b/src/portable/portable.c |
463 | index 34b123e84692..5a48504d00ac 100644 | 476 | index e18826ab2685..d9f4b81d8937 100644 |
464 | --- a/src/portable/portable.c | 477 | --- a/src/portable/portable.c |
465 | +++ b/src/portable/portable.c | 478 | +++ b/src/portable/portable.c |
466 | @@ -29,6 +29,7 @@ | 479 | @@ -31,6 +31,7 @@ |
467 | #include "strv.h" | 480 | #include "strv.h" |
468 | #include "tmpfile-util.h" | 481 | #include "tmpfile-util.h" |
469 | #include "user-util.h" | 482 | #include "user-util.h" |
@@ -472,10 +485,10 @@ index 34b123e84692..5a48504d00ac 100644 | |||
472 | static const char profile_dirs[] = CONF_PATHS_NULSTR("systemd/portable/profile"); | 485 | static const char profile_dirs[] = CONF_PATHS_NULSTR("systemd/portable/profile"); |
473 | 486 | ||
474 | diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c | 487 | diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c |
475 | index 0a96a18b3836..432d6ebc3730 100644 | 488 | index f20e8c44b8bc..9f6c4e8f49a7 100644 |
476 | --- a/src/resolve/resolvectl.c | 489 | --- a/src/resolve/resolvectl.c |
477 | +++ b/src/resolve/resolvectl.c | 490 | +++ b/src/resolve/resolvectl.c |
478 | @@ -31,6 +31,7 @@ | 491 | @@ -33,6 +33,7 @@ |
479 | #include "strv.h" | 492 | #include "strv.h" |
480 | #include "terminal-util.h" | 493 | #include "terminal-util.h" |
481 | #include "verbs.h" | 494 | #include "verbs.h" |
@@ -496,7 +509,7 @@ index b21fe393265f..af2640005c1d 100644 | |||
496 | struct CGroupInfo { | 509 | struct CGroupInfo { |
497 | char *cgroup_path; | 510 | char *cgroup_path; |
498 | diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c | 511 | diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c |
499 | index 22a15493d7f3..3f4c51975675 100644 | 512 | index 28d85944a8a7..4743a84a417e 100644 |
500 | --- a/src/shared/bus-unit-util.c | 513 | --- a/src/shared/bus-unit-util.c |
501 | +++ b/src/shared/bus-unit-util.c | 514 | +++ b/src/shared/bus-unit-util.c |
502 | @@ -34,6 +34,7 @@ | 515 | @@ -34,6 +34,7 @@ |
@@ -508,10 +521,10 @@ index 22a15493d7f3..3f4c51975675 100644 | |||
508 | int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) { | 521 | int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) { |
509 | assert(message); | 522 | assert(message); |
510 | diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c | 523 | diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c |
511 | index aea46d311996..223426298144 100644 | 524 | index 8e6a6e2ce2de..0cbf4b1997df 100644 |
512 | --- a/src/shared/bus-util.c | 525 | --- a/src/shared/bus-util.c |
513 | +++ b/src/shared/bus-util.c | 526 | +++ b/src/shared/bus-util.c |
514 | @@ -34,6 +34,7 @@ | 527 | @@ -30,6 +30,7 @@ |
515 | #include "stdio-util.h" | 528 | #include "stdio-util.h" |
516 | #include "strv.h" | 529 | #include "strv.h" |
517 | #include "user-util.h" | 530 | #include "user-util.h" |
@@ -544,10 +557,10 @@ index 7c4fc7021dec..3fbaf5a63969 100644 | |||
544 | enum { | 557 | enum { |
545 | IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */ | 558 | IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */ |
546 | diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c | 559 | diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c |
547 | index 95b2e3376e9a..facc23aaecd5 100644 | 560 | index 2bfd0b60c26b..6a1bb3a0760f 100644 |
548 | --- a/src/shared/logs-show.c | 561 | --- a/src/shared/logs-show.c |
549 | +++ b/src/shared/logs-show.c | 562 | +++ b/src/shared/logs-show.c |
550 | @@ -37,6 +37,7 @@ | 563 | @@ -39,6 +39,7 @@ |
551 | #include "time-util.h" | 564 | #include "time-util.h" |
552 | #include "utf8.h" | 565 | #include "utf8.h" |
553 | #include "util.h" | 566 | #include "util.h" |
@@ -592,7 +605,7 @@ index 7cb7d8a477e9..8e7d7f9e7ca6 100644 | |||
592 | static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) { | 605 | static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) { |
593 | assert(range); | 606 | assert(range); |
594 | diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c | 607 | diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c |
595 | index 2fb9c854fa50..58cef31458f7 100644 | 608 | index 2ee6fc2f0a6a..4a9934f9c14d 100644 |
596 | --- a/src/socket-proxy/socket-proxyd.c | 609 | --- a/src/socket-proxy/socket-proxyd.c |
597 | +++ b/src/socket-proxy/socket-proxyd.c | 610 | +++ b/src/socket-proxy/socket-proxyd.c |
598 | @@ -26,6 +26,7 @@ | 611 | @@ -26,6 +26,7 @@ |
@@ -628,7 +641,7 @@ index ca38f5608791..9d8cf4d2807b 100644 | |||
628 | _printf_(2,3) | 641 | _printf_(2,3) |
629 | static void path_prepend(char **path, const char *fmt, ...) { | 642 | static void path_prepend(char **path, const char *fmt, ...) { |
630 | diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c | 643 | diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c |
631 | index 58d484280aa5..90eab6806b55 100644 | 644 | index eb51139e519c..977cc16e9d7c 100644 |
632 | --- a/src/udev/udev-event.c | 645 | --- a/src/udev/udev-event.c |
633 | +++ b/src/udev/udev-event.c | 646 | +++ b/src/udev/udev-event.c |
634 | @@ -34,6 +34,7 @@ | 647 | @@ -34,6 +34,7 @@ |
@@ -640,7 +653,7 @@ index 58d484280aa5..90eab6806b55 100644 | |||
640 | typedef struct Spawn { | 653 | typedef struct Spawn { |
641 | sd_device *device; | 654 | sd_device *device; |
642 | diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c | 655 | diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c |
643 | index 6168b332d3b2..245fe0a64d22 100644 | 656 | index b9b350d1ef7a..2c114cc77572 100644 |
644 | --- a/src/udev/udev-rules.c | 657 | --- a/src/udev/udev-rules.c |
645 | +++ b/src/udev/udev-rules.c | 658 | +++ b/src/udev/udev-rules.c |
646 | @@ -30,6 +30,7 @@ | 659 | @@ -30,6 +30,7 @@ |
diff --git a/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch b/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch index ea003fd7da..9142d7b45c 100644 --- a/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch +++ b/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3932ce7f6c8ace5e1210aad20e1a141cb29329b1 Mon Sep 17 00:00:00 2001 | 1 | From 47818052121d135632f5e46c369e3e4706a0f9e0 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Thu, 26 Oct 2017 22:10:42 -0700 | 3 | Date: Thu, 26 Oct 2017 22:10:42 -0700 |
4 | Subject: [PATCH] Include netinet/if_ether.h | 4 | Subject: [PATCH] Include netinet/if_ether.h |
@@ -53,7 +53,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
53 | 19 files changed, 18 insertions(+), 4 deletions(-) | 53 | 19 files changed, 18 insertions(+), 4 deletions(-) |
54 | 54 | ||
55 | diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c | 55 | diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c |
56 | index 5417ba8c5feb..d3aba928dd96 100644 | 56 | index eac2e725cce7..1beae7ba91cc 100644 |
57 | --- a/src/libsystemd-network/sd-dhcp6-client.c | 57 | --- a/src/libsystemd-network/sd-dhcp6-client.c |
58 | +++ b/src/libsystemd-network/sd-dhcp6-client.c | 58 | +++ b/src/libsystemd-network/sd-dhcp6-client.c |
59 | @@ -5,7 +5,6 @@ | 59 | @@ -5,7 +5,6 @@ |
@@ -65,7 +65,7 @@ index 5417ba8c5feb..d3aba928dd96 100644 | |||
65 | 65 | ||
66 | #include "sd-dhcp6-client.h" | 66 | #include "sd-dhcp6-client.h" |
67 | diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c | 67 | diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c |
68 | index a55460f03407..6f9cd527c800 100644 | 68 | index e35127a4cd2e..4f6ad9ef5886 100644 |
69 | --- a/src/libsystemd/sd-netlink/netlink-types.c | 69 | --- a/src/libsystemd/sd-netlink/netlink-types.c |
70 | +++ b/src/libsystemd/sd-netlink/netlink-types.c | 70 | +++ b/src/libsystemd/sd-netlink/netlink-types.c |
71 | @@ -3,6 +3,7 @@ | 71 | @@ -3,6 +3,7 @@ |
@@ -77,7 +77,7 @@ index a55460f03407..6f9cd527c800 100644 | |||
77 | #include <linux/netlink.h> | 77 | #include <linux/netlink.h> |
78 | #include <linux/rtnetlink.h> | 78 | #include <linux/rtnetlink.h> |
79 | diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c | 79 | diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c |
80 | index 3b2ac3829859..760ccb445cd0 100644 | 80 | index a2990452af17..5af350883c28 100644 |
81 | --- a/src/machine/machine-dbus.c | 81 | --- a/src/machine/machine-dbus.c |
82 | +++ b/src/machine/machine-dbus.c | 82 | +++ b/src/machine/machine-dbus.c |
83 | @@ -3,6 +3,7 @@ | 83 | @@ -3,6 +3,7 @@ |
@@ -89,7 +89,7 @@ index 3b2ac3829859..760ccb445cd0 100644 | |||
89 | /* When we include libgen.h because we need dirname() we immediately | 89 | /* When we include libgen.h because we need dirname() we immediately |
90 | * undefine basename() since libgen.h defines it as a macro to the POSIX | 90 | * undefine basename() since libgen.h defines it as a macro to the POSIX |
91 | diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c | 91 | diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c |
92 | index 185b155440e7..dc1cd236c814 100644 | 92 | index 8df39e35843f..8d697894f970 100644 |
93 | --- a/src/network/netdev/bond.c | 93 | --- a/src/network/netdev/bond.c |
94 | +++ b/src/network/netdev/bond.c | 94 | +++ b/src/network/netdev/bond.c |
95 | @@ -1,5 +1,6 @@ | 95 | @@ -1,5 +1,6 @@ |
@@ -100,7 +100,7 @@ index 185b155440e7..dc1cd236c814 100644 | |||
100 | #include "bond.h" | 100 | #include "bond.h" |
101 | #include "conf-parser.h" | 101 | #include "conf-parser.h" |
102 | diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c | 102 | diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c |
103 | index 59a40faef8fa..8e821a3216b3 100644 | 103 | index 6b8f9944612e..7f81ec25c407 100644 |
104 | --- a/src/network/netdev/bridge.c | 104 | --- a/src/network/netdev/bridge.c |
105 | +++ b/src/network/netdev/bridge.c | 105 | +++ b/src/network/netdev/bridge.c |
106 | @@ -1,5 +1,6 @@ | 106 | @@ -1,5 +1,6 @@ |
@@ -111,7 +111,7 @@ index 59a40faef8fa..8e821a3216b3 100644 | |||
111 | 111 | ||
112 | #include "bridge.h" | 112 | #include "bridge.h" |
113 | diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c | 113 | diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c |
114 | index 25dc23ff0338..f20d11fbcf53 100644 | 114 | index 7d1fec3afe6d..e948a335336d 100644 |
115 | --- a/src/network/netdev/macsec.c | 115 | --- a/src/network/netdev/macsec.c |
116 | +++ b/src/network/netdev/macsec.c | 116 | +++ b/src/network/netdev/macsec.c |
117 | @@ -1,5 +1,6 @@ | 117 | @@ -1,5 +1,6 @@ |
@@ -134,7 +134,7 @@ index 09a5f4822e03..873299b1f98a 100644 | |||
134 | #include "bond.h" | 134 | #include "bond.h" |
135 | #include "bridge.h" | 135 | #include "bridge.h" |
136 | diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c | 136 | diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c |
137 | index 6908c4e811b0..e0d8c459ab63 100644 | 137 | index f8121a48ed92..437f411c61e8 100644 |
138 | --- a/src/network/netdev/netdev.c | 138 | --- a/src/network/netdev/netdev.c |
139 | +++ b/src/network/netdev/netdev.c | 139 | +++ b/src/network/netdev/netdev.c |
140 | @@ -1,5 +1,6 @@ | 140 | @@ -1,5 +1,6 @@ |
@@ -145,7 +145,7 @@ index 6908c4e811b0..e0d8c459ab63 100644 | |||
145 | #include <netinet/in.h> | 145 | #include <netinet/in.h> |
146 | 146 | ||
147 | diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c | 147 | diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c |
148 | index c3c5d535ac66..ebea408c89a8 100644 | 148 | index 41f09287f2b7..b67ce4fc8844 100644 |
149 | --- a/src/network/networkd-brvlan.c | 149 | --- a/src/network/networkd-brvlan.c |
150 | +++ b/src/network/networkd-brvlan.c | 150 | +++ b/src/network/networkd-brvlan.c |
151 | @@ -4,6 +4,7 @@ | 151 | @@ -4,6 +4,7 @@ |
@@ -157,7 +157,7 @@ index c3c5d535ac66..ebea408c89a8 100644 | |||
157 | #include <stdbool.h> | 157 | #include <stdbool.h> |
158 | 158 | ||
159 | diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c | 159 | diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c |
160 | index 6465a8cfe9c7..bd4b2cdfac15 100644 | 160 | index 8664d8cdc0d4..e9f91f74c1a1 100644 |
161 | --- a/src/network/networkd-dhcp-common.c | 161 | --- a/src/network/networkd-dhcp-common.c |
162 | +++ b/src/network/networkd-dhcp-common.c | 162 | +++ b/src/network/networkd-dhcp-common.c |
163 | @@ -4,6 +4,7 @@ | 163 | @@ -4,6 +4,7 @@ |
@@ -169,21 +169,22 @@ index 6465a8cfe9c7..bd4b2cdfac15 100644 | |||
169 | #include "parse-util.h" | 169 | #include "parse-util.h" |
170 | #include "string-table.h" | 170 | #include "string-table.h" |
171 | diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c | 171 | diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c |
172 | index 8ca87d99d4db..a66284896cf3 100644 | 172 | index 13e3e32f40e8..5394399c9150 100644 |
173 | --- a/src/network/networkd-dhcp4.c | 173 | --- a/src/network/networkd-dhcp4.c |
174 | +++ b/src/network/networkd-dhcp4.c | 174 | +++ b/src/network/networkd-dhcp4.c |
175 | @@ -1,8 +1,8 @@ | 175 | @@ -1,9 +1,9 @@ |
176 | /* SPDX-License-Identifier: LGPL-2.1+ */ | 176 | /* SPDX-License-Identifier: LGPL-2.1+ */ |
177 | 177 | ||
178 | +#include <netinet/if_ether.h> | 178 | +#include <netinet/if_ether.h> |
179 | #include <netinet/in.h> | 179 | #include <netinet/in.h> |
180 | #include <netinet/ip.h> | ||
180 | #include <linux/if.h> | 181 | #include <linux/if.h> |
181 | -#include <linux/if_arp.h> | 182 | -#include <linux/if_arp.h> |
182 | 183 | ||
183 | #include "alloc-util.h" | 184 | #include "alloc-util.h" |
184 | #include "dhcp-client-internal.h" | 185 | #include "dhcp-client-internal.h" |
185 | diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c | 186 | diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c |
186 | index 647623ac3778..325c641c6231 100644 | 187 | index 7304270c60b1..099064f64715 100644 |
187 | --- a/src/network/networkd-dhcp6.c | 188 | --- a/src/network/networkd-dhcp6.c |
188 | +++ b/src/network/networkd-dhcp6.c | 189 | +++ b/src/network/networkd-dhcp6.c |
189 | @@ -3,9 +3,9 @@ | 190 | @@ -3,9 +3,9 @@ |
@@ -198,7 +199,7 @@ index 647623ac3778..325c641c6231 100644 | |||
198 | 199 | ||
199 | #include "sd-dhcp6-client.h" | 200 | #include "sd-dhcp6-client.h" |
200 | diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c | 201 | diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c |
201 | index 2e60adbf7818..05aa8672d585 100644 | 202 | index 99d4b29c31ec..e8b467d6ac09 100644 |
202 | --- a/src/network/networkd-link.c | 203 | --- a/src/network/networkd-link.c |
203 | +++ b/src/network/networkd-link.c | 204 | +++ b/src/network/networkd-link.c |
204 | @@ -1,8 +1,8 @@ | 205 | @@ -1,8 +1,8 @@ |
@@ -212,7 +213,7 @@ index 2e60adbf7818..05aa8672d585 100644 | |||
212 | 213 | ||
213 | #include "alloc-util.h" | 214 | #include "alloc-util.h" |
214 | diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c | 215 | diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c |
215 | index 6e443975f171..d1aab0ca5ba2 100644 | 216 | index 2e716b291e97..56f18cea57fe 100644 |
216 | --- a/src/network/networkd-network.c | 217 | --- a/src/network/networkd-network.c |
217 | +++ b/src/network/networkd-network.c | 218 | +++ b/src/network/networkd-network.c |
218 | @@ -1,5 +1,6 @@ | 219 | @@ -1,5 +1,6 @@ |
@@ -232,7 +233,7 @@ index 25b939639775..530e4928835c 100644 | |||
232 | #include "dhcp6-internal.h" | 233 | #include "dhcp6-internal.h" |
233 | #include "dhcp6-protocol.h" | 234 | #include "dhcp6-protocol.h" |
234 | diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c | 235 | diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c |
235 | index 3119b2b92e3b..927ddd067eef 100644 | 236 | index 00a71d64a638..4593e89120b8 100644 |
236 | --- a/src/shared/ethtool-util.c | 237 | --- a/src/shared/ethtool-util.c |
237 | +++ b/src/shared/ethtool-util.c | 238 | +++ b/src/shared/ethtool-util.c |
238 | @@ -1,5 +1,6 @@ | 239 | @@ -1,5 +1,6 @@ |
@@ -243,19 +244,19 @@ index 3119b2b92e3b..927ddd067eef 100644 | |||
243 | #include <sys/ioctl.h> | 244 | #include <sys/ioctl.h> |
244 | #include <linux/ethtool.h> | 245 | #include <linux/ethtool.h> |
245 | diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h | 246 | diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h |
246 | index d408bcd90a0b..7a1e399af023 100644 | 247 | index c1d5d7590ef9..b3e018bf76e9 100644 |
247 | --- a/src/shared/ethtool-util.h | 248 | --- a/src/shared/ethtool-util.h |
248 | +++ b/src/shared/ethtool-util.h | 249 | +++ b/src/shared/ethtool-util.h |
249 | @@ -2,6 +2,7 @@ | 250 | @@ -3,6 +3,7 @@ |
250 | #pragma once | ||
251 | 251 | ||
252 | #include <macro.h> | 252 | #include <macro.h> |
253 | #include <net/ethernet.h> | ||
253 | +#include <netinet/if_ether.h> | 254 | +#include <netinet/if_ether.h> |
254 | #include <linux/ethtool.h> | 255 | #include <linux/ethtool.h> |
255 | 256 | ||
256 | #include "conf-parser.h" | 257 | #include "conf-parser.h" |
257 | diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c | 258 | diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c |
258 | index 7b07e2f38fa8..18680a8e5484 100644 | 259 | index 0332e99269c9..ff3aead4a779 100644 |
259 | --- a/src/udev/net/link-config.c | 260 | --- a/src/udev/net/link-config.c |
260 | +++ b/src/udev/net/link-config.c | 261 | +++ b/src/udev/net/link-config.c |
261 | @@ -1,5 +1,6 @@ | 262 | @@ -1,5 +1,6 @@ |
diff --git a/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch b/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch index 0de1121906..5ee501f235 100644 --- a/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch +++ b/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 5166a6657570d4072cdce118621791e4a8186e07 Mon Sep 17 00:00:00 2001 | 1 | From eed7427db98cc01db7e9b3479655d68b044bc85b Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Mon, 25 Feb 2019 15:03:47 +0800 | 3 | Date: Mon, 25 Feb 2019 15:03:47 +0800 |
4 | Subject: [PATCH] fix missing of __register_atfork for non-glibc builds | 4 | Subject: [PATCH] fix missing of __register_atfork for non-glibc builds |
@@ -12,7 +12,7 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
12 | 1 file changed, 7 insertions(+) | 12 | 1 file changed, 7 insertions(+) |
13 | 13 | ||
14 | diff --git a/src/basic/process-util.c b/src/basic/process-util.c | 14 | diff --git a/src/basic/process-util.c b/src/basic/process-util.c |
15 | index 9b6c4c31f713..24fec5ecb53a 100644 | 15 | index 5de366f830e8..644f53aee005 100644 |
16 | --- a/src/basic/process-util.c | 16 | --- a/src/basic/process-util.c |
17 | +++ b/src/basic/process-util.c | 17 | +++ b/src/basic/process-util.c |
18 | @@ -18,6 +18,9 @@ | 18 | @@ -18,6 +18,9 @@ |
@@ -25,7 +25,7 @@ index 9b6c4c31f713..24fec5ecb53a 100644 | |||
25 | 25 | ||
26 | #include "alloc-util.h" | 26 | #include "alloc-util.h" |
27 | #include "architecture.h" | 27 | #include "architecture.h" |
28 | @@ -1114,11 +1117,15 @@ void reset_cached_pid(void) { | 28 | @@ -1116,11 +1119,15 @@ void reset_cached_pid(void) { |
29 | cached_pid = CACHED_PID_UNSET; | 29 | cached_pid = CACHED_PID_UNSET; |
30 | } | 30 | } |
31 | 31 | ||
diff --git a/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch b/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch index e00600ab7c..e5d9515e86 100644 --- a/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch +++ b/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f6df7f25a6bb00d5540915216adfff8afefec2b0 Mon Sep 17 00:00:00 2001 | 1 | From 4aa91347ae975051dbe4dd2f98a1f4f459f2604f Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Mon, 25 Feb 2019 15:12:41 +0800 | 3 | Date: Mon, 25 Feb 2019 15:12:41 +0800 |
4 | Subject: [PATCH] Use uintmax_t for handling rlim_t | 4 | Subject: [PATCH] Use uintmax_t for handling rlim_t |
@@ -28,10 +28,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
28 | 3 files changed, 8 insertions(+), 14 deletions(-) | 28 | 3 files changed, 8 insertions(+), 14 deletions(-) |
29 | 29 | ||
30 | diff --git a/src/basic/format-util.h b/src/basic/format-util.h | 30 | diff --git a/src/basic/format-util.h b/src/basic/format-util.h |
31 | index 59622508a333..779b6826d50e 100644 | 31 | index c47fa76ea8ff..14a78d9f5fd0 100644 |
32 | --- a/src/basic/format-util.h | 32 | --- a/src/basic/format-util.h |
33 | +++ b/src/basic/format-util.h | 33 | +++ b/src/basic/format-util.h |
34 | @@ -44,13 +44,7 @@ | 34 | @@ -32,13 +32,7 @@ assert_cc(sizeof(gid_t) == sizeof(uint32_t)); |
35 | # define PRI_TIMEX "li" | 35 | # define PRI_TIMEX "li" |
36 | #endif | 36 | #endif |
37 | 37 | ||
@@ -78,10 +78,10 @@ index 2dc13eabc30d..0633cc67f417 100644 | |||
78 | return 1; | 78 | return 1; |
79 | } | 79 | } |
80 | diff --git a/src/core/execute.c b/src/core/execute.c | 80 | diff --git a/src/core/execute.c b/src/core/execute.c |
81 | index f04b8ba05002..084cf1420078 100644 | 81 | index 9762dc57443c..4a3421bb3ee6 100644 |
82 | --- a/src/core/execute.c | 82 | --- a/src/core/execute.c |
83 | +++ b/src/core/execute.c | 83 | +++ b/src/core/execute.c |
84 | @@ -4455,9 +4455,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) { | 84 | @@ -4567,9 +4567,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) { |
85 | for (i = 0; i < RLIM_NLIMITS; i++) | 85 | for (i = 0; i < RLIM_NLIMITS; i++) |
86 | if (c->rlimit[i]) { | 86 | if (c->rlimit[i]) { |
87 | fprintf(f, "%sLimit%s: " RLIM_FMT "\n", | 87 | fprintf(f, "%sLimit%s: " RLIM_FMT "\n", |
diff --git a/meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch b/meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch index aa23c7ab7d..049096d2a9 100644 --- a/meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch +++ b/meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 7874912817b5ac7ed7f8557359a12d9d4b2f53eb Mon Sep 17 00:00:00 2001 | 1 | From 62fac5e3ff0fccd329cdc49605258b6d0e573a3e Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Wed, 28 Feb 2018 21:25:22 -0800 | 3 | Date: Wed, 28 Feb 2018 21:25:22 -0800 |
4 | Subject: [PATCH] test-sizeof.c: Disable tests for missing typedefs in musl | 4 | Subject: [PATCH] test-sizeof.c: Disable tests for missing typedefs in musl |
@@ -13,10 +13,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
13 | 1 file changed, 4 insertions(+) | 13 | 1 file changed, 4 insertions(+) |
14 | 14 | ||
15 | diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c | 15 | diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c |
16 | index 7fc16a62b656..a710db5370b8 100644 | 16 | index 1020e0cb3153..c65062d2562c 100644 |
17 | --- a/src/test/test-sizeof.c | 17 | --- a/src/test/test-sizeof.c |
18 | +++ b/src/test/test-sizeof.c | 18 | +++ b/src/test/test-sizeof.c |
19 | @@ -42,8 +42,10 @@ int main(void) { | 19 | @@ -44,8 +44,10 @@ int main(void) { |
20 | info(unsigned); | 20 | info(unsigned); |
21 | info(long unsigned); | 21 | info(long unsigned); |
22 | info(long long unsigned); | 22 | info(long long unsigned); |
@@ -27,7 +27,7 @@ index 7fc16a62b656..a710db5370b8 100644 | |||
27 | 27 | ||
28 | info(float); | 28 | info(float); |
29 | info(double); | 29 | info(double); |
30 | @@ -61,7 +63,9 @@ int main(void) { | 30 | @@ -63,7 +65,9 @@ int main(void) { |
31 | info(ssize_t); | 31 | info(ssize_t); |
32 | info(time_t); | 32 | info(time_t); |
33 | info(usec_t); | 33 | info(usec_t); |
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 56f45381de..1934b783dc 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From a6f3359042219abaa8ae06dfcce41a4721e8c21f Mon Sep 17 00:00:00 2001 | 1 | From bb28a9c870bb47dcdb1ccebaa8e3a5a86730a244 Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Wed, 4 Jul 2018 15:00:44 +0800 | 3 | Date: Wed, 4 Jul 2018 15:00:44 +0800 |
4 | Subject: [PATCH] Do not disable buffering when writing to oom_score_adj | 4 | Subject: [PATCH] Do not disable buffering when writing to oom_score_adj |
@@ -25,10 +25,10 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
25 | 1 file changed, 1 insertion(+), 1 deletion(-) | 25 | 1 file changed, 1 insertion(+), 1 deletion(-) |
26 | 26 | ||
27 | diff --git a/src/basic/process-util.c b/src/basic/process-util.c | 27 | diff --git a/src/basic/process-util.c b/src/basic/process-util.c |
28 | index 24fec5ecb53a..642b02443c85 100644 | 28 | index 644f53aee005..acaf13591396 100644 |
29 | --- a/src/basic/process-util.c | 29 | --- a/src/basic/process-util.c |
30 | +++ b/src/basic/process-util.c | 30 | +++ b/src/basic/process-util.c |
31 | @@ -1492,7 +1492,7 @@ int set_oom_score_adjust(int value) { | 31 | @@ -1500,7 +1500,7 @@ int set_oom_score_adjust(int value) { |
32 | sprintf(t, "%i", value); | 32 | sprintf(t, "%i", value); |
33 | 33 | ||
34 | return write_string_file("/proc/self/oom_score_adj", t, | 34 | return write_string_file("/proc/self/oom_score_adj", t, |
@@ -36,4 +36,4 @@ index 24fec5ecb53a..642b02443c85 100644 | |||
36 | + WRITE_STRING_FILE_VERIFY_ON_FAILURE); | 36 | + WRITE_STRING_FILE_VERIFY_ON_FAILURE); |
37 | } | 37 | } |
38 | 38 | ||
39 | static const char *const ioprio_class_table[] = { | 39 | int pidfd_get_pid(int fd, pid_t *ret) { |
diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_245.5.bb index 7ab01fb8ce..ece4220987 100644 --- a/meta/recipes-core/systemd/systemd_244.3.bb +++ b/meta/recipes-core/systemd/systemd_245.5.bb | |||
@@ -47,6 +47,7 @@ SRC_URI_MUSL = "\ | |||
47 | file://0002-src-login-brightness.c-include-sys-wait.h.patch \ | 47 | file://0002-src-login-brightness.c-include-sys-wait.h.patch \ |
48 | file://0003-src-basic-copy.c-include-signal.h.patch \ | 48 | file://0003-src-basic-copy.c-include-signal.h.patch \ |
49 | file://0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch \ | 49 | file://0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch \ |
50 | file://0001-Handle-missing-gshadow.patch \ | ||
50 | " | 51 | " |
51 | 52 | ||
52 | PAM_PLUGINS = " \ | 53 | PAM_PLUGINS = " \ |
@@ -83,6 +84,7 @@ PACKAGECONFIG ??= " \ | |||
83 | sysvinit \ | 84 | sysvinit \ |
84 | timedated \ | 85 | timedated \ |
85 | timesyncd \ | 86 | timesyncd \ |
87 | userdb \ | ||
86 | utmp \ | 88 | utmp \ |
87 | vconsole \ | 89 | vconsole \ |
88 | xz \ | 90 | xz \ |
@@ -97,6 +99,7 @@ PACKAGECONFIG_remove_libc-musl = " \ | |||
97 | nss-mymachines \ | 99 | nss-mymachines \ |
98 | nss-resolve \ | 100 | nss-resolve \ |
99 | sysusers \ | 101 | sysusers \ |
102 | userdb \ | ||
100 | utmp \ | 103 | utmp \ |
101 | " | 104 | " |
102 | 105 | ||
@@ -174,6 +177,7 @@ PACKAGECONFIG[timedated] = "-Dtimedated=true,-Dtimedated=false" | |||
174 | PACKAGECONFIG[timesyncd] = "-Dtimesyncd=true,-Dtimesyncd=false" | 177 | PACKAGECONFIG[timesyncd] = "-Dtimesyncd=true,-Dtimesyncd=false" |
175 | PACKAGECONFIG[usrmerge] = "-Dsplit-usr=false,-Dsplit-usr=true" | 178 | PACKAGECONFIG[usrmerge] = "-Dsplit-usr=false,-Dsplit-usr=true" |
176 | PACKAGECONFIG[sbinmerge] = "-Dsplit-bin=false,-Dsplit-bin=true" | 179 | PACKAGECONFIG[sbinmerge] = "-Dsplit-bin=false,-Dsplit-bin=true" |
180 | PACKAGECONFIG[userdb] = "-Duserdb=true,-Duserdb=false" | ||
177 | PACKAGECONFIG[utmp] = "-Dutmp=true,-Dutmp=false" | 181 | PACKAGECONFIG[utmp] = "-Dutmp=true,-Dutmp=false" |
178 | PACKAGECONFIG[valgrind] = "-DVALGRIND=1,,valgrind" | 182 | PACKAGECONFIG[valgrind] = "-DVALGRIND=1,,valgrind" |
179 | PACKAGECONFIG[vconsole] = "-Dvconsole=true,-Dvconsole=false,,${PN}-vconsole-setup" | 183 | PACKAGECONFIG[vconsole] = "-Dvconsole=true,-Dvconsole=false,,${PN}-vconsole-setup" |
@@ -494,10 +498,13 @@ FILES_${PN}-extra-utils = "\ | |||
494 | CONFFILES_${PN} = "${sysconfdir}/systemd/coredump.conf \ | 498 | CONFFILES_${PN} = "${sysconfdir}/systemd/coredump.conf \ |
495 | ${sysconfdir}/systemd/journald.conf \ | 499 | ${sysconfdir}/systemd/journald.conf \ |
496 | ${sysconfdir}/systemd/logind.conf \ | 500 | ${sysconfdir}/systemd/logind.conf \ |
497 | ${sysconfdir}/systemd/system.conf \ | 501 | ${sysconfdir}/systemd/networkd.conf \ |
498 | ${sysconfdir}/systemd/user.conf \ | 502 | ${sysconfdir}/systemd/pstore.conf \ |
499 | ${sysconfdir}/systemd/resolved.conf \ | 503 | ${sysconfdir}/systemd/resolved.conf \ |
504 | ${sysconfdir}/systemd/sleep.conf \ | ||
505 | ${sysconfdir}/systemd/system.conf \ | ||
500 | ${sysconfdir}/systemd/timesyncd.conf \ | 506 | ${sysconfdir}/systemd/timesyncd.conf \ |
507 | ${sysconfdir}/systemd/user.conf \ | ||
501 | " | 508 | " |
502 | 509 | ||
503 | FILES_${PN} = " ${base_bindir}/* \ | 510 | FILES_${PN} = " ${base_bindir}/* \ |