summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-core/systemd/systemd.inc4
-rw-r--r--meta/recipes-core/systemd/systemd/0001-Adjust-for-musl-headers.patch82
-rw-r--r--meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch (renamed from meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch)14
-rw-r--r--meta/recipes-core/systemd/systemd/0003-errno-util-Make-STRERROR-portable-for-musl.patch (renamed from meta/recipes-core/systemd/systemd/0001-errno-util-Make-STRERROR-portable-for-musl.patch)4
-rw-r--r--meta/recipes-core/systemd/systemd/0004-Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-to-.patch (renamed from meta/recipes-core/systemd/systemd/0001-Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-to-.patch)8
-rw-r--r--meta/recipes-core/systemd/systemd/0005-pass-correct-parameters-to-getdents64.patch (renamed from meta/recipes-core/systemd/systemd/0001-pass-correct-parameters-to-getdents64.patch)10
-rw-r--r--meta/recipes-core/systemd/systemd/0006-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch (renamed from meta/recipes-core/systemd/systemd/0001-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch)20
-rw-r--r--meta/recipes-core/systemd/systemd/0007-Add-sys-stat.h-for-S_IFDIR.patch (renamed from meta/recipes-core/systemd/systemd/0002-Add-sys-stat.h-for-S_IFDIR.patch)8
-rw-r--r--meta/recipes-core/systemd/systemd/0008-implment-systemd-sysv-install-for-OE.patch (renamed from meta/recipes-core/systemd/systemd/0003-implment-systemd-sysv-install-for-OE.patch)8
-rw-r--r--meta/recipes-core/systemd/systemd/0009-missing_type.h-add-comparison_fn_t.patch (renamed from meta/recipes-core/systemd/systemd/0003-missing_type.h-add-comparison_fn_t.patch)8
-rw-r--r--meta/recipes-core/systemd/systemd/0010-add-fallback-parse_printf_format-implementation.patch (renamed from meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch)31
-rw-r--r--meta/recipes-core/systemd/systemd/0011-src-basic-missing.h-check-for-missing-strndupa.patch (renamed from meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch)169
-rw-r--r--meta/recipes-core/systemd/systemd/0012-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch (renamed from meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch)22
-rw-r--r--meta/recipes-core/systemd/systemd/0013-add-missing-FTW_-macros-for-musl.patch (renamed from meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch)6
-rw-r--r--meta/recipes-core/systemd/systemd/0014-Use-uintmax_t-for-handling-rlim_t.patch (renamed from meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch)20
-rw-r--r--meta/recipes-core/systemd/systemd/0015-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch (renamed from meta/recipes-core/systemd/systemd/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch)8
-rw-r--r--meta/recipes-core/systemd/systemd/0016-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch (renamed from meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch)18
-rw-r--r--meta/recipes-core/systemd/systemd/0017-Define-glibc-compatible-basename-for-non-glibc-syste.patch (renamed from meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch)8
-rw-r--r--meta/recipes-core/systemd/systemd/0018-Do-not-disable-buffering-when-writing-to-oom_score_a.patch (renamed from meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch)10
-rw-r--r--meta/recipes-core/systemd/systemd/0019-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch (renamed from meta/recipes-core/systemd/systemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch)22
-rw-r--r--meta/recipes-core/systemd/systemd/0020-avoid-redefinition-of-prctl_mm_map-structure.patch (renamed from meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch)6
-rw-r--r--meta/recipes-core/systemd/systemd/0021-do-not-disable-buffer-in-writing-files.patch (renamed from meta/recipes-core/systemd/systemd/0022-do-not-disable-buffer-in-writing-files.patch)139
-rw-r--r--meta/recipes-core/systemd/systemd/0022-Handle-__cpu_mask-usage.patch (renamed from meta/recipes-core/systemd/systemd/0025-Handle-__cpu_mask-usage.patch)8
-rw-r--r--meta/recipes-core/systemd/systemd/0023-Handle-missing-gshadow.patch (renamed from meta/recipes-core/systemd/systemd/0026-Handle-missing-gshadow.patch)20
-rw-r--r--meta/recipes-core/systemd/systemd/0024-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch (renamed from meta/recipes-core/systemd/systemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch)10
-rw-r--r--meta/recipes-core/systemd/systemd/0025-systemctl-explicitly-cast-the-constants-to-uint64_t.patch (renamed from meta/recipes-core/systemd/systemd/fix-32bit.patch)7
-rw-r--r--meta/recipes-core/systemd/systemd/0026-src-boot-efi-efi-string.c-define-wchar_t-from-__WCHA.patch (renamed from meta/recipes-core/systemd/systemd/0004-src-boot-efi-efi-string.c-define-wchar_t-from-__WCHA.patch)11
-rw-r--r--meta/recipes-core/systemd/systemd_253.1.bb46
28 files changed, 513 insertions, 214 deletions
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc
index 354cc46e90..14608f9abc 100644
--- a/meta/recipes-core/systemd/systemd.inc
+++ b/meta/recipes-core/systemd/systemd.inc
@@ -17,8 +17,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
17SRCREV = "6c327d74aa0d350482e82a247d7018559699798d" 17SRCREV = "6c327d74aa0d350482e82a247d7018559699798d"
18SRCBRANCH = "v253-stable" 18SRCBRANCH = "v253-stable"
19SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \ 19SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \
20 file://0004-src-boot-efi-efi-string.c-define-wchar_t-from-__WCHA.patch \ 20 file://0026-src-boot-efi-efi-string.c-define-wchar_t-from-__WCHA.patch \
21 file://fix-32bit.patch \ 21 file://0025-systemctl-explicitly-cast-the-constants-to-uint64_t.patch \
22 " 22 "
23 23
24S = "${WORKDIR}/git" 24S = "${WORKDIR}/git"
diff --git a/meta/recipes-core/systemd/systemd/0001-Adjust-for-musl-headers.patch b/meta/recipes-core/systemd/systemd/0001-Adjust-for-musl-headers.patch
index 6496280dda..5e9646c569 100644
--- a/meta/recipes-core/systemd/systemd/0001-Adjust-for-musl-headers.patch
+++ b/meta/recipes-core/systemd/systemd/0001-Adjust-for-musl-headers.patch
@@ -1,4 +1,4 @@
1From 9a1841402ce3ef21a10a7314a07a615f8196d406 Mon Sep 17 00:00:00 2001 1From e5f067cb3dc845dd865e450f4e64077b28feb4c0 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 21 Jan 2022 22:19:37 -0800 3Date: Fri, 21 Jan 2022 22:19:37 -0800
4Subject: [PATCH] Adjust for musl headers 4Subject: [PATCH] Adjust for musl headers
@@ -6,7 +6,6 @@ Subject: [PATCH] Adjust for musl headers
6Upstream-Status: Inappropriate [musl specific] 6Upstream-Status: Inappropriate [musl specific]
7 7
8Signed-off-by: Khem Raj <raj.khem@gmail.com> 8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
10--- 9---
11 src/libsystemd-network/sd-dhcp6-client.c | 2 +- 10 src/libsystemd-network/sd-dhcp6-client.c | 2 +-
12 src/network/netdev/bareudp.c | 2 +- 11 src/network/netdev/bareudp.c | 2 +-
@@ -47,6 +46,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
47 src/udev/udev-builtin-net_id.c | 2 +- 46 src/udev/udev-builtin-net_id.c | 2 +-
48 37 files changed, 44 insertions(+), 42 deletions(-) 47 37 files changed, 44 insertions(+), 42 deletions(-)
49 48
49diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c
50index 57dd91f81f..2b7f4fa3a7 100644
50--- a/src/libsystemd-network/sd-dhcp6-client.c 51--- a/src/libsystemd-network/sd-dhcp6-client.c
51+++ b/src/libsystemd-network/sd-dhcp6-client.c 52+++ b/src/libsystemd-network/sd-dhcp6-client.c
52@@ -5,7 +5,7 @@ 53@@ -5,7 +5,7 @@
@@ -58,6 +59,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
58 #include <linux/if_infiniband.h> 59 #include <linux/if_infiniband.h>
59 60
60 #include "sd-dhcp6-client.h" 61 #include "sd-dhcp6-client.h"
62diff --git a/src/network/netdev/bareudp.c b/src/network/netdev/bareudp.c
63index 24d3afb877..f6241b41ee 100644
61--- a/src/network/netdev/bareudp.c 64--- a/src/network/netdev/bareudp.c
62+++ b/src/network/netdev/bareudp.c 65+++ b/src/network/netdev/bareudp.c
63@@ -2,7 +2,7 @@ 66@@ -2,7 +2,7 @@
@@ -69,6 +72,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
69 72
70 #include "bareudp.h" 73 #include "bareudp.h"
71 #include "netlink-util.h" 74 #include "netlink-util.h"
75diff --git a/src/network/netdev/batadv.c b/src/network/netdev/batadv.c
76index 7e97619657..50fcffcfdf 100644
72--- a/src/network/netdev/batadv.c 77--- a/src/network/netdev/batadv.c
73+++ b/src/network/netdev/batadv.c 78+++ b/src/network/netdev/batadv.c
74@@ -3,7 +3,7 @@ 79@@ -3,7 +3,7 @@
@@ -80,6 +85,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
80 85
81 #include "batadv.h" 86 #include "batadv.h"
82 #include "fileio.h" 87 #include "fileio.h"
88diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c
89index 601bff0a9c..dfed8d9e54 100644
83--- a/src/network/netdev/bond.c 90--- a/src/network/netdev/bond.c
84+++ b/src/network/netdev/bond.c 91+++ b/src/network/netdev/bond.c
85@@ -1,7 +1,7 @@ 92@@ -1,7 +1,7 @@
@@ -91,6 +98,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
91 98
92 #include "alloc-util.h" 99 #include "alloc-util.h"
93 #include "bond.h" 100 #include "bond.h"
101diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c
102index b65c3b49fc..6875b4fbdb 100644
94--- a/src/network/netdev/bridge.c 103--- a/src/network/netdev/bridge.c
95+++ b/src/network/netdev/bridge.c 104+++ b/src/network/netdev/bridge.c
96@@ -2,7 +2,7 @@ 105@@ -2,7 +2,7 @@
@@ -102,6 +111,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
102 #include <linux/if_bridge.h> 111 #include <linux/if_bridge.h>
103 112
104 #include "bridge.h" 113 #include "bridge.h"
114diff --git a/src/network/netdev/dummy.c b/src/network/netdev/dummy.c
115index 00df1d2787..77b506b422 100644
105--- a/src/network/netdev/dummy.c 116--- a/src/network/netdev/dummy.c
106+++ b/src/network/netdev/dummy.c 117+++ b/src/network/netdev/dummy.c
107@@ -1,6 +1,6 @@ 118@@ -1,6 +1,6 @@
@@ -112,6 +123,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
112 123
113 #include "dummy.h" 124 #include "dummy.h"
114 125
126diff --git a/src/network/netdev/geneve.c b/src/network/netdev/geneve.c
127index 777a32d75c..73bfa2b5c1 100644
115--- a/src/network/netdev/geneve.c 128--- a/src/network/netdev/geneve.c
116+++ b/src/network/netdev/geneve.c 129+++ b/src/network/netdev/geneve.c
117@@ -2,7 +2,7 @@ 130@@ -2,7 +2,7 @@
@@ -123,6 +136,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
123 136
124 #include "alloc-util.h" 137 #include "alloc-util.h"
125 #include "conf-parser.h" 138 #include "conf-parser.h"
139diff --git a/src/network/netdev/ifb.c b/src/network/netdev/ifb.c
140index d7ff44cb9e..e037629ae4 100644
126--- a/src/network/netdev/ifb.c 141--- a/src/network/netdev/ifb.c
127+++ b/src/network/netdev/ifb.c 142+++ b/src/network/netdev/ifb.c
128@@ -1,7 +1,7 @@ 143@@ -1,7 +1,7 @@
@@ -134,6 +149,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
134 149
135 #include "ifb.h" 150 #include "ifb.h"
136 151
152diff --git a/src/network/netdev/ipoib.c b/src/network/netdev/ipoib.c
153index 5dd9286d57..4036d66dad 100644
137--- a/src/network/netdev/ipoib.c 154--- a/src/network/netdev/ipoib.c
138+++ b/src/network/netdev/ipoib.c 155+++ b/src/network/netdev/ipoib.c
139@@ -1,6 +1,6 @@ 156@@ -1,6 +1,6 @@
@@ -144,6 +161,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
144 #include <linux/if_link.h> 161 #include <linux/if_link.h>
145 162
146 #include "ipoib.h" 163 #include "ipoib.h"
164diff --git a/src/network/netdev/ipvlan.c b/src/network/netdev/ipvlan.c
165index 058eadebd7..c470ebb6d7 100644
147--- a/src/network/netdev/ipvlan.c 166--- a/src/network/netdev/ipvlan.c
148+++ b/src/network/netdev/ipvlan.c 167+++ b/src/network/netdev/ipvlan.c
149@@ -2,7 +2,7 @@ 168@@ -2,7 +2,7 @@
@@ -155,6 +174,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
155 174
156 #include "conf-parser.h" 175 #include "conf-parser.h"
157 #include "ipvlan.h" 176 #include "ipvlan.h"
177diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c
178index 0da3dd4bd2..eb20f04469 100644
158--- a/src/network/netdev/macsec.c 179--- a/src/network/netdev/macsec.c
159+++ b/src/network/netdev/macsec.c 180+++ b/src/network/netdev/macsec.c
160@@ -1,7 +1,7 @@ 181@@ -1,7 +1,7 @@
@@ -166,6 +187,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
166 #include <linux/if_ether.h> 187 #include <linux/if_ether.h>
167 #include <linux/if_macsec.h> 188 #include <linux/if_macsec.h>
168 #include <linux/genetlink.h> 189 #include <linux/genetlink.h>
190diff --git a/src/network/netdev/macvlan.c b/src/network/netdev/macvlan.c
191index 1114bb0cb1..6c79a219a4 100644
169--- a/src/network/netdev/macvlan.c 192--- a/src/network/netdev/macvlan.c
170+++ b/src/network/netdev/macvlan.c 193+++ b/src/network/netdev/macvlan.c
171@@ -2,7 +2,7 @@ 194@@ -2,7 +2,7 @@
@@ -177,6 +200,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
177 200
178 #include "conf-parser.h" 201 #include "conf-parser.h"
179 #include "macvlan.h" 202 #include "macvlan.h"
203diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c
204index 038a27c118..67155f0db7 100644
180--- a/src/network/netdev/netdev.c 205--- a/src/network/netdev/netdev.c
181+++ b/src/network/netdev/netdev.c 206+++ b/src/network/netdev/netdev.c
182@@ -2,7 +2,7 @@ 207@@ -2,7 +2,7 @@
@@ -188,6 +213,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
188 #include <unistd.h> 213 #include <unistd.h>
189 214
190 #include "alloc-util.h" 215 #include "alloc-util.h"
216diff --git a/src/network/netdev/netdevsim.c b/src/network/netdev/netdevsim.c
217index 15d5c132f9..a3ffa48b15 100644
191--- a/src/network/netdev/netdevsim.c 218--- a/src/network/netdev/netdevsim.c
192+++ b/src/network/netdev/netdevsim.c 219+++ b/src/network/netdev/netdevsim.c
193@@ -1,6 +1,6 @@ 220@@ -1,6 +1,6 @@
@@ -198,6 +225,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
198 225
199 #include "netdevsim.h" 226 #include "netdevsim.h"
200 227
228diff --git a/src/network/netdev/nlmon.c b/src/network/netdev/nlmon.c
229index ff372092e6..eef66811f4 100644
201--- a/src/network/netdev/nlmon.c 230--- a/src/network/netdev/nlmon.c
202+++ b/src/network/netdev/nlmon.c 231+++ b/src/network/netdev/nlmon.c
203@@ -1,6 +1,6 @@ 232@@ -1,6 +1,6 @@
@@ -208,6 +237,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
208 237
209 #include "nlmon.h" 238 #include "nlmon.h"
210 239
240diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c
241index 2addfeecaa..954987f26d 100644
211--- a/src/network/netdev/tunnel.c 242--- a/src/network/netdev/tunnel.c
212+++ b/src/network/netdev/tunnel.c 243+++ b/src/network/netdev/tunnel.c
213@@ -2,7 +2,7 @@ 244@@ -2,7 +2,7 @@
@@ -219,6 +250,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
219 #include <linux/if_tunnel.h> 250 #include <linux/if_tunnel.h>
220 #include <linux/ip.h> 251 #include <linux/ip.h>
221 #include <linux/ip6_tunnel.h> 252 #include <linux/ip6_tunnel.h>
253diff --git a/src/network/netdev/vcan.c b/src/network/netdev/vcan.c
254index 380547ee1e..137c1adf8a 100644
222--- a/src/network/netdev/vcan.c 255--- a/src/network/netdev/vcan.c
223+++ b/src/network/netdev/vcan.c 256+++ b/src/network/netdev/vcan.c
224@@ -1,6 +1,6 @@ 257@@ -1,6 +1,6 @@
@@ -229,6 +262,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
229 262
230 #include "vcan.h" 263 #include "vcan.h"
231 264
265diff --git a/src/network/netdev/veth.c b/src/network/netdev/veth.c
266index fb00e6667f..f52d9ee89a 100644
232--- a/src/network/netdev/veth.c 267--- a/src/network/netdev/veth.c
233+++ b/src/network/netdev/veth.c 268+++ b/src/network/netdev/veth.c
234@@ -3,7 +3,7 @@ 269@@ -3,7 +3,7 @@
@@ -240,6 +275,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
240 #include <linux/veth.h> 275 #include <linux/veth.h>
241 276
242 #include "netlink-util.h" 277 #include "netlink-util.h"
278diff --git a/src/network/netdev/vlan.c b/src/network/netdev/vlan.c
279index a3d961dac3..386b567a42 100644
243--- a/src/network/netdev/vlan.c 280--- a/src/network/netdev/vlan.c
244+++ b/src/network/netdev/vlan.c 281+++ b/src/network/netdev/vlan.c
245@@ -2,7 +2,7 @@ 282@@ -2,7 +2,7 @@
@@ -251,6 +288,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
251 #include <linux/if_vlan.h> 288 #include <linux/if_vlan.h>
252 289
253 #include "parse-util.h" 290 #include "parse-util.h"
291diff --git a/src/network/netdev/vrf.c b/src/network/netdev/vrf.c
292index 05ef3ff13d..825fc4a398 100644
254--- a/src/network/netdev/vrf.c 293--- a/src/network/netdev/vrf.c
255+++ b/src/network/netdev/vrf.c 294+++ b/src/network/netdev/vrf.c
256@@ -2,7 +2,7 @@ 295@@ -2,7 +2,7 @@
@@ -262,6 +301,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
262 301
263 #include "vrf.h" 302 #include "vrf.h"
264 303
304diff --git a/src/network/netdev/vxcan.c b/src/network/netdev/vxcan.c
305index 83269b0707..39c6dbe29c 100644
265--- a/src/network/netdev/vxcan.c 306--- a/src/network/netdev/vxcan.c
266+++ b/src/network/netdev/vxcan.c 307+++ b/src/network/netdev/vxcan.c
267@@ -1,7 +1,7 @@ 308@@ -1,7 +1,7 @@
@@ -273,6 +314,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
273 314
274 #include "vxcan.h" 315 #include "vxcan.h"
275 316
317diff --git a/src/network/netdev/vxlan.c b/src/network/netdev/vxlan.c
318index 589161938a..0ec9625b7a 100644
276--- a/src/network/netdev/vxlan.c 319--- a/src/network/netdev/vxlan.c
277+++ b/src/network/netdev/vxlan.c 320+++ b/src/network/netdev/vxlan.c
278@@ -2,7 +2,7 @@ 321@@ -2,7 +2,7 @@
@@ -284,6 +327,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
284 327
285 #include "conf-parser.h" 328 #include "conf-parser.h"
286 #include "alloc-util.h" 329 #include "alloc-util.h"
330diff --git a/src/network/netdev/wireguard.c b/src/network/netdev/wireguard.c
331index 51e7e02990..fc36c0623a 100644
287--- a/src/network/netdev/wireguard.c 332--- a/src/network/netdev/wireguard.c
288+++ b/src/network/netdev/wireguard.c 333+++ b/src/network/netdev/wireguard.c
289@@ -6,7 +6,7 @@ 334@@ -6,7 +6,7 @@
@@ -295,6 +340,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
295 #include <linux/ipv6_route.h> 340 #include <linux/ipv6_route.h>
296 341
297 #include "sd-resolve.h" 342 #include "sd-resolve.h"
343diff --git a/src/network/netdev/xfrm.c b/src/network/netdev/xfrm.c
344index a961d8fef2..6c1815b257 100644
298--- a/src/network/netdev/xfrm.c 345--- a/src/network/netdev/xfrm.c
299+++ b/src/network/netdev/xfrm.c 346+++ b/src/network/netdev/xfrm.c
300@@ -1,6 +1,6 @@ 347@@ -1,6 +1,6 @@
@@ -305,6 +352,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
305 352
306 #include "missing_network.h" 353 #include "missing_network.h"
307 #include "xfrm.h" 354 #include "xfrm.h"
355diff --git a/src/network/networkd-bridge-mdb.c b/src/network/networkd-bridge-mdb.c
356index bd1a9745dc..949d3da029 100644
308--- a/src/network/networkd-bridge-mdb.c 357--- a/src/network/networkd-bridge-mdb.c
309+++ b/src/network/networkd-bridge-mdb.c 358+++ b/src/network/networkd-bridge-mdb.c
310@@ -1,7 +1,5 @@ 359@@ -1,7 +1,5 @@
@@ -324,6 +373,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
324 373
325 #define STATIC_BRIDGE_MDB_ENTRIES_PER_NETWORK_MAX 1024U 374 #define STATIC_BRIDGE_MDB_ENTRIES_PER_NETWORK_MAX 1024U
326 375
376diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c
377index ca9a825e7b..8735e261ad 100644
327--- a/src/network/networkd-dhcp-common.c 378--- a/src/network/networkd-dhcp-common.c
328+++ b/src/network/networkd-dhcp-common.c 379+++ b/src/network/networkd-dhcp-common.c
329@@ -1,7 +1,8 @@ 380@@ -1,7 +1,8 @@
@@ -336,6 +387,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
336 387
337 #include "bus-error.h" 388 #include "bus-error.h"
338 #include "bus-locator.h" 389 #include "bus-locator.h"
390diff --git a/src/network/networkd-dhcp-prefix-delegation.c b/src/network/networkd-dhcp-prefix-delegation.c
391index 66c5e979d9..581b6b8c29 100644
339--- a/src/network/networkd-dhcp-prefix-delegation.c 392--- a/src/network/networkd-dhcp-prefix-delegation.c
340+++ b/src/network/networkd-dhcp-prefix-delegation.c 393+++ b/src/network/networkd-dhcp-prefix-delegation.c
341@@ -1,7 +1,5 @@ 394@@ -1,7 +1,5 @@
@@ -355,6 +408,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
355 bool link_dhcp_pd_is_enabled(Link *link) { 408 bool link_dhcp_pd_is_enabled(Link *link) {
356 assert(link); 409 assert(link);
357 410
411diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c
412index 620fbbddc7..c8af20fb34 100644
358--- a/src/network/networkd-dhcp-server.c 413--- a/src/network/networkd-dhcp-server.c
359+++ b/src/network/networkd-dhcp-server.c 414+++ b/src/network/networkd-dhcp-server.c
360@@ -1,7 +1,7 @@ 415@@ -1,7 +1,7 @@
@@ -366,6 +421,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
366 #include <linux/if.h> 421 #include <linux/if.h>
367 422
368 #include "sd-dhcp-server.h" 423 #include "sd-dhcp-server.h"
424diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
425index d4b4942173..3d78da5609 100644
369--- a/src/network/networkd-dhcp4.c 426--- a/src/network/networkd-dhcp4.c
370+++ b/src/network/networkd-dhcp4.c 427+++ b/src/network/networkd-dhcp4.c
371@@ -3,7 +3,7 @@ 428@@ -3,7 +3,7 @@
@@ -377,6 +434,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
377 434
378 #include "alloc-util.h" 435 #include "alloc-util.h"
379 #include "dhcp-client-internal.h" 436 #include "dhcp-client-internal.h"
437diff --git a/src/network/networkd-ipv6ll.c b/src/network/networkd-ipv6ll.c
438index 32229a3fc7..662a345d6e 100644
380--- a/src/network/networkd-ipv6ll.c 439--- a/src/network/networkd-ipv6ll.c
381+++ b/src/network/networkd-ipv6ll.c 440+++ b/src/network/networkd-ipv6ll.c
382@@ -1,7 +1,7 @@ 441@@ -1,7 +1,7 @@
@@ -388,6 +447,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
388 447
389 #include "in-addr-util.h" 448 #include "in-addr-util.h"
390 #include "networkd-address.h" 449 #include "networkd-address.h"
450diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
451index 019bef0590..657fc41ae6 100644
391--- a/src/network/networkd-link.c 452--- a/src/network/networkd-link.c
392+++ b/src/network/networkd-link.c 453+++ b/src/network/networkd-link.c
393@@ -3,7 +3,7 @@ 454@@ -3,7 +3,7 @@
@@ -399,6 +460,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
399 #include <linux/if_link.h> 460 #include <linux/if_link.h>
400 #include <linux/netdevice.h> 461 #include <linux/netdevice.h>
401 #include <sys/socket.h> 462 #include <sys/socket.h>
463diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
464index 99a07e16fc..e51cd81d96 100644
402--- a/src/network/networkd-ndisc.c 465--- a/src/network/networkd-ndisc.c
403+++ b/src/network/networkd-ndisc.c 466+++ b/src/network/networkd-ndisc.c
404@@ -6,7 +6,7 @@ 467@@ -6,7 +6,7 @@
@@ -410,6 +473,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
410 473
411 #include "sd-ndisc.h" 474 #include "sd-ndisc.h"
412 475
476diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
477index 5214a8ad2c..9dd758daae 100644
413--- a/src/network/networkd-route.c 478--- a/src/network/networkd-route.c
414+++ b/src/network/networkd-route.c 479+++ b/src/network/networkd-route.c
415@@ -1,9 +1,5 @@ 480@@ -1,9 +1,5 @@
@@ -433,6 +498,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
433 int route_new(Route **ret) { 498 int route_new(Route **ret) {
434 _cleanup_(route_freep) Route *route = NULL; 499 _cleanup_(route_freep) Route *route = NULL;
435 500
501diff --git a/src/network/networkd-setlink.c b/src/network/networkd-setlink.c
502index 541c4b8a72..06ebda8f0f 100644
436--- a/src/network/networkd-setlink.c 503--- a/src/network/networkd-setlink.c
437+++ b/src/network/networkd-setlink.c 504+++ b/src/network/networkd-setlink.c
438@@ -2,7 +2,7 @@ 505@@ -2,7 +2,7 @@
@@ -444,6 +511,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
444 #include <linux/if_bridge.h> 511 #include <linux/if_bridge.h>
445 512
446 #include "missing_network.h" 513 #include "missing_network.h"
514diff --git a/src/shared/linux/ethtool.h b/src/shared/linux/ethtool.h
515index 1458de3627..d5c2d2e0ac 100644
447--- a/src/shared/linux/ethtool.h 516--- a/src/shared/linux/ethtool.h
448+++ b/src/shared/linux/ethtool.h 517+++ b/src/shared/linux/ethtool.h
449@@ -16,7 +16,8 @@ 518@@ -16,7 +16,8 @@
@@ -454,8 +523,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
454+#include <netinet/if_ether.h> 523+#include <netinet/if_ether.h>
455+//#include <linux/if_ether.h> 524+//#include <linux/if_ether.h>
456 525
457 #ifndef __KERNEL__
458 #include <limits.h> /* for INT_MAX */ 526 #include <limits.h> /* for INT_MAX */
527
528diff --git a/src/shared/netif-util.c b/src/shared/netif-util.c
529index f56c5646c1..5af28ff119 100644
459--- a/src/shared/netif-util.c 530--- a/src/shared/netif-util.c
460+++ b/src/shared/netif-util.c 531+++ b/src/shared/netif-util.c
461@@ -1,7 +1,7 @@ 532@@ -1,7 +1,7 @@
@@ -467,6 +538,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
467 538
468 #include "arphrd-util.h" 539 #include "arphrd-util.h"
469 #include "device-util.h" 540 #include "device-util.h"
541diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
542index a48d5dedf8..31a8bc1b3c 100644
470--- a/src/udev/udev-builtin-net_id.c 543--- a/src/udev/udev-builtin-net_id.c
471+++ b/src/udev/udev-builtin-net_id.c 544+++ b/src/udev/udev-builtin-net_id.c
472@@ -18,7 +18,7 @@ 545@@ -18,7 +18,7 @@
@@ -478,3 +551,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
478 #include <linux/netdevice.h> 551 #include <linux/netdevice.h>
479 #include <linux/pci_regs.h> 552 #include <linux/pci_regs.h>
480 553
554--
5552.39.2
556
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/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch
index 2a033b134e..43611e65fb 100644
--- a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch
+++ b/meta/recipes-core/systemd/systemd/0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch
@@ -1,4 +1,4 @@
1From f9974d7dc289551bfbf823b716fd32b43c54e465 Mon Sep 17 00:00:00 2001 1From ca7d9a8d9c81702af9c599bb79706f12b1a465cf Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Thu, 21 Feb 2019 16:23:24 +0800 3Date: Thu, 21 Feb 2019 16:23:24 +0800
4Subject: [PATCH] binfmt: Don't install dependency links at install time for 4Subject: [PATCH] binfmt: Don't install dependency links at install time for
@@ -18,7 +18,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
18Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 18Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
19[rebased for systemd 243] 19[rebased for systemd 243]
20Signed-off-by: Scott Murray <scott.murray@konsulko.com> 20Signed-off-by: Scott Murray <scott.murray@konsulko.com>
21
22--- 21---
23 units/meson.build | 6 ++---- 22 units/meson.build | 6 ++----
24 units/proc-sys-fs-binfmt_misc.automount | 3 +++ 23 units/proc-sys-fs-binfmt_misc.automount | 3 +++
@@ -26,7 +25,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
26 3 files changed, 9 insertions(+), 4 deletions(-) 25 3 files changed, 9 insertions(+), 4 deletions(-)
27 26
28diff --git a/units/meson.build b/units/meson.build 27diff --git a/units/meson.build b/units/meson.build
29index a9bf28f6d9..11d3644168 100644 28index c7939a10f8..219570ab19 100644
30--- a/units/meson.build 29--- a/units/meson.build
31+++ b/units/meson.build 30+++ b/units/meson.build
32@@ -62,8 +62,7 @@ units = [ 31@@ -62,8 +62,7 @@ units = [
@@ -39,7 +38,7 @@ index a9bf28f6d9..11d3644168 100644
39 ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'], 38 ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'],
40 ['reboot.target', '', 39 ['reboot.target', '',
41 'ctrl-alt-del.target' + (with_runlevels ? ' runlevel6.target' : '')], 40 'ctrl-alt-del.target' + (with_runlevels ? ' runlevel6.target' : '')],
42@@ -186,8 +185,7 @@ in_units = [ 41@@ -185,8 +184,7 @@ in_units = [
43 ['rescue.service', ''], 42 ['rescue.service', ''],
44 ['serial-getty@.service', ''], 43 ['serial-getty@.service', ''],
45 ['systemd-backlight@.service', 'ENABLE_BACKLIGHT'], 44 ['systemd-backlight@.service', 'ENABLE_BACKLIGHT'],
@@ -50,7 +49,7 @@ index a9bf28f6d9..11d3644168 100644
50 ['systemd-boot-check-no-failures.service', ''], 49 ['systemd-boot-check-no-failures.service', ''],
51 ['systemd-coredump@.service', 'ENABLE_COREDUMP'], 50 ['systemd-coredump@.service', 'ENABLE_COREDUMP'],
52diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount 51diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount
53index 172c8757ab..f65d8930c6 100644 52index 6b1bbdc91e..5ec5b8670a 100644
54--- a/units/proc-sys-fs-binfmt_misc.automount 53--- a/units/proc-sys-fs-binfmt_misc.automount
55+++ b/units/proc-sys-fs-binfmt_misc.automount 54+++ b/units/proc-sys-fs-binfmt_misc.automount
56@@ -19,3 +19,6 @@ ConditionPathIsReadWrite=/proc/sys/ 55@@ -19,3 +19,6 @@ ConditionPathIsReadWrite=/proc/sys/
@@ -61,7 +60,7 @@ index 172c8757ab..f65d8930c6 100644
61+[Install] 60+[Install]
62+WantedBy=sysinit.target 61+WantedBy=sysinit.target
63diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in 62diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
64index 96f595ad72..7c010bb224 100644 63index b04412e037..63f116e4fa 100644
65--- a/units/systemd-binfmt.service.in 64--- a/units/systemd-binfmt.service.in
66+++ b/units/systemd-binfmt.service.in 65+++ b/units/systemd-binfmt.service.in
67@@ -14,6 +14,7 @@ Documentation=https://docs.kernel.org/admin-guide/binfmt-misc.html 66@@ -14,6 +14,7 @@ Documentation=https://docs.kernel.org/admin-guide/binfmt-misc.html
@@ -79,3 +78,6 @@ index 96f595ad72..7c010bb224 100644
79+ 78+
80+[Install] 79+[Install]
81+WantedBy=sysinit.target 80+WantedBy=sysinit.target
81--
822.39.2
83
diff --git a/meta/recipes-core/systemd/systemd/0001-errno-util-Make-STRERROR-portable-for-musl.patch b/meta/recipes-core/systemd/systemd/0003-errno-util-Make-STRERROR-portable-for-musl.patch
index 2fb8985ad1..e9e69cb648 100644
--- a/meta/recipes-core/systemd/systemd/0001-errno-util-Make-STRERROR-portable-for-musl.patch
+++ b/meta/recipes-core/systemd/systemd/0003-errno-util-Make-STRERROR-portable-for-musl.patch
@@ -1,4 +1,4 @@
1From f66b5c802ce0a3310f5580cfc1b02446f8087568 Mon Sep 17 00:00:00 2001 1From f629a76e0fba300a9d511614160fee38dd4a5e57 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 23 Jan 2023 23:39:46 -0800 3Date: Mon, 23 Jan 2023 23:39:46 -0800
4Subject: [PATCH] errno-util: Make STRERROR portable for musl 4Subject: [PATCH] errno-util: Make STRERROR portable for musl
@@ -38,5 +38,5 @@ index 091f99c590..eb5c1f9961 100644
38 * Note that we can't use ({ … }) to define a temporary variable, so errnum is 38 * Note that we can't use ({ … }) to define a temporary variable, so errnum is
39 * evaluated twice. */ 39 * evaluated twice. */
40-- 40--
412.39.1 412.39.2
42 42
diff --git a/meta/recipes-core/systemd/systemd/0001-Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-to-.patch b/meta/recipes-core/systemd/systemd/0004-Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-to-.patch
index 0fb6efb469..aa1f3c2e82 100644
--- a/meta/recipes-core/systemd/systemd/0001-Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-to-.patch
+++ b/meta/recipes-core/systemd/systemd/0004-Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-to-.patch
@@ -1,4 +1,4 @@
1From 258af8106cbed6fa53f7bee042bf903e58b57a41 Mon Sep 17 00:00:00 2001 1From f75f03ef6bc3554068e456bed227f333d5cb8c34 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 29 Sep 2020 18:01:41 -0700 3Date: Tue, 29 Sep 2020 18:01:41 -0700
4Subject: [PATCH] Move sysusers.d/sysctl.d/binfmt.d/modules-load.d to /usr 4Subject: [PATCH] Move sysusers.d/sysctl.d/binfmt.d/modules-load.d to /usr
@@ -10,7 +10,6 @@ the old /usr/lib is still being used.
10Upstream-Status: Inappropriate (OE-specific) 10Upstream-Status: Inappropriate (OE-specific)
11Signed-off-by: Khem Raj <raj.khem@gmail.com> 11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12Signed-off-by: Jiaqing Zhao <jiaqing.zhao@linux.intel.com> 12Signed-off-by: Jiaqing Zhao <jiaqing.zhao@linux.intel.com>
13
14--- 13---
15 src/core/systemd.pc.in | 8 ++++---- 14 src/core/systemd.pc.in | 8 ++++----
16 src/libsystemd/sd-path/sd-path.c | 8 ++++---- 15 src/libsystemd/sd-path/sd-path.c | 8 ++++----
@@ -42,7 +41,7 @@ index 693433b34b..8368a3ff02 100644
42 41
43 catalog_dir=${prefix}/lib/systemd/catalog 42 catalog_dir=${prefix}/lib/systemd/catalog
44diff --git a/src/libsystemd/sd-path/sd-path.c b/src/libsystemd/sd-path/sd-path.c 43diff --git a/src/libsystemd/sd-path/sd-path.c b/src/libsystemd/sd-path/sd-path.c
45index ac33e349c0..f0615ffb22 100644 44index 1af3a36d1d..def502b717 100644
46--- a/src/libsystemd/sd-path/sd-path.c 45--- a/src/libsystemd/sd-path/sd-path.c
47+++ b/src/libsystemd/sd-path/sd-path.c 46+++ b/src/libsystemd/sd-path/sd-path.c
48@@ -362,19 +362,19 @@ static int get_path(uint64_t type, char **buffer, const char **ret) { 47@@ -362,19 +362,19 @@ static int get_path(uint64_t type, char **buffer, const char **ret) {
@@ -69,3 +68,6 @@ index ac33e349c0..f0615ffb22 100644
69 return 0; 68 return 0;
70 69
71 case SD_PATH_CATALOG: 70 case SD_PATH_CATALOG:
71--
722.39.2
73
diff --git a/meta/recipes-core/systemd/systemd/0001-pass-correct-parameters-to-getdents64.patch b/meta/recipes-core/systemd/systemd/0005-pass-correct-parameters-to-getdents64.patch
index 144314c409..c634d8ec3d 100644
--- a/meta/recipes-core/systemd/systemd/0001-pass-correct-parameters-to-getdents64.patch
+++ b/meta/recipes-core/systemd/systemd/0005-pass-correct-parameters-to-getdents64.patch
@@ -1,4 +1,4 @@
1From dab02796780f00d689cc1c7a0ba81abe7c5f28d0 Mon Sep 17 00:00:00 2001 1From 17766c64ecc7dedf09ed2d361690fc4eda77bf42 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 21 Jan 2022 15:15:11 -0800 3Date: Fri, 21 Jan 2022 15:15:11 -0800
4Subject: [PATCH] pass correct parameters to getdents64 4Subject: [PATCH] pass correct parameters to getdents64
@@ -15,16 +15,15 @@ Fixes
15Upstream-Status: Inappropriate [musl specific] 15Upstream-Status: Inappropriate [musl specific]
16Signed-off-by: Khem Raj <raj.khem@gmail.com> 16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17Signed-off-by: Jiaqing Zhao <jiaqing.zhao@linux.intel.com> 17Signed-off-by: Jiaqing Zhao <jiaqing.zhao@linux.intel.com>
18
19--- 18---
20 src/basic/recurse-dir.c | 2 +- 19 src/basic/recurse-dir.c | 2 +-
21 1 file changed, 1 insertion(+), 1 deletion(-) 20 1 file changed, 1 insertion(+), 1 deletion(-)
22 21
23diff --git a/src/basic/recurse-dir.c b/src/basic/recurse-dir.c 22diff --git a/src/basic/recurse-dir.c b/src/basic/recurse-dir.c
24index efa1797b7b..03ff10ebe9 100644 23index 5e98b7a5d8..aef065047b 100644
25--- a/src/basic/recurse-dir.c 24--- a/src/basic/recurse-dir.c
26+++ b/src/basic/recurse-dir.c 25+++ b/src/basic/recurse-dir.c
27@@ -54,7 +54,7 @@ int readdir_all(int dir_fd, 26@@ -55,7 +55,7 @@ int readdir_all(int dir_fd,
28 bs = MIN(MALLOC_SIZEOF_SAFE(de) - offsetof(DirectoryEntries, buffer), (size_t) SSIZE_MAX); 27 bs = MIN(MALLOC_SIZEOF_SAFE(de) - offsetof(DirectoryEntries, buffer), (size_t) SSIZE_MAX);
29 assert(bs > de->buffer_size); 28 assert(bs > de->buffer_size);
30 29
@@ -33,3 +32,6 @@ index efa1797b7b..03ff10ebe9 100644
33 if (n < 0) 32 if (n < 0)
34 return -errno; 33 return -errno;
35 if (n == 0) 34 if (n == 0)
35--
362.39.2
37
diff --git a/meta/recipes-core/systemd/systemd/0001-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch b/meta/recipes-core/systemd/systemd/0006-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch
index c02d495d31..96322e5a56 100644
--- a/meta/recipes-core/systemd/systemd/0001-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch
+++ b/meta/recipes-core/systemd/systemd/0006-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch
@@ -1,15 +1,19 @@
1From 5b5675913e2dbe6c5acda935b5814a8991829ec5 Mon Sep 17 00:00:00 2001 1From fa598869cca684c001f3dc23ce2198f5a6169e2a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 8 Nov 2022 13:31:34 -0800 3Date: Tue, 8 Nov 2022 13:31:34 -0800
4Subject: [PATCH 2/2] test-bus-error: strerror() is assumed to be GNU specific version mark it so 4Subject: [PATCH] test-bus-error: strerror() is assumed to be GNU specific
5 version mark it so
5 6
6Upstream-Status: Inappropriate [Upstream systemd only supports glibc] 7Upstream-Status: Inappropriate [Upstream systemd only supports glibc]
7 8
8Signed-off-by: Khem Raj <raj.khem@gmail.com> 9Signed-off-by: Khem Raj <raj.khem@gmail.com>
9--- 10---
10 src/libsystemd/sd-bus/test-bus-error.c | 2 ++ 11 src/libsystemd/sd-bus/test-bus-error.c | 2 ++
11 1 file changed, 2 insertions(+) 12 src/test/test-errno-util.c | 3 ++-
13 2 files changed, 4 insertions(+), 1 deletion(-)
12 14
15diff --git a/src/libsystemd/sd-bus/test-bus-error.c b/src/libsystemd/sd-bus/test-bus-error.c
16index a55f3f9856..4123bf3da0 100644
13--- a/src/libsystemd/sd-bus/test-bus-error.c 17--- a/src/libsystemd/sd-bus/test-bus-error.c
14+++ b/src/libsystemd/sd-bus/test-bus-error.c 18+++ b/src/libsystemd/sd-bus/test-bus-error.c
15@@ -99,7 +99,9 @@ TEST(error) { 19@@ -99,7 +99,9 @@ TEST(error) {
@@ -22,6 +26,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
22 assert_se(sd_bus_error_has_name(&error, "System.Error.EBUSY")); 26 assert_se(sd_bus_error_has_name(&error, "System.Error.EBUSY"));
23 assert_se(sd_bus_error_get_errno(&error) == EBUSY); 27 assert_se(sd_bus_error_get_errno(&error) == EBUSY);
24 assert_se(sd_bus_error_is_set(&error)); 28 assert_se(sd_bus_error_is_set(&error));
29diff --git a/src/test/test-errno-util.c b/src/test/test-errno-util.c
30index d3d022c33f..74e95c804d 100644
25--- a/src/test/test-errno-util.c 31--- a/src/test/test-errno-util.c
26+++ b/src/test/test-errno-util.c 32+++ b/src/test/test-errno-util.c
27@@ -4,7 +4,7 @@ 33@@ -4,7 +4,7 @@
@@ -33,10 +39,14 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
33 TEST(strerror_not_threadsafe) { 39 TEST(strerror_not_threadsafe) {
34 /* Just check that strerror really is not thread-safe. */ 40 /* Just check that strerror really is not thread-safe. */
35 log_info("strerror(%d) → %s", 200, strerror(200)); 41 log_info("strerror(%d) → %s", 200, strerror(200));
36@@ -46,5 +46,6 @@ TEST(STRERROR_OR_ELSE) { 42@@ -46,6 +46,7 @@ TEST(STRERROR_OR_ELSE) {
37 log_info("STRERROR_OR_ELSE(EPERM, \"EOF\") → %s", STRERROR_OR_EOF(EPERM)); 43 log_info("STRERROR_OR_ELSE(EPERM, \"EOF\") → %s", STRERROR_OR_EOF(EPERM));
38 log_info("STRERROR_OR_ELSE(-EPERM, \"EOF\") → %s", STRERROR_OR_EOF(-EPERM)); 44 log_info("STRERROR_OR_ELSE(-EPERM, \"EOF\") → %s", STRERROR_OR_EOF(-EPERM));
39 } 45 }
40+#endif /* __GLIBC__ */ 46+#endif /* __GLIBC__ */
41 47
42 DEFINE_TEST_MAIN(LOG_INFO); 48 TEST(PROTECT_ERRNO) {
49 errno = 12;
50--
512.39.2
52
diff --git a/meta/recipes-core/systemd/systemd/0002-Add-sys-stat.h-for-S_IFDIR.patch b/meta/recipes-core/systemd/systemd/0007-Add-sys-stat.h-for-S_IFDIR.patch
index e6abaadfcb..479b9a1ca1 100644
--- a/meta/recipes-core/systemd/systemd/0002-Add-sys-stat.h-for-S_IFDIR.patch
+++ b/meta/recipes-core/systemd/systemd/0007-Add-sys-stat.h-for-S_IFDIR.patch
@@ -1,4 +1,4 @@
1From 4b731a5e2547b5292f9a774b849e14c0cf7b3955 Mon Sep 17 00:00:00 2001 1From 1480ef4ea9f71befbc22272c219b62ee5cd71d43 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 21 Jan 2022 15:17:37 -0800 3Date: Fri, 21 Jan 2022 15:17:37 -0800
4Subject: [PATCH] Add sys/stat.h for S_IFDIR 4Subject: [PATCH] Add sys/stat.h for S_IFDIR
@@ -8,11 +8,12 @@ Subject: [PATCH] Add sys/stat.h for S_IFDIR
8 8
9Upstream-Status: Backport [29b7114c5d9624002aa7c17748d960cd1e45362d] 9Upstream-Status: Backport [29b7114c5d9624002aa7c17748d960cd1e45362d]
10Signed-off-by: Khem Raj <raj.khem@gmail.com> 10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11
12--- 11---
13 src/shared/mkdir-label.c | 1 + 12 src/shared/mkdir-label.c | 1 +
14 1 file changed, 1 insertion(+) 13 1 file changed, 1 insertion(+)
15 14
15diff --git a/src/shared/mkdir-label.c b/src/shared/mkdir-label.c
16index e3afc2b666..f1df778966 100644
16--- a/src/shared/mkdir-label.c 17--- a/src/shared/mkdir-label.c
17+++ b/src/shared/mkdir-label.c 18+++ b/src/shared/mkdir-label.c
18@@ -7,6 +7,7 @@ 19@@ -7,6 +7,7 @@
@@ -23,3 +24,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
23 24
24 int mkdirat_label(int dirfd, const char *path, mode_t mode) { 25 int mkdirat_label(int dirfd, const char *path, mode_t mode) {
25 int r; 26 int r;
27--
282.39.2
29
diff --git a/meta/recipes-core/systemd/systemd/0003-implment-systemd-sysv-install-for-OE.patch b/meta/recipes-core/systemd/systemd/0008-implment-systemd-sysv-install-for-OE.patch
index 4556ab5da6..acff18dc43 100644
--- a/meta/recipes-core/systemd/systemd/0003-implment-systemd-sysv-install-for-OE.patch
+++ b/meta/recipes-core/systemd/systemd/0008-implment-systemd-sysv-install-for-OE.patch
@@ -1,4 +1,4 @@
1From f9078501a1495c9991431d1435d081cd2e830328 Mon Sep 17 00:00:00 2001 1From 5712d56f1cd654d2e5d2e9117ff77fe4c299f76b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 5 Sep 2015 06:31:47 +0000 3Date: Sat, 5 Sep 2015 06:31:47 +0000
4Subject: [PATCH] implment systemd-sysv-install for OE 4Subject: [PATCH] implment systemd-sysv-install for OE
@@ -9,13 +9,12 @@ to check the status of the sysv service
9Upstream-Status: Inappropriate [OE-Specific] 9Upstream-Status: Inappropriate [OE-Specific]
10 10
11Signed-off-by: Khem Raj <raj.khem@gmail.com> 11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12
13--- 12---
14 src/systemctl/systemd-sysv-install.SKELETON | 6 +++--- 13 src/systemctl/systemd-sysv-install.SKELETON | 6 +++---
15 1 file changed, 3 insertions(+), 3 deletions(-) 14 1 file changed, 3 insertions(+), 3 deletions(-)
16 15
17diff --git a/src/systemctl/systemd-sysv-install.SKELETON b/src/systemctl/systemd-sysv-install.SKELETON 16diff --git a/src/systemctl/systemd-sysv-install.SKELETON b/src/systemctl/systemd-sysv-install.SKELETON
18index a2a0059fef..7f95791d9b 100755 17index cb58d8243b..000bdf6165 100755
19--- a/src/systemctl/systemd-sysv-install.SKELETON 18--- a/src/systemctl/systemd-sysv-install.SKELETON
20+++ b/src/systemctl/systemd-sysv-install.SKELETON 19+++ b/src/systemctl/systemd-sysv-install.SKELETON
21@@ -34,17 +34,17 @@ case "$1" in 20@@ -34,17 +34,17 @@ case "$1" in
@@ -39,3 +38,6 @@ index a2a0059fef..7f95791d9b 100755
39 ;; 38 ;;
40 *) 39 *)
41 usage ;; 40 usage ;;
41--
422.39.2
43
diff --git a/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-comparison_fn_t.patch b/meta/recipes-core/systemd/systemd/0009-missing_type.h-add-comparison_fn_t.patch
index c28c8381e8..e50b47a5a0 100644
--- a/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-comparison_fn_t.patch
+++ b/meta/recipes-core/systemd/systemd/0009-missing_type.h-add-comparison_fn_t.patch
@@ -1,4 +1,4 @@
1From 5513b918d02900a3a78fd0e0300a118b163edfef Mon Sep 17 00:00:00 2001 1From 542f999a846dfd49d9373d30fffb2a44168d7b5e Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Mon, 25 Feb 2019 13:55:12 +0800 3Date: Mon, 25 Feb 2019 13:55:12 +0800
4Subject: [PATCH] missing_type.h: add comparison_fn_t 4Subject: [PATCH] missing_type.h: add comparison_fn_t
@@ -33,7 +33,7 @@ index f6233090a9..6c0456349d 100644
33+typedef int (*comparison_fn_t)(const void *, const void *); 33+typedef int (*comparison_fn_t)(const void *, const void *);
34+#endif 34+#endif
35diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h 35diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h
36index 02a6784d99..0b33c83d59 100644 36index f0bf246aa3..33669c7a75 100644
37--- a/src/basic/sort-util.h 37--- a/src/basic/sort-util.h
38+++ b/src/basic/sort-util.h 38+++ b/src/basic/sort-util.h
39@@ -4,6 +4,7 @@ 39@@ -4,6 +4,7 @@
@@ -45,7 +45,7 @@ index 02a6784d99..0b33c83d59 100644
45 /* This is the same as glibc's internal __compar_d_fn_t type. glibc exports a public comparison_fn_t, for the 45 /* This is the same as glibc's internal __compar_d_fn_t type. glibc exports a public comparison_fn_t, for the
46 * external type __compar_fn_t, but doesn't do anything similar for __compar_d_fn_t. Let's hence do that 46 * external type __compar_fn_t, but doesn't do anything similar for __compar_d_fn_t. Let's hence do that
47diff --git a/src/libsystemd/sd-journal/catalog.c b/src/libsystemd/sd-journal/catalog.c 47diff --git a/src/libsystemd/sd-journal/catalog.c b/src/libsystemd/sd-journal/catalog.c
48index 8fc87b131a..36a6efdbd8 100644 48index 7527abf636..f33383e57f 100644
49--- a/src/libsystemd/sd-journal/catalog.c 49--- a/src/libsystemd/sd-journal/catalog.c
50+++ b/src/libsystemd/sd-journal/catalog.c 50+++ b/src/libsystemd/sd-journal/catalog.c
51@@ -28,6 +28,7 @@ 51@@ -28,6 +28,7 @@
@@ -57,5 +57,5 @@ index 8fc87b131a..36a6efdbd8 100644
57 const char * const catalog_file_dirs[] = { 57 const char * const catalog_file_dirs[] = {
58 "/usr/local/lib/systemd/catalog/", 58 "/usr/local/lib/systemd/catalog/",
59-- 59--
602.34.1 602.39.2
61 61
diff --git a/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch b/meta/recipes-core/systemd/systemd/0010-add-fallback-parse_printf_format-implementation.patch
index f9c7ced947..6f01721459 100644
--- a/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch
+++ b/meta/recipes-core/systemd/systemd/0010-add-fallback-parse_printf_format-implementation.patch
@@ -1,4 +1,4 @@
1From 3d9910dcda697b1e361bba49c99050ee0d116742 Mon Sep 17 00:00:00 2001 1From 383e85e15f16a46aac925aa439b8b60f58b40aa6 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Sat, 22 May 2021 20:26:24 +0200 3Date: Sat, 22 May 2021 20:26:24 +0200
4Subject: [PATCH] add fallback parse_printf_format implementation 4Subject: [PATCH] add fallback parse_printf_format implementation
@@ -10,7 +10,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
10Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 10Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
11[rebased for systemd 243] 11[rebased for systemd 243]
12Signed-off-by: Scott Murray <scott.murray@konsulko.com> 12Signed-off-by: Scott Murray <scott.murray@konsulko.com>
13
14--- 13---
15 meson.build | 1 + 14 meson.build | 1 +
16 src/basic/meson.build | 5 + 15 src/basic/meson.build | 5 +
@@ -22,9 +21,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
22 create mode 100644 src/basic/parse-printf-format.c 21 create mode 100644 src/basic/parse-printf-format.c
23 create mode 100644 src/basic/parse-printf-format.h 22 create mode 100644 src/basic/parse-printf-format.h
24 23
24diff --git a/meson.build b/meson.build
25index bfc86857d6..fb96143c37 100644
25--- a/meson.build 26--- a/meson.build
26+++ b/meson.build 27+++ b/meson.build
27@@ -739,6 +739,7 @@ endif 28@@ -755,6 +755,7 @@ endif
28 foreach header : ['crypt.h', 29 foreach header : ['crypt.h',
29 'linux/memfd.h', 30 'linux/memfd.h',
30 'linux/vm_sockets.h', 31 'linux/vm_sockets.h',
@@ -32,9 +33,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
32 'sys/auxv.h', 33 'sys/auxv.h',
33 'valgrind/memcheck.h', 34 'valgrind/memcheck.h',
34 'valgrind/valgrind.h', 35 'valgrind/valgrind.h',
36diff --git a/src/basic/meson.build b/src/basic/meson.build
37index 7aae031d81..1aa9f5006d 100644
35--- a/src/basic/meson.build 38--- a/src/basic/meson.build
36+++ b/src/basic/meson.build 39+++ b/src/basic/meson.build
37@@ -337,6 +337,11 @@ endforeach 40@@ -173,6 +173,11 @@ endforeach
38 41
39 basic_sources += generated_gperf_headers 42 basic_sources += generated_gperf_headers
40 43
@@ -46,6 +49,9 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
46 ############################################################ 49 ############################################################
47 50
48 arch_list = [ 51 arch_list = [
52diff --git a/src/basic/parse-printf-format.c b/src/basic/parse-printf-format.c
53new file mode 100644
54index 0000000000..49437e5445
49--- /dev/null 55--- /dev/null
50+++ b/src/basic/parse-printf-format.c 56+++ b/src/basic/parse-printf-format.c
51@@ -0,0 +1,273 @@ 57@@ -0,0 +1,273 @@
@@ -322,6 +328,9 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
322+ 328+
323+ return last; 329+ return last;
324+} 330+}
331diff --git a/src/basic/parse-printf-format.h b/src/basic/parse-printf-format.h
332new file mode 100644
333index 0000000000..47be7522d7
325--- /dev/null 334--- /dev/null
326+++ b/src/basic/parse-printf-format.h 335+++ b/src/basic/parse-printf-format.h
327@@ -0,0 +1,57 @@ 336@@ -0,0 +1,57 @@
@@ -382,9 +391,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
382+size_t parse_printf_format(const char *fmt, size_t n, int *types); 391+size_t parse_printf_format(const char *fmt, size_t n, int *types);
383+ 392+
384+#endif /* HAVE_PRINTF_H */ 393+#endif /* HAVE_PRINTF_H */
394diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h
395index 4e93ac90c9..f9deb6f662 100644
385--- a/src/basic/stdio-util.h 396--- a/src/basic/stdio-util.h
386+++ b/src/basic/stdio-util.h 397+++ b/src/basic/stdio-util.h
387@@ -1,13 +1,13 @@ 398@@ -1,12 +1,12 @@
388 /* SPDX-License-Identifier: LGPL-2.1-or-later */ 399 /* SPDX-License-Identifier: LGPL-2.1-or-later */
389 #pragma once 400 #pragma once
390 401
@@ -394,11 +405,12 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
394 #include <sys/types.h> 405 #include <sys/types.h>
395 406
396 #include "macro.h" 407 #include "macro.h"
397 #include "memory-util.h"
398+#include "parse-printf-format.h" 408+#include "parse-printf-format.h"
399 409
400 #define snprintf_ok(buf, len, fmt, ...) \ 410 _printf_(3, 4)
401 ({ \ 411 static inline char *snprintf_ok(char *buf, size_t len, const char *format, ...) {
412diff --git a/src/libsystemd/sd-journal/journal-send.c b/src/libsystemd/sd-journal/journal-send.c
413index 3b74d2246e..136ebcb153 100644
402--- a/src/libsystemd/sd-journal/journal-send.c 414--- a/src/libsystemd/sd-journal/journal-send.c
403+++ b/src/libsystemd/sd-journal/journal-send.c 415+++ b/src/libsystemd/sd-journal/journal-send.c
404@@ -2,7 +2,6 @@ 416@@ -2,7 +2,6 @@
@@ -417,3 +429,6 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
417 429
418 #define SNDBUF_SIZE (8*1024*1024) 430 #define SNDBUF_SIZE (8*1024*1024)
419 431
432--
4332.39.2
434
diff --git a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch b/meta/recipes-core/systemd/systemd/0011-src-basic-missing.h-check-for-missing-strndupa.patch
index 2c33033e91..bd5f6a6190 100644
--- a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch
+++ b/meta/recipes-core/systemd/systemd/0011-src-basic-missing.h-check-for-missing-strndupa.patch
@@ -1,4 +1,4 @@
1From 106b7bd7186c9d6c1dcd72bd4ca6457d3fa72d0b Mon Sep 17 00:00:00 2001 1From ee5c8b494a3269edd154a0b799a03b39dba2ceb0 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Mon, 25 Feb 2019 14:18:21 +0800 3Date: Mon, 25 Feb 2019 14:18:21 +0800
4Subject: [PATCH] src/basic/missing.h: check for missing strndupa 4Subject: [PATCH] src/basic/missing.h: check for missing strndupa
@@ -49,7 +49,6 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
49 src/libsystemd/sd-bus/sd-bus.c | 1 + 49 src/libsystemd/sd-bus/sd-bus.c | 1 +
50 src/libsystemd/sd-bus/test-bus-benchmark.c | 1 + 50 src/libsystemd/sd-bus/test-bus-benchmark.c | 1 +
51 src/libsystemd/sd-journal/sd-journal.c | 1 + 51 src/libsystemd/sd-journal/sd-journal.c | 1 +
52 src/locale/keymap-util.c | 1 +
53 src/login/pam_systemd.c | 1 + 52 src/login/pam_systemd.c | 1 +
54 src/network/generator/network-generator.c | 1 + 53 src/network/generator/network-generator.c | 1 +
55 src/nspawn/nspawn-settings.c | 1 + 54 src/nspawn/nspawn-settings.c | 1 +
@@ -64,17 +63,18 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
64 src/shared/journal-importer.c | 1 + 63 src/shared/journal-importer.c | 1 +
65 src/shared/logs-show.c | 1 + 64 src/shared/logs-show.c | 1 +
66 src/shared/pager.c | 1 + 65 src/shared/pager.c | 1 +
67 src/shared/uid-range.c | 1 +
68 src/socket-proxy/socket-proxyd.c | 1 + 66 src/socket-proxy/socket-proxyd.c | 1 +
69 src/test/test-hexdecoct.c | 1 + 67 src/test/test-hexdecoct.c | 1 +
70 src/udev/udev-builtin-path_id.c | 1 + 68 src/udev/udev-builtin-path_id.c | 1 +
71 src/udev/udev-event.c | 1 + 69 src/udev/udev-event.c | 1 +
72 src/udev/udev-rules.c | 1 + 70 src/udev/udev-rules.c | 1 +
73 52 files changed, 63 insertions(+) 71 50 files changed, 61 insertions(+)
74 72
73diff --git a/meson.build b/meson.build
74index fb96143c37..739b2f7f72 100644
75--- a/meson.build 75--- a/meson.build
76+++ b/meson.build 76+++ b/meson.build
77@@ -557,6 +557,7 @@ foreach ident : ['secure_getenv', '__sec 77@@ -574,6 +574,7 @@ foreach ident : ['secure_getenv', '__secure_getenv']
78 endforeach 78 endforeach
79 79
80 foreach ident : [ 80 foreach ident : [
@@ -82,16 +82,20 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
82 ['memfd_create', '''#include <sys/mman.h>'''], 82 ['memfd_create', '''#include <sys/mman.h>'''],
83 ['gettid', '''#include <sys/types.h> 83 ['gettid', '''#include <sys/types.h>
84 #include <unistd.h>'''], 84 #include <unistd.h>'''],
85diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
86index e66477f328..2613d1e3f9 100644
85--- a/src/backlight/backlight.c 87--- a/src/backlight/backlight.c
86+++ b/src/backlight/backlight.c 88+++ b/src/backlight/backlight.c
87@@ -20,6 +20,7 @@ 89@@ -19,6 +19,7 @@
90 #include "string-util.h"
88 #include "strv.h" 91 #include "strv.h"
89 #include "terminal-util.h" 92 #include "terminal-util.h"
90 #include "util.h"
91+#include "missing_stdlib.h" 93+#include "missing_stdlib.h"
92 94
93 #define PCI_CLASS_GRAPHICS_CARD 0x30000 95 #define PCI_CLASS_GRAPHICS_CARD 0x30000
94 96
97diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
98index feda596939..11b4375ed5 100644
95--- a/src/basic/cgroup-util.c 99--- a/src/basic/cgroup-util.c
96+++ b/src/basic/cgroup-util.c 100+++ b/src/basic/cgroup-util.c
97@@ -37,6 +37,7 @@ 101@@ -37,6 +37,7 @@
@@ -102,6 +106,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
102 106
103 static int cg_enumerate_items(const char *controller, const char *path, FILE **_f, const char *item) { 107 static int cg_enumerate_items(const char *controller, const char *path, FILE **_f, const char *item) {
104 _cleanup_free_ char *fs = NULL; 108 _cleanup_free_ char *fs = NULL;
109diff --git a/src/basic/env-util.c b/src/basic/env-util.c
110index 55ac11a512..7ccb1d7887 100644
105--- a/src/basic/env-util.c 111--- a/src/basic/env-util.c
106+++ b/src/basic/env-util.c 112+++ b/src/basic/env-util.c
107@@ -19,6 +19,7 @@ 113@@ -19,6 +19,7 @@
@@ -112,16 +118,20 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
112 118
113 /* We follow bash for the character set. Different shells have different rules. */ 119 /* We follow bash for the character set. Different shells have different rules. */
114 #define VALID_BASH_ENV_NAME_CHARS \ 120 #define VALID_BASH_ENV_NAME_CHARS \
121diff --git a/src/basic/log.c b/src/basic/log.c
122index fc5793139e..515218fca8 100644
115--- a/src/basic/log.c 123--- a/src/basic/log.c
116+++ b/src/basic/log.c 124+++ b/src/basic/log.c
117@@ -36,6 +36,7 @@ 125@@ -39,6 +39,7 @@
118 #include "terminal-util.h" 126 #include "terminal-util.h"
119 #include "time-util.h" 127 #include "time-util.h"
120 #include "utf8.h" 128 #include "utf8.h"
121+#include "missing_stdlib.h" 129+#include "missing_stdlib.h"
122 130
123 #define SNDBUF_SIZE (8*1024*1024) 131 #define SNDBUF_SIZE (8*1024*1024)
124 132 #define IOVEC_MAX 128U
133diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h
134index 8c76f93eb2..9068bfb4f0 100644
125--- a/src/basic/missing_stdlib.h 135--- a/src/basic/missing_stdlib.h
126+++ b/src/basic/missing_stdlib.h 136+++ b/src/basic/missing_stdlib.h
127@@ -11,3 +11,15 @@ 137@@ -11,3 +11,15 @@
@@ -140,6 +150,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
140+ (char *)memcpy(__new, __old, __len); \ 150+ (char *)memcpy(__new, __old, __len); \
141+ }) 151+ })
142+#endif 152+#endif
153diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c
154index 7ad19ee33b..cc1d5e1e5b 100644
143--- a/src/basic/mkdir.c 155--- a/src/basic/mkdir.c
144+++ b/src/basic/mkdir.c 156+++ b/src/basic/mkdir.c
145@@ -15,6 +15,7 @@ 157@@ -15,6 +15,7 @@
@@ -148,8 +160,10 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
148 #include "user-util.h" 160 #include "user-util.h"
149+#include "missing_stdlib.h" 161+#include "missing_stdlib.h"
150 162
151 int mkdir_safe_internal( 163 int mkdirat_safe_internal(
152 const char *path, 164 int dir_fd,
165diff --git a/src/basic/mountpoint-util.c b/src/basic/mountpoint-util.c
166index bc74fbef8f..cdb609bb84 100644
153--- a/src/basic/mountpoint-util.c 167--- a/src/basic/mountpoint-util.c
154+++ b/src/basic/mountpoint-util.c 168+++ b/src/basic/mountpoint-util.c
155@@ -13,6 +13,7 @@ 169@@ -13,6 +13,7 @@
@@ -160,6 +174,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
160 #include "mountpoint-util.h" 174 #include "mountpoint-util.h"
161 #include "nulstr-util.h" 175 #include "nulstr-util.h"
162 #include "parse-util.h" 176 #include "parse-util.h"
177diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
178index 3445d31307..d82b4415d9 100644
163--- a/src/basic/parse-util.c 179--- a/src/basic/parse-util.c
164+++ b/src/basic/parse-util.c 180+++ b/src/basic/parse-util.c
165@@ -18,6 +18,7 @@ 181@@ -18,6 +18,7 @@
@@ -170,6 +186,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
170 186
171 int parse_boolean(const char *v) { 187 int parse_boolean(const char *v) {
172 if (!v) 188 if (!v)
189diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c
190index c99e9d8786..71a917a0b0 100644
173--- a/src/basic/path-lookup.c 191--- a/src/basic/path-lookup.c
174+++ b/src/basic/path-lookup.c 192+++ b/src/basic/path-lookup.c
175@@ -16,6 +16,7 @@ 193@@ -16,6 +16,7 @@
@@ -180,6 +198,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
180 198
181 int xdg_user_runtime_dir(char **ret, const char *suffix) { 199 int xdg_user_runtime_dir(char **ret, const char *suffix) {
182 const char *e; 200 const char *e;
201diff --git a/src/basic/percent-util.c b/src/basic/percent-util.c
202index cab9d0eaea..5f6ca258e9 100644
183--- a/src/basic/percent-util.c 203--- a/src/basic/percent-util.c
184+++ b/src/basic/percent-util.c 204+++ b/src/basic/percent-util.c
185@@ -3,6 +3,7 @@ 205@@ -3,6 +3,7 @@
@@ -190,16 +210,20 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
190 210
191 static int parse_parts_value_whole(const char *p, const char *symbol) { 211 static int parse_parts_value_whole(const char *p, const char *symbol) {
192 const char *pc, *n; 212 const char *pc, *n;
213diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c
214index eea70d8606..ae3abd8402 100644
193--- a/src/basic/proc-cmdline.c 215--- a/src/basic/proc-cmdline.c
194+++ b/src/basic/proc-cmdline.c 216+++ b/src/basic/proc-cmdline.c
195@@ -15,6 +15,7 @@ 217@@ -15,6 +15,7 @@
218 #include "special.h"
196 #include "string-util.h" 219 #include "string-util.h"
197 #include "util.h"
198 #include "virt.h" 220 #include "virt.h"
199+#include "missing_stdlib.h" 221+#include "missing_stdlib.h"
200 222
201 int proc_cmdline(char **ret) { 223 int proc_cmdline(char **ret) {
202 const char *e; 224 const char *e;
225diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c
226index bcba5a5208..64a95dd866 100644
203--- a/src/basic/procfs-util.c 227--- a/src/basic/procfs-util.c
204+++ b/src/basic/procfs-util.c 228+++ b/src/basic/procfs-util.c
205@@ -12,6 +12,7 @@ 229@@ -12,6 +12,7 @@
@@ -210,6 +234,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
210 234
211 int procfs_get_pid_max(uint64_t *ret) { 235 int procfs_get_pid_max(uint64_t *ret) {
212 _cleanup_free_ char *value = NULL; 236 _cleanup_free_ char *value = NULL;
237diff --git a/src/basic/time-util.c b/src/basic/time-util.c
238index b700f364ef..48a26bcec9 100644
213--- a/src/basic/time-util.c 239--- a/src/basic/time-util.c
214+++ b/src/basic/time-util.c 240+++ b/src/basic/time-util.c
215@@ -26,6 +26,7 @@ 241@@ -26,6 +26,7 @@
@@ -220,16 +246,20 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
220 246
221 static clockid_t map_clock_id(clockid_t c) { 247 static clockid_t map_clock_id(clockid_t c) {
222 248
249diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c
250index 59f02b761a..7496646350 100644
223--- a/src/boot/bless-boot.c 251--- a/src/boot/bless-boot.c
224+++ b/src/boot/bless-boot.c 252+++ b/src/boot/bless-boot.c
225@@ -22,6 +22,7 @@ 253@@ -22,6 +22,7 @@
226 #include "util.h" 254 #include "terminal-util.h"
227 #include "verbs.h" 255 #include "verbs.h"
228 #include "virt.h" 256 #include "virt.h"
229+#include "missing_stdlib.h" 257+#include "missing_stdlib.h"
230 258
231 static char **arg_path = NULL; 259 static char **arg_path = NULL;
232 260
261diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c
262index b5484eda78..54ed62c790 100644
233--- a/src/core/dbus-cgroup.c 263--- a/src/core/dbus-cgroup.c
234+++ b/src/core/dbus-cgroup.c 264+++ b/src/core/dbus-cgroup.c
235@@ -21,6 +21,7 @@ 265@@ -21,6 +21,7 @@
@@ -240,9 +270,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
240 #include "socket-util.h" 270 #include "socket-util.h"
241 271
242 BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", TasksMax, tasks_max_resolve); 272 BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", TasksMax, tasks_max_resolve);
273diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
274index f514b8fd12..4febd0d496 100644
243--- a/src/core/dbus-execute.c 275--- a/src/core/dbus-execute.c
244+++ b/src/core/dbus-execute.c 276+++ b/src/core/dbus-execute.c
245@@ -44,6 +44,7 @@ 277@@ -45,6 +45,7 @@
246 #include "unit-printf.h" 278 #include "unit-printf.h"
247 #include "user-util.h" 279 #include "user-util.h"
248 #include "utf8.h" 280 #include "utf8.h"
@@ -250,6 +282,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
250 282
251 BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput); 283 BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput);
252 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input, exec_input, ExecInput); 284 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input, exec_input, ExecInput);
285diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c
286index edfa0eb69a..6fd2ec9062 100644
253--- a/src/core/dbus-util.c 287--- a/src/core/dbus-util.c
254+++ b/src/core/dbus-util.c 288+++ b/src/core/dbus-util.c
255@@ -9,6 +9,7 @@ 289@@ -9,6 +9,7 @@
@@ -260,9 +294,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
260 294
261 int bus_property_get_triggered_unit( 295 int bus_property_get_triggered_unit(
262 sd_bus *bus, 296 sd_bus *bus,
297diff --git a/src/core/execute.c b/src/core/execute.c
298index 853e87450f..8ef76de9ab 100644
263--- a/src/core/execute.c 299--- a/src/core/execute.c
264+++ b/src/core/execute.c 300+++ b/src/core/execute.c
265@@ -104,6 +104,7 @@ 301@@ -105,6 +105,7 @@
266 #include "unit-serialize.h" 302 #include "unit-serialize.h"
267 #include "user-util.h" 303 #include "user-util.h"
268 #include "utmp-wtmp.h" 304 #include "utmp-wtmp.h"
@@ -270,9 +306,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
270 306
271 #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC) 307 #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC)
272 #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC) 308 #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC)
309diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
310index e843743777..e149807492 100644
273--- a/src/core/kmod-setup.c 311--- a/src/core/kmod-setup.c
274+++ b/src/core/kmod-setup.c 312+++ b/src/core/kmod-setup.c
275@@ -11,6 +11,7 @@ 313@@ -12,6 +12,7 @@
276 #include "recurse-dir.h" 314 #include "recurse-dir.h"
277 #include "string-util.h" 315 #include "string-util.h"
278 #include "virt.h" 316 #include "virt.h"
@@ -280,16 +318,20 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
280 318
281 #if HAVE_KMOD 319 #if HAVE_KMOD
282 #include "module-util.h" 320 #include "module-util.h"
321diff --git a/src/core/service.c b/src/core/service.c
322index 9ad3c3d995..b112d64919 100644
283--- a/src/core/service.c 323--- a/src/core/service.c
284+++ b/src/core/service.c 324+++ b/src/core/service.c
285@@ -42,6 +42,7 @@ 325@@ -42,6 +42,7 @@
326 #include "unit-name.h"
286 #include "unit.h" 327 #include "unit.h"
287 #include "utf8.h" 328 #include "utf8.h"
288 #include "util.h"
289+#include "missing_stdlib.h" 329+#include "missing_stdlib.h"
290 330
291 #define service_spawn(...) service_spawn_internal(__func__, __VA_ARGS__) 331 #define service_spawn(...) service_spawn_internal(__func__, __VA_ARGS__)
292 332
333diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c
334index c6e201ecf2..ab034475e2 100644
293--- a/src/coredump/coredump-vacuum.c 335--- a/src/coredump/coredump-vacuum.c
294+++ b/src/coredump/coredump-vacuum.c 336+++ b/src/coredump/coredump-vacuum.c
295@@ -17,6 +17,7 @@ 337@@ -17,6 +17,7 @@
@@ -300,19 +342,23 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
300 342
301 #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL) /* 1 MiB */ 343 #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL) /* 1 MiB */
302 #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */ 344 #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */
345diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
346index efc553b698..acea922311 100644
303--- a/src/fstab-generator/fstab-generator.c 347--- a/src/fstab-generator/fstab-generator.c
304+++ b/src/fstab-generator/fstab-generator.c 348+++ b/src/fstab-generator/fstab-generator.c
305@@ -32,6 +32,7 @@ 349@@ -33,6 +33,7 @@
306 #include "util.h" 350 #include "unit-name.h"
307 #include "virt.h" 351 #include "virt.h"
308 #include "volatile-util.h" 352 #include "volatile-util.h"
309+#include "missing_stdlib.h" 353+#include "missing_stdlib.h"
310 354
311 typedef enum MountPointFlags { 355 typedef enum MountPointFlags {
312 MOUNT_NOAUTO = 1 << 0, 356 MOUNT_NOAUTO = 1 << 0,
357diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c
358index 7df264fb53..9463a0e9fb 100644
313--- a/src/journal-remote/journal-remote-main.c 359--- a/src/journal-remote/journal-remote-main.c
314+++ b/src/journal-remote/journal-remote-main.c 360+++ b/src/journal-remote/journal-remote-main.c
315@@ -24,6 +24,7 @@ 361@@ -25,6 +25,7 @@
316 #include "stat-util.h" 362 #include "stat-util.h"
317 #include "string-table.h" 363 #include "string-table.h"
318 #include "strv.h" 364 #include "strv.h"
@@ -320,9 +366,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
320 366
321 #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" 367 #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem"
322 #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" 368 #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem"
369diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
370index da0fac548e..c1c043e0e0 100644
323--- a/src/journal/journalctl.c 371--- a/src/journal/journalctl.c
324+++ b/src/journal/journalctl.c 372+++ b/src/journal/journalctl.c
325@@ -70,6 +70,7 @@ 373@@ -72,6 +72,7 @@
326 #include "unit-name.h" 374 #include "unit-name.h"
327 #include "user-util.h" 375 #include "user-util.h"
328 #include "varlink.h" 376 #include "varlink.h"
@@ -330,6 +378,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
330 378
331 #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) 379 #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE)
332 #define PROCESS_INOTIFY_INTERVAL 1024 /* Every 1,024 messages processed */ 380 #define PROCESS_INOTIFY_INTERVAL 1024 /* Every 1,024 messages processed */
381diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
382index 9719f97c02..75decd9834 100644
333--- a/src/libsystemd/sd-bus/bus-message.c 383--- a/src/libsystemd/sd-bus/bus-message.c
334+++ b/src/libsystemd/sd-bus/bus-message.c 384+++ b/src/libsystemd/sd-bus/bus-message.c
335@@ -19,6 +19,7 @@ 385@@ -19,6 +19,7 @@
@@ -340,6 +390,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
340 390
341 static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); 391 static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored);
342 static int message_parse_fields(sd_bus_message *m); 392 static int message_parse_fields(sd_bus_message *m);
393diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c
394index 2ad7a9993d..bba72f99f4 100644
343--- a/src/libsystemd/sd-bus/bus-objects.c 395--- a/src/libsystemd/sd-bus/bus-objects.c
344+++ b/src/libsystemd/sd-bus/bus-objects.c 396+++ b/src/libsystemd/sd-bus/bus-objects.c
345@@ -11,6 +11,7 @@ 397@@ -11,6 +11,7 @@
@@ -350,9 +402,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
350 402
351 static int node_vtable_get_userdata( 403 static int node_vtable_get_userdata(
352 sd_bus *bus, 404 sd_bus *bus,
405diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c
406index 64037e4fe0..9b9ce0aaa9 100644
353--- a/src/libsystemd/sd-bus/bus-socket.c 407--- a/src/libsystemd/sd-bus/bus-socket.c
354+++ b/src/libsystemd/sd-bus/bus-socket.c 408+++ b/src/libsystemd/sd-bus/bus-socket.c
355@@ -28,6 +28,7 @@ 409@@ -27,6 +27,7 @@
356 #include "string-util.h" 410 #include "string-util.h"
357 #include "user-util.h" 411 #include "user-util.h"
358 #include "utf8.h" 412 #include "utf8.h"
@@ -360,6 +414,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
360 414
361 #define SNDBUF_SIZE (8*1024*1024) 415 #define SNDBUF_SIZE (8*1024*1024)
362 416
417diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
418index f6a5e4aa06..b36faa79a3 100644
363--- a/src/libsystemd/sd-bus/sd-bus.c 419--- a/src/libsystemd/sd-bus/sd-bus.c
364+++ b/src/libsystemd/sd-bus/sd-bus.c 420+++ b/src/libsystemd/sd-bus/sd-bus.c
365@@ -44,6 +44,7 @@ 421@@ -44,6 +44,7 @@
@@ -370,16 +426,20 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
370 426
371 #define log_debug_bus_message(m) \ 427 #define log_debug_bus_message(m) \
372 do { \ 428 do { \
429diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c
430index 1eb6edd329..d434a3c178 100644
373--- a/src/libsystemd/sd-bus/test-bus-benchmark.c 431--- a/src/libsystemd/sd-bus/test-bus-benchmark.c
374+++ b/src/libsystemd/sd-bus/test-bus-benchmark.c 432+++ b/src/libsystemd/sd-bus/test-bus-benchmark.c
375@@ -14,6 +14,7 @@ 433@@ -13,6 +13,7 @@
434 #include "missing_resource.h"
376 #include "string-util.h" 435 #include "string-util.h"
377 #include "time-util.h" 436 #include "time-util.h"
378 #include "util.h"
379+#include "missing_stdlib.h" 437+#include "missing_stdlib.h"
380 438
381 #define MAX_SIZE (2*1024*1024) 439 #define MAX_SIZE (2*1024*1024)
382 440
441diff --git a/src/libsystemd/sd-journal/sd-journal.c b/src/libsystemd/sd-journal/sd-journal.c
442index 9947947ef2..8dc6f93159 100644
383--- a/src/libsystemd/sd-journal/sd-journal.c 443--- a/src/libsystemd/sd-journal/sd-journal.c
384+++ b/src/libsystemd/sd-journal/sd-journal.c 444+++ b/src/libsystemd/sd-journal/sd-journal.c
385@@ -41,6 +41,7 @@ 445@@ -41,6 +41,7 @@
@@ -388,8 +448,10 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
388 #include "syslog-util.h" 448 #include "syslog-util.h"
389+#include "missing_stdlib.h" 449+#include "missing_stdlib.h"
390 450
391 #define JOURNAL_FILES_MAX 7168 451 #define JOURNAL_FILES_RECHECK_USEC (2 * USEC_PER_SEC)
392 452
453diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c
454index ba2fca32c6..e1f9caa13b 100644
393--- a/src/login/pam_systemd.c 455--- a/src/login/pam_systemd.c
394+++ b/src/login/pam_systemd.c 456+++ b/src/login/pam_systemd.c
395@@ -32,6 +32,7 @@ 457@@ -32,6 +32,7 @@
@@ -400,6 +462,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
400 #include "pam-util.h" 462 #include "pam-util.h"
401 #include "parse-util.h" 463 #include "parse-util.h"
402 #include "path-util.h" 464 #include "path-util.h"
465diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c
466index 1090934bfc..69a77f66e2 100644
403--- a/src/network/generator/network-generator.c 467--- a/src/network/generator/network-generator.c
404+++ b/src/network/generator/network-generator.c 468+++ b/src/network/generator/network-generator.c
405@@ -13,6 +13,7 @@ 469@@ -13,6 +13,7 @@
@@ -410,16 +474,20 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
410 474
411 /* 475 /*
412 # .network 476 # .network
477diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c
478index 05bde1c756..aa29587868 100644
413--- a/src/nspawn/nspawn-settings.c 479--- a/src/nspawn/nspawn-settings.c
414+++ b/src/nspawn/nspawn-settings.c 480+++ b/src/nspawn/nspawn-settings.c
415@@ -17,6 +17,7 @@ 481@@ -16,6 +16,7 @@
482 #include "string-util.h"
416 #include "strv.h" 483 #include "strv.h"
417 #include "user-util.h" 484 #include "user-util.h"
418 #include "util.h"
419+#include "missing_stdlib.h" 485+#include "missing_stdlib.h"
420 486
421 Settings *settings_new(void) { 487 Settings *settings_new(void) {
422 Settings *s; 488 Settings *s;
489diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c
490index c64e79bdff..eda26b0b9a 100644
423--- a/src/nss-mymachines/nss-mymachines.c 491--- a/src/nss-mymachines/nss-mymachines.c
424+++ b/src/nss-mymachines/nss-mymachines.c 492+++ b/src/nss-mymachines/nss-mymachines.c
425@@ -21,6 +21,7 @@ 493@@ -21,6 +21,7 @@
@@ -430,6 +498,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
430 498
431 static void setup_logging_once(void) { 499 static void setup_logging_once(void) {
432 static pthread_once_t once = PTHREAD_ONCE_INIT; 500 static pthread_once_t once = PTHREAD_ONCE_INIT;
501diff --git a/src/portable/portable.c b/src/portable/portable.c
502index 7811833fac..c6414da91c 100644
433--- a/src/portable/portable.c 503--- a/src/portable/portable.c
434+++ b/src/portable/portable.c 504+++ b/src/portable/portable.c
435@@ -39,6 +39,7 @@ 505@@ -39,6 +39,7 @@
@@ -440,9 +510,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
440 510
441 /* Markers used in the first line of our 20-portable.conf unit file drop-in to determine, that a) the unit file was 511 /* Markers used in the first line of our 20-portable.conf unit file drop-in to determine, that a) the unit file was
442 * dropped there by the portable service logic and b) for which image it was dropped there. */ 512 * dropped there by the portable service logic and b) for which image it was dropped there. */
513diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c
514index 2638e985fb..82c903fd66 100644
443--- a/src/resolve/resolvectl.c 515--- a/src/resolve/resolvectl.c
444+++ b/src/resolve/resolvectl.c 516+++ b/src/resolve/resolvectl.c
445@@ -46,6 +46,7 @@ 517@@ -48,6 +48,7 @@
446 #include "varlink.h" 518 #include "varlink.h"
447 #include "verb-log-control.h" 519 #include "verb-log-control.h"
448 #include "verbs.h" 520 #include "verbs.h"
@@ -450,6 +522,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
450 522
451 static int arg_family = AF_UNSPEC; 523 static int arg_family = AF_UNSPEC;
452 static int arg_ifindex = 0; 524 static int arg_ifindex = 0;
525diff --git a/src/shared/bus-get-properties.c b/src/shared/bus-get-properties.c
526index 8b4f66b22e..5926e4c61b 100644
453--- a/src/shared/bus-get-properties.c 527--- a/src/shared/bus-get-properties.c
454+++ b/src/shared/bus-get-properties.c 528+++ b/src/shared/bus-get-properties.c
455@@ -4,6 +4,7 @@ 529@@ -4,6 +4,7 @@
@@ -460,6 +534,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
460 534
461 int bus_property_get_bool( 535 int bus_property_get_bool(
462 sd_bus *bus, 536 sd_bus *bus,
537diff --git a/src/shared/bus-unit-procs.c b/src/shared/bus-unit-procs.c
538index 8b462b5627..183ce1c18e 100644
463--- a/src/shared/bus-unit-procs.c 539--- a/src/shared/bus-unit-procs.c
464+++ b/src/shared/bus-unit-procs.c 540+++ b/src/shared/bus-unit-procs.c
465@@ -11,6 +11,7 @@ 541@@ -11,6 +11,7 @@
@@ -470,9 +546,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
470 546
471 struct CGroupInfo { 547 struct CGroupInfo {
472 char *cgroup_path; 548 char *cgroup_path;
549diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c
550index 1e95e36678..640ee031d5 100644
473--- a/src/shared/bus-unit-util.c 551--- a/src/shared/bus-unit-util.c
474+++ b/src/shared/bus-unit-util.c 552+++ b/src/shared/bus-unit-util.c
475@@ -49,6 +49,7 @@ 553@@ -50,6 +50,7 @@
476 #include "unit-def.h" 554 #include "unit-def.h"
477 #include "user-util.h" 555 #include "user-util.h"
478 #include "utf8.h" 556 #include "utf8.h"
@@ -480,6 +558,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
480 558
481 int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) { 559 int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) {
482 assert(message); 560 assert(message);
561diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
562index d09ec5148d..f38a8f7cc1 100644
483--- a/src/shared/bus-util.c 563--- a/src/shared/bus-util.c
484+++ b/src/shared/bus-util.c 564+++ b/src/shared/bus-util.c
485@@ -21,6 +21,7 @@ 565@@ -21,6 +21,7 @@
@@ -490,6 +570,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
490 570
491 static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { 571 static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
492 sd_event *e = ASSERT_PTR(userdata); 572 sd_event *e = ASSERT_PTR(userdata);
573diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c
574index 620b156563..5ee5b09186 100644
493--- a/src/shared/dns-domain.c 575--- a/src/shared/dns-domain.c
494+++ b/src/shared/dns-domain.c 576+++ b/src/shared/dns-domain.c
495@@ -18,6 +18,7 @@ 577@@ -18,6 +18,7 @@
@@ -500,6 +582,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
500 582
501 int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) { 583 int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) {
502 const char *n; 584 const char *n;
585diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c
586index d9eabec886..534c6cf7e3 100644
503--- a/src/shared/journal-importer.c 587--- a/src/shared/journal-importer.c
504+++ b/src/shared/journal-importer.c 588+++ b/src/shared/journal-importer.c
505@@ -15,6 +15,7 @@ 589@@ -15,6 +15,7 @@
@@ -510,36 +594,44 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
510 594
511 enum { 595 enum {
512 IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */ 596 IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */
597diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
598index b72e516c8d..6e832b74c3 100644
513--- a/src/shared/logs-show.c 599--- a/src/shared/logs-show.c
514+++ b/src/shared/logs-show.c 600+++ b/src/shared/logs-show.c
515@@ -42,6 +42,7 @@ 601@@ -41,6 +41,7 @@
602 #include "time-util.h"
516 #include "utf8.h" 603 #include "utf8.h"
517 #include "util.h"
518 #include "web-util.h" 604 #include "web-util.h"
519+#include "missing_stdlib.h" 605+#include "missing_stdlib.h"
520 606
521 /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */ 607 /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */
522 #define PRINT_LINE_THRESHOLD 3 608 #define PRINT_LINE_THRESHOLD 3
609diff --git a/src/shared/pager.c b/src/shared/pager.c
610index 6ed35a3ca9..99d9d36140 100644
523--- a/src/shared/pager.c 611--- a/src/shared/pager.c
524+++ b/src/shared/pager.c 612+++ b/src/shared/pager.c
525@@ -26,6 +26,7 @@ 613@@ -25,6 +25,7 @@
614 #include "string-util.h"
526 #include "strv.h" 615 #include "strv.h"
527 #include "terminal-util.h" 616 #include "terminal-util.h"
528 #include "util.h"
529+#include "missing_stdlib.h" 617+#include "missing_stdlib.h"
530 618
531 static pid_t pager_pid = 0; 619 static pid_t pager_pid = 0;
532 620
621diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c
622index 821049e667..08a5bdae3d 100644
533--- a/src/socket-proxy/socket-proxyd.c 623--- a/src/socket-proxy/socket-proxyd.c
534+++ b/src/socket-proxy/socket-proxyd.c 624+++ b/src/socket-proxy/socket-proxyd.c
535@@ -26,6 +26,7 @@ 625@@ -26,6 +26,7 @@
626 #include "set.h"
536 #include "socket-util.h" 627 #include "socket-util.h"
537 #include "string-util.h" 628 #include "string-util.h"
538 #include "util.h"
539+#include "missing_stdlib.h" 629+#include "missing_stdlib.h"
540 630
541 #define BUFFER_SIZE (256 * 1024) 631 #define BUFFER_SIZE (256 * 1024)
542 632
633diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c
634index 9d71db6ae1..a9938c1e6e 100644
543--- a/src/test/test-hexdecoct.c 635--- a/src/test/test-hexdecoct.c
544+++ b/src/test/test-hexdecoct.c 636+++ b/src/test/test-hexdecoct.c
545@@ -7,6 +7,7 @@ 637@@ -7,6 +7,7 @@
@@ -550,6 +642,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
550 #include "tests.h" 642 #include "tests.h"
551 643
552 TEST(hexchar) { 644 TEST(hexchar) {
645diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
646index 8e4d57ee72..6b4555b4d5 100644
553--- a/src/udev/udev-builtin-path_id.c 647--- a/src/udev/udev-builtin-path_id.c
554+++ b/src/udev/udev-builtin-path_id.c 648+++ b/src/udev/udev-builtin-path_id.c
555@@ -22,6 +22,7 @@ 649@@ -22,6 +22,7 @@
@@ -560,6 +654,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
560 654
561 _printf_(2,3) 655 _printf_(2,3)
562 static void path_prepend(char **path, const char *fmt, ...) { 656 static void path_prepend(char **path, const char *fmt, ...) {
657diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
658index ec4ad30824..bc40303a46 100644
563--- a/src/udev/udev-event.c 659--- a/src/udev/udev-event.c
564+++ b/src/udev/udev-event.c 660+++ b/src/udev/udev-event.c
565@@ -34,6 +34,7 @@ 661@@ -34,6 +34,7 @@
@@ -570,6 +666,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
570 666
571 typedef struct Spawn { 667 typedef struct Spawn {
572 sd_device *device; 668 sd_device *device;
669diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
670index 5bd09a64d1..0ce79f815c 100644
573--- a/src/udev/udev-rules.c 671--- a/src/udev/udev-rules.c
574+++ b/src/udev/udev-rules.c 672+++ b/src/udev/udev-rules.c
575@@ -34,6 +34,7 @@ 673@@ -34,6 +34,7 @@
@@ -580,3 +678,6 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
580 678
581 #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d") 679 #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d")
582 680
681--
6822.39.2
683
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/0012-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
index 2a5770c515..b86cc42589 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/0012-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
@@ -1,4 +1,4 @@
1From 74c664bcd6b9a5fcf3466310c07f608d12456f7f Mon Sep 17 00:00:00 2001 1From 747ff78ecda6afe01c7eab4d7c27aea6af810c86 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Mon, 25 Feb 2019 14:56:21 +0800 3Date: Mon, 25 Feb 2019 14:56:21 +0800
4Subject: [PATCH] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not defined 4Subject: [PATCH] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not defined
@@ -16,13 +16,14 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
16Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 16Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
17[rebased for systemd 243] 17[rebased for systemd 243]
18Signed-off-by: Scott Murray <scott.murray@konsulko.com> 18Signed-off-by: Scott Murray <scott.murray@konsulko.com>
19
20--- 19---
21 src/basic/glob-util.c | 12 ++++++++++++ 20 src/basic/glob-util.c | 12 ++++++++++++
22 src/test/test-glob-util.c | 16 ++++++++++++++++ 21 src/test/test-glob-util.c | 16 ++++++++++++++++
23 src/tmpfiles/tmpfiles.c | 10 ++++++++++ 22 src/tmpfiles/tmpfiles.c | 10 ++++++++++
24 3 files changed, 38 insertions(+) 23 3 files changed, 38 insertions(+)
25 24
25diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c
26index fd60a6eda2..c73edc41ea 100644
26--- a/src/basic/glob-util.c 27--- a/src/basic/glob-util.c
27+++ b/src/basic/glob-util.c 28+++ b/src/basic/glob-util.c
28@@ -12,6 +12,12 @@ 29@@ -12,6 +12,12 @@
@@ -46,7 +47,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
46 /* We want to set GLOB_ALTDIRFUNC ourselves, don't allow it to be set. */ 47 /* We want to set GLOB_ALTDIRFUNC ourselves, don't allow it to be set. */
47 assert(!(flags & GLOB_ALTDIRFUNC)); 48 assert(!(flags & GLOB_ALTDIRFUNC));
48 49
49@@ -32,9 +39,14 @@ int safe_glob(const char *path, int flag 50@@ -32,9 +39,14 @@ int safe_glob(const char *path, int flags, glob_t *pglob) {
50 pglob->gl_lstat = lstat; 51 pglob->gl_lstat = lstat;
51 if (!pglob->gl_stat) 52 if (!pglob->gl_stat)
52 pglob->gl_stat = stat; 53 pglob->gl_stat = stat;
@@ -61,6 +62,8 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
61 if (k == GLOB_NOMATCH) 62 if (k == GLOB_NOMATCH)
62 return -ENOENT; 63 return -ENOENT;
63 if (k == GLOB_NOSPACE) 64 if (k == GLOB_NOSPACE)
65diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c
66index 9b3e73cce0..3790ba3be5 100644
64--- a/src/test/test-glob-util.c 67--- a/src/test/test-glob-util.c
65+++ b/src/test/test-glob-util.c 68+++ b/src/test/test-glob-util.c
66@@ -34,6 +34,12 @@ TEST(glob_first) { 69@@ -34,6 +34,12 @@ TEST(glob_first) {
@@ -75,7 +78,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
75+ 78+
76 TEST(glob_exists) { 79 TEST(glob_exists) {
77 char name[] = "/tmp/test-glob_exists.XXXXXX"; 80 char name[] = "/tmp/test-glob_exists.XXXXXX";
78 int fd = -1; 81 int fd = -EBADF;
79@@ -61,11 +67,13 @@ TEST(glob_no_dot) { 82@@ -61,11 +67,13 @@ TEST(glob_no_dot) {
80 const char *fn; 83 const char *fn;
81 84
@@ -110,9 +113,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
110 assert_se(r == GLOB_NOMATCH); 113 assert_se(r == GLOB_NOMATCH);
111 114
112 (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL); 115 (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL);
116diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
117index 458aed7054..2cf24b38c0 100644
113--- a/src/tmpfiles/tmpfiles.c 118--- a/src/tmpfiles/tmpfiles.c
114+++ b/src/tmpfiles/tmpfiles.c 119+++ b/src/tmpfiles/tmpfiles.c
115@@ -71,6 +71,12 @@ 120@@ -73,6 +73,12 @@
116 #include "user-util.h" 121 #include "user-util.h"
117 #include "virt.h" 122 #include "virt.h"
118 123
@@ -125,7 +130,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
125 /* 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
126 * 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
127 * properly owned directories beneath /tmp, /var/tmp, /run, which are 132 * properly owned directories beneath /tmp, /var/tmp, /run, which are
128@@ -2174,7 +2180,9 @@ finish: 133@@ -2194,7 +2200,9 @@ finish:
129 134
130 static int glob_item(Item *i, action_t action) { 135 static int glob_item(Item *i, action_t action) {
131 _cleanup_globfree_ glob_t g = { 136 _cleanup_globfree_ glob_t g = {
@@ -135,7 +140,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
135 }; 140 };
136 int r = 0, k; 141 int r = 0, k;
137 142
138@@ -2194,7 +2202,9 @@ static int glob_item(Item *i, action_t a 143@@ -2214,7 +2222,9 @@ static int glob_item(Item *i, action_t action) {
139 144
140 static int glob_item_recursively(Item *i, fdaction_t action) { 145 static int glob_item_recursively(Item *i, fdaction_t action) {
141 _cleanup_globfree_ glob_t g = { 146 _cleanup_globfree_ glob_t g = {
@@ -145,3 +150,6 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
145 }; 150 };
146 int r = 0, k; 151 int r = 0, k;
147 152
153--
1542.39.2
155
diff --git a/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch b/meta/recipes-core/systemd/systemd/0013-add-missing-FTW_-macros-for-musl.patch
index d1191d7e8e..d6aaadc006 100644
--- a/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch
+++ b/meta/recipes-core/systemd/systemd/0013-add-missing-FTW_-macros-for-musl.patch
@@ -1,4 +1,4 @@
1From a0450f7909348e7ff1d58adc0aee4119a0519c1f Mon Sep 17 00:00:00 2001 1From efd7b41cf270c7b07ee3b9aec0fedd8e52dd422f Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Mon, 25 Feb 2019 15:00:06 +0800 3Date: Mon, 25 Feb 2019 15:00:06 +0800
4Subject: [PATCH] add missing FTW_ macros for musl 4Subject: [PATCH] add missing FTW_ macros for musl
@@ -10,7 +10,6 @@ This is to avoid build failures like below for musl.
10Upstream-Status: Inappropriate [musl specific] 10Upstream-Status: Inappropriate [musl specific]
11 11
12Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 12Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
13
14--- 13---
15 src/basic/missing_type.h | 4 ++++ 14 src/basic/missing_type.h | 4 ++++
16 src/test/test-recurse-dir.c | 1 + 15 src/test/test-recurse-dir.c | 1 +
@@ -40,3 +39,6 @@ index 2c2120b136..bc60a178a2 100644
40 39
41 static char **list_nftw = NULL; 40 static char **list_nftw = NULL;
42 41
42--
432.39.2
44
diff --git a/meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch b/meta/recipes-core/systemd/systemd/0014-Use-uintmax_t-for-handling-rlim_t.patch
index aac4ad49d7..f586d3ff52 100644
--- a/meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch
+++ b/meta/recipes-core/systemd/systemd/0014-Use-uintmax_t-for-handling-rlim_t.patch
@@ -1,4 +1,4 @@
1From 48a791aae7a47a2a08e9e60c18054071a43b8cda Mon Sep 17 00:00:00 2001 1From 60f7d2c62bc3718023df93c01688d3ee1625d64d Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Mon, 25 Feb 2019 15:12:41 +0800 3Date: Mon, 25 Feb 2019 15:12:41 +0800
4Subject: [PATCH] Use uintmax_t for handling rlim_t 4Subject: [PATCH] Use uintmax_t for handling rlim_t
@@ -20,16 +20,17 @@ Upstream-Status: Denied [https://github.com/systemd/systemd/pull/7199]
20Signed-off-by: Khem Raj <raj.khem@gmail.com> 20Signed-off-by: Khem Raj <raj.khem@gmail.com>
21[Rebased for v241] 21[Rebased for v241]
22Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 22Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
23
24--- 23---
25 src/basic/format-util.h | 8 +------- 24 src/basic/format-util.h | 8 +-------
26 src/basic/rlimit-util.c | 12 ++++++------ 25 src/basic/rlimit-util.c | 12 ++++++------
27 src/core/execute.c | 4 ++-- 26 src/core/execute.c | 4 ++--
28 3 files changed, 9 insertions(+), 15 deletions(-) 27 3 files changed, 9 insertions(+), 15 deletions(-)
29 28
29diff --git a/src/basic/format-util.h b/src/basic/format-util.h
30index 8719df3e29..9becc96066 100644
30--- a/src/basic/format-util.h 31--- a/src/basic/format-util.h
31+++ b/src/basic/format-util.h 32+++ b/src/basic/format-util.h
32@@ -34,13 +34,7 @@ assert_cc(sizeof(gid_t) == sizeof(uint32 33@@ -34,13 +34,7 @@ assert_cc(sizeof(gid_t) == sizeof(uint32_t));
33 # error Unknown timex member size 34 # error Unknown timex member size
34 #endif 35 #endif
35 36
@@ -44,9 +45,11 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
44 45
45 #if SIZEOF_DEV_T == 8 46 #if SIZEOF_DEV_T == 8
46 # define DEV_FMT "%" PRIu64 47 # define DEV_FMT "%" PRIu64
48diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c
49index 33dfde9d6c..e018fd81fd 100644
47--- a/src/basic/rlimit-util.c 50--- a/src/basic/rlimit-util.c
48+++ b/src/basic/rlimit-util.c 51+++ b/src/basic/rlimit-util.c
49@@ -44,7 +44,7 @@ int setrlimit_closest(int resource, cons 52@@ -44,7 +44,7 @@ int setrlimit_closest(int resource, const struct rlimit *rlim) {
50 fixed.rlim_max == highest.rlim_max) 53 fixed.rlim_max == highest.rlim_max)
51 return 0; 54 return 0;
52 55
@@ -55,7 +58,7 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
55 58
56 return RET_NERRNO(setrlimit(resource, &fixed)); 59 return RET_NERRNO(setrlimit(resource, &fixed));
57 } 60 }
58@@ -307,13 +307,13 @@ int rlimit_format(const struct rlimit *r 61@@ -307,13 +307,13 @@ int rlimit_format(const struct rlimit *rl, char **ret) {
59 if (rl->rlim_cur >= RLIM_INFINITY && rl->rlim_max >= RLIM_INFINITY) 62 if (rl->rlim_cur >= RLIM_INFINITY && rl->rlim_max >= RLIM_INFINITY)
60 r = free_and_strdup(&s, "infinity"); 63 r = free_and_strdup(&s, "infinity");
61 else if (rl->rlim_cur >= RLIM_INFINITY) 64 else if (rl->rlim_cur >= RLIM_INFINITY)
@@ -82,9 +85,11 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
82 85
83 return 1; 86 return 1;
84 } 87 }
88diff --git a/src/core/execute.c b/src/core/execute.c
89index 8ef76de9ab..ea1c203e43 100644
85--- a/src/core/execute.c 90--- a/src/core/execute.c
86+++ b/src/core/execute.c 91+++ b/src/core/execute.c
87@@ -5869,9 +5869,9 @@ void exec_context_dump(const ExecContext 92@@ -6034,9 +6034,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) {
88 for (unsigned i = 0; i < RLIM_NLIMITS; i++) 93 for (unsigned i = 0; i < RLIM_NLIMITS; i++)
89 if (c->rlimit[i]) { 94 if (c->rlimit[i]) {
90 fprintf(f, "%sLimit%s: " RLIM_FMT "\n", 95 fprintf(f, "%sLimit%s: " RLIM_FMT "\n",
@@ -96,3 +101,6 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
96 } 101 }
97 102
98 if (c->ioprio_set) { 103 if (c->ioprio_set) {
104--
1052.39.2
106
diff --git a/meta/recipes-core/systemd/systemd/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch b/meta/recipes-core/systemd/systemd/0015-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch
index 1074866f86..afc80b9511 100644
--- a/meta/recipes-core/systemd/systemd/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch
+++ b/meta/recipes-core/systemd/systemd/0015-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch
@@ -1,4 +1,4 @@
1From e8025c8eefdf1be4bba34c48f3430838f3859c52 Mon Sep 17 00:00:00 2001 1From 96088895149746dd2ee8e8c2e4b97972ccf44696 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Wed, 28 Feb 2018 21:25:22 -0800 3Date: Wed, 28 Feb 2018 21:25:22 -0800
4Subject: [PATCH] test-sizeof.c: Disable tests for missing typedefs in musl 4Subject: [PATCH] test-sizeof.c: Disable tests for missing typedefs in musl
@@ -7,13 +7,12 @@ Upstream-Status: Inappropriate [musl specific]
7 7
8Signed-off-by: Khem Raj <raj.khem@gmail.com> 8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 9Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
10
11--- 10---
12 src/test/test-sizeof.c | 4 ++++ 11 src/test/test-sizeof.c | 4 ++++
13 1 file changed, 4 insertions(+) 12 1 file changed, 4 insertions(+)
14 13
15diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c 14diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c
16index f349852553..602772227e 100644 15index 55bd81e22f..6cf92bffde 100644
17--- a/src/test/test-sizeof.c 16--- a/src/test/test-sizeof.c
18+++ b/src/test/test-sizeof.c 17+++ b/src/test/test-sizeof.c
19@@ -55,8 +55,10 @@ int main(void) { 18@@ -55,8 +55,10 @@ int main(void) {
@@ -37,3 +36,6 @@ index f349852553..602772227e 100644
37 info(pid_t); 36 info(pid_t);
38 info(uid_t); 37 info(uid_t);
39 info(gid_t); 38 info(gid_t);
39--
402.39.2
41
diff --git a/meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch b/meta/recipes-core/systemd/systemd/0016-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
index 6367adce07..2f84d3d6c2 100644
--- a/meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
+++ b/meta/recipes-core/systemd/systemd/0016-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
@@ -1,4 +1,4 @@
1From 46fdc959257d60d9b32953cae0152ae118f8564b Mon Sep 17 00:00:00 2001 1From 26b02348e39fe72b73dd61bba8a0cefb0352717d Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com> 2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Tue, 10 Oct 2017 14:33:30 -0700 3Date: Tue, 10 Oct 2017 14:33:30 -0700
4Subject: [PATCH] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() 4Subject: [PATCH] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat()
@@ -25,15 +25,16 @@ just historical and not actually necessary or desired behaviour?
25Upstream-Status: Inappropriate [musl specific] 25Upstream-Status: Inappropriate [musl specific]
26 26
27Signed-off-by: Andre McCurdy <armccurdy@gmail.com> 27Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
28
29--- 28---
30 src/basic/fs-util.h | 21 ++++++++++++++++++++- 29 src/basic/fs-util.h | 21 ++++++++++++++++++++-
31 src/shared/base-filesystem.c | 6 +++--- 30 src/shared/base-filesystem.c | 6 +++---
32 2 files changed, 23 insertions(+), 4 deletions(-) 31 2 files changed, 23 insertions(+), 4 deletions(-)
33 32
33diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h
34index 932d003f19..33215dbf5f 100644
34--- a/src/basic/fs-util.h 35--- a/src/basic/fs-util.h
35+++ b/src/basic/fs-util.h 36+++ b/src/basic/fs-util.h
36@@ -47,8 +47,27 @@ int futimens_opath(int fd, const struct 37@@ -50,8 +50,27 @@ int futimens_opath(int fd, const struct timespec ts[2]);
37 int fd_warn_permissions(const char *path, int fd); 38 int fd_warn_permissions(const char *path, int fd);
38 int stat_warn_permissions(const char *path, const struct stat *st); 39 int stat_warn_permissions(const char *path, const struct stat *st);
39 40
@@ -62,9 +63,11 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
62 63
63 int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode); 64 int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode);
64 65
66diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c
67index be6dd1654a..2726dc946a 100644
65--- a/src/shared/base-filesystem.c 68--- a/src/shared/base-filesystem.c
66+++ b/src/shared/base-filesystem.c 69+++ b/src/shared/base-filesystem.c
67@@ -131,7 +131,7 @@ int base_filesystem_create(const char *r 70@@ -131,7 +131,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) {
68 return log_error_errno(errno, "Failed to open root file system: %m"); 71 return log_error_errno(errno, "Failed to open root file system: %m");
69 72
70 for (size_t i = 0; i < ELEMENTSOF(table); i++) { 73 for (size_t i = 0; i < ELEMENTSOF(table); i++) {
@@ -73,7 +76,7 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
73 continue; 76 continue;
74 77
75 if (table[i].target) { 78 if (table[i].target) {
76@@ -139,7 +139,7 @@ int base_filesystem_create(const char *r 79@@ -139,7 +139,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) {
77 80
78 /* check if one of the targets exists */ 81 /* check if one of the targets exists */
79 NULSTR_FOREACH(s, table[i].target) { 82 NULSTR_FOREACH(s, table[i].target) {
@@ -82,7 +85,7 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
82 continue; 85 continue;
83 86
84 /* check if a specific file exists at the target path */ 87 /* check if a specific file exists at the target path */
85@@ -150,7 +150,7 @@ int base_filesystem_create(const char *r 88@@ -150,7 +150,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) {
86 if (!p) 89 if (!p)
87 return log_oom(); 90 return log_oom();
88 91
@@ -91,3 +94,6 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
91 continue; 94 continue;
92 } 95 }
93 96
97--
982.39.2
99
diff --git a/meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch b/meta/recipes-core/systemd/systemd/0017-Define-glibc-compatible-basename-for-non-glibc-syste.patch
index 3228f1716b..7d74cfcc24 100644
--- a/meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch
+++ b/meta/recipes-core/systemd/systemd/0017-Define-glibc-compatible-basename-for-non-glibc-syste.patch
@@ -1,4 +1,4 @@
1From d0bdce977b7acc5e45e82cf84256c4bedc0e74c4 Mon Sep 17 00:00:00 2001 1From fdc7fb940bb41020271b9db41d5608004efdbde5 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 27 May 2018 08:36:44 -0700 3Date: Sun, 27 May 2018 08:36:44 -0700
4Subject: [PATCH] Define glibc compatible basename() for non-glibc systems 4Subject: [PATCH] Define glibc compatible basename() for non-glibc systems
@@ -9,11 +9,12 @@ using non-posix basename implementation, we have a way out
9Upstream-Status: Inappropriate [musl specific] 9Upstream-Status: Inappropriate [musl specific]
10 10
11Signed-off-by: Khem Raj <raj.khem@gmail.com> 11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12
13--- 12---
14 src/machine/machine-dbus.c | 5 +++++ 13 src/machine/machine-dbus.c | 5 +++++
15 1 file changed, 5 insertions(+) 14 1 file changed, 5 insertions(+)
16 15
16diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
17index 45bc056326..aee51d5da5 100644
17--- a/src/machine/machine-dbus.c 18--- a/src/machine/machine-dbus.c
18+++ b/src/machine/machine-dbus.c 19+++ b/src/machine/machine-dbus.c
19@@ -4,6 +4,11 @@ 20@@ -4,6 +4,11 @@
@@ -28,3 +29,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
28 #include "alloc-util.h" 29 #include "alloc-util.h"
29 #include "bus-common-errors.h" 30 #include "bus-common-errors.h"
30 #include "bus-get-properties.h" 31 #include "bus-get-properties.h"
32--
332.39.2
34
diff --git a/meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch b/meta/recipes-core/systemd/systemd/0018-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
index da56d8b4b6..401a9a9546 100644
--- a/meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
+++ b/meta/recipes-core/systemd/systemd/0018-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
@@ -1,4 +1,4 @@
1From e480d28305907c3874f4e58b722b8aa43c3ac7a2 Mon Sep 17 00:00:00 2001 1From 32fd0dc67b6df531f0769dbb099dbe8f30c28514 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Wed, 4 Jul 2018 15:00:44 +0800 3Date: Wed, 4 Jul 2018 15:00:44 +0800
4Subject: [PATCH] Do not disable buffering when writing to oom_score_adj 4Subject: [PATCH] Do not disable buffering when writing to oom_score_adj
@@ -19,14 +19,15 @@ Upstream-Status: Inappropriate [musl specific]
19Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 19Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
20[rebased for systemd 243] 20[rebased for systemd 243]
21Signed-off-by: Scott Murray <scott.murray@konsulko.com> 21Signed-off-by: Scott Murray <scott.murray@konsulko.com>
22
23--- 22---
24 src/basic/process-util.c | 2 +- 23 src/basic/process-util.c | 2 +-
25 1 file changed, 1 insertion(+), 1 deletion(-) 24 1 file changed, 1 insertion(+), 1 deletion(-)
26 25
26diff --git a/src/basic/process-util.c b/src/basic/process-util.c
27index 0747c14c1c..8d0c5aae92 100644
27--- a/src/basic/process-util.c 28--- a/src/basic/process-util.c
28+++ b/src/basic/process-util.c 29+++ b/src/basic/process-util.c
29@@ -1466,7 +1466,7 @@ int set_oom_score_adjust(int value) { 30@@ -1405,7 +1405,7 @@ int set_oom_score_adjust(int value) {
30 xsprintf(t, "%i", value); 31 xsprintf(t, "%i", value);
31 32
32 return write_string_file("/proc/self/oom_score_adj", t, 33 return write_string_file("/proc/self/oom_score_adj", t,
@@ -35,3 +36,6 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
35 } 36 }
36 37
37 int get_oom_score_adjust(int *ret) { 38 int get_oom_score_adjust(int *ret) {
39--
402.39.2
41
diff --git a/meta/recipes-core/systemd/systemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch b/meta/recipes-core/systemd/systemd/0019-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
index 7533fde1e1..48b8eda0a5 100644
--- a/meta/recipes-core/systemd/systemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
+++ b/meta/recipes-core/systemd/systemd/0019-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
@@ -1,4 +1,4 @@
1From 0542d27ebbb250c09bdcfcf9f2ea3d27426fe522 Mon Sep 17 00:00:00 2001 1From ed46afcbc6bc1f6277a0a54c3db8cf1b056bca1e Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Tue, 10 Jul 2018 15:40:17 +0800 3Date: Tue, 10 Jul 2018 15:40:17 +0800
4Subject: [PATCH] distinguish XSI-compliant strerror_r from GNU-specifi 4Subject: [PATCH] distinguish XSI-compliant strerror_r from GNU-specifi
@@ -18,15 +18,16 @@ assigned to (char *) variable, resulting in segment fault.
18Upstream-Status: Inappropriate [musl specific] 18Upstream-Status: Inappropriate [musl specific]
19 19
20Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 20Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
21
22--- 21---
23 src/libsystemd/sd-bus/bus-error.c | 5 +++++ 22 src/libsystemd/sd-bus/bus-error.c | 11 ++++++++++-
24 src/libsystemd/sd-journal/journal-send.c | 5 +++++ 23 src/libsystemd/sd-journal/journal-send.c | 5 +++++
25 2 files changed, 10 insertions(+) 24 2 files changed, 15 insertions(+), 1 deletion(-)
26 25
26diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c
27index 413e2dd43f..805e5da0c0 100644
27--- a/src/libsystemd/sd-bus/bus-error.c 28--- a/src/libsystemd/sd-bus/bus-error.c
28+++ b/src/libsystemd/sd-bus/bus-error.c 29+++ b/src/libsystemd/sd-bus/bus-error.c
29@@ -409,7 +409,12 @@ static void bus_error_strerror(sd_bus_er 30@@ -408,7 +408,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) {
30 return; 31 return;
31 32
32 errno = 0; 33 errno = 0;
@@ -39,7 +40,7 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
39 if (errno == ERANGE || strlen(x) >= k - 1) { 40 if (errno == ERANGE || strlen(x) >= k - 1) {
40 free(m); 41 free(m);
41 k *= 2; 42 k *= 2;
42@@ -594,8 +599,12 @@ const char* _bus_error_message(const sd_ 43@@ -593,8 +598,12 @@ const char* _bus_error_message(const sd_bus_error *e, int error, char buf[static
43 44
44 if (e && e->message) 45 if (e && e->message)
45 return e->message; 46 return e->message;
@@ -53,9 +54,11 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
53 } 54 }
54 55
55 static bool map_ok(const sd_bus_error_map *map) { 56 static bool map_ok(const sd_bus_error_map *map) {
57diff --git a/src/libsystemd/sd-journal/journal-send.c b/src/libsystemd/sd-journal/journal-send.c
58index 136ebcb153..8a75ba4ecd 100644
56--- a/src/libsystemd/sd-journal/journal-send.c 59--- a/src/libsystemd/sd-journal/journal-send.c
57+++ b/src/libsystemd/sd-journal/journal-send.c 60+++ b/src/libsystemd/sd-journal/journal-send.c
58@@ -381,7 +381,12 @@ static int fill_iovec_perror_and_send(co 61@@ -381,7 +381,12 @@ static int fill_iovec_perror_and_send(const char *message, int skip, struct iove
59 char* j; 62 char* j;
60 63
61 errno = 0; 64 errno = 0;
@@ -68,3 +71,6 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
68 if (errno == 0) { 71 if (errno == 0) {
69 char error[STRLEN("ERRNO=") + DECIMAL_STR_MAX(int) + 1]; 72 char error[STRLEN("ERRNO=") + DECIMAL_STR_MAX(int) + 1];
70 73
74--
752.39.2
76
diff --git a/meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch b/meta/recipes-core/systemd/systemd/0020-avoid-redefinition-of-prctl_mm_map-structure.patch
index 1fcba7af08..e5f017347c 100644
--- a/meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch
+++ b/meta/recipes-core/systemd/systemd/0020-avoid-redefinition-of-prctl_mm_map-structure.patch
@@ -1,4 +1,4 @@
1From e1d0210b47906dd121f936f3181092835df6a95c Mon Sep 17 00:00:00 2001 1From 277b680d07a178b8278862b60417052d05c1376f Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Mon, 25 Feb 2019 15:44:54 +0800 3Date: Mon, 25 Feb 2019 15:44:54 +0800
4Subject: [PATCH] avoid redefinition of prctl_mm_map structure 4Subject: [PATCH] avoid redefinition of prctl_mm_map structure
@@ -9,7 +9,6 @@ error: redefinition of 'struct prctl_mm_map'
9Upstream-Status: Inappropriate [musl specific] 9Upstream-Status: Inappropriate [musl specific]
10 10
11Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 11Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
12
13--- 12---
14 src/basic/missing_prctl.h | 2 ++ 13 src/basic/missing_prctl.h | 2 ++
15 1 file changed, 2 insertions(+) 14 1 file changed, 2 insertions(+)
@@ -28,3 +27,6 @@ index ab851306ba..5547cad875 100644
28 27
29 /* 58319057b7847667f0c9585b9de0e8932b0fdb08 (4.3) */ 28 /* 58319057b7847667f0c9585b9de0e8932b0fdb08 (4.3) */
30 #ifndef PR_CAP_AMBIENT 29 #ifndef PR_CAP_AMBIENT
30--
312.39.2
32
diff --git a/meta/recipes-core/systemd/systemd/0022-do-not-disable-buffer-in-writing-files.patch b/meta/recipes-core/systemd/systemd/0021-do-not-disable-buffer-in-writing-files.patch
index 6edab0dfe2..46267a5ada 100644
--- a/meta/recipes-core/systemd/systemd/0022-do-not-disable-buffer-in-writing-files.patch
+++ b/meta/recipes-core/systemd/systemd/0021-do-not-disable-buffer-in-writing-files.patch
@@ -1,4 +1,4 @@
1From 414e2f97008a1f3c26a260a6dc4d51a8c1fa6900 Mon Sep 17 00:00:00 2001 1From aa6e5588e6d01c12e2f101d140cc710ab199df16 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Fri, 1 Mar 2019 15:22:15 +0800 3Date: Fri, 1 Mar 2019 15:22:15 +0800
4Subject: [PATCH] do not disable buffer in writing files 4Subject: [PATCH] do not disable buffer in writing files
@@ -18,16 +18,14 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
18Signed-off-by: Andrej Valek <andrej.valek@siemens.com> 18Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
19[rebased for systemd 243] 19[rebased for systemd 243]
20Signed-off-by: Scott Murray <scott.murray@konsulko.com> 20Signed-off-by: Scott Murray <scott.murray@konsulko.com>
21
22--- 21---
23 src/basic/cgroup-util.c | 12 ++++++------ 22 src/basic/cgroup-util.c | 12 ++++++------
24 src/basic/namespace-util.c | 4 ++-- 23 src/basic/namespace-util.c | 4 ++--
25 src/basic/procfs-util.c | 4 ++-- 24 src/basic/procfs-util.c | 4 ++--
26 src/basic/sysctl-util.c | 2 +- 25 src/basic/sysctl-util.c | 2 +-
27 src/basic/util.c | 2 +-
28 src/binfmt/binfmt.c | 6 +++--- 26 src/binfmt/binfmt.c | 6 +++---
29 src/core/cgroup.c | 2 +- 27 src/core/cgroup.c | 2 +-
30 src/core/main.c | 4 ++-- 28 src/core/main.c | 2 +-
31 src/core/smack-setup.c | 8 ++++---- 29 src/core/smack-setup.c | 8 ++++----
32 src/hibernate-resume/hibernate-resume.c | 2 +- 30 src/hibernate-resume/hibernate-resume.c | 2 +-
33 src/home/homework.c | 2 +- 31 src/home/homework.c | 2 +-
@@ -41,11 +39,13 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
41 src/sleep/sleep.c | 8 ++++---- 39 src/sleep/sleep.c | 8 ++++----
42 src/udev/udev-rules.c | 1 - 40 src/udev/udev-rules.c | 1 -
43 src/vconsole/vconsole-setup.c | 2 +- 41 src/vconsole/vconsole-setup.c | 2 +-
44 21 files changed, 39 insertions(+), 40 deletions(-) 42 20 files changed, 37 insertions(+), 38 deletions(-)
45 43
44diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
45index 11b4375ed5..7d81a6007f 100644
46--- a/src/basic/cgroup-util.c 46--- a/src/basic/cgroup-util.c
47+++ b/src/basic/cgroup-util.c 47+++ b/src/basic/cgroup-util.c
48@@ -399,7 +399,7 @@ int cg_kill_kernel_sigkill(const char *c 48@@ -399,7 +399,7 @@ int cg_kill_kernel_sigkill(const char *controller, const char *path) {
49 if (r < 0) 49 if (r < 0)
50 return r; 50 return r;
51 51
@@ -54,7 +54,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
54 if (r < 0) 54 if (r < 0)
55 return r; 55 return r;
56 56
57@@ -805,7 +805,7 @@ int cg_install_release_agent(const char 57@@ -805,7 +805,7 @@ int cg_install_release_agent(const char *controller, const char *agent) {
58 58
59 sc = strstrip(contents); 59 sc = strstrip(contents);
60 if (isempty(sc)) { 60 if (isempty(sc)) {
@@ -63,7 +63,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
63 if (r < 0) 63 if (r < 0)
64 return r; 64 return r;
65 } else if (!path_equal(sc, agent)) 65 } else if (!path_equal(sc, agent))
66@@ -823,7 +823,7 @@ int cg_install_release_agent(const char 66@@ -823,7 +823,7 @@ int cg_install_release_agent(const char *controller, const char *agent) {
67 67
68 sc = strstrip(contents); 68 sc = strstrip(contents);
69 if (streq(sc, "0")) { 69 if (streq(sc, "0")) {
@@ -72,7 +72,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
72 if (r < 0) 72 if (r < 0)
73 return r; 73 return r;
74 74
75@@ -850,7 +850,7 @@ int cg_uninstall_release_agent(const cha 75@@ -850,7 +850,7 @@ int cg_uninstall_release_agent(const char *controller) {
76 if (r < 0) 76 if (r < 0)
77 return r; 77 return r;
78 78
@@ -81,7 +81,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
81 if (r < 0) 81 if (r < 0)
82 return r; 82 return r;
83 83
84@@ -860,7 +860,7 @@ int cg_uninstall_release_agent(const cha 84@@ -860,7 +860,7 @@ int cg_uninstall_release_agent(const char *controller) {
85 if (r < 0) 85 if (r < 0)
86 return r; 86 return r;
87 87
@@ -90,7 +90,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
90 if (r < 0) 90 if (r < 0)
91 return r; 91 return r;
92 92
93@@ -1730,7 +1730,7 @@ int cg_set_attribute(const char *control 93@@ -1752,7 +1752,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri
94 if (r < 0) 94 if (r < 0)
95 return r; 95 return r;
96 96
@@ -99,9 +99,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
99 } 99 }
100 100
101 int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) { 101 int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) {
102diff --git a/src/basic/namespace-util.c b/src/basic/namespace-util.c
103index f5c0e04cec..272b920022 100644
102--- a/src/basic/namespace-util.c 104--- a/src/basic/namespace-util.c
103+++ b/src/basic/namespace-util.c 105+++ b/src/basic/namespace-util.c
104@@ -220,12 +220,12 @@ int userns_acquire(const char *uid_map, 106@@ -220,12 +220,12 @@ int userns_acquire(const char *uid_map, const char *gid_map) {
105 freeze(); 107 freeze();
106 108
107 xsprintf(path, "/proc/" PID_FMT "/uid_map", pid); 109 xsprintf(path, "/proc/" PID_FMT "/uid_map", pid);
@@ -116,9 +118,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
116 if (r < 0) 118 if (r < 0)
117 return log_error_errno(r, "Failed to write GID map: %m"); 119 return log_error_errno(r, "Failed to write GID map: %m");
118 120
121diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c
122index 64a95dd866..12cd16db1c 100644
119--- a/src/basic/procfs-util.c 123--- a/src/basic/procfs-util.c
120+++ b/src/basic/procfs-util.c 124+++ b/src/basic/procfs-util.c
121@@ -64,13 +64,13 @@ int procfs_tasks_set_limit(uint64_t limi 125@@ -64,13 +64,13 @@ int procfs_tasks_set_limit(uint64_t limit) {
122 * decrease it, as threads-max is the much more relevant sysctl. */ 126 * decrease it, as threads-max is the much more relevant sysctl. */
123 if (limit > pid_max-1) { 127 if (limit > pid_max-1) {
124 sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ 128 sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */
@@ -134,9 +138,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
134 if (r < 0) { 138 if (r < 0) {
135 uint64_t threads_max; 139 uint64_t threads_max;
136 140
141diff --git a/src/basic/sysctl-util.c b/src/basic/sysctl-util.c
142index b66a6622ae..8d1c93008a 100644
137--- a/src/basic/sysctl-util.c 143--- a/src/basic/sysctl-util.c
138+++ b/src/basic/sysctl-util.c 144+++ b/src/basic/sysctl-util.c
139@@ -58,7 +58,7 @@ int sysctl_write(const char *property, c 145@@ -58,7 +58,7 @@ int sysctl_write(const char *property, const char *value) {
140 146
141 log_debug("Setting '%s' to '%s'", p, value); 147 log_debug("Setting '%s' to '%s'", p, value);
142 148
@@ -145,20 +151,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
145 } 151 }
146 152
147 int sysctl_writef(const char *property, const char *format, ...) { 153 int sysctl_writef(const char *property, const char *format, ...) {
148--- a/src/basic/util.c 154diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
149+++ b/src/basic/util.c 155index e1ddf97914..df6e156f19 100644
150@@ -134,7 +134,7 @@ void disable_coredumps(void) {
151 if (detect_container() > 0)
152 return;
153
154- r = write_string_file("/proc/sys/kernel/core_pattern", "|/bin/false", WRITE_STRING_FILE_DISABLE_BUFFER);
155+ r = write_string_file("/proc/sys/kernel/core_pattern", "|/bin/false", 0);
156 if (r < 0)
157 log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m");
158 }
159--- a/src/binfmt/binfmt.c 156--- a/src/binfmt/binfmt.c
160+++ b/src/binfmt/binfmt.c 157+++ b/src/binfmt/binfmt.c
161@@ -29,7 +29,7 @@ static bool arg_unregister = false; 158@@ -30,7 +30,7 @@ static bool arg_unregister = false;
162 159
163 static int delete_rule(const char *rulename) { 160 static int delete_rule(const char *rulename) {
164 const char *fn = strjoina("/proc/sys/fs/binfmt_misc/", rulename); 161 const char *fn = strjoina("/proc/sys/fs/binfmt_misc/", rulename);
@@ -167,7 +164,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
167 } 164 }
168 165
169 static int apply_rule(const char *filename, unsigned line, const char *rule) { 166 static int apply_rule(const char *filename, unsigned line, const char *rule) {
170@@ -59,7 +59,7 @@ static int apply_rule(const char *filena 167@@ -58,7 +58,7 @@ static int apply_rule(const char *filename, unsigned line, const char *rule) {
171 if (r >= 0) 168 if (r >= 0)
172 log_debug("%s:%u: Rule '%s' deleted.", filename, line, rulename); 169 log_debug("%s:%u: Rule '%s' deleted.", filename, line, rulename);
173 170
@@ -176,8 +173,8 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
176 if (r < 0) 173 if (r < 0)
177 return log_error_errno(r, "%s:%u: Failed to add binary format '%s': %m", 174 return log_error_errno(r, "%s:%u: Failed to add binary format '%s': %m",
178 filename, line, rulename); 175 filename, line, rulename);
179@@ -225,7 +225,7 @@ static int run(int argc, char *argv[]) { 176@@ -244,7 +244,7 @@ static int run(int argc, char *argv[]) {
180 } 177 return r;
181 178
182 /* Flush out all rules */ 179 /* Flush out all rules */
183- r = write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", WRITE_STRING_FILE_DISABLE_BUFFER); 180- r = write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", WRITE_STRING_FILE_DISABLE_BUFFER);
@@ -185,9 +182,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
185 if (r < 0) 182 if (r < 0)
186 log_warning_errno(r, "Failed to flush binfmt_misc rules, ignoring: %m"); 183 log_warning_errno(r, "Failed to flush binfmt_misc rules, ignoring: %m");
187 else 184 else
185diff --git a/src/core/cgroup.c b/src/core/cgroup.c
186index 4cac3f6a89..bebe2cd120 100644
188--- a/src/core/cgroup.c 187--- a/src/core/cgroup.c
189+++ b/src/core/cgroup.c 188+++ b/src/core/cgroup.c
190@@ -4210,7 +4210,7 @@ int unit_cgroup_freezer_action(Unit *u, 189@@ -4267,7 +4267,7 @@ int unit_cgroup_freezer_action(Unit *u, FreezerAction action) {
191 u->freezer_state = FREEZER_THAWING; 190 u->freezer_state = FREEZER_THAWING;
192 } 191 }
193 192
@@ -196,18 +195,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
196 if (r < 0) 195 if (r < 0)
197 return r; 196 return r;
198 197
198diff --git a/src/core/main.c b/src/core/main.c
199index c0b8126d96..fe676320ba 100644
199--- a/src/core/main.c 200--- a/src/core/main.c
200+++ b/src/core/main.c 201+++ b/src/core/main.c
201@@ -1404,7 +1404,7 @@ static int bump_unix_max_dgram_qlen(void 202@@ -1716,7 +1716,7 @@ static void initialize_core_pattern(bool skip_setup) {
202 if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN)
203 return 0;
204
205- r = write_string_filef("/proc/sys/net/unix/max_dgram_qlen", WRITE_STRING_FILE_DISABLE_BUFFER,
206+ r = write_string_filef("/proc/sys/net/unix/max_dgram_qlen", 0,
207 "%lu", DEFAULT_UNIX_MAX_DGRAM_QLEN);
208 if (r < 0)
209 return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r,
210@@ -1676,7 +1676,7 @@ static void initialize_core_pattern(bool
211 if (getpid_cached() != 1) 203 if (getpid_cached() != 1)
212 return; 204 return;
213 205
@@ -216,9 +208,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
216 if (r < 0) 208 if (r < 0)
217 log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", 209 log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m",
218 arg_early_core_pattern); 210 arg_early_core_pattern);
211diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c
212index bcaa237c8d..4032bde19e 100644
219--- a/src/core/smack-setup.c 213--- a/src/core/smack-setup.c
220+++ b/src/core/smack-setup.c 214+++ b/src/core/smack-setup.c
221@@ -320,17 +320,17 @@ int mac_smack_setup(bool *loaded_policy) 215@@ -319,17 +319,17 @@ int mac_smack_setup(bool *loaded_policy) {
222 } 216 }
223 217
224 #if HAVE_SMACK_RUN_LABEL 218 #if HAVE_SMACK_RUN_LABEL
@@ -240,6 +234,8 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
240 if (r < 0) 234 if (r < 0)
241 log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); 235 log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m");
242 #endif 236 #endif
237diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c
238index 9a9df5d22f..75ddec881a 100644
243--- a/src/hibernate-resume/hibernate-resume.c 239--- a/src/hibernate-resume/hibernate-resume.c
244+++ b/src/hibernate-resume/hibernate-resume.c 240+++ b/src/hibernate-resume/hibernate-resume.c
245@@ -40,7 +40,7 @@ int main(int argc, char *argv[]) { 241@@ -40,7 +40,7 @@ int main(int argc, char *argv[]) {
@@ -251,6 +247,8 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
251 if (r < 0) { 247 if (r < 0) {
252 log_error_errno(r, "Failed to write '" DEVNUM_FORMAT_STR "' to /sys/power/resume: %m", DEVNUM_FORMAT_VAL(st.st_rdev)); 248 log_error_errno(r, "Failed to write '" DEVNUM_FORMAT_STR "' to /sys/power/resume: %m", DEVNUM_FORMAT_VAL(st.st_rdev));
253 return EXIT_FAILURE; 249 return EXIT_FAILURE;
250diff --git a/src/home/homework.c b/src/home/homework.c
251index 28907386a4..f9e45349a7 100644
254--- a/src/home/homework.c 252--- a/src/home/homework.c
255+++ b/src/home/homework.c 253+++ b/src/home/homework.c
256@@ -278,7 +278,7 @@ static void drop_caches_now(void) { 254@@ -278,7 +278,7 @@ static void drop_caches_now(void) {
@@ -262,9 +260,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
262 if (r < 0) 260 if (r < 0)
263 log_warning_errno(r, "Failed to drop caches, ignoring: %m"); 261 log_warning_errno(r, "Failed to drop caches, ignoring: %m");
264 else 262 else
263diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c
264index 8c65ee3469..153edab081 100644
265--- a/src/libsystemd/sd-device/sd-device.c 265--- a/src/libsystemd/sd-device/sd-device.c
266+++ b/src/libsystemd/sd-device/sd-device.c 266+++ b/src/libsystemd/sd-device/sd-device.c
267@@ -2444,7 +2444,7 @@ _public_ int sd_device_set_sysattr_value 267@@ -2481,7 +2481,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr,
268 if (!value) 268 if (!value)
269 return -ENOMEM; 269 return -ENOMEM;
270 270
@@ -273,9 +273,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
273 if (r < 0) { 273 if (r < 0) {
274 /* On failure, clear cache entry, as we do not know how it fails. */ 274 /* On failure, clear cache entry, as we do not know how it fails. */
275 device_remove_cached_sysattr_value(device, sysattr); 275 device_remove_cached_sysattr_value(device, sysattr);
276diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c
277index 0deb4ebb30..bae8eead9e 100644
276--- a/src/nspawn/nspawn-cgroup.c 278--- a/src/nspawn/nspawn-cgroup.c
277+++ b/src/nspawn/nspawn-cgroup.c 279+++ b/src/nspawn/nspawn-cgroup.c
278@@ -123,7 +123,7 @@ int sync_cgroup(pid_t pid, CGroupUnified 280@@ -122,7 +122,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) {
279 fn = strjoina(tree, cgroup, "/cgroup.procs"); 281 fn = strjoina(tree, cgroup, "/cgroup.procs");
280 282
281 sprintf(pid_string, PID_FMT, pid); 283 sprintf(pid_string, PID_FMT, pid);
@@ -284,9 +286,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
284 if (r < 0) { 286 if (r < 0) {
285 log_error_errno(r, "Failed to move process: %m"); 287 log_error_errno(r, "Failed to move process: %m");
286 goto finish; 288 goto finish;
289diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
290index 36d336dfc8..8c5c69596b 100644
287--- a/src/nspawn/nspawn.c 291--- a/src/nspawn/nspawn.c
288+++ b/src/nspawn/nspawn.c 292+++ b/src/nspawn/nspawn.c
289@@ -2762,7 +2762,7 @@ static int reset_audit_loginuid(void) { 293@@ -2771,7 +2771,7 @@ static int reset_audit_loginuid(void) {
290 if (streq(p, "4294967295")) 294 if (streq(p, "4294967295"))
291 return 0; 295 return 0;
292 296
@@ -295,7 +299,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
295 if (r < 0) { 299 if (r < 0) {
296 log_error_errno(r, 300 log_error_errno(r,
297 "Failed to reset audit login UID. This probably means that your kernel is too\n" 301 "Failed to reset audit login UID. This probably means that your kernel is too\n"
298@@ -4187,7 +4187,7 @@ static int setup_uid_map( 302@@ -4211,7 +4211,7 @@ static int setup_uid_map(
299 return log_oom(); 303 return log_oom();
300 304
301 xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); 305 xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid);
@@ -304,7 +308,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
304 if (r < 0) 308 if (r < 0)
305 return log_error_errno(r, "Failed to write UID map: %m"); 309 return log_error_errno(r, "Failed to write UID map: %m");
306 310
307@@ -4197,7 +4197,7 @@ static int setup_uid_map( 311@@ -4221,7 +4221,7 @@ static int setup_uid_map(
308 return log_oom(); 312 return log_oom();
309 313
310 xsprintf(uid_map, "/proc/" PID_FMT "/gid_map", pid); 314 xsprintf(uid_map, "/proc/" PID_FMT "/gid_map", pid);
@@ -313,20 +317,24 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
313 if (r < 0) 317 if (r < 0)
314 return log_error_errno(r, "Failed to write GID map: %m"); 318 return log_error_errno(r, "Failed to write GID map: %m");
315 319
320diff --git a/src/shared/binfmt-util.c b/src/shared/binfmt-util.c
321index a26175474b..1413a9c72c 100644
316--- a/src/shared/binfmt-util.c 322--- a/src/shared/binfmt-util.c
317+++ b/src/shared/binfmt-util.c 323+++ b/src/shared/binfmt-util.c
318@@ -26,7 +26,7 @@ int disable_binfmt(void) { 324@@ -46,7 +46,7 @@ int disable_binfmt(void) {
319 if (r < 0) 325 return 0;
320 return log_warning_errno(r, "Failed to determine whether binfmt_misc is mounted: %m"); 326 }
321 327
322- r = write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", WRITE_STRING_FILE_DISABLE_BUFFER); 328- r = write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", WRITE_STRING_FILE_DISABLE_BUFFER);
323+ r = write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", 0); 329+ r = write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", 0);
324 if (r < 0) 330 if (r < 0)
325 return log_warning_errno(r, "Failed to unregister binfmt_misc entries: %m"); 331 return log_warning_errno(r, "Failed to unregister binfmt_misc entries: %m");
326 332
333diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c
334index 2ea83f05d3..8626bb184c 100644
327--- a/src/shared/cgroup-setup.c 335--- a/src/shared/cgroup-setup.c
328+++ b/src/shared/cgroup-setup.c 336+++ b/src/shared/cgroup-setup.c
329@@ -350,7 +350,7 @@ int cg_attach(const char *controller, co 337@@ -350,7 +350,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) {
330 338
331 xsprintf(c, PID_FMT "\n", pid); 339 xsprintf(c, PID_FMT "\n", pid);
332 340
@@ -344,18 +352,24 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
344 if (r < 0) { 352 if (r < 0) {
345 log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", 353 log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m",
346 FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); 354 FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs);
355diff --git a/src/shared/coredump-util.c b/src/shared/coredump-util.c
356index 3d2f179049..c1b6c170ac 100644
347--- a/src/shared/coredump-util.c 357--- a/src/shared/coredump-util.c
348+++ b/src/shared/coredump-util.c 358+++ b/src/shared/coredump-util.c
349@@ -70,5 +70,5 @@ int set_coredump_filter(uint64_t value) 359@@ -71,7 +71,7 @@ int set_coredump_filter(uint64_t value) {
350 sprintf(t, "0x%"PRIx64, value); 360 sprintf(t, "0x%"PRIx64, value);
351 361
352 return write_string_file("/proc/self/coredump_filter", t, 362 return write_string_file("/proc/self/coredump_filter", t,
353- WRITE_STRING_FILE_VERIFY_ON_FAILURE|WRITE_STRING_FILE_DISABLE_BUFFER); 363- WRITE_STRING_FILE_VERIFY_ON_FAILURE|WRITE_STRING_FILE_DISABLE_BUFFER);
354+ WRITE_STRING_FILE_VERIFY_ON_FAILURE); 364+ 0);
355 } 365 }
366
367 /* Turn off core dumps but only if we're running outside of a container. */
368diff --git a/src/shared/smack-util.c b/src/shared/smack-util.c
369index b3b5c905ad..bbfa1973fd 100644
356--- a/src/shared/smack-util.c 370--- a/src/shared/smack-util.c
357+++ b/src/shared/smack-util.c 371+++ b/src/shared/smack-util.c
358@@ -115,7 +115,7 @@ int mac_smack_apply_pid(pid_t pid, const 372@@ -115,7 +115,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) {
359 return 0; 373 return 0;
360 374
361 p = procfs_file_alloca(pid, "attr/current"); 375 p = procfs_file_alloca(pid, "attr/current");
@@ -364,9 +378,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
364 if (r < 0) 378 if (r < 0)
365 return r; 379 return r;
366 380
381diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
382index 765dd4974f..cd6afb001b 100644
367--- a/src/sleep/sleep.c 383--- a/src/sleep/sleep.c
368+++ b/src/sleep/sleep.c 384+++ b/src/sleep/sleep.c
369@@ -50,7 +50,7 @@ static int write_hibernate_location_info 385@@ -50,7 +50,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca
370 assert(hibernate_location->swap); 386 assert(hibernate_location->swap);
371 387
372 xsprintf(resume_str, "%u:%u", major(hibernate_location->devno), minor(hibernate_location->devno)); 388 xsprintf(resume_str, "%u:%u", major(hibernate_location->devno), minor(hibernate_location->devno));
@@ -375,7 +391,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
375 if (r < 0) 391 if (r < 0)
376 return log_debug_errno(r, "Failed to write partition device to /sys/power/resume for '%s': '%s': %m", 392 return log_debug_errno(r, "Failed to write partition device to /sys/power/resume for '%s': '%s': %m",
377 hibernate_location->swap->device, resume_str); 393 hibernate_location->swap->device, resume_str);
378@@ -77,7 +77,7 @@ static int write_hibernate_location_info 394@@ -77,7 +77,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca
379 } 395 }
380 396
381 xsprintf(offset_str, "%" PRIu64, hibernate_location->offset); 397 xsprintf(offset_str, "%" PRIu64, hibernate_location->offset);
@@ -393,7 +409,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
393 if (k >= 0) 409 if (k >= 0)
394 return 0; 410 return 0;
395 411
396@@ -114,7 +114,7 @@ static int write_state(FILE **f, char ** 412@@ -114,7 +114,7 @@ static int write_state(FILE **f, char **states) {
397 STRV_FOREACH(state, states) { 413 STRV_FOREACH(state, states) {
398 int k; 414 int k;
399 415
@@ -402,9 +418,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
402 if (k >= 0) 418 if (k >= 0)
403 return 0; 419 return 0;
404 log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state); 420 log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state);
421diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
422index 0ce79f815c..28aab475d0 100644
405--- a/src/udev/udev-rules.c 423--- a/src/udev/udev-rules.c
406+++ b/src/udev/udev-rules.c 424+++ b/src/udev/udev-rules.c
407@@ -2354,7 +2354,6 @@ static int udev_rule_apply_token_to_even 425@@ -2357,7 +2357,6 @@ static int udev_rule_apply_token_to_event(
408 log_rule_debug(dev, rules, "ATTR '%s' writing '%s'", buf, value); 426 log_rule_debug(dev, rules, "ATTR '%s' writing '%s'", buf, value);
409 r = write_string_file(buf, value, 427 r = write_string_file(buf, value,
410 WRITE_STRING_FILE_VERIFY_ON_FAILURE | 428 WRITE_STRING_FILE_VERIFY_ON_FAILURE |
@@ -412,9 +430,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
412 WRITE_STRING_FILE_AVOID_NEWLINE | 430 WRITE_STRING_FILE_AVOID_NEWLINE |
413 WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE); 431 WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE);
414 if (r < 0) 432 if (r < 0)
433diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
434index 7d3e9db73f..2d4a0c4c9d 100644
415--- a/src/vconsole/vconsole-setup.c 435--- a/src/vconsole/vconsole-setup.c
416+++ b/src/vconsole/vconsole-setup.c 436+++ b/src/vconsole/vconsole-setup.c
417@@ -108,7 +108,7 @@ static int toggle_utf8_vc(const char *na 437@@ -108,7 +108,7 @@ static int toggle_utf8_vc(const char *name, int fd, bool utf8) {
418 static int toggle_utf8_sysfs(bool utf8) { 438 static int toggle_utf8_sysfs(bool utf8) {
419 int r; 439 int r;
420 440
@@ -423,3 +443,6 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
423 if (r < 0) 443 if (r < 0)
424 return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8)); 444 return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8));
425 445
446--
4472.39.2
448
diff --git a/meta/recipes-core/systemd/systemd/0025-Handle-__cpu_mask-usage.patch b/meta/recipes-core/systemd/systemd/0022-Handle-__cpu_mask-usage.patch
index 6981d70af0..61545f5778 100644
--- a/meta/recipes-core/systemd/systemd/0025-Handle-__cpu_mask-usage.patch
+++ b/meta/recipes-core/systemd/systemd/0022-Handle-__cpu_mask-usage.patch
@@ -1,4 +1,4 @@
1From 8871f78c559f37169c0cfaf20b0af1dbec0399af Mon Sep 17 00:00:00 2001 1From a50ec65dbe660421052656dda7499c925005f486 Mon Sep 17 00:00:00 2001
2From: Scott Murray <scott.murray@konsulko.com> 2From: Scott Murray <scott.murray@konsulko.com>
3Date: Fri, 13 Sep 2019 19:26:27 -0400 3Date: Fri, 13 Sep 2019 19:26:27 -0400
4Subject: [PATCH] Handle __cpu_mask usage 4Subject: [PATCH] Handle __cpu_mask usage
@@ -18,7 +18,6 @@ add a typedef to cpu-set-util.h defining __cpu_mask appropriately.
18Upstream-Status: Inappropriate [musl specific] 18Upstream-Status: Inappropriate [musl specific]
19 19
20Signed-off-by: Scott Murray <scott.murray@konsulko.com> 20Signed-off-by: Scott Murray <scott.murray@konsulko.com>
21
22--- 21---
23 src/shared/cpu-set-util.h | 2 ++ 22 src/shared/cpu-set-util.h | 2 ++
24 src/test/test-sizeof.c | 2 +- 23 src/test/test-sizeof.c | 2 +-
@@ -38,7 +37,7 @@ index 3c63a58826..4c2d4347fc 100644
38 typedef struct CPUSet { 37 typedef struct CPUSet {
39 cpu_set_t *set; 38 cpu_set_t *set;
40diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c 39diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c
41index 602772227e..7f1ed19d77 100644 40index 6cf92bffde..937d26ca55 100644
42--- a/src/test/test-sizeof.c 41--- a/src/test/test-sizeof.c
43+++ b/src/test/test-sizeof.c 42+++ b/src/test/test-sizeof.c
44@@ -1,6 +1,5 @@ 43@@ -1,6 +1,5 @@
@@ -56,3 +55,6 @@ index 602772227e..7f1ed19d77 100644
56 55
57 /* Print information about various types. Useful when diagnosing 56 /* Print information about various types. Useful when diagnosing
58 * gcc diagnostics on an unfamiliar architecture. */ 57 * gcc diagnostics on an unfamiliar architecture. */
58--
592.39.2
60
diff --git a/meta/recipes-core/systemd/systemd/0026-Handle-missing-gshadow.patch b/meta/recipes-core/systemd/systemd/0023-Handle-missing-gshadow.patch
index 45778541c3..7da8798ebc 100644
--- a/meta/recipes-core/systemd/systemd/0026-Handle-missing-gshadow.patch
+++ b/meta/recipes-core/systemd/systemd/0023-Handle-missing-gshadow.patch
@@ -1,4 +1,4 @@
1From ec519727bb1ceda6e7787ccf86237a6aad07137c Mon Sep 17 00:00:00 2001 1From ebf0f69d8614b8d86a971b97ff0d847d1e5d47c9 Mon Sep 17 00:00:00 2001
2From: Alex Kiernan <alex.kiernan@gmail.com> 2From: Alex Kiernan <alex.kiernan@gmail.com>
3Date: Tue, 10 Mar 2020 11:05:20 +0000 3Date: Tue, 10 Mar 2020 11:05:20 +0000
4Subject: [PATCH] Handle missing gshadow 4Subject: [PATCH] Handle missing gshadow
@@ -10,13 +10,14 @@ Upstream-Status: Inappropriate [musl specific]
10Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> 10Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
11[Rebased for v247] 11[Rebased for v247]
12Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> 12Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
13
14--- 13---
15 src/shared/user-record-nss.c | 20 ++++++++++++++++++++ 14 src/shared/user-record-nss.c | 20 ++++++++++++++++++++
16 src/shared/user-record-nss.h | 4 ++++ 15 src/shared/user-record-nss.h | 4 ++++
17 src/shared/userdb.c | 7 ++++++- 16 src/shared/userdb.c | 7 ++++++-
18 3 files changed, 30 insertions(+), 1 deletion(-) 17 3 files changed, 30 insertions(+), 1 deletion(-)
19 18
19diff --git a/src/shared/user-record-nss.c b/src/shared/user-record-nss.c
20index 88b8fc2f8f..a819d41bac 100644
20--- a/src/shared/user-record-nss.c 21--- a/src/shared/user-record-nss.c
21+++ b/src/shared/user-record-nss.c 22+++ b/src/shared/user-record-nss.c
22@@ -331,8 +331,10 @@ int nss_group_to_group_record( 23@@ -331,8 +331,10 @@ int nss_group_to_group_record(
@@ -46,7 +47,7 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
46 47
47 r = json_build(&g->json, JSON_BUILD_OBJECT( 48 r = json_build(&g->json, JSON_BUILD_OBJECT(
48 JSON_BUILD_PAIR("groupName", JSON_BUILD_STRING(g->group_name)), 49 JSON_BUILD_PAIR("groupName", JSON_BUILD_STRING(g->group_name)),
49@@ -388,6 +392,7 @@ int nss_sgrp_for_group(const struct grou 50@@ -388,6 +392,7 @@ int nss_sgrp_for_group(const struct group *grp, struct sgrp *ret_sgrp, char **re
50 assert(ret_sgrp); 51 assert(ret_sgrp);
51 assert(ret_buffer); 52 assert(ret_buffer);
52 53
@@ -54,7 +55,7 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
54 for (;;) { 55 for (;;) {
55 _cleanup_free_ char *buf = NULL; 56 _cleanup_free_ char *buf = NULL;
56 struct sgrp sgrp, *result; 57 struct sgrp sgrp, *result;
57@@ -416,6 +421,9 @@ int nss_sgrp_for_group(const struct grou 58@@ -416,6 +421,9 @@ int nss_sgrp_for_group(const struct group *grp, struct sgrp *ret_sgrp, char **re
58 buflen *= 2; 59 buflen *= 2;
59 buf = mfree(buf); 60 buf = mfree(buf);
60 } 61 }
@@ -120,6 +121,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
120 if (r < 0) 121 if (r < 0)
121 return r; 122 return r;
122 123
124diff --git a/src/shared/user-record-nss.h b/src/shared/user-record-nss.h
125index 22ab04d6ee..4e52e7a911 100644
123--- a/src/shared/user-record-nss.h 126--- a/src/shared/user-record-nss.h
124+++ b/src/shared/user-record-nss.h 127+++ b/src/shared/user-record-nss.h
125@@ -2,7 +2,11 @@ 128@@ -2,7 +2,11 @@
@@ -134,9 +137,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
134 #include <pwd.h> 137 #include <pwd.h>
135 #include <shadow.h> 138 #include <shadow.h>
136 139
140diff --git a/src/shared/userdb.c b/src/shared/userdb.c
141index a77eff4407..955e361d3a 100644
137--- a/src/shared/userdb.c 142--- a/src/shared/userdb.c
138+++ b/src/shared/userdb.c 143+++ b/src/shared/userdb.c
139@@ -1044,13 +1044,15 @@ int groupdb_iterator_get(UserDBIterator 144@@ -1044,13 +1044,15 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) {
140 if (gr) { 145 if (gr) {
141 _cleanup_free_ char *buffer = NULL; 146 _cleanup_free_ char *buffer = NULL;
142 bool incomplete = false; 147 bool incomplete = false;
@@ -153,7 +158,7 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
153 if (!FLAGS_SET(iterator->flags, USERDB_SUPPRESS_SHADOW)) { 158 if (!FLAGS_SET(iterator->flags, USERDB_SUPPRESS_SHADOW)) {
154 r = nss_sgrp_for_group(gr, &sgrp, &buffer); 159 r = nss_sgrp_for_group(gr, &sgrp, &buffer);
155 if (r < 0) { 160 if (r < 0) {
156@@ -1063,6 +1065,9 @@ int groupdb_iterator_get(UserDBIterator 161@@ -1063,6 +1065,9 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) {
157 } 162 }
158 163
159 r = nss_group_to_group_record(gr, r >= 0 ? &sgrp : NULL, ret); 164 r = nss_group_to_group_record(gr, r >= 0 ? &sgrp : NULL, ret);
@@ -163,3 +168,6 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
163 if (r < 0) 168 if (r < 0)
164 return r; 169 return r;
165 170
171--
1722.39.2
173
diff --git a/meta/recipes-core/systemd/systemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch b/meta/recipes-core/systemd/systemd/0024-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
index 6c97a272e2..15ff6eb4f8 100644
--- a/meta/recipes-core/systemd/systemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
+++ b/meta/recipes-core/systemd/systemd/0024-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
@@ -1,4 +1,4 @@
1From 754a16eeb255c06dbdd4655632276573f0f075ec Mon Sep 17 00:00:00 2001 1From a2f56a2a6cdd5137bb1e680aa9f6c40540107166 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 12 Apr 2021 23:44:53 -0700 3Date: Mon, 12 Apr 2021 23:44:53 -0700
4Subject: [PATCH] missing_syscall.h: Define MIPS ABI defines for musl 4Subject: [PATCH] missing_syscall.h: Define MIPS ABI defines for musl
@@ -10,14 +10,13 @@ them here in case they are undefined
10Upstream-Status: Pending 10Upstream-Status: Pending
11 11
12Signed-off-by: Khem Raj <raj.khem@gmail.com> 12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13
14--- 13---
15 src/basic/missing_syscall.h | 6 ++++++ 14 src/basic/missing_syscall.h | 6 ++++++
16 src/shared/base-filesystem.c | 1 + 15 src/shared/base-filesystem.c | 1 +
17 2 files changed, 7 insertions(+) 16 2 files changed, 7 insertions(+)
18 17
19diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h 18diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h
20index 793d111c55..9665848b88 100644 19index 98cd037962..ea6a76c2e2 100644
21--- a/src/basic/missing_syscall.h 20--- a/src/basic/missing_syscall.h
22+++ b/src/basic/missing_syscall.h 21+++ b/src/basic/missing_syscall.h
23@@ -20,6 +20,12 @@ 22@@ -20,6 +20,12 @@
@@ -34,7 +33,7 @@ index 793d111c55..9665848b88 100644
34 #include "missing_keyctl.h" 33 #include "missing_keyctl.h"
35 #include "missing_stat.h" 34 #include "missing_stat.h"
36diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c 35diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c
37index d396bc99fe..7e9c0c3412 100644 36index 2726dc946a..484f63e0b4 100644
38--- a/src/shared/base-filesystem.c 37--- a/src/shared/base-filesystem.c
39+++ b/src/shared/base-filesystem.c 38+++ b/src/shared/base-filesystem.c
40@@ -19,6 +19,7 @@ 39@@ -19,6 +19,7 @@
@@ -45,3 +44,6 @@ index d396bc99fe..7e9c0c3412 100644
45 44
46 typedef struct BaseFilesystem { 45 typedef struct BaseFilesystem {
47 const char *dir; /* directory or symlink to create */ 46 const char *dir; /* directory or symlink to create */
47--
482.39.2
49
diff --git a/meta/recipes-core/systemd/systemd/fix-32bit.patch b/meta/recipes-core/systemd/systemd/0025-systemctl-explicitly-cast-the-constants-to-uint64_t.patch
index 6b614625c8..d840de870f 100644
--- a/meta/recipes-core/systemd/systemd/fix-32bit.patch
+++ b/meta/recipes-core/systemd/systemd/0025-systemctl-explicitly-cast-the-constants-to-uint64_t.patch
@@ -1,4 +1,4 @@
1From c63bfd0884cf20e48befbee49d41f667660a8802 Mon Sep 17 00:00:00 2001 1From fad29ce1f5cc7b12bc13671d9ad80775771a67eb Mon Sep 17 00:00:00 2001
2From: Frantisek Sumsal <frantisek@sumsal.cz> 2From: Frantisek Sumsal <frantisek@sumsal.cz>
3Date: Fri, 3 Mar 2023 12:17:27 +0100 3Date: Fri, 3 Mar 2023 12:17:27 +0100
4Subject: [PATCH] systemctl: explicitly cast the constants to uint64_t 4Subject: [PATCH] systemctl: explicitly cast the constants to uint64_t
@@ -27,7 +27,7 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
27 1 file changed, 1 insertion(+), 1 deletion(-) 27 1 file changed, 1 insertion(+), 1 deletion(-)
28 28
29diff --git a/src/systemctl/systemctl-enable.c b/src/systemctl/systemctl-enable.c 29diff --git a/src/systemctl/systemctl-enable.c b/src/systemctl/systemctl-enable.c
30index 4ebe5888ac69..a9c6f3a742c9 100644 30index 86d9f602fa..f94a286122 100644
31--- a/src/systemctl/systemctl-enable.c 31--- a/src/systemctl/systemctl-enable.c
32+++ b/src/systemctl/systemctl-enable.c 32+++ b/src/systemctl/systemctl-enable.c
33@@ -211,7 +211,7 @@ int verb_enable(int argc, char *argv[], void *userdata) { 33@@ -211,7 +211,7 @@ int verb_enable(int argc, char *argv[], void *userdata) {
@@ -39,3 +39,6 @@ index 4ebe5888ac69..a9c6f3a742c9 100644
39 else 39 else
40 r = sd_bus_message_append(m, "b", arg_runtime); 40 r = sd_bus_message_append(m, "b", arg_runtime);
41 if (r < 0) 41 if (r < 0)
42--
432.39.2
44
diff --git a/meta/recipes-core/systemd/systemd/0004-src-boot-efi-efi-string.c-define-wchar_t-from-__WCHA.patch b/meta/recipes-core/systemd/systemd/0026-src-boot-efi-efi-string.c-define-wchar_t-from-__WCHA.patch
index 43173ac32d..c7e2280c3b 100644
--- a/meta/recipes-core/systemd/systemd/0004-src-boot-efi-efi-string.c-define-wchar_t-from-__WCHA.patch
+++ b/meta/recipes-core/systemd/systemd/0026-src-boot-efi-efi-string.c-define-wchar_t-from-__WCHA.patch
@@ -1,4 +1,4 @@
1From a4ff7772acf1d983921833aa20ccd7c4d5e59a1c Mon Sep 17 00:00:00 2001 1From 34072f456b4fe880fbb2f18760b64a1a6c1eebb8 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de> 2From: Alexander Kanavin <alex@linutronix.de>
3Date: Mon, 6 Mar 2023 15:24:49 +0100 3Date: Mon, 6 Mar 2023 15:24:49 +0100
4Subject: [PATCH] src/boot/efi/efi-string.c: define wchar_t from __WCHAR_TYPE__ 4Subject: [PATCH] src/boot/efi/efi-string.c: define wchar_t from __WCHAR_TYPE__
@@ -18,9 +18,11 @@ however this will not be backported to v253 and we need a different fix.
18Upstream-Status: Inappropriate [fixed differently in trunk according to https://github.com/systemd/systemd/pull/26689] 18Upstream-Status: Inappropriate [fixed differently in trunk according to https://github.com/systemd/systemd/pull/26689]
19Signed-off-by: Alexander Kanavin <alex@linutronix.de> 19Signed-off-by: Alexander Kanavin <alex@linutronix.de>
20--- 20---
21 src/boot/efi/efi-string.c | 5 +++++ 21 src/boot/efi/efi-string.c | 6 ++++++
22 1 file changed, 5 insertions(+) 22 1 file changed, 6 insertions(+)
23 23
24diff --git a/src/boot/efi/efi-string.c b/src/boot/efi/efi-string.c
25index 22923d60f6..5d09d4281f 100644
24--- a/src/boot/efi/efi-string.c 26--- a/src/boot/efi/efi-string.c
25+++ b/src/boot/efi/efi-string.c 27+++ b/src/boot/efi/efi-string.c
26@@ -2,7 +2,13 @@ 28@@ -2,7 +2,13 @@
@@ -37,3 +39,6 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
37 39
38 #include "efi-string.h" 40 #include "efi-string.h"
39 41
42--
432.39.2
44
diff --git a/meta/recipes-core/systemd/systemd_253.1.bb b/meta/recipes-core/systemd/systemd_253.1.bb
index 1d4e0e71e2..9c2b96d3c1 100644
--- a/meta/recipes-core/systemd/systemd_253.1.bb
+++ b/meta/recipes-core/systemd/systemd_253.1.bb
@@ -22,35 +22,35 @@ SRC_URI += " \
22 file://init \ 22 file://init \
23 file://99-default.preset \ 23 file://99-default.preset \
24 file://systemd-pager.sh \ 24 file://systemd-pager.sh \
25 file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ 25 file://0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch \
26 file://0003-implment-systemd-sysv-install-for-OE.patch \ 26 file://0008-implment-systemd-sysv-install-for-OE.patch \
27 file://0001-Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-to-.patch \ 27 file://0004-Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-to-.patch \
28 " 28 "
29 29
30# patches needed by musl 30# patches needed by musl
31SRC_URI:append:libc-musl = " ${SRC_URI_MUSL}" 31SRC_URI:append:libc-musl = " ${SRC_URI_MUSL}"
32SRC_URI_MUSL = "\ 32SRC_URI_MUSL = "\
33 file://0003-missing_type.h-add-comparison_fn_t.patch \ 33 file://0009-missing_type.h-add-comparison_fn_t.patch \
34 file://0004-add-fallback-parse_printf_format-implementation.patch \ 34 file://0010-add-fallback-parse_printf_format-implementation.patch \
35 file://0005-src-basic-missing.h-check-for-missing-strndupa.patch \ 35 file://0011-src-basic-missing.h-check-for-missing-strndupa.patch \
36 file://0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch \ 36 file://0012-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch \
37 file://0008-add-missing-FTW_-macros-for-musl.patch \ 37 file://0013-add-missing-FTW_-macros-for-musl.patch \
38 file://0010-Use-uintmax_t-for-handling-rlim_t.patch \ 38 file://0014-Use-uintmax_t-for-handling-rlim_t.patch \
39 file://0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch \ 39 file://0015-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch \
40 file://0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch \ 40 file://0016-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch \
41 file://0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch \ 41 file://0017-Define-glibc-compatible-basename-for-non-glibc-syste.patch \
42 file://0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch \ 42 file://0018-Do-not-disable-buffering-when-writing-to-oom_score_a.patch \
43 file://0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch \ 43 file://0019-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch \
44 file://0018-avoid-redefinition-of-prctl_mm_map-structure.patch \ 44 file://0020-avoid-redefinition-of-prctl_mm_map-structure.patch \
45 file://0022-do-not-disable-buffer-in-writing-files.patch \ 45 file://0021-do-not-disable-buffer-in-writing-files.patch \
46 file://0025-Handle-__cpu_mask-usage.patch \ 46 file://0022-Handle-__cpu_mask-usage.patch \
47 file://0026-Handle-missing-gshadow.patch \ 47 file://0023-Handle-missing-gshadow.patch \
48 file://0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch \ 48 file://0024-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch \
49 file://0001-pass-correct-parameters-to-getdents64.patch \ 49 file://0005-pass-correct-parameters-to-getdents64.patch \
50 file://0002-Add-sys-stat.h-for-S_IFDIR.patch \ 50 file://0007-Add-sys-stat.h-for-S_IFDIR.patch \
51 file://0001-Adjust-for-musl-headers.patch \ 51 file://0001-Adjust-for-musl-headers.patch \
52 file://0001-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch \ 52 file://0006-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch \
53 file://0001-errno-util-Make-STRERROR-portable-for-musl.patch \ 53 file://0003-errno-util-Make-STRERROR-portable-for-musl.patch \
54 " 54 "
55 55
56PAM_PLUGINS = " \ 56PAM_PLUGINS = " \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-09-25 19:11:31 +0000