summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-core/systemd/systemd-boot_250.5.bb (renamed from meta/recipes-core/systemd/systemd-boot_250.4.bb)0
-rw-r--r--meta/recipes-core/systemd/systemd.inc2
-rw-r--r--meta/recipes-core/systemd/systemd/0001-Adjust-for-musl-headers.patch98
-rw-r--r--meta/recipes-core/systemd/systemd/0001-pass-correct-parameters-to-getdents64.patch10
-rw-r--r--meta/recipes-core/systemd/systemd/0002-Add-sys-stat.h-for-S_IFDIR.patch8
-rw-r--r--meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch20
-rw-r--r--meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch10
-rw-r--r--meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch20
-rw-r--r--meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch151
-rw-r--r--meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch12
-rw-r--r--meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch17
-rw-r--r--meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch6
-rw-r--r--meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch16
-rw-r--r--meta/recipes-core/systemd/systemd/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch4
-rw-r--r--meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch18
-rw-r--r--meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch4
-rw-r--r--meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch4
-rw-r--r--meta/recipes-core/systemd/systemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch10
-rw-r--r--meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch4
-rw-r--r--meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch2
-rw-r--r--meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch2
-rw-r--r--meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch4
-rw-r--r--meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch6
-rw-r--r--meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch4
-rw-r--r--meta/recipes-core/systemd/systemd/0022-do-not-disable-buffer-in-writing-files.patch239
-rw-r--r--meta/recipes-core/systemd/systemd/0025-Handle-__cpu_mask-usage.patch4
-rw-r--r--meta/recipes-core/systemd/systemd/0026-Handle-missing-gshadow.patch16
-rw-r--r--meta/recipes-core/systemd/systemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch11
-rw-r--r--meta/recipes-core/systemd/systemd/0029-network-enable-KeepConfiguration-when-running-on-net.patch253
-rw-r--r--meta/recipes-core/systemd/systemd_250.5.bb (renamed from meta/recipes-core/systemd/systemd_250.4.bb)1
30 files changed, 499 insertions, 457 deletions
diff --git a/meta/recipes-core/systemd/systemd-boot_250.4.bb b/meta/recipes-core/systemd/systemd-boot_250.5.bb
index b67706b731..b67706b731 100644
--- a/meta/recipes-core/systemd/systemd-boot_250.4.bb
+++ b/meta/recipes-core/systemd/systemd-boot_250.5.bb
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc
index ac454b8afd..309105290f 100644
--- a/meta/recipes-core/systemd/systemd.inc
+++ b/meta/recipes-core/systemd/systemd.inc
@@ -14,7 +14,7 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only"
14LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ 14LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
15 file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" 15 file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
16 16
17SRCREV = "c3aead556847dd2694d559620123b65ff16afe8c" 17SRCREV = "4a31fa2fb040005b73253da75cf84949b8485175"
18SRCBRANCH = "v250-stable" 18SRCBRANCH = "v250-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 20
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 2363679c98..c42c66786f 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 4c2e932664ec67662f4a0306cca4a7cd82853bda Mon Sep 17 00:00:00 2001 1From 9a1841402ce3ef21a10a7314a07a615f8196d406 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,6 +6,7 @@ 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
9--- 10---
10 src/libsystemd-network/sd-dhcp6-client.c | 2 +- 11 src/libsystemd-network/sd-dhcp6-client.c | 2 +-
11 src/network/netdev/bareudp.c | 2 +- 12 src/network/netdev/bareudp.c | 2 +-
@@ -29,6 +30,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
29 src/network/netdev/vrf.c | 2 +- 30 src/network/netdev/vrf.c | 2 +-
30 src/network/netdev/vxcan.c | 2 +- 31 src/network/netdev/vxcan.c | 2 +-
31 src/network/netdev/vxlan.c | 2 +- 32 src/network/netdev/vxlan.c | 2 +-
33 src/network/netdev/wireguard.c | 2 +-
32 src/network/netdev/xfrm.c | 2 +- 34 src/network/netdev/xfrm.c | 2 +-
33 src/network/networkd-bridge-mdb.c | 4 ++-- 35 src/network/networkd-bridge-mdb.c | 4 ++--
34 src/network/networkd-dhcp-common.c | 3 ++- 36 src/network/networkd-dhcp-common.c | 3 ++-
@@ -41,8 +43,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
41 src/shared/linux/ethtool.h | 3 ++- 43 src/shared/linux/ethtool.h | 3 ++-
42 src/shared/netif-util.c | 2 +- 44 src/shared/netif-util.c | 2 +-
43 src/udev/udev-builtin-net_id.c | 2 +- 45 src/udev/udev-builtin-net_id.c | 2 +-
44 34 files changed, 41 insertions(+), 39 deletions(-) 46 35 files changed, 42 insertions(+), 40 deletions(-)
45 47
48diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c
49index 84bc739bba..ff8cb6bf9d 100644
46--- a/src/libsystemd-network/sd-dhcp6-client.c 50--- a/src/libsystemd-network/sd-dhcp6-client.c
47+++ b/src/libsystemd-network/sd-dhcp6-client.c 51+++ b/src/libsystemd-network/sd-dhcp6-client.c
48@@ -5,7 +5,7 @@ 52@@ -5,7 +5,7 @@
@@ -54,6 +58,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
54 #include <linux/if_infiniband.h> 58 #include <linux/if_infiniband.h>
55 59
56 #include "sd-dhcp6-client.h" 60 #include "sd-dhcp6-client.h"
61diff --git a/src/network/netdev/bareudp.c b/src/network/netdev/bareudp.c
62index 8ff0eb1360..7e06b8d57d 100644
57--- a/src/network/netdev/bareudp.c 63--- a/src/network/netdev/bareudp.c
58+++ b/src/network/netdev/bareudp.c 64+++ b/src/network/netdev/bareudp.c
59@@ -2,7 +2,7 @@ 65@@ -2,7 +2,7 @@
@@ -65,6 +71,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
65 71
66 #include "bareudp.h" 72 #include "bareudp.h"
67 #include "netlink-util.h" 73 #include "netlink-util.h"
74diff --git a/src/network/netdev/batadv.c b/src/network/netdev/batadv.c
75index 15f3aee3a6..ec76428436 100644
68--- a/src/network/netdev/batadv.c 76--- a/src/network/netdev/batadv.c
69+++ b/src/network/netdev/batadv.c 77+++ b/src/network/netdev/batadv.c
70@@ -3,7 +3,7 @@ 78@@ -3,7 +3,7 @@
@@ -76,6 +84,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
76 84
77 #include "batadv.h" 85 #include "batadv.h"
78 #include "fileio.h" 86 #include "fileio.h"
87diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c
88index 5d94aa1d68..4e379a326d 100644
79--- a/src/network/netdev/bond.c 89--- a/src/network/netdev/bond.c
80+++ b/src/network/netdev/bond.c 90+++ b/src/network/netdev/bond.c
81@@ -1,7 +1,7 @@ 91@@ -1,7 +1,7 @@
@@ -87,6 +97,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
87 97
88 #include "alloc-util.h" 98 #include "alloc-util.h"
89 #include "bond.h" 99 #include "bond.h"
100diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c
101index b974f2ae0a..9a5f18d556 100644
90--- a/src/network/netdev/bridge.c 102--- a/src/network/netdev/bridge.c
91+++ b/src/network/netdev/bridge.c 103+++ b/src/network/netdev/bridge.c
92@@ -2,7 +2,7 @@ 104@@ -2,7 +2,7 @@
@@ -98,6 +110,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
98 #include <linux/if_bridge.h> 110 #include <linux/if_bridge.h>
99 111
100 #include "bridge.h" 112 #include "bridge.h"
113diff --git a/src/network/netdev/dummy.c b/src/network/netdev/dummy.c
114index 00df1d2787..77b506b422 100644
101--- a/src/network/netdev/dummy.c 115--- a/src/network/netdev/dummy.c
102+++ b/src/network/netdev/dummy.c 116+++ b/src/network/netdev/dummy.c
103@@ -1,6 +1,6 @@ 117@@ -1,6 +1,6 @@
@@ -108,6 +122,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
108 122
109 #include "dummy.h" 123 #include "dummy.h"
110 124
125diff --git a/src/network/netdev/geneve.c b/src/network/netdev/geneve.c
126index 224c17e979..fb79cc13f6 100644
111--- a/src/network/netdev/geneve.c 127--- a/src/network/netdev/geneve.c
112+++ b/src/network/netdev/geneve.c 128+++ b/src/network/netdev/geneve.c
113@@ -2,7 +2,7 @@ 129@@ -2,7 +2,7 @@
@@ -119,6 +135,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
119 135
120 #include "alloc-util.h" 136 #include "alloc-util.h"
121 #include "conf-parser.h" 137 #include "conf-parser.h"
138diff --git a/src/network/netdev/ifb.c b/src/network/netdev/ifb.c
139index d7ff44cb9e..e037629ae4 100644
122--- a/src/network/netdev/ifb.c 140--- a/src/network/netdev/ifb.c
123+++ b/src/network/netdev/ifb.c 141+++ b/src/network/netdev/ifb.c
124@@ -1,7 +1,7 @@ 142@@ -1,7 +1,7 @@
@@ -130,6 +148,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
130 148
131 #include "ifb.h" 149 #include "ifb.h"
132 150
151diff --git a/src/network/netdev/ipoib.c b/src/network/netdev/ipoib.c
152index e0ff9e8c62..ab085c1f6d 100644
133--- a/src/network/netdev/ipoib.c 153--- a/src/network/netdev/ipoib.c
134+++ b/src/network/netdev/ipoib.c 154+++ b/src/network/netdev/ipoib.c
135@@ -1,6 +1,6 @@ 155@@ -1,6 +1,6 @@
@@ -140,6 +160,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
140 #include <linux/if_link.h> 160 #include <linux/if_link.h>
141 161
142 #include "ipoib.h" 162 #include "ipoib.h"
163diff --git a/src/network/netdev/ipvlan.c b/src/network/netdev/ipvlan.c
164index d15766cd7b..60728b4f94 100644
143--- a/src/network/netdev/ipvlan.c 165--- a/src/network/netdev/ipvlan.c
144+++ b/src/network/netdev/ipvlan.c 166+++ b/src/network/netdev/ipvlan.c
145@@ -2,7 +2,7 @@ 167@@ -2,7 +2,7 @@
@@ -151,6 +173,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
151 173
152 #include "conf-parser.h" 174 #include "conf-parser.h"
153 #include "ipvlan.h" 175 #include "ipvlan.h"
176diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c
177index f1a566a9ca..1f37927a83 100644
154--- a/src/network/netdev/macsec.c 178--- a/src/network/netdev/macsec.c
155+++ b/src/network/netdev/macsec.c 179+++ b/src/network/netdev/macsec.c
156@@ -1,7 +1,7 @@ 180@@ -1,7 +1,7 @@
@@ -162,6 +186,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
162 #include <linux/if_ether.h> 186 #include <linux/if_ether.h>
163 #include <linux/if_macsec.h> 187 #include <linux/if_macsec.h>
164 #include <linux/genetlink.h> 188 #include <linux/genetlink.h>
189diff --git a/src/network/netdev/macvlan.c b/src/network/netdev/macvlan.c
190index c41be6e78f..ee2660c5bf 100644
165--- a/src/network/netdev/macvlan.c 191--- a/src/network/netdev/macvlan.c
166+++ b/src/network/netdev/macvlan.c 192+++ b/src/network/netdev/macvlan.c
167@@ -2,7 +2,7 @@ 193@@ -2,7 +2,7 @@
@@ -173,6 +199,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
173 199
174 #include "conf-parser.h" 200 #include "conf-parser.h"
175 #include "macvlan.h" 201 #include "macvlan.h"
202diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c
203index 8e7fe11c18..701ab2bd69 100644
176--- a/src/network/netdev/netdev.c 204--- a/src/network/netdev/netdev.c
177+++ b/src/network/netdev/netdev.c 205+++ b/src/network/netdev/netdev.c
178@@ -2,7 +2,7 @@ 206@@ -2,7 +2,7 @@
@@ -184,6 +212,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
184 #include <unistd.h> 212 #include <unistd.h>
185 213
186 #include "alloc-util.h" 214 #include "alloc-util.h"
215diff --git a/src/network/netdev/netdevsim.c b/src/network/netdev/netdevsim.c
216index 15d5c132f9..a3ffa48b15 100644
187--- a/src/network/netdev/netdevsim.c 217--- a/src/network/netdev/netdevsim.c
188+++ b/src/network/netdev/netdevsim.c 218+++ b/src/network/netdev/netdevsim.c
189@@ -1,6 +1,6 @@ 219@@ -1,6 +1,6 @@
@@ -194,6 +224,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
194 224
195 #include "netdevsim.h" 225 #include "netdevsim.h"
196 226
227diff --git a/src/network/netdev/nlmon.c b/src/network/netdev/nlmon.c
228index ff372092e6..eef66811f4 100644
197--- a/src/network/netdev/nlmon.c 229--- a/src/network/netdev/nlmon.c
198+++ b/src/network/netdev/nlmon.c 230+++ b/src/network/netdev/nlmon.c
199@@ -1,6 +1,6 @@ 231@@ -1,6 +1,6 @@
@@ -204,6 +236,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
204 236
205 #include "nlmon.h" 237 #include "nlmon.h"
206 238
239diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c
240index 97e534fe99..0302c1cb94 100644
207--- a/src/network/netdev/tunnel.c 241--- a/src/network/netdev/tunnel.c
208+++ b/src/network/netdev/tunnel.c 242+++ b/src/network/netdev/tunnel.c
209@@ -2,7 +2,7 @@ 243@@ -2,7 +2,7 @@
@@ -215,6 +249,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
215 #include <linux/if_tunnel.h> 249 #include <linux/if_tunnel.h>
216 #include <linux/ip.h> 250 #include <linux/ip.h>
217 #include <linux/ip6_tunnel.h> 251 #include <linux/ip6_tunnel.h>
252diff --git a/src/network/netdev/vcan.c b/src/network/netdev/vcan.c
253index 380547ee1e..137c1adf8a 100644
218--- a/src/network/netdev/vcan.c 254--- a/src/network/netdev/vcan.c
219+++ b/src/network/netdev/vcan.c 255+++ b/src/network/netdev/vcan.c
220@@ -1,6 +1,6 @@ 256@@ -1,6 +1,6 @@
@@ -225,6 +261,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
225 261
226 #include "vcan.h" 262 #include "vcan.h"
227 263
264diff --git a/src/network/netdev/veth.c b/src/network/netdev/veth.c
265index c946e81fc0..d1a6be73f9 100644
228--- a/src/network/netdev/veth.c 266--- a/src/network/netdev/veth.c
229+++ b/src/network/netdev/veth.c 267+++ b/src/network/netdev/veth.c
230@@ -3,7 +3,7 @@ 268@@ -3,7 +3,7 @@
@@ -236,6 +274,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
236 #include <linux/veth.h> 274 #include <linux/veth.h>
237 275
238 #include "netlink-util.h" 276 #include "netlink-util.h"
277diff --git a/src/network/netdev/vlan.c b/src/network/netdev/vlan.c
278index af3e77963e..efa4b0a164 100644
239--- a/src/network/netdev/vlan.c 279--- a/src/network/netdev/vlan.c
240+++ b/src/network/netdev/vlan.c 280+++ b/src/network/netdev/vlan.c
241@@ -2,7 +2,7 @@ 281@@ -2,7 +2,7 @@
@@ -247,6 +287,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
247 #include <linux/if_vlan.h> 287 #include <linux/if_vlan.h>
248 288
249 #include "parse-util.h" 289 #include "parse-util.h"
290diff --git a/src/network/netdev/vrf.c b/src/network/netdev/vrf.c
291index b1b6707441..1c6d1982e1 100644
250--- a/src/network/netdev/vrf.c 292--- a/src/network/netdev/vrf.c
251+++ b/src/network/netdev/vrf.c 293+++ b/src/network/netdev/vrf.c
252@@ -2,7 +2,7 @@ 294@@ -2,7 +2,7 @@
@@ -258,6 +300,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
258 300
259 #include "vrf.h" 301 #include "vrf.h"
260 302
303diff --git a/src/network/netdev/vxcan.c b/src/network/netdev/vxcan.c
304index a0ba048eb1..875f2e5901 100644
261--- a/src/network/netdev/vxcan.c 305--- a/src/network/netdev/vxcan.c
262+++ b/src/network/netdev/vxcan.c 306+++ b/src/network/netdev/vxcan.c
263@@ -1,7 +1,7 @@ 307@@ -1,7 +1,7 @@
@@ -269,6 +313,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
269 313
270 #include "vxcan.h" 314 #include "vxcan.h"
271 315
316diff --git a/src/network/netdev/vxlan.c b/src/network/netdev/vxlan.c
317index 30b0855598..a065158801 100644
272--- a/src/network/netdev/vxlan.c 318--- a/src/network/netdev/vxlan.c
273+++ b/src/network/netdev/vxlan.c 319+++ b/src/network/netdev/vxlan.c
274@@ -2,7 +2,7 @@ 320@@ -2,7 +2,7 @@
@@ -280,6 +326,21 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
280 326
281 #include "conf-parser.h" 327 #include "conf-parser.h"
282 #include "alloc-util.h" 328 #include "alloc-util.h"
329diff --git a/src/network/netdev/wireguard.c b/src/network/netdev/wireguard.c
330index 88f668753a..5fc753384b 100644
331--- a/src/network/netdev/wireguard.c
332+++ b/src/network/netdev/wireguard.c
333@@ -6,7 +6,7 @@
334 #include <sys/ioctl.h>
335 #include <net/if.h>
336 #include <netinet/in.h>
337-#include <linux/if_arp.h>
338+//#include <linux/if_arp.h>
339 #include <linux/ipv6_route.h>
340
341 #include "sd-resolve.h"
342diff --git a/src/network/netdev/xfrm.c b/src/network/netdev/xfrm.c
343index ef5e735b2b..419afd75f2 100644
283--- a/src/network/netdev/xfrm.c 344--- a/src/network/netdev/xfrm.c
284+++ b/src/network/netdev/xfrm.c 345+++ b/src/network/netdev/xfrm.c
285@@ -1,6 +1,6 @@ 346@@ -1,6 +1,6 @@
@@ -290,6 +351,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
290 351
291 #include "missing_network.h" 352 #include "missing_network.h"
292 #include "xfrm.h" 353 #include "xfrm.h"
354diff --git a/src/network/networkd-bridge-mdb.c b/src/network/networkd-bridge-mdb.c
355index 10025a97ae..a0239ea83a 100644
293--- a/src/network/networkd-bridge-mdb.c 356--- a/src/network/networkd-bridge-mdb.c
294+++ b/src/network/networkd-bridge-mdb.c 357+++ b/src/network/networkd-bridge-mdb.c
295@@ -1,7 +1,5 @@ 358@@ -1,7 +1,5 @@
@@ -309,6 +372,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
309 372
310 #define STATIC_BRIDGE_MDB_ENTRIES_PER_NETWORK_MAX 1024U 373 #define STATIC_BRIDGE_MDB_ENTRIES_PER_NETWORK_MAX 1024U
311 374
375diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c
376index 7996960bd1..e870b9ba26 100644
312--- a/src/network/networkd-dhcp-common.c 377--- a/src/network/networkd-dhcp-common.c
313+++ b/src/network/networkd-dhcp-common.c 378+++ b/src/network/networkd-dhcp-common.c
314@@ -1,7 +1,8 @@ 379@@ -1,7 +1,8 @@
@@ -321,6 +386,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
321 386
322 #include "bus-error.h" 387 #include "bus-error.h"
323 #include "dhcp-identifier.h" 388 #include "dhcp-identifier.h"
389diff --git a/src/network/networkd-dhcp-prefix-delegation.c b/src/network/networkd-dhcp-prefix-delegation.c
390index 7be9713d46..e830fcd575 100644
324--- a/src/network/networkd-dhcp-prefix-delegation.c 391--- a/src/network/networkd-dhcp-prefix-delegation.c
325+++ b/src/network/networkd-dhcp-prefix-delegation.c 392+++ b/src/network/networkd-dhcp-prefix-delegation.c
326@@ -1,7 +1,5 @@ 393@@ -1,7 +1,5 @@
@@ -340,6 +407,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
340 bool link_dhcp_pd_is_enabled(Link *link) { 407 bool link_dhcp_pd_is_enabled(Link *link) {
341 assert(link); 408 assert(link);
342 409
410diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c
411index 9acfd17d49..3108289602 100644
343--- a/src/network/networkd-dhcp-server.c 412--- a/src/network/networkd-dhcp-server.c
344+++ b/src/network/networkd-dhcp-server.c 413+++ b/src/network/networkd-dhcp-server.c
345@@ -1,7 +1,7 @@ 414@@ -1,7 +1,7 @@
@@ -351,6 +420,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
351 #include <linux/if.h> 420 #include <linux/if.h>
352 421
353 #include "sd-dhcp-server.h" 422 #include "sd-dhcp-server.h"
423diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
424index cb9c428ae9..a35d58f3f1 100644
354--- a/src/network/networkd-dhcp4.c 425--- a/src/network/networkd-dhcp4.c
355+++ b/src/network/networkd-dhcp4.c 426+++ b/src/network/networkd-dhcp4.c
356@@ -3,7 +3,7 @@ 427@@ -3,7 +3,7 @@
@@ -362,6 +433,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
362 433
363 #include "alloc-util.h" 434 #include "alloc-util.h"
364 #include "dhcp-client-internal.h" 435 #include "dhcp-client-internal.h"
436diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
437index b62a154828..75949e6094 100644
365--- a/src/network/networkd-link.c 438--- a/src/network/networkd-link.c
366+++ b/src/network/networkd-link.c 439+++ b/src/network/networkd-link.c
367@@ -3,7 +3,7 @@ 440@@ -3,7 +3,7 @@
@@ -373,6 +446,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
373 #include <linux/if_link.h> 446 #include <linux/if_link.h>
374 #include <linux/netdevice.h> 447 #include <linux/netdevice.h>
375 #include <sys/socket.h> 448 #include <sys/socket.h>
449diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
450index ee7a535075..ce6ed64133 100644
376--- a/src/network/networkd-route.c 451--- a/src/network/networkd-route.c
377+++ b/src/network/networkd-route.c 452+++ b/src/network/networkd-route.c
378@@ -1,9 +1,5 @@ 453@@ -1,9 +1,5 @@
@@ -396,6 +471,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
396 int route_new(Route **ret) { 471 int route_new(Route **ret) {
397 _cleanup_(route_freep) Route *route = NULL; 472 _cleanup_(route_freep) Route *route = NULL;
398 473
474diff --git a/src/network/networkd-setlink.c b/src/network/networkd-setlink.c
475index e00cc1e589..e392c7e1a2 100644
399--- a/src/network/networkd-setlink.c 476--- a/src/network/networkd-setlink.c
400+++ b/src/network/networkd-setlink.c 477+++ b/src/network/networkd-setlink.c
401@@ -2,7 +2,7 @@ 478@@ -2,7 +2,7 @@
@@ -407,6 +484,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
407 #include <linux/if_bridge.h> 484 #include <linux/if_bridge.h>
408 485
409 #include "missing_network.h" 486 #include "missing_network.h"
487diff --git a/src/shared/linux/ethtool.h b/src/shared/linux/ethtool.h
488index 974d4292e7..fe9b8a9e07 100644
410--- a/src/shared/linux/ethtool.h 489--- a/src/shared/linux/ethtool.h
411+++ b/src/shared/linux/ethtool.h 490+++ b/src/shared/linux/ethtool.h
412@@ -16,7 +16,8 @@ 491@@ -16,7 +16,8 @@
@@ -419,6 +498,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
419 498
420 #ifndef __KERNEL__ 499 #ifndef __KERNEL__
421 #include <limits.h> /* for INT_MAX */ 500 #include <limits.h> /* for INT_MAX */
501diff --git a/src/shared/netif-util.c b/src/shared/netif-util.c
502index 603d4de109..7e3531808a 100644
422--- a/src/shared/netif-util.c 503--- a/src/shared/netif-util.c
423+++ b/src/shared/netif-util.c 504+++ b/src/shared/netif-util.c
424@@ -1,6 +1,6 @@ 505@@ -1,6 +1,6 @@
@@ -429,6 +510,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
429 510
430 #include "arphrd-util.h" 511 #include "arphrd-util.h"
431 #include "device-util.h" 512 #include "device-util.h"
513diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
514index 65e003eb15..0b3dc04be0 100644
432--- a/src/udev/udev-builtin-net_id.c 515--- a/src/udev/udev-builtin-net_id.c
433+++ b/src/udev/udev-builtin-net_id.c 516+++ b/src/udev/udev-builtin-net_id.c
434@@ -18,7 +18,7 @@ 517@@ -18,7 +18,7 @@
@@ -440,14 +523,3 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
440 #include <linux/netdevice.h> 523 #include <linux/netdevice.h>
441 #include <linux/pci_regs.h> 524 #include <linux/pci_regs.h>
442 525
443--- a/src/network/netdev/wireguard.c
444+++ b/src/network/netdev/wireguard.c
445@@ -6,7 +6,7 @@
446 #include <sys/ioctl.h>
447 #include <net/if.h>
448 #include <netinet/in.h>
449-#include <linux/if_arp.h>
450+//#include <linux/if_arp.h>
451 #include <linux/ipv6_route.h>
452
453 #include "sd-resolve.h"
diff --git a/meta/recipes-core/systemd/systemd/0001-pass-correct-parameters-to-getdents64.patch b/meta/recipes-core/systemd/systemd/0001-pass-correct-parameters-to-getdents64.patch
index 03a29b5327..028f50b243 100644
--- a/meta/recipes-core/systemd/systemd/0001-pass-correct-parameters-to-getdents64.patch
+++ b/meta/recipes-core/systemd/systemd/0001-pass-correct-parameters-to-getdents64.patch
@@ -1,7 +1,7 @@
1From fbc10748c7c59d82024a4d35146b8dfef8d52927 Mon Sep 17 00:00:00 2001 1From 8c8899b4641125cfe8e7baee32e5c5f452545d2c 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 1/2] pass correct parameters to getdents64 4Subject: [PATCH] pass correct parameters to getdents64
5 5
6Fixes 6Fixes
7../git/src/basic/recurse-dir.c:57:40: error: incompatible pointer types passing 'uint8_t *' (aka 'unsigned char *') to parameter of type 'struct dirent *' [-Werror,-Wincompatible-pointer-types] 7../git/src/basic/recurse-dir.c:57:40: error: incompatible pointer types passing 'uint8_t *' (aka 'unsigned char *') to parameter of type 'struct dirent *' [-Werror,-Wincompatible-pointer-types]
@@ -14,6 +14,7 @@ Fixes
14 14
15Upstream-Status: Pending 15Upstream-Status: Pending
16Signed-off-by: Khem Raj <raj.khem@gmail.com> 16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17
17--- 18---
18 src/basic/recurse-dir.c | 2 +- 19 src/basic/recurse-dir.c | 2 +-
19 src/basic/stat-util.c | 2 +- 20 src/basic/stat-util.c | 2 +-
@@ -33,7 +34,7 @@ index efa1797b7b..797285e3be 100644
33 return -errno; 34 return -errno;
34 if (n == 0) 35 if (n == 0)
35diff --git a/src/basic/stat-util.c b/src/basic/stat-util.c 36diff --git a/src/basic/stat-util.c b/src/basic/stat-util.c
36index efac7b002e..9e1fe7f5a0 100644 37index c2269844f8..7cd6c7fa42 100644
37--- a/src/basic/stat-util.c 38--- a/src/basic/stat-util.c
38+++ b/src/basic/stat-util.c 39+++ b/src/basic/stat-util.c
39@@ -99,7 +99,7 @@ int dir_is_empty_at(int dir_fd, const char *path) { 40@@ -99,7 +99,7 @@ int dir_is_empty_at(int dir_fd, const char *path) {
@@ -45,6 +46,3 @@ index efac7b002e..9e1fe7f5a0 100644
45 if (n < 0) 46 if (n < 0)
46 return -errno; 47 return -errno;
47 48
48--
492.34.1
50
diff --git a/meta/recipes-core/systemd/systemd/0002-Add-sys-stat.h-for-S_IFDIR.patch b/meta/recipes-core/systemd/systemd/0002-Add-sys-stat.h-for-S_IFDIR.patch
index 7dfa1a0df2..15413d7a0b 100644
--- a/meta/recipes-core/systemd/systemd/0002-Add-sys-stat.h-for-S_IFDIR.patch
+++ b/meta/recipes-core/systemd/systemd/0002-Add-sys-stat.h-for-S_IFDIR.patch
@@ -1,13 +1,14 @@
1From d16f7b37c917b91e951b9313e2c8264c72ed93e5 Mon Sep 17 00:00:00 2001 1From 4b731a5e2547b5292f9a774b849e14c0cf7b3955 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 2/2] Add sys/stat.h for S_IFDIR 4Subject: [PATCH] Add sys/stat.h for S_IFDIR
5 5
6../git/src/shared/mkdir-label.c:13:61: error: use of undeclared identifier 'S_IFDIR' 6../git/src/shared/mkdir-label.c:13:61: error: use of undeclared identifier 'S_IFDIR'
7 r = mac_selinux_create_file_prepare_at(dirfd, path, S_IFDIR); 7 r = mac_selinux_create_file_prepare_at(dirfd, path, S_IFDIR);
8 8
9Upstream-Status: Pending 9Upstream-Status: Pending
10Signed-off-by: Khem Raj <raj.khem@gmail.com> 10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11
11--- 12---
12 src/shared/mkdir-label.c | 1 + 13 src/shared/mkdir-label.c | 1 +
13 1 file changed, 1 insertion(+) 14 1 file changed, 1 insertion(+)
@@ -24,6 +25,3 @@ index d36a6466d7..63b764cd83 100644
24 25
25 int mkdirat_label(int dirfd, const char *path, mode_t mode) { 26 int mkdirat_label(int dirfd, const char *path, mode_t mode) {
26 int r; 27 int r;
27--
282.34.1
29
diff --git a/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch b/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch
index 5027682df2..d109860e1a 100644
--- a/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch
+++ b/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch
@@ -1,4 +1,4 @@
1From 5d730902f47498a2866b46875352f6810a01d67c Mon Sep 17 00:00:00 2001 1From c542d2d93cf536e91d4edb8791fdc0de732b0a52 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:41:41 +0800 3Date: Mon, 25 Feb 2019 13:41:41 +0800
4Subject: [PATCH] don't use glibc-specific qsort_r 4Subject: [PATCH] don't use glibc-specific qsort_r
@@ -19,9 +19,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
19 src/shared/hwdb-util.c | 19 ++++++++++++++----- 19 src/shared/hwdb-util.c | 19 ++++++++++++++-----
20 3 files changed, 38 insertions(+), 31 deletions(-) 20 3 files changed, 38 insertions(+), 31 deletions(-)
21 21
22diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h
23index 02a6784d99..cb448df109 100644
22--- a/src/basic/sort-util.h 24--- a/src/basic/sort-util.h
23+++ b/src/basic/sort-util.h 25+++ b/src/basic/sort-util.h
24@@ -61,18 +61,4 @@ static inline void _qsort_safe(void *bas 26@@ -61,18 +61,4 @@ static inline void _qsort_safe(void *base, size_t nmemb, size_t size, comparison
25 _qsort_safe((p), (n), sizeof((p)[0]), (comparison_fn_t) _func_); \ 27 _qsort_safe((p), (n), sizeof((p)[0]), (comparison_fn_t) _func_); \
26 }) 28 })
27 29
@@ -40,9 +42,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
40- }) 42- })
41- 43-
42 int cmp_int(const int *a, const int *b); 44 int cmp_int(const int *a, const int *b);
45diff --git a/src/shared/format-table.c b/src/shared/format-table.c
46index b95680b365..5ffa208615 100644
43--- a/src/shared/format-table.c 47--- a/src/shared/format-table.c
44+++ b/src/shared/format-table.c 48+++ b/src/shared/format-table.c
45@@ -1324,30 +1324,32 @@ static int cell_data_compare(TableData * 49@@ -1324,30 +1324,32 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t
46 return CMP(index_a, index_b); 50 return CMP(index_a, index_b);
47 } 51 }
48 52
@@ -99,7 +103,7 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
99 } 103 }
100 104
101 if (t->display_map) 105 if (t->display_map)
102@@ -2647,7 +2654,12 @@ int table_to_json(Table *t, JsonVariant 106@@ -2647,7 +2654,12 @@ int table_to_json(Table *t, JsonVariant **ret) {
103 for (size_t i = 0; i < n_rows; i++) 107 for (size_t i = 0; i < n_rows; i++)
104 sorted[i] = i * t->n_columns; 108 sorted[i] = i * t->n_columns;
105 109
@@ -113,9 +117,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
113 } 117 }
114 118
115 if (t->display_map) 119 if (t->display_map)
120diff --git a/src/shared/hwdb-util.c b/src/shared/hwdb-util.c
121index fe4785f3e5..827e1639c3 100644
116--- a/src/shared/hwdb-util.c 122--- a/src/shared/hwdb-util.c
117+++ b/src/shared/hwdb-util.c 123+++ b/src/shared/hwdb-util.c
118@@ -127,9 +127,13 @@ static struct trie* trie_free(struct tri 124@@ -127,9 +127,13 @@ static struct trie* trie_free(struct trie *trie) {
119 125
120 DEFINE_TRIVIAL_CLEANUP_FUNC(struct trie*, trie_free); 126 DEFINE_TRIVIAL_CLEANUP_FUNC(struct trie*, trie_free);
121 127
@@ -132,7 +138,7 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
132 } 138 }
133 139
134 static int trie_node_add_value(struct trie *trie, struct trie_node *node, 140 static int trie_node_add_value(struct trie *trie, struct trie_node *node,
135@@ -157,7 +161,10 @@ static int trie_node_add_value(struct tr 141@@ -157,7 +161,10 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node,
136 .value_off = v, 142 .value_off = v,
137 }; 143 };
138 144
@@ -144,7 +150,7 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
144 if (val) { 150 if (val) {
145 /* At this point we have 2 identical properties on the same match-string. 151 /* At this point we have 2 identical properties on the same match-string.
146 * Since we process files in order, we just replace the previous value. */ 152 * Since we process files in order, we just replace the previous value. */
147@@ -183,7 +190,9 @@ static int trie_node_add_value(struct tr 153@@ -183,7 +190,9 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node,
148 .line_number = line_number, 154 .line_number = line_number,
149 }; 155 };
150 node->values_count++; 156 node->values_count++;
diff --git a/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch b/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch
index f3edc7d82b..18fcc6e48c 100644
--- a/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch
+++ b/meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch
@@ -1,4 +1,4 @@
1From 3b42a888685aee1776a12cff84a5fe0063378483 Mon Sep 17 00:00:00 2001 1From a4f51ef07375466f79cb148ff1178ed11f808f0a 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 __compare_fn_t and comparison_fn_t 4Subject: [PATCH] missing_type.h: add __compare_fn_t and comparison_fn_t
@@ -21,6 +21,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
21 src/libsystemd/sd-journal/catalog.c | 1 + 21 src/libsystemd/sd-journal/catalog.c | 1 +
22 4 files changed, 12 insertions(+) 22 4 files changed, 12 insertions(+)
23 23
24diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h
25index f6233090a9..aeaf6ad5ec 100644
24--- a/src/basic/missing_type.h 26--- a/src/basic/missing_type.h
25+++ b/src/basic/missing_type.h 27+++ b/src/basic/missing_type.h
26@@ -10,3 +10,12 @@ 28@@ -10,3 +10,12 @@
@@ -36,6 +38,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
36+#define __COMPAR_FN_T 38+#define __COMPAR_FN_T
37+typedef int (*__compar_fn_t)(const void *, const void *); 39+typedef int (*__compar_fn_t)(const void *, const void *);
38+#endif 40+#endif
41diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h
42index cb448df109..fd738a65ab 100644
39--- a/src/basic/sort-util.h 43--- a/src/basic/sort-util.h
40+++ b/src/basic/sort-util.h 44+++ b/src/basic/sort-util.h
41@@ -4,6 +4,7 @@ 45@@ -4,6 +4,7 @@
@@ -46,6 +50,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
46 50
47 /* This is the same as glibc's internal __compar_d_fn_t type. glibc exports a public comparison_fn_t, for the 51 /* This is the same as glibc's internal __compar_d_fn_t type. glibc exports a public comparison_fn_t, for the
48 * external type __compar_fn_t, but doesn't do anything similar for __compar_d_fn_t. Let's hence do that 52 * external type __compar_fn_t, but doesn't do anything similar for __compar_d_fn_t. Let's hence do that
53diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
54index d054668b8e..d3bf55acbe 100644
49--- a/src/core/kmod-setup.c 55--- a/src/core/kmod-setup.c
50+++ b/src/core/kmod-setup.c 56+++ b/src/core/kmod-setup.c
51@@ -10,6 +10,7 @@ 57@@ -10,6 +10,7 @@
@@ -56,6 +62,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
56 62
57 #if HAVE_KMOD 63 #if HAVE_KMOD
58 #include "module-util.h" 64 #include "module-util.h"
65diff --git a/src/libsystemd/sd-journal/catalog.c b/src/libsystemd/sd-journal/catalog.c
66index 8fc87b131a..36a6efdbd8 100644
59--- a/src/libsystemd/sd-journal/catalog.c 67--- a/src/libsystemd/sd-journal/catalog.c
60+++ b/src/libsystemd/sd-journal/catalog.c 68+++ b/src/libsystemd/sd-journal/catalog.c
61@@ -28,6 +28,7 @@ 69@@ -28,6 +28,7 @@
diff --git a/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch b/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch
index d93f630752..1bd538b0c0 100644
--- a/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch
+++ b/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch
@@ -1,4 +1,4 @@
1From 3e0df2c22bfd37bc62bf09a01ec498e40d3599de Mon Sep 17 00:00:00 2001 1From 3d9910dcda697b1e361bba49c99050ee0d116742 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
@@ -22,6 +22,8 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
22 create mode 100644 src/basic/parse-printf-format.c 22 create mode 100644 src/basic/parse-printf-format.c
23 create mode 100644 src/basic/parse-printf-format.h 23 create mode 100644 src/basic/parse-printf-format.h
24 24
25diff --git a/meson.build b/meson.build
26index cb9936ee8b..ae53345260 100644
25--- a/meson.build 27--- a/meson.build
26+++ b/meson.build 28+++ b/meson.build
27@@ -686,6 +686,7 @@ endif 29@@ -686,6 +686,7 @@ endif
@@ -32,9 +34,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
32 'sys/auxv.h', 34 'sys/auxv.h',
33 'valgrind/memcheck.h', 35 'valgrind/memcheck.h',
34 'valgrind/valgrind.h', 36 'valgrind/valgrind.h',
37diff --git a/src/basic/meson.build b/src/basic/meson.build
38index 49e1e7f43e..4131494bfa 100644
35--- a/src/basic/meson.build 39--- a/src/basic/meson.build
36+++ b/src/basic/meson.build 40+++ b/src/basic/meson.build
37@@ -335,6 +335,11 @@ endforeach 41@@ -334,6 +334,11 @@ endforeach
38 42
39 basic_sources += generated_gperf_headers 43 basic_sources += generated_gperf_headers
40 44
@@ -46,6 +50,9 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
46 ############################################################ 50 ############################################################
47 51
48 arch_list = [ 52 arch_list = [
53diff --git a/src/basic/parse-printf-format.c b/src/basic/parse-printf-format.c
54new file mode 100644
55index 0000000000..49437e5445
49--- /dev/null 56--- /dev/null
50+++ b/src/basic/parse-printf-format.c 57+++ b/src/basic/parse-printf-format.c
51@@ -0,0 +1,273 @@ 58@@ -0,0 +1,273 @@
@@ -322,6 +329,9 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
322+ 329+
323+ return last; 330+ return last;
324+} 331+}
332diff --git a/src/basic/parse-printf-format.h b/src/basic/parse-printf-format.h
333new file mode 100644
334index 0000000000..47be7522d7
325--- /dev/null 335--- /dev/null
326+++ b/src/basic/parse-printf-format.h 336+++ b/src/basic/parse-printf-format.h
327@@ -0,0 +1,57 @@ 337@@ -0,0 +1,57 @@
@@ -382,6 +392,8 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
382+size_t parse_printf_format(const char *fmt, size_t n, int *types); 392+size_t parse_printf_format(const char *fmt, size_t n, int *types);
383+ 393+
384+#endif /* HAVE_PRINTF_H */ 394+#endif /* HAVE_PRINTF_H */
395diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h
396index 69d7062ec6..f55c5aab2c 100644
385--- a/src/basic/stdio-util.h 397--- a/src/basic/stdio-util.h
386+++ b/src/basic/stdio-util.h 398+++ b/src/basic/stdio-util.h
387@@ -1,13 +1,13 @@ 399@@ -1,13 +1,13 @@
@@ -399,6 +411,8 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
399 411
400 #define snprintf_ok(buf, len, fmt, ...) \ 412 #define snprintf_ok(buf, len, fmt, ...) \
401 ({ \ 413 ({ \
414diff --git a/src/libsystemd/sd-journal/journal-send.c b/src/libsystemd/sd-journal/journal-send.c
415index 1e10ed5524..e6ceba54f9 100644
402--- a/src/libsystemd/sd-journal/journal-send.c 416--- a/src/libsystemd/sd-journal/journal-send.c
403+++ b/src/libsystemd/sd-journal/journal-send.c 417+++ b/src/libsystemd/sd-journal/journal-send.c
404@@ -2,7 +2,6 @@ 418@@ -2,7 +2,6 @@
@@ -409,7 +423,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
409 #include <stddef.h> 423 #include <stddef.h>
410 #include <sys/un.h> 424 #include <sys/un.h>
411 #include <unistd.h> 425 #include <unistd.h>
412@@ -21,6 +20,7 @@ 426@@ -25,6 +24,7 @@
413 #include "stdio-util.h" 427 #include "stdio-util.h"
414 #include "string-util.h" 428 #include "string-util.h"
415 #include "tmpfile-util.h" 429 #include "tmpfile-util.h"
diff --git a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch
index 36545c2f60..4b1fac06b5 100644
--- a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch
+++ b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch
@@ -1,4 +1,4 @@
1From cef23a651ea200e30e1e6ed2a2564505e3a42d46 Mon Sep 17 00:00:00 2001 1From 55d48dd81e57add5b2d4b5a7d697c575a0f37ef5 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
@@ -41,6 +41,7 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
41 src/core/kmod-setup.c | 1 + 41 src/core/kmod-setup.c | 1 +
42 src/core/service.c | 1 + 42 src/core/service.c | 1 +
43 src/coredump/coredump-vacuum.c | 1 + 43 src/coredump/coredump-vacuum.c | 1 +
44 src/fstab-generator/fstab-generator.c | 1 +
44 src/journal-remote/journal-remote-main.c | 1 + 45 src/journal-remote/journal-remote-main.c | 1 +
45 src/journal/journalctl.c | 1 + 46 src/journal/journalctl.c | 1 +
46 src/libsystemd/sd-bus/bus-message.c | 1 + 47 src/libsystemd/sd-bus/bus-message.c | 1 +
@@ -70,11 +71,13 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
70 src/udev/udev-builtin-path_id.c | 1 + 71 src/udev/udev-builtin-path_id.c | 1 +
71 src/udev/udev-event.c | 1 + 72 src/udev/udev-event.c | 1 +
72 src/udev/udev-rules.c | 1 + 73 src/udev/udev-rules.c | 1 +
73 51 files changed, 62 insertions(+) 74 52 files changed, 63 insertions(+)
74 75
76diff --git a/meson.build b/meson.build
77index ae53345260..8c8a6c9bdf 100644
75--- a/meson.build 78--- a/meson.build
76+++ b/meson.build 79+++ b/meson.build
77@@ -507,6 +507,7 @@ foreach ident : ['secure_getenv', '__sec 80@@ -507,6 +507,7 @@ foreach ident : ['secure_getenv', '__secure_getenv']
78 endforeach 81 endforeach
79 82
80 foreach ident : [ 83 foreach ident : [
@@ -82,6 +85,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
82 ['memfd_create', '''#include <sys/mman.h>'''], 85 ['memfd_create', '''#include <sys/mman.h>'''],
83 ['gettid', '''#include <sys/types.h> 86 ['gettid', '''#include <sys/types.h>
84 #include <unistd.h>'''], 87 #include <unistd.h>'''],
88diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
89index 5a3095cbba..22cfa4d526 100644
85--- a/src/backlight/backlight.c 90--- a/src/backlight/backlight.c
86+++ b/src/backlight/backlight.c 91+++ b/src/backlight/backlight.c
87@@ -19,6 +19,7 @@ 92@@ -19,6 +19,7 @@
@@ -92,6 +97,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
92 97
93 static int help(void) { 98 static int help(void) {
94 _cleanup_free_ char *link = NULL; 99 _cleanup_free_ char *link = NULL;
100diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
101index a626ecf2e2..f7dc6c8421 100644
95--- a/src/basic/cgroup-util.c 102--- a/src/basic/cgroup-util.c
96+++ b/src/basic/cgroup-util.c 103+++ b/src/basic/cgroup-util.c
97@@ -37,6 +37,7 @@ 104@@ -37,6 +37,7 @@
@@ -102,6 +109,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
102 109
103 static int cg_enumerate_items(const char *controller, const char *path, FILE **_f, const char *item) { 110 static int cg_enumerate_items(const char *controller, const char *path, FILE **_f, const char *item) {
104 _cleanup_free_ char *fs = NULL; 111 _cleanup_free_ char *fs = NULL;
112diff --git a/src/basic/env-util.c b/src/basic/env-util.c
113index 885967e7f3..d0b7dc845e 100644
105--- a/src/basic/env-util.c 114--- a/src/basic/env-util.c
106+++ b/src/basic/env-util.c 115+++ b/src/basic/env-util.c
107@@ -19,6 +19,7 @@ 116@@ -19,6 +19,7 @@
@@ -112,6 +121,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
112 121
113 /* We follow bash for the character set. Different shells have different rules. */ 122 /* We follow bash for the character set. Different shells have different rules. */
114 #define VALID_BASH_ENV_NAME_CHARS \ 123 #define VALID_BASH_ENV_NAME_CHARS \
124diff --git a/src/basic/log.c b/src/basic/log.c
125index 12071e2ebd..15254c7bbc 100644
115--- a/src/basic/log.c 126--- a/src/basic/log.c
116+++ b/src/basic/log.c 127+++ b/src/basic/log.c
117@@ -36,6 +36,7 @@ 128@@ -36,6 +36,7 @@
@@ -122,6 +133,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
122 133
123 #define SNDBUF_SIZE (8*1024*1024) 134 #define SNDBUF_SIZE (8*1024*1024)
124 135
136diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h
137index 8c76f93eb2..9068bfb4f0 100644
125--- a/src/basic/missing_stdlib.h 138--- a/src/basic/missing_stdlib.h
126+++ b/src/basic/missing_stdlib.h 139+++ b/src/basic/missing_stdlib.h
127@@ -11,3 +11,15 @@ 140@@ -11,3 +11,15 @@
@@ -140,6 +153,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
140+ (char *)memcpy(__new, __old, __len); \ 153+ (char *)memcpy(__new, __old, __len); \
141+ }) 154+ })
142+#endif 155+#endif
156diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c
157index 51a0d74e87..03569f71f8 100644
143--- a/src/basic/mkdir.c 158--- a/src/basic/mkdir.c
144+++ b/src/basic/mkdir.c 159+++ b/src/basic/mkdir.c
145@@ -15,6 +15,7 @@ 160@@ -15,6 +15,7 @@
@@ -150,6 +165,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
150 165
151 int mkdir_safe_internal( 166 int mkdir_safe_internal(
152 const char *path, 167 const char *path,
168diff --git a/src/basic/mountpoint-util.c b/src/basic/mountpoint-util.c
169index 82a33a6829..d947774b40 100644
153--- a/src/basic/mountpoint-util.c 170--- a/src/basic/mountpoint-util.c
154+++ b/src/basic/mountpoint-util.c 171+++ b/src/basic/mountpoint-util.c
155@@ -13,6 +13,7 @@ 172@@ -13,6 +13,7 @@
@@ -160,6 +177,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
160 #include "mountpoint-util.h" 177 #include "mountpoint-util.h"
161 #include "nulstr-util.h" 178 #include "nulstr-util.h"
162 #include "parse-util.h" 179 #include "parse-util.h"
180diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
181index 2888ab6523..d941afec2d 100644
163--- a/src/basic/parse-util.c 182--- a/src/basic/parse-util.c
164+++ b/src/basic/parse-util.c 183+++ b/src/basic/parse-util.c
165@@ -18,6 +18,7 @@ 184@@ -18,6 +18,7 @@
@@ -170,6 +189,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
170 189
171 int parse_boolean(const char *v) { 190 int parse_boolean(const char *v) {
172 if (!v) 191 if (!v)
192diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c
193index 6fb8c40e7a..c4b59e8518 100644
173--- a/src/basic/path-lookup.c 194--- a/src/basic/path-lookup.c
174+++ b/src/basic/path-lookup.c 195+++ b/src/basic/path-lookup.c
175@@ -16,6 +16,7 @@ 196@@ -16,6 +16,7 @@
@@ -180,6 +201,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
180 201
181 int xdg_user_runtime_dir(char **ret, const char *suffix) { 202 int xdg_user_runtime_dir(char **ret, const char *suffix) {
182 const char *e; 203 const char *e;
204diff --git a/src/basic/percent-util.c b/src/basic/percent-util.c
205index cab9d0eaea..5f6ca258e9 100644
183--- a/src/basic/percent-util.c 206--- a/src/basic/percent-util.c
184+++ b/src/basic/percent-util.c 207+++ b/src/basic/percent-util.c
185@@ -3,6 +3,7 @@ 208@@ -3,6 +3,7 @@
@@ -190,6 +213,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
190 213
191 static int parse_parts_value_whole(const char *p, const char *symbol) { 214 static int parse_parts_value_whole(const char *p, const char *symbol) {
192 const char *pc, *n; 215 const char *pc, *n;
216diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c
217index 410b8a3eb5..f2c4355609 100644
193--- a/src/basic/proc-cmdline.c 218--- a/src/basic/proc-cmdline.c
194+++ b/src/basic/proc-cmdline.c 219+++ b/src/basic/proc-cmdline.c
195@@ -15,6 +15,7 @@ 220@@ -15,6 +15,7 @@
@@ -200,6 +225,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
200 225
201 int proc_cmdline(char **ret) { 226 int proc_cmdline(char **ret) {
202 const char *e; 227 const char *e;
228diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c
229index 65f96abb06..e485a0196b 100644
203--- a/src/basic/procfs-util.c 230--- a/src/basic/procfs-util.c
204+++ b/src/basic/procfs-util.c 231+++ b/src/basic/procfs-util.c
205@@ -12,6 +12,7 @@ 232@@ -12,6 +12,7 @@
@@ -210,6 +237,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
210 237
211 int procfs_get_pid_max(uint64_t *ret) { 238 int procfs_get_pid_max(uint64_t *ret) {
212 _cleanup_free_ char *value = NULL; 239 _cleanup_free_ char *value = NULL;
240diff --git a/src/basic/time-util.c b/src/basic/time-util.c
241index b659d6905d..020112be24 100644
213--- a/src/basic/time-util.c 242--- a/src/basic/time-util.c
214+++ b/src/basic/time-util.c 243+++ b/src/basic/time-util.c
215@@ -26,6 +26,7 @@ 244@@ -26,6 +26,7 @@
@@ -220,6 +249,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
220 249
221 static clockid_t map_clock_id(clockid_t c) { 250 static clockid_t map_clock_id(clockid_t c) {
222 251
252diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c
253index 9e4b0d1f72..d640316ff7 100644
223--- a/src/boot/bless-boot.c 254--- a/src/boot/bless-boot.c
224+++ b/src/boot/bless-boot.c 255+++ b/src/boot/bless-boot.c
225@@ -19,6 +19,7 @@ 256@@ -19,6 +19,7 @@
@@ -230,6 +261,20 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
230 261
231 static char **arg_path = NULL; 262 static char **arg_path = NULL;
232 263
264diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c
265index f0d8759e85..b4c1053e64 100644
266--- a/src/core/dbus-cgroup.c
267+++ b/src/core/dbus-cgroup.c
268@@ -21,6 +21,7 @@
269 #include "parse-util.h"
270 #include "path-util.h"
271 #include "percent-util.h"
272+#include "missing_stdlib.h"
273 #include "socket-util.h"
274
275 BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", TasksMax, tasks_max_resolve);
276diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
277index 5c499e5d06..e7ab1bb9a5 100644
233--- a/src/core/dbus-execute.c 278--- a/src/core/dbus-execute.c
234+++ b/src/core/dbus-execute.c 279+++ b/src/core/dbus-execute.c
235@@ -44,6 +44,7 @@ 280@@ -44,6 +44,7 @@
@@ -240,6 +285,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
240 285
241 BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput); 286 BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput);
242 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input, exec_input, ExecInput); 287 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input, exec_input, ExecInput);
288diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c
289index 32a2ec0ff9..36be2511e4 100644
243--- a/src/core/dbus-util.c 290--- a/src/core/dbus-util.c
244+++ b/src/core/dbus-util.c 291+++ b/src/core/dbus-util.c
245@@ -9,6 +9,7 @@ 292@@ -9,6 +9,7 @@
@@ -250,6 +297,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
250 297
251 int bus_property_get_triggered_unit( 298 int bus_property_get_triggered_unit(
252 sd_bus *bus, 299 sd_bus *bus,
300diff --git a/src/core/execute.c b/src/core/execute.c
301index 0b20d386d3..fccfb9268c 100644
253--- a/src/core/execute.c 302--- a/src/core/execute.c
254+++ b/src/core/execute.c 303+++ b/src/core/execute.c
255@@ -102,6 +102,7 @@ 304@@ -102,6 +102,7 @@
@@ -260,6 +309,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
260 309
261 #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC) 310 #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC)
262 #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC) 311 #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC)
312diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
313index d3bf55acbe..63dd807b8a 100644
263--- a/src/core/kmod-setup.c 314--- a/src/core/kmod-setup.c
264+++ b/src/core/kmod-setup.c 315+++ b/src/core/kmod-setup.c
265@@ -11,6 +11,7 @@ 316@@ -11,6 +11,7 @@
@@ -270,6 +321,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
270 321
271 #if HAVE_KMOD 322 #if HAVE_KMOD
272 #include "module-util.h" 323 #include "module-util.h"
324diff --git a/src/core/service.c b/src/core/service.c
325index 87f0d34c8c..ccda3feb29 100644
273--- a/src/core/service.c 326--- a/src/core/service.c
274+++ b/src/core/service.c 327+++ b/src/core/service.c
275@@ -42,6 +42,7 @@ 328@@ -42,6 +42,7 @@
@@ -280,6 +333,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
280 333
281 static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { 334 static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = {
282 [SERVICE_DEAD] = UNIT_INACTIVE, 335 [SERVICE_DEAD] = UNIT_INACTIVE,
336diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c
337index dcf9cc03cd..8f8d992ec2 100644
283--- a/src/coredump/coredump-vacuum.c 338--- a/src/coredump/coredump-vacuum.c
284+++ b/src/coredump/coredump-vacuum.c 339+++ b/src/coredump/coredump-vacuum.c
285@@ -16,6 +16,7 @@ 340@@ -16,6 +16,7 @@
@@ -290,6 +345,20 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
290 345
291 #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL) /* 1 MiB */ 346 #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL) /* 1 MiB */
292 #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */ 347 #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */
348diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
349index 9b32383a76..f8d3397a06 100644
350--- a/src/fstab-generator/fstab-generator.c
351+++ b/src/fstab-generator/fstab-generator.c
352@@ -29,6 +29,7 @@
353 #include "util.h"
354 #include "virt.h"
355 #include "volatile-util.h"
356+#include "missing_stdlib.h"
357
358 typedef enum MountPointFlags {
359 MOUNT_NOAUTO = 1 << 0,
360diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c
361index 3e3646e45f..6a8fc60f6d 100644
293--- a/src/journal-remote/journal-remote-main.c 362--- a/src/journal-remote/journal-remote-main.c
294+++ b/src/journal-remote/journal-remote-main.c 363+++ b/src/journal-remote/journal-remote-main.c
295@@ -24,6 +24,7 @@ 364@@ -24,6 +24,7 @@
@@ -300,6 +369,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
300 369
301 #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem" 370 #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem"
302 #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem" 371 #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem"
372diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
373index 3c4a7c0a7a..6a792404f2 100644
303--- a/src/journal/journalctl.c 374--- a/src/journal/journalctl.c
304+++ b/src/journal/journalctl.c 375+++ b/src/journal/journalctl.c
305@@ -73,6 +73,7 @@ 376@@ -73,6 +73,7 @@
@@ -310,6 +381,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
310 381
311 #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) 382 #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE)
312 #define PROCESS_INOTIFY_INTERVAL 1024 /* Every 1,024 messages processed */ 383 #define PROCESS_INOTIFY_INTERVAL 1024 /* Every 1,024 messages processed */
384diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
385index 96529b422b..ddb5e9c698 100644
313--- a/src/libsystemd/sd-bus/bus-message.c 386--- a/src/libsystemd/sd-bus/bus-message.c
314+++ b/src/libsystemd/sd-bus/bus-message.c 387+++ b/src/libsystemd/sd-bus/bus-message.c
315@@ -20,6 +20,7 @@ 388@@ -20,6 +20,7 @@
@@ -320,6 +393,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
320 393
321 static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); 394 static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored);
322 395
396diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c
397index 28d8336718..5d3ce88a53 100644
323--- a/src/libsystemd/sd-bus/bus-objects.c 398--- a/src/libsystemd/sd-bus/bus-objects.c
324+++ b/src/libsystemd/sd-bus/bus-objects.c 399+++ b/src/libsystemd/sd-bus/bus-objects.c
325@@ -12,6 +12,7 @@ 400@@ -12,6 +12,7 @@
@@ -330,6 +405,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
330 405
331 static int node_vtable_get_userdata( 406 static int node_vtable_get_userdata(
332 sd_bus *bus, 407 sd_bus *bus,
408diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c
409index 14951ccb33..b7f86ca501 100644
333--- a/src/libsystemd/sd-bus/bus-socket.c 410--- a/src/libsystemd/sd-bus/bus-socket.c
334+++ b/src/libsystemd/sd-bus/bus-socket.c 411+++ b/src/libsystemd/sd-bus/bus-socket.c
335@@ -28,6 +28,7 @@ 412@@ -28,6 +28,7 @@
@@ -340,6 +417,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
340 417
341 #define SNDBUF_SIZE (8*1024*1024) 418 #define SNDBUF_SIZE (8*1024*1024)
342 419
420diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
421index 9e1d29cc1d..8c3165f0ce 100644
343--- a/src/libsystemd/sd-bus/sd-bus.c 422--- a/src/libsystemd/sd-bus/sd-bus.c
344+++ b/src/libsystemd/sd-bus/sd-bus.c 423+++ b/src/libsystemd/sd-bus/sd-bus.c
345@@ -43,6 +43,7 @@ 424@@ -43,6 +43,7 @@
@@ -350,6 +429,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
350 429
351 #define log_debug_bus_message(m) \ 430 #define log_debug_bus_message(m) \
352 do { \ 431 do { \
432diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c
433index 317653bedc..d028216c48 100644
353--- a/src/libsystemd/sd-bus/test-bus-benchmark.c 434--- a/src/libsystemd/sd-bus/test-bus-benchmark.c
354+++ b/src/libsystemd/sd-bus/test-bus-benchmark.c 435+++ b/src/libsystemd/sd-bus/test-bus-benchmark.c
355@@ -14,6 +14,7 @@ 436@@ -14,6 +14,7 @@
@@ -360,6 +441,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
360 441
361 #define MAX_SIZE (2*1024*1024) 442 #define MAX_SIZE (2*1024*1024)
362 443
444diff --git a/src/libsystemd/sd-journal/sd-journal.c b/src/libsystemd/sd-journal/sd-journal.c
445index 7a6cc4aca3..b7f7cd65c5 100644
363--- a/src/libsystemd/sd-journal/sd-journal.c 446--- a/src/libsystemd/sd-journal/sd-journal.c
364+++ b/src/libsystemd/sd-journal/sd-journal.c 447+++ b/src/libsystemd/sd-journal/sd-journal.c
365@@ -41,6 +41,7 @@ 448@@ -41,6 +41,7 @@
@@ -370,6 +453,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
370 453
371 #define JOURNAL_FILES_MAX 7168 454 #define JOURNAL_FILES_MAX 7168
372 455
456diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c
457index 10d2ed7aec..4fbe3f6b4a 100644
373--- a/src/locale/keymap-util.c 458--- a/src/locale/keymap-util.c
374+++ b/src/locale/keymap-util.c 459+++ b/src/locale/keymap-util.c
375@@ -24,6 +24,7 @@ 460@@ -24,6 +24,7 @@
@@ -380,6 +465,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
380 465
381 static bool startswith_comma(const char *s, const char *prefix) { 466 static bool startswith_comma(const char *s, const char *prefix) {
382 s = startswith(s, prefix); 467 s = startswith(s, prefix);
468diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c
469index 5bd7efc3e8..282899601e 100644
383--- a/src/login/pam_systemd.c 470--- a/src/login/pam_systemd.c
384+++ b/src/login/pam_systemd.c 471+++ b/src/login/pam_systemd.c
385@@ -31,6 +31,7 @@ 472@@ -31,6 +31,7 @@
@@ -390,6 +477,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
390 #include "pam-util.h" 477 #include "pam-util.h"
391 #include "parse-util.h" 478 #include "parse-util.h"
392 #include "path-util.h" 479 #include "path-util.h"
480diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c
481index 063ad08d80..f9823a433b 100644
393--- a/src/network/generator/network-generator.c 482--- a/src/network/generator/network-generator.c
394+++ b/src/network/generator/network-generator.c 483+++ b/src/network/generator/network-generator.c
395@@ -13,6 +13,7 @@ 484@@ -13,6 +13,7 @@
@@ -400,6 +489,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
400 489
401 /* 490 /*
402 # .network 491 # .network
492diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c
493index 1f58bf3ed4..8457a3b0e3 100644
403--- a/src/nspawn/nspawn-settings.c 494--- a/src/nspawn/nspawn-settings.c
404+++ b/src/nspawn/nspawn-settings.c 495+++ b/src/nspawn/nspawn-settings.c
405@@ -17,6 +17,7 @@ 496@@ -17,6 +17,7 @@
@@ -410,6 +501,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
410 501
411 Settings *settings_new(void) { 502 Settings *settings_new(void) {
412 Settings *s; 503 Settings *s;
504diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c
505index c64e79bdff..eda26b0b9a 100644
413--- a/src/nss-mymachines/nss-mymachines.c 506--- a/src/nss-mymachines/nss-mymachines.c
414+++ b/src/nss-mymachines/nss-mymachines.c 507+++ b/src/nss-mymachines/nss-mymachines.c
415@@ -21,6 +21,7 @@ 508@@ -21,6 +21,7 @@
@@ -420,6 +513,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
420 513
421 static void setup_logging_once(void) { 514 static void setup_logging_once(void) {
422 static pthread_once_t once = PTHREAD_ONCE_INIT; 515 static pthread_once_t once = PTHREAD_ONCE_INIT;
516diff --git a/src/portable/portable.c b/src/portable/portable.c
517index 0e6461ba93..54148d5924 100644
423--- a/src/portable/portable.c 518--- a/src/portable/portable.c
424+++ b/src/portable/portable.c 519+++ b/src/portable/portable.c
425@@ -39,6 +39,7 @@ 520@@ -39,6 +39,7 @@
@@ -430,6 +525,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
430 525
431 /* Markers used in the first line of our 20-portable.conf unit file drop-in to determine, that a) the unit file was 526 /* Markers used in the first line of our 20-portable.conf unit file drop-in to determine, that a) the unit file was
432 * dropped there by the portable service logic and b) for which image it was dropped there. */ 527 * dropped there by the portable service logic and b) for which image it was dropped there. */
528diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c
529index 5b3ceeff36..d36d1d57ae 100644
433--- a/src/resolve/resolvectl.c 530--- a/src/resolve/resolvectl.c
434+++ b/src/resolve/resolvectl.c 531+++ b/src/resolve/resolvectl.c
435@@ -43,6 +43,7 @@ 532@@ -43,6 +43,7 @@
@@ -440,6 +537,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
440 537
441 static int arg_family = AF_UNSPEC; 538 static int arg_family = AF_UNSPEC;
442 static int arg_ifindex = 0; 539 static int arg_ifindex = 0;
540diff --git a/src/shared/bus-get-properties.c b/src/shared/bus-get-properties.c
541index 8b4f66b22e..5926e4c61b 100644
443--- a/src/shared/bus-get-properties.c 542--- a/src/shared/bus-get-properties.c
444+++ b/src/shared/bus-get-properties.c 543+++ b/src/shared/bus-get-properties.c
445@@ -4,6 +4,7 @@ 544@@ -4,6 +4,7 @@
@@ -450,6 +549,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
450 549
451 int bus_property_get_bool( 550 int bus_property_get_bool(
452 sd_bus *bus, 551 sd_bus *bus,
552diff --git a/src/shared/bus-unit-procs.c b/src/shared/bus-unit-procs.c
553index 87c0334fec..402ab3493b 100644
453--- a/src/shared/bus-unit-procs.c 554--- a/src/shared/bus-unit-procs.c
454+++ b/src/shared/bus-unit-procs.c 555+++ b/src/shared/bus-unit-procs.c
455@@ -10,6 +10,7 @@ 556@@ -10,6 +10,7 @@
@@ -460,6 +561,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
460 561
461 struct CGroupInfo { 562 struct CGroupInfo {
462 char *cgroup_path; 563 char *cgroup_path;
564diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c
565index dcce530c99..faf5a5bda0 100644
463--- a/src/shared/bus-unit-util.c 566--- a/src/shared/bus-unit-util.c
464+++ b/src/shared/bus-unit-util.c 567+++ b/src/shared/bus-unit-util.c
465@@ -49,6 +49,7 @@ 568@@ -49,6 +49,7 @@
@@ -470,6 +573,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
470 573
471 int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) { 574 int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) {
472 assert(message); 575 assert(message);
576diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
577index 4a2b7684bc..ee6d687c58 100644
473--- a/src/shared/bus-util.c 578--- a/src/shared/bus-util.c
474+++ b/src/shared/bus-util.c 579+++ b/src/shared/bus-util.c
475@@ -21,6 +21,7 @@ 580@@ -21,6 +21,7 @@
@@ -480,6 +585,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
480 585
481 static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { 586 static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
482 sd_event *e = userdata; 587 sd_event *e = userdata;
588diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c
589index f54b187a1b..299758c7e4 100644
483--- a/src/shared/dns-domain.c 590--- a/src/shared/dns-domain.c
484+++ b/src/shared/dns-domain.c 591+++ b/src/shared/dns-domain.c
485@@ -17,6 +17,7 @@ 592@@ -17,6 +17,7 @@
@@ -490,6 +597,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
490 597
491 int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) { 598 int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) {
492 const char *n; 599 const char *n;
600diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c
601index c6caf9330a..ebe33bd44a 100644
493--- a/src/shared/journal-importer.c 602--- a/src/shared/journal-importer.c
494+++ b/src/shared/journal-importer.c 603+++ b/src/shared/journal-importer.c
495@@ -15,6 +15,7 @@ 604@@ -15,6 +15,7 @@
@@ -500,6 +609,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
500 609
501 enum { 610 enum {
502 IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */ 611 IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */
612diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
613index cf83eb6bca..e672a003a3 100644
503--- a/src/shared/logs-show.c 614--- a/src/shared/logs-show.c
504+++ b/src/shared/logs-show.c 615+++ b/src/shared/logs-show.c
505@@ -42,6 +42,7 @@ 616@@ -42,6 +42,7 @@
@@ -510,6 +621,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
510 621
511 /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */ 622 /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */
512 #define PRINT_LINE_THRESHOLD 3 623 #define PRINT_LINE_THRESHOLD 3
624diff --git a/src/shared/pager.c b/src/shared/pager.c
625index f75ef62d2d..530001a821 100644
513--- a/src/shared/pager.c 626--- a/src/shared/pager.c
514+++ b/src/shared/pager.c 627+++ b/src/shared/pager.c
515@@ -26,6 +26,7 @@ 628@@ -26,6 +26,7 @@
@@ -520,6 +633,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
520 633
521 static pid_t pager_pid = 0; 634 static pid_t pager_pid = 0;
522 635
636diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c
637index 2c07a1b7a8..2a9d6ef4ab 100644
523--- a/src/shared/uid-range.c 638--- a/src/shared/uid-range.c
524+++ b/src/shared/uid-range.c 639+++ b/src/shared/uid-range.c
525@@ -9,6 +9,7 @@ 640@@ -9,6 +9,7 @@
@@ -530,6 +645,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
530 645
531 static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) { 646 static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) {
532 assert(range); 647 assert(range);
648diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c
649index 7e9ab19666..56f619e54e 100644
533--- a/src/socket-proxy/socket-proxyd.c 650--- a/src/socket-proxy/socket-proxyd.c
534+++ b/src/socket-proxy/socket-proxyd.c 651+++ b/src/socket-proxy/socket-proxyd.c
535@@ -26,6 +26,7 @@ 652@@ -26,6 +26,7 @@
@@ -540,6 +657,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
540 657
541 #define BUFFER_SIZE (256 * 1024) 658 #define BUFFER_SIZE (256 * 1024)
542 659
660diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c
661index cc9a7cb838..a679614a47 100644
543--- a/src/test/test-hexdecoct.c 662--- a/src/test/test-hexdecoct.c
544+++ b/src/test/test-hexdecoct.c 663+++ b/src/test/test-hexdecoct.c
545@@ -7,6 +7,7 @@ 664@@ -7,6 +7,7 @@
@@ -550,6 +669,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
550 #include "tests.h" 669 #include "tests.h"
551 670
552 TEST(hexchar) { 671 TEST(hexchar) {
672diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
673index ae92e45205..1e6f3205cb 100644
553--- a/src/udev/udev-builtin-path_id.c 674--- a/src/udev/udev-builtin-path_id.c
554+++ b/src/udev/udev-builtin-path_id.c 675+++ b/src/udev/udev-builtin-path_id.c
555@@ -22,6 +22,7 @@ 676@@ -22,6 +22,7 @@
@@ -560,6 +681,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
560 681
561 _printf_(2,3) 682 _printf_(2,3)
562 static void path_prepend(char **path, const char *fmt, ...) { 683 static void path_prepend(char **path, const char *fmt, ...) {
684diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
685index a60e4f294c..571c43765b 100644
563--- a/src/udev/udev-event.c 686--- a/src/udev/udev-event.c
564+++ b/src/udev/udev-event.c 687+++ b/src/udev/udev-event.c
565@@ -35,6 +35,7 @@ 688@@ -35,6 +35,7 @@
@@ -570,6 +693,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
570 693
571 typedef struct Spawn { 694 typedef struct Spawn {
572 sd_device *device; 695 sd_device *device;
696diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
697index 1a384d6b38..0089833e3f 100644
573--- a/src/udev/udev-rules.c 698--- a/src/udev/udev-rules.c
574+++ b/src/udev/udev-rules.c 699+++ b/src/udev/udev-rules.c
575@@ -34,6 +34,7 @@ 700@@ -34,6 +34,7 @@
@@ -580,23 +705,3 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
580 705
581 #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d") 706 #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d")
582 707
583--- a/src/core/dbus-cgroup.c
584+++ b/src/core/dbus-cgroup.c
585@@ -21,6 +21,7 @@
586 #include "parse-util.h"
587 #include "path-util.h"
588 #include "percent-util.h"
589+#include "missing_stdlib.h"
590 #include "socket-util.h"
591
592 BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", TasksMax, tasks_max_resolve);
593--- a/src/fstab-generator/fstab-generator.c
594+++ b/src/fstab-generator/fstab-generator.c
595@@ -29,6 +29,7 @@
596 #include "util.h"
597 #include "virt.h"
598 #include "volatile-util.h"
599+#include "missing_stdlib.h"
600
601 typedef enum MountPointFlags {
602 MOUNT_NOAUTO = 1 << 0,
diff --git a/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch b/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
index 846c01bd4f..b84fbaa67e 100644
--- a/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
+++ b/meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
@@ -1,4 +1,4 @@
1From fb068403b25002156435350165ea418a6338a313 Mon Sep 17 00:00:00 2001 1From 74c664bcd6b9a5fcf3466310c07f608d12456f7f 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
@@ -23,6 +23,8 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
23 src/tmpfiles/tmpfiles.c | 10 ++++++++++ 23 src/tmpfiles/tmpfiles.c | 10 ++++++++++
24 3 files changed, 38 insertions(+) 24 3 files changed, 38 insertions(+)
25 25
26diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c
27index e026b29478..815e56ef68 100644
26--- a/src/basic/glob-util.c 28--- a/src/basic/glob-util.c
27+++ b/src/basic/glob-util.c 29+++ b/src/basic/glob-util.c
28@@ -12,6 +12,12 @@ 30@@ -12,6 +12,12 @@
@@ -46,7 +48,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. */ 48 /* We want to set GLOB_ALTDIRFUNC ourselves, don't allow it to be set. */
47 assert(!(flags & GLOB_ALTDIRFUNC)); 49 assert(!(flags & GLOB_ALTDIRFUNC));
48 50
49@@ -32,9 +39,14 @@ int safe_glob(const char *path, int flag 51@@ -32,9 +39,14 @@ int safe_glob(const char *path, int flags, glob_t *pglob) {
50 pglob->gl_lstat = lstat; 52 pglob->gl_lstat = lstat;
51 if (!pglob->gl_stat) 53 if (!pglob->gl_stat)
52 pglob->gl_stat = stat; 54 pglob->gl_stat = stat;
@@ -61,6 +63,8 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
61 if (k == GLOB_NOMATCH) 63 if (k == GLOB_NOMATCH)
62 return -ENOENT; 64 return -ENOENT;
63 if (k == GLOB_NOSPACE) 65 if (k == GLOB_NOSPACE)
66diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c
67index ec8b74f48f..d99a6095df 100644
64--- a/src/test/test-glob-util.c 68--- a/src/test/test-glob-util.c
65+++ b/src/test/test-glob-util.c 69+++ b/src/test/test-glob-util.c
66@@ -13,6 +13,12 @@ 70@@ -13,6 +13,12 @@
@@ -110,6 +114,8 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
110 assert_se(r == GLOB_NOMATCH); 114 assert_se(r == GLOB_NOMATCH);
111 115
112 (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL); 116 (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL);
117diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
118index fcab51c208..fdef1807ae 100644
113--- a/src/tmpfiles/tmpfiles.c 119--- a/src/tmpfiles/tmpfiles.c
114+++ b/src/tmpfiles/tmpfiles.c 120+++ b/src/tmpfiles/tmpfiles.c
115@@ -67,6 +67,12 @@ 121@@ -67,6 +67,12 @@
@@ -135,7 +141,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
135 }; 141 };
136 int r = 0, k; 142 int r = 0, k;
137 char **fn; 143 char **fn;
138@@ -1981,7 +1989,9 @@ static int glob_item(Item *i, action_t a 144@@ -1981,7 +1989,9 @@ static int glob_item(Item *i, action_t action) {
139 145
140 static int glob_item_recursively(Item *i, fdaction_t action) { 146 static int glob_item_recursively(Item *i, fdaction_t action) {
141 _cleanup_globfree_ glob_t g = { 147 _cleanup_globfree_ glob_t g = {
diff --git a/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch b/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch
index 57e18a5808..59bd81c76f 100644
--- a/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch
+++ b/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch
@@ -1,4 +1,4 @@
1From 7ca9887f84adba065dc2e59b3de55ace2fc72ec0 Mon Sep 17 00:00:00 2001 1From a0450f7909348e7ff1d58adc0aee4119a0519c1f 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
@@ -12,13 +12,16 @@ Upstream-Status: Inappropriate [musl specific]
12Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 12Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
13 13
14--- 14---
15 src/basic/missing_type.h | 20 ++++++++++++++++++++ 15 src/basic/missing_type.h | 20 ++++++++++++++++++++
16 src/shared/mount-setup.c | 1 + 16 src/shared/mount-setup.c | 1 +
17 2 files changed, 21 insertions(+) 17 src/test/test-recurse-dir.c | 1 +
18 3 files changed, 22 insertions(+)
18 19
20diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h
21index aeaf6ad5ec..3df1084ef2 100644
19--- a/src/basic/missing_type.h 22--- a/src/basic/missing_type.h
20+++ b/src/basic/missing_type.h 23+++ b/src/basic/missing_type.h
21@@ -19,3 +19,23 @@ typedef int (*comparison_fn_t)(const voi 24@@ -19,3 +19,23 @@ typedef int (*comparison_fn_t)(const void *, const void *);
22 #define __COMPAR_FN_T 25 #define __COMPAR_FN_T
23 typedef int (*__compar_fn_t)(const void *, const void *); 26 typedef int (*__compar_fn_t)(const void *, const void *);
24 #endif 27 #endif
@@ -42,6 +45,8 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
42+#ifndef FTW_SKIP_SIBLINGS 45+#ifndef FTW_SKIP_SIBLINGS
43+#define FTW_SKIP_SIBLINGS 3 46+#define FTW_SKIP_SIBLINGS 3
44+#endif 47+#endif
48diff --git a/src/shared/mount-setup.c b/src/shared/mount-setup.c
49index 7917968497..cc3d5baaab 100644
45--- a/src/shared/mount-setup.c 50--- a/src/shared/mount-setup.c
46+++ b/src/shared/mount-setup.c 51+++ b/src/shared/mount-setup.c
47@@ -32,6 +32,7 @@ 52@@ -32,6 +32,7 @@
@@ -52,6 +57,8 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
52 57
53 typedef enum MountMode { 58 typedef enum MountMode {
54 MNT_NONE = 0, 59 MNT_NONE = 0,
60diff --git a/src/test/test-recurse-dir.c b/src/test/test-recurse-dir.c
61index 2c2120b136..bc60a178a2 100644
55--- a/src/test/test-recurse-dir.c 62--- a/src/test/test-recurse-dir.c
56+++ b/src/test/test-recurse-dir.c 63+++ b/src/test/test-recurse-dir.c
57@@ -6,6 +6,7 @@ 64@@ -6,6 +6,7 @@
diff --git a/meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch b/meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch
index 0fc320420e..1fb84c7090 100644
--- a/meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch
+++ b/meta/recipes-core/systemd/systemd/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch
@@ -1,4 +1,4 @@
1From c7453b716ae308b89cf4b2b231a36ddd38a49752 Mon Sep 17 00:00:00 2001 1From 3ca0920429f7eaf8c59f9ac8afd30a43b83d95ed 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:03:47 +0800 3Date: Mon, 25 Feb 2019 15:03:47 +0800
4Subject: [PATCH] fix missing of __register_atfork for non-glibc builds 4Subject: [PATCH] fix missing of __register_atfork for non-glibc builds
@@ -12,7 +12,7 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
12 1 file changed, 7 insertions(+) 12 1 file changed, 7 insertions(+)
13 13
14diff --git a/src/basic/process-util.c b/src/basic/process-util.c 14diff --git a/src/basic/process-util.c b/src/basic/process-util.c
15index 461bbfe9a5..2d06f9f60a 100644 15index c971852158..df6e85b1fc 100644
16--- a/src/basic/process-util.c 16--- a/src/basic/process-util.c
17+++ b/src/basic/process-util.c 17+++ b/src/basic/process-util.c
18@@ -18,6 +18,9 @@ 18@@ -18,6 +18,9 @@
@@ -25,7 +25,7 @@ index 461bbfe9a5..2d06f9f60a 100644
25 25
26 #include "alloc-util.h" 26 #include "alloc-util.h"
27 #include "architecture.h" 27 #include "architecture.h"
28@@ -1202,11 +1205,15 @@ void reset_cached_pid(void) { 28@@ -1161,11 +1164,15 @@ void reset_cached_pid(void) {
29 cached_pid = CACHED_PID_UNSET; 29 cached_pid = CACHED_PID_UNSET;
30 } 30 }
31 31
diff --git a/meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch b/meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch
index 029f413aa8..3a47d09e8a 100644
--- a/meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch
+++ b/meta/recipes-core/systemd/systemd/0010-Use-uintmax_t-for-handling-rlim_t.patch
@@ -1,4 +1,4 @@
1From 856010e268a6aca8e5f02502457afe289bd877f1 Mon Sep 17 00:00:00 2001 1From 48a791aae7a47a2a08e9e60c18054071a43b8cda 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
@@ -27,9 +27,11 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
27 src/core/execute.c | 4 ++-- 27 src/core/execute.c | 4 ++--
28 3 files changed, 9 insertions(+), 15 deletions(-) 28 3 files changed, 9 insertions(+), 15 deletions(-)
29 29
30diff --git a/src/basic/format-util.h b/src/basic/format-util.h
31index 8719df3e29..9becc96066 100644
30--- a/src/basic/format-util.h 32--- a/src/basic/format-util.h
31+++ b/src/basic/format-util.h 33+++ b/src/basic/format-util.h
32@@ -34,13 +34,7 @@ assert_cc(sizeof(gid_t) == sizeof(uint32 34@@ -34,13 +34,7 @@ assert_cc(sizeof(gid_t) == sizeof(uint32_t));
33 # error Unknown timex member size 35 # error Unknown timex member size
34 #endif 36 #endif
35 37
@@ -44,9 +46,11 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
44 46
45 #if SIZEOF_DEV_T == 8 47 #if SIZEOF_DEV_T == 8
46 # define DEV_FMT "%" PRIu64 48 # define DEV_FMT "%" PRIu64
49diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c
50index 33dfde9d6c..e018fd81fd 100644
47--- a/src/basic/rlimit-util.c 51--- a/src/basic/rlimit-util.c
48+++ b/src/basic/rlimit-util.c 52+++ b/src/basic/rlimit-util.c
49@@ -44,7 +44,7 @@ int setrlimit_closest(int resource, cons 53@@ -44,7 +44,7 @@ int setrlimit_closest(int resource, const struct rlimit *rlim) {
50 fixed.rlim_max == highest.rlim_max) 54 fixed.rlim_max == highest.rlim_max)
51 return 0; 55 return 0;
52 56
@@ -55,7 +59,7 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
55 59
56 return RET_NERRNO(setrlimit(resource, &fixed)); 60 return RET_NERRNO(setrlimit(resource, &fixed));
57 } 61 }
58@@ -307,13 +307,13 @@ int rlimit_format(const struct rlimit *r 62@@ -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) 63 if (rl->rlim_cur >= RLIM_INFINITY && rl->rlim_max >= RLIM_INFINITY)
60 r = free_and_strdup(&s, "infinity"); 64 r = free_and_strdup(&s, "infinity");
61 else if (rl->rlim_cur >= RLIM_INFINITY) 65 else if (rl->rlim_cur >= RLIM_INFINITY)
@@ -82,9 +86,11 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
82 86
83 return 1; 87 return 1;
84 } 88 }
89diff --git a/src/core/execute.c b/src/core/execute.c
90index fccfb9268c..90f00e10a5 100644
85--- a/src/core/execute.c 91--- a/src/core/execute.c
86+++ b/src/core/execute.c 92+++ b/src/core/execute.c
87@@ -5639,9 +5639,9 @@ void exec_context_dump(const ExecContext 93@@ -5633,9 +5633,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) {
88 for (unsigned i = 0; i < RLIM_NLIMITS; i++) 94 for (unsigned i = 0; i < RLIM_NLIMITS; i++)
89 if (c->rlimit[i]) { 95 if (c->rlimit[i]) {
90 fprintf(f, "%sLimit%s: " RLIM_FMT "\n", 96 fprintf(f, "%sLimit%s: " RLIM_FMT "\n",
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/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch
index 327084bae9..7e4587cc23 100644
--- a/meta/recipes-core/systemd/systemd/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch
+++ b/meta/recipes-core/systemd/systemd/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch
@@ -1,4 +1,4 @@
1From ad395dda5db9b1ae156be121cfc8a38960de6c55 Mon Sep 17 00:00:00 2001 1From e8025c8eefdf1be4bba34c48f3430838f3859c52 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
@@ -12,6 +12,8 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
12 src/test/test-sizeof.c | 4 ++++ 12 src/test/test-sizeof.c | 4 ++++
13 1 file changed, 4 insertions(+) 13 1 file changed, 4 insertions(+)
14 14
15diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c
16index f349852553..602772227e 100644
15--- a/src/test/test-sizeof.c 17--- a/src/test/test-sizeof.c
16+++ b/src/test/test-sizeof.c 18+++ b/src/test/test-sizeof.c
17@@ -55,8 +55,10 @@ int main(void) { 19@@ -55,8 +55,10 @@ int main(void) {
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/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
index 0026a7b72a..6eecd3197c 100644
--- a/meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
+++ b/meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
@@ -1,4 +1,4 @@
1From 5d4c6b2f4b88b69b31f967371d2a6136c65dc3fd Mon Sep 17 00:00:00 2001 1From 46fdc959257d60d9b32953cae0152ae118f8564b 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()
@@ -27,13 +27,15 @@ Upstream-Status: Inappropriate [musl specific]
27Signed-off-by: Andre McCurdy <armccurdy@gmail.com> 27Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
28 28
29--- 29---
30 src/basic/fs-util.h | 23 +++++++++++++++++++++-- 30 src/basic/fs-util.h | 21 ++++++++++++++++++++-
31 src/shared/base-filesystem.c | 6 +++--- 31 src/shared/base-filesystem.c | 6 +++---
32 2 files changed, 24 insertions(+), 5 deletions(-) 32 2 files changed, 23 insertions(+), 4 deletions(-)
33 33
34diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h
35index 0bbb3f6298..3dc494dbfb 100644
34--- a/src/basic/fs-util.h 36--- a/src/basic/fs-util.h
35+++ b/src/basic/fs-util.h 37+++ b/src/basic/fs-util.h
36@@ -46,8 +46,27 @@ int futimens_opath(int fd, const struct 38@@ -46,8 +46,27 @@ int futimens_opath(int fd, const struct timespec ts[2]);
37 int fd_warn_permissions(const char *path, int fd); 39 int fd_warn_permissions(const char *path, int fd);
38 int stat_warn_permissions(const char *path, const struct stat *st); 40 int stat_warn_permissions(const char *path, const struct stat *st);
39 41
@@ -62,9 +64,11 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
62 64
63 int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode); 65 int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode);
64 int touch(const char *path); 66 int touch(const char *path);
67diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c
68index 5f5328c8cf..d396bc99fe 100644
65--- a/src/shared/base-filesystem.c 69--- a/src/shared/base-filesystem.c
66+++ b/src/shared/base-filesystem.c 70+++ b/src/shared/base-filesystem.c
67@@ -117,7 +117,7 @@ int base_filesystem_create(const char *r 71@@ -117,7 +117,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"); 72 return log_error_errno(errno, "Failed to open root file system: %m");
69 73
70 for (size_t i = 0; i < ELEMENTSOF(table); i++) { 74 for (size_t i = 0; i < ELEMENTSOF(table); i++) {
@@ -73,7 +77,7 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
73 continue; 77 continue;
74 78
75 if (table[i].target) { 79 if (table[i].target) {
76@@ -125,7 +125,7 @@ int base_filesystem_create(const char *r 80@@ -125,7 +125,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) {
77 81
78 /* check if one of the targets exists */ 82 /* check if one of the targets exists */
79 NULSTR_FOREACH(s, table[i].target) { 83 NULSTR_FOREACH(s, table[i].target) {
@@ -82,7 +86,7 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
82 continue; 86 continue;
83 87
84 /* check if a specific file exists at the target path */ 88 /* check if a specific file exists at the target path */
85@@ -136,7 +136,7 @@ int base_filesystem_create(const char *r 89@@ -136,7 +136,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) {
86 if (!p) 90 if (!p)
87 return log_oom(); 91 return log_oom();
88 92
diff --git a/meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch b/meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch
index 612a535d3c..7b22d6214f 100644
--- a/meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch
+++ b/meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch
@@ -1,4 +1,4 @@
1From 1803ea271b93370fdcf7ec497277344f1e775429 Mon Sep 17 00:00:00 2001 1From d0bdce977b7acc5e45e82cf84256c4bedc0e74c4 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
@@ -14,6 +14,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 src/machine/machine-dbus.c | 5 +++++ 14 src/machine/machine-dbus.c | 5 +++++
15 1 file changed, 5 insertions(+) 15 1 file changed, 5 insertions(+)
16 16
17diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
18index 8f11afd65b..a2b57deb7a 100644
17--- a/src/machine/machine-dbus.c 19--- a/src/machine/machine-dbus.c
18+++ b/src/machine/machine-dbus.c 20+++ b/src/machine/machine-dbus.c
19@@ -10,6 +10,11 @@ 21@@ -10,6 +10,11 @@
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/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
index baf4903803..015347cb6a 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/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
@@ -1,4 +1,4 @@
1From 30b08f76ea7f5c324afedf97f0867b76dac9f128 Mon Sep 17 00:00:00 2001 1From e480d28305907c3874f4e58b722b8aa43c3ac7a2 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
@@ -24,6 +24,8 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
24 src/basic/process-util.c | 2 +- 24 src/basic/process-util.c | 2 +-
25 1 file changed, 1 insertion(+), 1 deletion(-) 25 1 file changed, 1 insertion(+), 1 deletion(-)
26 26
27diff --git a/src/basic/process-util.c b/src/basic/process-util.c
28index df6e85b1fc..635dbb5d26 100644
27--- a/src/basic/process-util.c 29--- a/src/basic/process-util.c
28+++ b/src/basic/process-util.c 30+++ b/src/basic/process-util.c
29@@ -1489,7 +1489,7 @@ int set_oom_score_adjust(int value) { 31@@ -1489,7 +1489,7 @@ int set_oom_score_adjust(int value) {
diff --git a/meta/recipes-core/systemd/systemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch b/meta/recipes-core/systemd/systemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
index 878914b307..c563982607 100644
--- a/meta/recipes-core/systemd/systemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
+++ b/meta/recipes-core/systemd/systemd/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
@@ -1,4 +1,4 @@
1From 873202f63f9f117c6e5a98e444cc709057042979 Mon Sep 17 00:00:00 2001 1From 0542d27ebbb250c09bdcfcf9f2ea3d27426fe522 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
@@ -24,9 +24,11 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
24 src/libsystemd/sd-journal/journal-send.c | 5 +++++ 24 src/libsystemd/sd-journal/journal-send.c | 5 +++++
25 2 files changed, 10 insertions(+) 25 2 files changed, 10 insertions(+)
26 26
27diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c
28index bdfa145ab7..61928f4bf3 100644
27--- a/src/libsystemd/sd-bus/bus-error.c 29--- a/src/libsystemd/sd-bus/bus-error.c
28+++ b/src/libsystemd/sd-bus/bus-error.c 30+++ b/src/libsystemd/sd-bus/bus-error.c
29@@ -409,7 +409,12 @@ static void bus_error_strerror(sd_bus_er 31@@ -409,7 +409,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) {
30 return; 32 return;
31 33
32 errno = 0; 34 errno = 0;
@@ -39,9 +41,11 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
39 if (errno == ERANGE || strlen(x) >= k - 1) { 41 if (errno == ERANGE || strlen(x) >= k - 1) {
40 free(m); 42 free(m);
41 k *= 2; 43 k *= 2;
44diff --git a/src/libsystemd/sd-journal/journal-send.c b/src/libsystemd/sd-journal/journal-send.c
45index e6ceba54f9..285ebbc9ef 100644
42--- a/src/libsystemd/sd-journal/journal-send.c 46--- a/src/libsystemd/sd-journal/journal-send.c
43+++ b/src/libsystemd/sd-journal/journal-send.c 47+++ b/src/libsystemd/sd-journal/journal-send.c
44@@ -348,7 +348,12 @@ static int fill_iovec_perror_and_send(co 48@@ -370,7 +370,12 @@ static int fill_iovec_perror_and_send(const char *message, int skip, struct iove
45 char* j; 49 char* j;
46 50
47 errno = 0; 51 errno = 0;
diff --git a/meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch b/meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch
index e6507c5f89..f4066d7e4f 100644
--- a/meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch
+++ b/meta/recipes-core/systemd/systemd/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch
@@ -1,4 +1,4 @@
1From e7441559266074e7a33e3c11ff5cdaf5ba9c0e24 Mon Sep 17 00:00:00 2001 1From d8bf23d7a698bd3253b0cfba24bd8afd0886d82d 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:18:00 +0800 3Date: Mon, 25 Feb 2019 15:18:00 +0800
4Subject: [PATCH] Hide __start_BUS_ERROR_MAP and __stop_BUS_ERROR_MAP 4Subject: [PATCH] Hide __start_BUS_ERROR_MAP and __stop_BUS_ERROR_MAP
@@ -17,7 +17,7 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
17 1 file changed, 2 insertions(+), 2 deletions(-) 17 1 file changed, 2 insertions(+), 2 deletions(-)
18 18
19diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c 19diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c
20index c49be29e46..90731bd7e7 100644 20index 61928f4bf3..79b698b092 100644
21--- a/src/libsystemd/sd-bus/bus-error.c 21--- a/src/libsystemd/sd-bus/bus-error.c
22+++ b/src/libsystemd/sd-bus/bus-error.c 22+++ b/src/libsystemd/sd-bus/bus-error.c
23@@ -55,8 +55,8 @@ BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_standard_errors[] = { 23@@ -55,8 +55,8 @@ BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_standard_errors[] = {
diff --git a/meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch b/meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch
index eeff693bc4..5ee212a4e7 100644
--- a/meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch
+++ b/meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch
@@ -1,4 +1,4 @@
1From 64f4d2eb976b9f23ce85b3655a876f7299eafd58 Mon Sep 17 00:00:00 2001 1From 68bb59615e91c4d3e5eb2076979c2b760f4bf027 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:27:54 +0800 3Date: Mon, 25 Feb 2019 15:27:54 +0800
4Subject: [PATCH] missing_type.h: add __compar_d_fn_t definition 4Subject: [PATCH] missing_type.h: add __compar_d_fn_t definition
diff --git a/meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch b/meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch
index 5ca5386289..1fcba7af08 100644
--- a/meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch
+++ b/meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch
@@ -1,4 +1,4 @@
1From d95330f328c23c1cd6c51aeca43f081746cf2899 Mon Sep 17 00:00:00 2001 1From e1d0210b47906dd121f936f3181092835df6a95c 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
diff --git a/meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch b/meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch
index d51ac4265a..662f8110db 100644
--- a/meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch
+++ b/meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch
@@ -1,4 +1,4 @@
1From 2284f2f44b1b30f10b9196e0f5c6d0a2e0c1871f Mon Sep 17 00:00:00 2001 1From f1574cf91340800cf8253e922b2c613d6b9b5e4a Mon Sep 17 00:00:00 2001
2From: Alex Kiernan <alex.kiernan@gmail.com> 2From: Alex Kiernan <alex.kiernan@gmail.com>
3Date: Fri, 7 Aug 2020 15:19:27 +0000 3Date: Fri, 7 Aug 2020 15:19:27 +0000
4Subject: [PATCH] Handle missing LOCK_EX 4Subject: [PATCH] Handle missing LOCK_EX
@@ -11,7 +11,7 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
11 1 file changed, 1 insertion(+) 11 1 file changed, 1 insertion(+)
12 12
13diff --git a/src/partition/makefs.c b/src/partition/makefs.c 13diff --git a/src/partition/makefs.c b/src/partition/makefs.c
14index 7c94fbfedb..42f966722d 100644 14index b6979b7e4f..63d70d861e 100644
15--- a/src/partition/makefs.c 15--- a/src/partition/makefs.c
16+++ b/src/partition/makefs.c 16+++ b/src/partition/makefs.c
17@@ -6,6 +6,7 @@ 17@@ -6,6 +6,7 @@
diff --git a/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch b/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch
index 1ba5c1292b..70ac8b607c 100644
--- a/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch
+++ b/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch
@@ -1,4 +1,4 @@
1From a6a25e1ecae91f48a4f87bf0cc17eaaf0a919ffe Mon Sep 17 00:00:00 2001 1From d2f3293ceb22731e0e97945f0d1132e356b66d07 Mon Sep 17 00:00:00 2001
2From: Alex Kiernan <alex.kiernan@gmail.com> 2From: Alex Kiernan <alex.kiernan@gmail.com>
3Date: Fri, 7 Aug 2020 15:20:17 +0000 3Date: Fri, 7 Aug 2020 15:20:17 +0000
4Subject: [PATCH] Fix incompatible pointer type struct sockaddr_un * 4Subject: [PATCH] Fix incompatible pointer type struct sockaddr_un *
@@ -23,9 +23,11 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
23 src/nspawn/nspawn.c | 2 +- 23 src/nspawn/nspawn.c | 2 +-
24 1 file changed, 1 insertion(+), 1 deletion(-) 24 1 file changed, 1 insertion(+), 1 deletion(-)
25 25
26diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
27index a2af4948c0..fb6af295b5 100644
26--- a/src/nspawn/nspawn.c 28--- a/src/nspawn/nspawn.c
27+++ b/src/nspawn/nspawn.c 29+++ b/src/nspawn/nspawn.c
28@@ -5389,7 +5389,7 @@ static int cant_be_in_netns(void) { 30@@ -5399,7 +5399,7 @@ static int cant_be_in_netns(void) {
29 if (fd < 0) 31 if (fd < 0)
30 return log_error_errno(errno, "Failed to allocate udev control socket: %m"); 32 return log_error_errno(errno, "Failed to allocate udev control socket: %m");
31 33
diff --git a/meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch b/meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch
index dfab8fbbdf..cc20c3710a 100644
--- a/meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch
+++ b/meta/recipes-core/systemd/systemd/0021-test-json.c-define-M_PIl.patch
@@ -1,4 +1,4 @@
1From 47472da6e8900773c26da8fd26699367447d97a6 Mon Sep 17 00:00:00 2001 1From e10a73de254b570bbc29b26423dbb86b4265bb05 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 16:53:06 +0800 3Date: Mon, 25 Feb 2019 16:53:06 +0800
4Subject: [PATCH] test-json.c: define M_PIl 4Subject: [PATCH] test-json.c: define M_PIl
@@ -14,6 +14,8 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
14 src/test/test-json.c | 4 ++++ 14 src/test/test-json.c | 4 ++++
15 1 file changed, 4 insertions(+) 15 1 file changed, 4 insertions(+)
16 16
17diff --git a/src/test/test-json.c b/src/test/test-json.c
18index b385edc269..5e5830238c 100644
17--- a/src/test/test-json.c 19--- a/src/test/test-json.c
18+++ b/src/test/test-json.c 20+++ b/src/test/test-json.c
19@@ -14,6 +14,10 @@ 21@@ -14,6 +14,10 @@
diff --git a/meta/recipes-core/systemd/systemd/0022-do-not-disable-buffer-in-writing-files.patch b/meta/recipes-core/systemd/systemd/0022-do-not-disable-buffer-in-writing-files.patch
index d389e1d9f9..4dd6ff6e2e 100644
--- a/meta/recipes-core/systemd/systemd/0022-do-not-disable-buffer-in-writing-files.patch
+++ b/meta/recipes-core/systemd/systemd/0022-do-not-disable-buffer-in-writing-files.patch
@@ -1,4 +1,4 @@
1From 0f9422780a569c79a4b28e44c79c70b4a354bd92 Mon Sep 17 00:00:00 2001 1From 414e2f97008a1f3c26a260a6dc4d51a8c1fa6900 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
@@ -20,27 +20,34 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
20Signed-off-by: Scott Murray <scott.murray@konsulko.com> 20Signed-off-by: Scott Murray <scott.murray@konsulko.com>
21 21
22--- 22---
23 src/basic/cgroup-util.c | 10 +++++----- 23 src/basic/cgroup-util.c | 12 ++++++------
24 src/basic/namespace-util.c | 4 ++--
24 src/basic/procfs-util.c | 4 ++-- 25 src/basic/procfs-util.c | 4 ++--
25 src/basic/sysctl-util.c | 2 +- 26 src/basic/sysctl-util.c | 2 +-
26 src/basic/util.c | 2 +- 27 src/basic/util.c | 2 +-
27 src/binfmt/binfmt.c | 6 +++--- 28 src/binfmt/binfmt.c | 6 +++---
29 src/core/cgroup.c | 2 +-
28 src/core/main.c | 4 ++-- 30 src/core/main.c | 4 ++--
29 src/core/smack-setup.c | 8 ++++---- 31 src/core/smack-setup.c | 8 ++++----
30 src/hibernate-resume/hibernate-resume.c | 2 +- 32 src/hibernate-resume/hibernate-resume.c | 2 +-
33 src/home/homework.c | 2 +-
31 src/libsystemd/sd-device/sd-device.c | 2 +- 34 src/libsystemd/sd-device/sd-device.c | 2 +-
32 src/nspawn/nspawn-cgroup.c | 2 +- 35 src/nspawn/nspawn-cgroup.c | 2 +-
33 src/nspawn/nspawn.c | 6 +++--- 36 src/nspawn/nspawn.c | 6 +++---
37 src/shared/binfmt-util.c | 2 +-
34 src/shared/cgroup-setup.c | 4 ++-- 38 src/shared/cgroup-setup.c | 4 ++--
35 src/shared/mount-util.c | 4 ++-- 39 src/shared/coredump-util.c | 2 +-
36 src/shared/smack-util.c | 2 +- 40 src/shared/smack-util.c | 2 +-
37 src/sleep/sleep.c | 8 ++++---- 41 src/sleep/sleep.c | 8 ++++----
42 src/udev/udev-rules.c | 1 -
38 src/vconsole/vconsole-setup.c | 2 +- 43 src/vconsole/vconsole-setup.c | 2 +-
39 16 files changed, 34 insertions(+), 34 deletions(-) 44 21 files changed, 39 insertions(+), 40 deletions(-)
40 45
46diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
47index f7dc6c8421..5f7a27c2c4 100644
41--- a/src/basic/cgroup-util.c 48--- a/src/basic/cgroup-util.c
42+++ b/src/basic/cgroup-util.c 49+++ b/src/basic/cgroup-util.c
43@@ -390,7 +390,7 @@ int cg_kill_kernel_sigkill(const char *c 50@@ -390,7 +390,7 @@ int cg_kill_kernel_sigkill(const char *controller, const char *path) {
44 if (r < 0) 51 if (r < 0)
45 return r; 52 return r;
46 53
@@ -49,7 +56,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
49 if (r < 0) 56 if (r < 0)
50 return r; 57 return r;
51 58
52@@ -803,7 +803,7 @@ int cg_install_release_agent(const char 59@@ -803,7 +803,7 @@ int cg_install_release_agent(const char *controller, const char *agent) {
53 60
54 sc = strstrip(contents); 61 sc = strstrip(contents);
55 if (isempty(sc)) { 62 if (isempty(sc)) {
@@ -58,7 +65,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
58 if (r < 0) 65 if (r < 0)
59 return r; 66 return r;
60 } else if (!path_equal(sc, agent)) 67 } else if (!path_equal(sc, agent))
61@@ -821,7 +821,7 @@ int cg_install_release_agent(const char 68@@ -821,7 +821,7 @@ int cg_install_release_agent(const char *controller, const char *agent) {
62 69
63 sc = strstrip(contents); 70 sc = strstrip(contents);
64 if (streq(sc, "0")) { 71 if (streq(sc, "0")) {
@@ -67,7 +74,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
67 if (r < 0) 74 if (r < 0)
68 return r; 75 return r;
69 76
70@@ -848,7 +848,7 @@ int cg_uninstall_release_agent(const cha 77@@ -848,7 +848,7 @@ int cg_uninstall_release_agent(const char *controller) {
71 if (r < 0) 78 if (r < 0)
72 return r; 79 return r;
73 80
@@ -76,7 +83,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
76 if (r < 0) 83 if (r < 0)
77 return r; 84 return r;
78 85
79@@ -858,7 +858,7 @@ int cg_uninstall_release_agent(const cha 86@@ -858,7 +858,7 @@ int cg_uninstall_release_agent(const char *controller) {
80 if (r < 0) 87 if (r < 0)
81 return r; 88 return r;
82 89
@@ -85,7 +92,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
85 if (r < 0) 92 if (r < 0)
86 return r; 93 return r;
87 94
88@@ -1704,7 +1704,7 @@ int cg_set_attribute(const char *control 95@@ -1704,7 +1704,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri
89 if (r < 0) 96 if (r < 0)
90 return r; 97 return r;
91 98
@@ -94,9 +101,30 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
94 } 101 }
95 102
96 int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) { 103 int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) {
104diff --git a/src/basic/namespace-util.c b/src/basic/namespace-util.c
105index b9120a5ed0..78e460b75f 100644
106--- a/src/basic/namespace-util.c
107+++ b/src/basic/namespace-util.c
108@@ -202,12 +202,12 @@ int userns_acquire(const char *uid_map, const char *gid_map) {
109 freeze();
110
111 xsprintf(path, "/proc/" PID_FMT "/uid_map", pid);
112- r = write_string_file(path, uid_map, WRITE_STRING_FILE_DISABLE_BUFFER);
113+ r = write_string_file(path, uid_map, 0);
114 if (r < 0)
115 return log_error_errno(r, "Failed to write UID map: %m");
116
117 xsprintf(path, "/proc/" PID_FMT "/gid_map", pid);
118- r = write_string_file(path, gid_map, WRITE_STRING_FILE_DISABLE_BUFFER);
119+ r = write_string_file(path, gid_map, 0);
120 if (r < 0)
121 return log_error_errno(r, "Failed to write GID map: %m");
122
123diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c
124index e485a0196b..8bff210356 100644
97--- a/src/basic/procfs-util.c 125--- a/src/basic/procfs-util.c
98+++ b/src/basic/procfs-util.c 126+++ b/src/basic/procfs-util.c
99@@ -64,13 +64,13 @@ int procfs_tasks_set_limit(uint64_t limi 127@@ -64,13 +64,13 @@ int procfs_tasks_set_limit(uint64_t limit) {
100 * decrease it, as threads-max is the much more relevant sysctl. */ 128 * decrease it, as threads-max is the much more relevant sysctl. */
101 if (limit > pid_max-1) { 129 if (limit > pid_max-1) {
102 sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ 130 sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */
@@ -112,9 +140,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
112 if (r < 0) { 140 if (r < 0) {
113 uint64_t threads_max; 141 uint64_t threads_max;
114 142
143diff --git a/src/basic/sysctl-util.c b/src/basic/sysctl-util.c
144index b66a6622ae..8d1c93008a 100644
115--- a/src/basic/sysctl-util.c 145--- a/src/basic/sysctl-util.c
116+++ b/src/basic/sysctl-util.c 146+++ b/src/basic/sysctl-util.c
117@@ -58,7 +58,7 @@ int sysctl_write(const char *property, c 147@@ -58,7 +58,7 @@ int sysctl_write(const char *property, const char *value) {
118 148
119 log_debug("Setting '%s' to '%s'", p, value); 149 log_debug("Setting '%s' to '%s'", p, value);
120 150
@@ -123,6 +153,8 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
123 } 153 }
124 154
125 int sysctl_writef(const char *property, const char *format, ...) { 155 int sysctl_writef(const char *property, const char *format, ...) {
156diff --git a/src/basic/util.c b/src/basic/util.c
157index d7ef382737..31c35118d1 100644
126--- a/src/basic/util.c 158--- a/src/basic/util.c
127+++ b/src/basic/util.c 159+++ b/src/basic/util.c
128@@ -168,7 +168,7 @@ void disable_coredumps(void) { 160@@ -168,7 +168,7 @@ void disable_coredumps(void) {
@@ -134,6 +166,8 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
134 if (r < 0) 166 if (r < 0)
135 log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); 167 log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m");
136 } 168 }
169diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
170index 18231c2618..6c598d55c8 100644
137--- a/src/binfmt/binfmt.c 171--- a/src/binfmt/binfmt.c
138+++ b/src/binfmt/binfmt.c 172+++ b/src/binfmt/binfmt.c
139@@ -29,7 +29,7 @@ static bool arg_unregister = false; 173@@ -29,7 +29,7 @@ static bool arg_unregister = false;
@@ -145,7 +179,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
145 } 179 }
146 180
147 static int apply_rule(const char *filename, unsigned line, const char *rule) { 181 static int apply_rule(const char *filename, unsigned line, const char *rule) {
148@@ -59,7 +59,7 @@ static int apply_rule(const char *filena 182@@ -59,7 +59,7 @@ static int apply_rule(const char *filename, unsigned line, const char *rule) {
149 if (r >= 0) 183 if (r >= 0)
150 log_debug("%s:%u: Rule '%s' deleted.", filename, line, rulename); 184 log_debug("%s:%u: Rule '%s' deleted.", filename, line, rulename);
151 185
@@ -163,9 +197,24 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
163 if (r < 0) 197 if (r < 0)
164 log_warning_errno(r, "Failed to flush binfmt_misc rules, ignoring: %m"); 198 log_warning_errno(r, "Failed to flush binfmt_misc rules, ignoring: %m");
165 else 199 else
200diff --git a/src/core/cgroup.c b/src/core/cgroup.c
201index f58de95a49..7a97ab6f99 100644
202--- a/src/core/cgroup.c
203+++ b/src/core/cgroup.c
204@@ -4140,7 +4140,7 @@ int unit_cgroup_freezer_action(Unit *u, FreezerAction action) {
205 else
206 u->freezer_state = FREEZER_THAWING;
207
208- r = write_string_file(path, one_zero(action == FREEZER_FREEZE), WRITE_STRING_FILE_DISABLE_BUFFER);
209+ r = write_string_file(path, one_zero(action == FREEZER_FREEZE), 0);
210 if (r < 0)
211 return r;
212
213diff --git a/src/core/main.c b/src/core/main.c
214index 57aedb9b93..7ef36d22f5 100644
166--- a/src/core/main.c 215--- a/src/core/main.c
167+++ b/src/core/main.c 216+++ b/src/core/main.c
168@@ -1466,7 +1466,7 @@ static int bump_unix_max_dgram_qlen(void 217@@ -1466,7 +1466,7 @@ static int bump_unix_max_dgram_qlen(void) {
169 if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN) 218 if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN)
170 return 0; 219 return 0;
171 220
@@ -174,7 +223,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
174 "%lu", DEFAULT_UNIX_MAX_DGRAM_QLEN); 223 "%lu", DEFAULT_UNIX_MAX_DGRAM_QLEN);
175 if (r < 0) 224 if (r < 0)
176 return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r, 225 return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r,
177@@ -1737,7 +1737,7 @@ static void initialize_core_pattern(bool 226@@ -1737,7 +1737,7 @@ static void initialize_core_pattern(bool skip_setup) {
178 if (getpid_cached() != 1) 227 if (getpid_cached() != 1)
179 return; 228 return;
180 229
@@ -183,9 +232,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
183 if (r < 0) 232 if (r < 0)
184 log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", 233 log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m",
185 arg_early_core_pattern); 234 arg_early_core_pattern);
235diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c
236index f88cb80834..68055fb64a 100644
186--- a/src/core/smack-setup.c 237--- a/src/core/smack-setup.c
187+++ b/src/core/smack-setup.c 238+++ b/src/core/smack-setup.c
188@@ -320,17 +320,17 @@ int mac_smack_setup(bool *loaded_policy) 239@@ -320,17 +320,17 @@ int mac_smack_setup(bool *loaded_policy) {
189 } 240 }
190 241
191 #if HAVE_SMACK_RUN_LABEL 242 #if HAVE_SMACK_RUN_LABEL
@@ -207,6 +258,8 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
207 if (r < 0) 258 if (r < 0)
208 log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); 259 log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m");
209 #endif 260 #endif
261diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c
262index 58e35e403e..1d0beb4008 100644
210--- a/src/hibernate-resume/hibernate-resume.c 263--- a/src/hibernate-resume/hibernate-resume.c
211+++ b/src/hibernate-resume/hibernate-resume.c 264+++ b/src/hibernate-resume/hibernate-resume.c
212@@ -45,7 +45,7 @@ int main(int argc, char *argv[]) { 265@@ -45,7 +45,7 @@ int main(int argc, char *argv[]) {
@@ -218,9 +271,24 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
218 if (r < 0) { 271 if (r < 0) {
219 log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor); 272 log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor);
220 return EXIT_FAILURE; 273 return EXIT_FAILURE;
274diff --git a/src/home/homework.c b/src/home/homework.c
275index 9fdc74b775..9858a2b415 100644
276--- a/src/home/homework.c
277+++ b/src/home/homework.c
278@@ -284,7 +284,7 @@ static void drop_caches_now(void) {
279 * details. We write "2" into /proc/sys/vm/drop_caches to ensure dentries/inodes are flushed, but not
280 * more. */
281
282- r = write_string_file("/proc/sys/vm/drop_caches", "2\n", WRITE_STRING_FILE_DISABLE_BUFFER);
283+ r = write_string_file("/proc/sys/vm/drop_caches", "2\n", 0);
284 if (r < 0)
285 log_warning_errno(r, "Failed to drop caches, ignoring: %m");
286 else
287diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c
288index b163a0fb6b..fd6c5301d6 100644
221--- a/src/libsystemd/sd-device/sd-device.c 289--- a/src/libsystemd/sd-device/sd-device.c
222+++ b/src/libsystemd/sd-device/sd-device.c 290+++ b/src/libsystemd/sd-device/sd-device.c
223@@ -2108,7 +2108,7 @@ _public_ int sd_device_set_sysattr_value 291@@ -2108,7 +2108,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr,
224 if (!value) 292 if (!value)
225 return -ENOMEM; 293 return -ENOMEM;
226 294
@@ -229,9 +297,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
229 if (r < 0) { 297 if (r < 0) {
230 /* On failure, clear cache entry, as we do not know how it fails. */ 298 /* On failure, clear cache entry, as we do not know how it fails. */
231 device_remove_cached_sysattr_value(device, sysattr); 299 device_remove_cached_sysattr_value(device, sysattr);
300diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c
301index d472e80c03..c7780c7fc6 100644
232--- a/src/nspawn/nspawn-cgroup.c 302--- a/src/nspawn/nspawn-cgroup.c
233+++ b/src/nspawn/nspawn-cgroup.c 303+++ b/src/nspawn/nspawn-cgroup.c
234@@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified 304@@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) {
235 fn = strjoina(tree, cgroup, "/cgroup.procs"); 305 fn = strjoina(tree, cgroup, "/cgroup.procs");
236 306
237 sprintf(pid_string, PID_FMT, pid); 307 sprintf(pid_string, PID_FMT, pid);
@@ -240,9 +310,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
240 if (r < 0) { 310 if (r < 0) {
241 log_error_errno(r, "Failed to move process: %m"); 311 log_error_errno(r, "Failed to move process: %m");
242 goto finish; 312 goto finish;
313diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
314index fb6af295b5..0d83f1e4d2 100644
243--- a/src/nspawn/nspawn.c 315--- a/src/nspawn/nspawn.c
244+++ b/src/nspawn/nspawn.c 316+++ b/src/nspawn/nspawn.c
245@@ -2757,7 +2757,7 @@ static int reset_audit_loginuid(void) { 317@@ -2759,7 +2759,7 @@ static int reset_audit_loginuid(void) {
246 if (streq(p, "4294967295")) 318 if (streq(p, "4294967295"))
247 return 0; 319 return 0;
248 320
@@ -251,7 +323,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
251 if (r < 0) { 323 if (r < 0) {
252 log_error_errno(r, 324 log_error_errno(r,
253 "Failed to reset audit login UID. This probably means that your kernel is too\n" 325 "Failed to reset audit login UID. This probably means that your kernel is too\n"
254@@ -4163,7 +4163,7 @@ static int setup_uid_map( 326@@ -4175,7 +4175,7 @@ static int setup_uid_map(
255 return log_oom(); 327 return log_oom();
256 328
257 xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); 329 xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid);
@@ -260,7 +332,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
260 if (r < 0) 332 if (r < 0)
261 return log_error_errno(r, "Failed to write UID map: %m"); 333 return log_error_errno(r, "Failed to write UID map: %m");
262 334
263@@ -4173,7 +4173,7 @@ static int setup_uid_map( 335@@ -4185,7 +4185,7 @@ static int setup_uid_map(
264 return log_oom(); 336 return log_oom();
265 337
266 xsprintf(uid_map, "/proc/" PID_FMT "/gid_map", pid); 338 xsprintf(uid_map, "/proc/" PID_FMT "/gid_map", pid);
@@ -269,9 +341,24 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
269 if (r < 0) 341 if (r < 0)
270 return log_error_errno(r, "Failed to write GID map: %m"); 342 return log_error_errno(r, "Failed to write GID map: %m");
271 343
344diff --git a/src/shared/binfmt-util.c b/src/shared/binfmt-util.c
345index 724d7f27d9..dd725cff92 100644
346--- a/src/shared/binfmt-util.c
347+++ b/src/shared/binfmt-util.c
348@@ -26,7 +26,7 @@ int disable_binfmt(void) {
349 if (r < 0)
350 return log_warning_errno(r, "Failed to determine whether binfmt_misc is mounted: %m");
351
352- r = write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", WRITE_STRING_FILE_DISABLE_BUFFER);
353+ r = write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", 0);
354 if (r < 0)
355 return log_warning_errno(r, "Failed to unregister binfmt_misc entries: %m");
356
357diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c
358index 8bda66ca36..4e1e9943ee 100644
272--- a/src/shared/cgroup-setup.c 359--- a/src/shared/cgroup-setup.c
273+++ b/src/shared/cgroup-setup.c 360+++ b/src/shared/cgroup-setup.c
274@@ -345,7 +345,7 @@ int cg_attach(const char *controller, co 361@@ -345,7 +345,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) {
275 362
276 xsprintf(c, PID_FMT "\n", pid); 363 xsprintf(c, PID_FMT "\n", pid);
277 364
@@ -289,9 +376,22 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
289 if (r < 0) { 376 if (r < 0) {
290 log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", 377 log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m",
291 FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); 378 FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs);
379diff --git a/src/shared/coredump-util.c b/src/shared/coredump-util.c
380index a0b648bf79..13f921390d 100644
381--- a/src/shared/coredump-util.c
382+++ b/src/shared/coredump-util.c
383@@ -70,5 +70,5 @@ int set_coredump_filter(uint64_t value) {
384 sprintf(t, "0x%"PRIx64, value);
385
386 return write_string_file("/proc/self/coredump_filter", t,
387- WRITE_STRING_FILE_VERIFY_ON_FAILURE|WRITE_STRING_FILE_DISABLE_BUFFER);
388+ WRITE_STRING_FILE_VERIFY_ON_FAILURE);
389 }
390diff --git a/src/shared/smack-util.c b/src/shared/smack-util.c
391index 0df1778cb2..3b9a0c934e 100644
292--- a/src/shared/smack-util.c 392--- a/src/shared/smack-util.c
293+++ b/src/shared/smack-util.c 393+++ b/src/shared/smack-util.c
294@@ -114,7 +114,7 @@ int mac_smack_apply_pid(pid_t pid, const 394@@ -114,7 +114,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) {
295 return 0; 395 return 0;
296 396
297 p = procfs_file_alloca(pid, "attr/current"); 397 p = procfs_file_alloca(pid, "attr/current");
@@ -300,9 +400,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
300 if (r < 0) 400 if (r < 0)
301 return r; 401 return r;
302 402
403diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
404index 7064f3a905..8f2a7d9da2 100644
303--- a/src/sleep/sleep.c 405--- a/src/sleep/sleep.c
304+++ b/src/sleep/sleep.c 406+++ b/src/sleep/sleep.c
305@@ -46,7 +46,7 @@ static int write_hibernate_location_info 407@@ -46,7 +46,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca
306 assert(hibernate_location->swap); 408 assert(hibernate_location->swap);
307 409
308 xsprintf(resume_str, "%u:%u", major(hibernate_location->devno), minor(hibernate_location->devno)); 410 xsprintf(resume_str, "%u:%u", major(hibernate_location->devno), minor(hibernate_location->devno));
@@ -311,7 +413,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
311 if (r < 0) 413 if (r < 0)
312 return log_debug_errno(r, "Failed to write partition device to /sys/power/resume for '%s': '%s': %m", 414 return log_debug_errno(r, "Failed to write partition device to /sys/power/resume for '%s': '%s': %m",
313 hibernate_location->swap->device, resume_str); 415 hibernate_location->swap->device, resume_str);
314@@ -73,7 +73,7 @@ static int write_hibernate_location_info 416@@ -73,7 +73,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca
315 } 417 }
316 418
317 xsprintf(offset_str, "%" PRIu64, hibernate_location->offset); 419 xsprintf(offset_str, "%" PRIu64, hibernate_location->offset);
@@ -329,7 +431,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
329 if (k >= 0) 431 if (k >= 0)
330 return 0; 432 return 0;
331 433
332@@ -112,7 +112,7 @@ static int write_state(FILE **f, char ** 434@@ -112,7 +112,7 @@ static int write_state(FILE **f, char **states) {
333 STRV_FOREACH(state, states) { 435 STRV_FOREACH(state, states) {
334 int k; 436 int k;
335 437
@@ -338,9 +440,23 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
338 if (k >= 0) 440 if (k >= 0)
339 return 0; 441 return 0;
340 log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state); 442 log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state);
443diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
444index 0089833e3f..0a6a3abbb4 100644
445--- a/src/udev/udev-rules.c
446+++ b/src/udev/udev-rules.c
447@@ -2181,7 +2181,6 @@ static int udev_rule_apply_token_to_event(
448 log_rule_debug(dev, rules, "ATTR '%s' writing '%s'", buf, value);
449 r = write_string_file(buf, value,
450 WRITE_STRING_FILE_VERIFY_ON_FAILURE |
451- WRITE_STRING_FILE_DISABLE_BUFFER |
452 WRITE_STRING_FILE_AVOID_NEWLINE |
453 WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE);
454 if (r < 0)
455diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
456index 50930d4af3..5efd5d3728 100644
341--- a/src/vconsole/vconsole-setup.c 457--- a/src/vconsole/vconsole-setup.c
342+++ b/src/vconsole/vconsole-setup.c 458+++ b/src/vconsole/vconsole-setup.c
343@@ -108,7 +108,7 @@ static int toggle_utf8_vc(const char *na 459@@ -108,7 +108,7 @@ static int toggle_utf8_vc(const char *name, int fd, bool utf8) {
344 static int toggle_utf8_sysfs(bool utf8) { 460 static int toggle_utf8_sysfs(bool utf8) {
345 int r; 461 int r;
346 462
@@ -349,72 +465,3 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
349 if (r < 0) 465 if (r < 0)
350 return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8)); 466 return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8));
351 467
352--- a/src/basic/namespace-util.c
353+++ b/src/basic/namespace-util.c
354@@ -202,12 +202,12 @@ int userns_acquire(const char *uid_map,
355 freeze();
356
357 xsprintf(path, "/proc/" PID_FMT "/uid_map", pid);
358- r = write_string_file(path, uid_map, WRITE_STRING_FILE_DISABLE_BUFFER);
359+ r = write_string_file(path, uid_map, 0);
360 if (r < 0)
361 return log_error_errno(r, "Failed to write UID map: %m");
362
363 xsprintf(path, "/proc/" PID_FMT "/gid_map", pid);
364- r = write_string_file(path, gid_map, WRITE_STRING_FILE_DISABLE_BUFFER);
365+ r = write_string_file(path, gid_map, 0);
366 if (r < 0)
367 return log_error_errno(r, "Failed to write GID map: %m");
368
369--- a/src/core/cgroup.c
370+++ b/src/core/cgroup.c
371@@ -4140,7 +4140,7 @@ int unit_cgroup_freezer_action(Unit *u,
372 else
373 u->freezer_state = FREEZER_THAWING;
374
375- r = write_string_file(path, one_zero(action == FREEZER_FREEZE), WRITE_STRING_FILE_DISABLE_BUFFER);
376+ r = write_string_file(path, one_zero(action == FREEZER_FREEZE), 0);
377 if (r < 0)
378 return r;
379
380--- a/src/home/homework.c
381+++ b/src/home/homework.c
382@@ -284,7 +284,7 @@ static void drop_caches_now(void) {
383 * details. We write "2" into /proc/sys/vm/drop_caches to ensure dentries/inodes are flushed, but not
384 * more. */
385
386- r = write_string_file("/proc/sys/vm/drop_caches", "2\n", WRITE_STRING_FILE_DISABLE_BUFFER);
387+ r = write_string_file("/proc/sys/vm/drop_caches", "2\n", 0);
388 if (r < 0)
389 log_warning_errno(r, "Failed to drop caches, ignoring: %m");
390 else
391--- a/src/shared/binfmt-util.c
392+++ b/src/shared/binfmt-util.c
393@@ -26,7 +26,7 @@ int disable_binfmt(void) {
394 if (r < 0)
395 return log_warning_errno(r, "Failed to determine whether binfmt_misc is mounted: %m");
396
397- r = write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", WRITE_STRING_FILE_DISABLE_BUFFER);
398+ r = write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", 0);
399 if (r < 0)
400 return log_warning_errno(r, "Failed to unregister binfmt_misc entries: %m");
401
402--- a/src/shared/coredump-util.c
403+++ b/src/shared/coredump-util.c
404@@ -70,5 +70,5 @@ int set_coredump_filter(uint64_t value)
405 sprintf(t, "0x%"PRIx64, value);
406
407 return write_string_file("/proc/self/coredump_filter", t,
408- WRITE_STRING_FILE_VERIFY_ON_FAILURE|WRITE_STRING_FILE_DISABLE_BUFFER);
409+ WRITE_STRING_FILE_VERIFY_ON_FAILURE);
410 }
411--- a/src/udev/udev-rules.c
412+++ b/src/udev/udev-rules.c
413@@ -2181,7 +2181,6 @@ static int udev_rule_apply_token_to_even
414 log_rule_debug(dev, rules, "ATTR '%s' writing '%s'", buf, value);
415 r = write_string_file(buf, value,
416 WRITE_STRING_FILE_VERIFY_ON_FAILURE |
417- WRITE_STRING_FILE_DISABLE_BUFFER |
418 WRITE_STRING_FILE_AVOID_NEWLINE |
419 WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE);
420 if (r < 0)
diff --git a/meta/recipes-core/systemd/systemd/0025-Handle-__cpu_mask-usage.patch b/meta/recipes-core/systemd/systemd/0025-Handle-__cpu_mask-usage.patch
index e001ed59e8..6981d70af0 100644
--- a/meta/recipes-core/systemd/systemd/0025-Handle-__cpu_mask-usage.patch
+++ b/meta/recipes-core/systemd/systemd/0025-Handle-__cpu_mask-usage.patch
@@ -1,4 +1,4 @@
1From e4f9ef547fa342102db15188544daa18e71e9c66 Mon Sep 17 00:00:00 2001 1From 8871f78c559f37169c0cfaf20b0af1dbec0399af 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
@@ -38,7 +38,7 @@ index 3c63a58826..4c2d4347fc 100644
38 typedef struct CPUSet { 38 typedef struct CPUSet {
39 cpu_set_t *set; 39 cpu_set_t *set;
40diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c 40diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c
41index 4403c0aa52..e7e4ae112d 100644 41index 602772227e..7f1ed19d77 100644
42--- a/src/test/test-sizeof.c 42--- a/src/test/test-sizeof.c
43+++ b/src/test/test-sizeof.c 43+++ b/src/test/test-sizeof.c
44@@ -1,6 +1,5 @@ 44@@ -1,6 +1,5 @@
diff --git a/meta/recipes-core/systemd/systemd/0026-Handle-missing-gshadow.patch b/meta/recipes-core/systemd/systemd/0026-Handle-missing-gshadow.patch
index 2d06ab84a2..2c56838644 100644
--- a/meta/recipes-core/systemd/systemd/0026-Handle-missing-gshadow.patch
+++ b/meta/recipes-core/systemd/systemd/0026-Handle-missing-gshadow.patch
@@ -1,4 +1,4 @@
1From 66a926cf906260c2fb5ea851e55efe03edd444dc Mon Sep 17 00:00:00 2001 1From ec519727bb1ceda6e7787ccf86237a6aad07137c 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
@@ -17,6 +17,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
17 src/shared/userdb.c | 7 ++++++- 17 src/shared/userdb.c | 7 ++++++-
18 3 files changed, 30 insertions(+), 1 deletion(-) 18 3 files changed, 30 insertions(+), 1 deletion(-)
19 19
20diff --git a/src/shared/user-record-nss.c b/src/shared/user-record-nss.c
21index 88b8fc2f8f..a819d41bac 100644
20--- a/src/shared/user-record-nss.c 22--- a/src/shared/user-record-nss.c
21+++ b/src/shared/user-record-nss.c 23+++ b/src/shared/user-record-nss.c
22@@ -331,8 +331,10 @@ int nss_group_to_group_record( 24@@ -331,8 +331,10 @@ int nss_group_to_group_record(
@@ -46,7 +48,7 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
46 48
47 r = json_build(&g->json, JSON_BUILD_OBJECT( 49 r = json_build(&g->json, JSON_BUILD_OBJECT(
48 JSON_BUILD_PAIR("groupName", JSON_BUILD_STRING(g->group_name)), 50 JSON_BUILD_PAIR("groupName", JSON_BUILD_STRING(g->group_name)),
49@@ -388,6 +392,7 @@ int nss_sgrp_for_group(const struct grou 51@@ -388,6 +392,7 @@ int nss_sgrp_for_group(const struct group *grp, struct sgrp *ret_sgrp, char **re
50 assert(ret_sgrp); 52 assert(ret_sgrp);
51 assert(ret_buffer); 53 assert(ret_buffer);
52 54
@@ -54,7 +56,7 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
54 for (;;) { 56 for (;;) {
55 _cleanup_free_ char *buf = NULL; 57 _cleanup_free_ char *buf = NULL;
56 struct sgrp sgrp, *result; 58 struct sgrp sgrp, *result;
57@@ -416,6 +421,9 @@ int nss_sgrp_for_group(const struct grou 59@@ -416,6 +421,9 @@ int nss_sgrp_for_group(const struct group *grp, struct sgrp *ret_sgrp, char **re
58 buflen *= 2; 60 buflen *= 2;
59 buf = mfree(buf); 61 buf = mfree(buf);
60 } 62 }
@@ -120,6 +122,8 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
120 if (r < 0) 122 if (r < 0)
121 return r; 123 return r;
122 124
125diff --git a/src/shared/user-record-nss.h b/src/shared/user-record-nss.h
126index 22ab04d6ee..4e52e7a911 100644
123--- a/src/shared/user-record-nss.h 127--- a/src/shared/user-record-nss.h
124+++ b/src/shared/user-record-nss.h 128+++ b/src/shared/user-record-nss.h
125@@ -2,7 +2,11 @@ 129@@ -2,7 +2,11 @@
@@ -134,9 +138,11 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
134 #include <pwd.h> 138 #include <pwd.h>
135 #include <shadow.h> 139 #include <shadow.h>
136 140
141diff --git a/src/shared/userdb.c b/src/shared/userdb.c
142index 0eddd382e6..d506b8e263 100644
137--- a/src/shared/userdb.c 143--- a/src/shared/userdb.c
138+++ b/src/shared/userdb.c 144+++ b/src/shared/userdb.c
139@@ -1046,13 +1046,15 @@ int groupdb_iterator_get(UserDBIterator 145@@ -1046,13 +1046,15 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) {
140 if (gr) { 146 if (gr) {
141 _cleanup_free_ char *buffer = NULL; 147 _cleanup_free_ char *buffer = NULL;
142 bool incomplete = false; 148 bool incomplete = false;
@@ -153,7 +159,7 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
153 if (!FLAGS_SET(iterator->flags, USERDB_SUPPRESS_SHADOW)) { 159 if (!FLAGS_SET(iterator->flags, USERDB_SUPPRESS_SHADOW)) {
154 r = nss_sgrp_for_group(gr, &sgrp, &buffer); 160 r = nss_sgrp_for_group(gr, &sgrp, &buffer);
155 if (r < 0) { 161 if (r < 0) {
156@@ -1065,6 +1067,9 @@ int groupdb_iterator_get(UserDBIterator 162@@ -1065,6 +1067,9 @@ int groupdb_iterator_get(UserDBIterator *iterator, GroupRecord **ret) {
157 } 163 }
158 164
159 r = nss_group_to_group_record(gr, r >= 0 ? &sgrp : NULL, ret); 165 r = nss_group_to_group_record(gr, r >= 0 ? &sgrp : NULL, ret);
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/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
index f4a71be7cc..6c97a272e2 100644
--- a/meta/recipes-core/systemd/systemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
+++ b/meta/recipes-core/systemd/systemd/0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch
@@ -1,4 +1,4 @@
1From 6f0dd2ba75b68036d7b4ebfe47ac5eaf44d26f06 Mon Sep 17 00:00:00 2001 1From 754a16eeb255c06dbdd4655632276573f0f075ec 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
@@ -12,9 +12,12 @@ Upstream-Status: Pending
12Signed-off-by: Khem Raj <raj.khem@gmail.com> 12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13 13
14--- 14---
15 src/basic/missing_syscall.h | 6 ++++++ 15 src/basic/missing_syscall.h | 6 ++++++
16 1 file changed, 6 insertions(+) 16 src/shared/base-filesystem.c | 1 +
17 2 files changed, 7 insertions(+)
17 18
19diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h
20index 793d111c55..9665848b88 100644
18--- a/src/basic/missing_syscall.h 21--- a/src/basic/missing_syscall.h
19+++ b/src/basic/missing_syscall.h 22+++ b/src/basic/missing_syscall.h
20@@ -20,6 +20,12 @@ 23@@ -20,6 +20,12 @@
@@ -30,6 +33,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
30 #include "macro.h" 33 #include "macro.h"
31 #include "missing_keyctl.h" 34 #include "missing_keyctl.h"
32 #include "missing_stat.h" 35 #include "missing_stat.h"
36diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c
37index d396bc99fe..7e9c0c3412 100644
33--- a/src/shared/base-filesystem.c 38--- a/src/shared/base-filesystem.c
34+++ b/src/shared/base-filesystem.c 39+++ b/src/shared/base-filesystem.c
35@@ -19,6 +19,7 @@ 40@@ -19,6 +19,7 @@
diff --git a/meta/recipes-core/systemd/systemd/0029-network-enable-KeepConfiguration-when-running-on-net.patch b/meta/recipes-core/systemd/systemd/0029-network-enable-KeepConfiguration-when-running-on-net.patch
deleted file mode 100644
index 782b9645cb..0000000000
--- a/meta/recipes-core/systemd/systemd/0029-network-enable-KeepConfiguration-when-running-on-net.patch
+++ /dev/null
@@ -1,253 +0,0 @@
1From 6f4e84126aaa4e26cb6865b054ea5ddebd3906e5 Mon Sep 17 00:00:00 2001
2From: Yu Watanabe <watanabe.yu+github@gmail.com>
3Date: Thu, 3 Feb 2022 12:14:19 +0900
4Subject: [PATCH] network: enable KeepConfiguration= when running on network
5 filesystem
6Cc: pavel@zhukoff.net
7
8Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/22383]
9[YOCTO #14708]
10
11network-generator: rename DHCP_TYPE_DHCP -> DHCP_TYPE_DHCP4
12
13To emphasize this is DHCPv4. No behavior is changed.
14
15stat-util: introduce path_is_network_fs()
16
17network: enable KeepConfiguration= when running on network filesystem
18
19Also, set KeepConfiguration=dhcp-on-stop by default when running in
20initrd.
21
22Fixes #21967.
23---
24 man/systemd.network.xml | 6 +++--
25 src/basic/stat-util.c | 9 +++++++
26 src/basic/stat-util.h | 1 +
27 src/network/generator/network-generator.c | 4 ++--
28 src/network/generator/network-generator.h | 2 +-
29 src/network/networkd-manager.c | 29 +++++++++++++++++++++++
30 src/network/networkd-manager.h | 2 ++
31 src/network/networkd-network.c | 12 ++++++----
32 src/network/test-networkd-conf.c | 5 ++++
33 9 files changed, 60 insertions(+), 10 deletions(-)
34
35diff --git a/man/systemd.network.xml b/man/systemd.network.xml
36index af431e4f2c..f90cff4cd6 100644
37--- a/man/systemd.network.xml
38+++ b/man/systemd.network.xml
39@@ -944,8 +944,10 @@ Table=1234</programlisting></para>
40 lease expires. This is contrary to the DHCP specification, but may be the best choice if,
41 e.g., the root filesystem relies on this connection. The setting <literal>dhcp</literal>
42 implies <literal>dhcp-on-stop</literal>, and <literal>yes</literal> implies
43- <literal>dhcp</literal> and <literal>static</literal>. Defaults to <literal>no</literal>.
44- </para>
45+ <literal>dhcp</literal> and <literal>static</literal>. Defaults to
46+ <literal>dhcp-on-stop</literal> when <command>systemd-networkd</command> is running in
47+ initrd, <literal>yes</literal> when the root filesystem is a network filesystem, and
48+ <literal>no</literal> otherwise.</para>
49 </listitem>
50 </varlistentry>
51 </variablelist>
52diff --git a/src/basic/stat-util.c b/src/basic/stat-util.c
53index efac7b002e..c2269844f8 100644
54--- a/src/basic/stat-util.c
55+++ b/src/basic/stat-util.c
56@@ -249,6 +249,15 @@ int path_is_temporary_fs(const char *path) {
57 return is_temporary_fs(&s);
58 }
59
60+int path_is_network_fs(const char *path) {
61+ struct statfs s;
62+
63+ if (statfs(path, &s) < 0)
64+ return -errno;
65+
66+ return is_network_fs(&s);
67+}
68+
69 int stat_verify_regular(const struct stat *st) {
70 assert(st);
71
72diff --git a/src/basic/stat-util.h b/src/basic/stat-util.h
73index a566114f7c..f7d2f12aa9 100644
74--- a/src/basic/stat-util.h
75+++ b/src/basic/stat-util.h
76@@ -53,6 +53,7 @@ int fd_is_temporary_fs(int fd);
77 int fd_is_network_fs(int fd);
78
79 int path_is_temporary_fs(const char *path);
80+int path_is_network_fs(const char *path);
81
82 /* Because statfs.t_type can be int on some architectures, we have to cast
83 * the const magic to the type, otherwise the compiler warns about
84diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c
85index c081ec673c..063ad08d80 100644
86--- a/src/network/generator/network-generator.c
87+++ b/src/network/generator/network-generator.c
88@@ -47,7 +47,7 @@ static const char * const dracut_dhcp_type_table[_DHCP_TYPE_MAX] = {
89 [DHCP_TYPE_OFF] = "off",
90 [DHCP_TYPE_ON] = "on",
91 [DHCP_TYPE_ANY] = "any",
92- [DHCP_TYPE_DHCP] = "dhcp",
93+ [DHCP_TYPE_DHCP4] = "dhcp",
94 [DHCP_TYPE_DHCP6] = "dhcp6",
95 [DHCP_TYPE_AUTO6] = "auto6",
96 [DHCP_TYPE_EITHER6] = "either6",
97@@ -62,7 +62,7 @@ static const char * const networkd_dhcp_type_table[_DHCP_TYPE_MAX] = {
98 [DHCP_TYPE_OFF] = "no",
99 [DHCP_TYPE_ON] = "yes",
100 [DHCP_TYPE_ANY] = "yes",
101- [DHCP_TYPE_DHCP] = "ipv4",
102+ [DHCP_TYPE_DHCP4] = "ipv4",
103 [DHCP_TYPE_DHCP6] = "ipv6",
104 [DHCP_TYPE_AUTO6] = "no", /* TODO: enable other setting? */
105 [DHCP_TYPE_EITHER6] = "ipv6", /* TODO: enable other setting? */
106diff --git a/src/network/generator/network-generator.h b/src/network/generator/network-generator.h
107index dd0a58738b..0e0da2a57a 100644
108--- a/src/network/generator/network-generator.h
109+++ b/src/network/generator/network-generator.h
110@@ -13,7 +13,7 @@ typedef enum DHCPType {
111 DHCP_TYPE_OFF,
112 DHCP_TYPE_ON,
113 DHCP_TYPE_ANY,
114- DHCP_TYPE_DHCP,
115+ DHCP_TYPE_DHCP4,
116 DHCP_TYPE_DHCP6,
117 DHCP_TYPE_AUTO6,
118 DHCP_TYPE_EITHER6,
119diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
120index 7e89366ae8..3261f289e9 100644
121--- a/src/network/networkd-manager.c
122+++ b/src/network/networkd-manager.c
123@@ -398,6 +398,30 @@ static int signal_restart_callback(sd_event_source *s, const struct signalfd_sig
124 return sd_event_exit(sd_event_source_get_event(s), 0);
125 }
126
127+static int manager_set_keep_configuration(Manager *m) {
128+ int r;
129+
130+ assert(m);
131+
132+ if (in_initrd()) {
133+ log_debug("Running in initrd, keep DHCPv4 addresses on stopping networkd by default.");
134+ m->keep_configuration = KEEP_CONFIGURATION_DHCP_ON_STOP;
135+ return 0;
136+ }
137+
138+ r = path_is_network_fs("/");
139+ if (r < 0)
140+ return log_error_errno(r, "Failed to detect if root is network filesystem: %m");
141+ if (r == 0) {
142+ m->keep_configuration = _KEEP_CONFIGURATION_INVALID;
143+ return 0;
144+ }
145+
146+ log_debug("Running on network filesystem, enabling KeepConfiguration= by default.");
147+ m->keep_configuration = KEEP_CONFIGURATION_YES;
148+ return 0;
149+}
150+
151 int manager_setup(Manager *m) {
152 int r;
153
154@@ -453,6 +477,10 @@ int manager_setup(Manager *m) {
155 if (r < 0)
156 return r;
157
158+ r = manager_set_keep_configuration(m);
159+ if (r < 0)
160+ return r;
161+
162 m->state_file = strdup("/run/systemd/netif/state");
163 if (!m->state_file)
164 return -ENOMEM;
165@@ -468,6 +496,7 @@ int manager_new(Manager **ret, bool test_mode) {
166 return -ENOMEM;
167
168 *m = (Manager) {
169+ .keep_configuration = _KEEP_CONFIGURATION_INVALID,
170 .test_mode = test_mode,
171 .speed_meter_interval_usec = SPEED_METER_DEFAULT_TIME_INTERVAL,
172 .online_state = _LINK_ONLINE_STATE_INVALID,
173diff --git a/src/network/networkd-manager.h b/src/network/networkd-manager.h
174index 36313589a3..86de529124 100644
175--- a/src/network/networkd-manager.h
176+++ b/src/network/networkd-manager.h
177@@ -28,6 +28,8 @@ struct Manager {
178 Hashmap *polkit_registry;
179 int ethtool_fd;
180
181+ KeepConfiguration keep_configuration;
182+
183 bool test_mode;
184 bool enumerating;
185 bool dirty;
186diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
187index 3142be471f..edcd68d616 100644
188--- a/src/network/networkd-network.c
189+++ b/src/network/networkd-network.c
190@@ -124,6 +124,7 @@ int network_verify(Network *network) {
191 int r;
192
193 assert(network);
194+ assert(network->manager);
195 assert(network->filename);
196
197 if (net_match_is_empty(&network->match) && !network->conditions)
198@@ -248,10 +249,11 @@ int network_verify(Network *network) {
199 }
200
201 if (network->dhcp_critical >= 0) {
202- if (network->keep_configuration >= 0)
203- log_warning("%s: Both KeepConfiguration= and deprecated CriticalConnection= are set. "
204- "Ignoring CriticalConnection=.", network->filename);
205- else if (network->dhcp_critical)
206+ if (network->keep_configuration >= 0) {
207+ if (network->manager->keep_configuration < 0)
208+ log_warning("%s: Both KeepConfiguration= and deprecated CriticalConnection= are set. "
209+ "Ignoring CriticalConnection=.", network->filename);
210+ } else if (network->dhcp_critical)
211 /* CriticalConnection=yes also preserve foreign static configurations. */
212 network->keep_configuration = KEEP_CONFIGURATION_YES;
213 else
214@@ -386,7 +388,7 @@ int network_load_one(Manager *manager, OrderedHashmap **networks, const char *fi
215 .allmulticast = -1,
216 .promiscuous = -1,
217
218- .keep_configuration = _KEEP_CONFIGURATION_INVALID,
219+ .keep_configuration = manager->keep_configuration,
220
221 .dhcp_duid.type = _DUID_TYPE_INVALID,
222 .dhcp_critical = -1,
223diff --git a/src/network/test-networkd-conf.c b/src/network/test-networkd-conf.c
224index 4b00a98086..5f1328e39c 100644
225--- a/src/network/test-networkd-conf.c
226+++ b/src/network/test-networkd-conf.c
227@@ -6,6 +6,7 @@
228 #include "net-condition.h"
229 #include "networkd-address.h"
230 #include "networkd-conf.h"
231+#include "networkd-manager.h"
232 #include "networkd-network.h"
233 #include "strv.h"
234
235@@ -166,11 +167,15 @@ static void test_config_parse_ether_addr(void) {
236 }
237
238 static void test_config_parse_address_one(const char *rvalue, int family, unsigned n_addresses, const union in_addr_union *u, unsigned char prefixlen) {
239+ _cleanup_(manager_freep) Manager *manager = NULL;
240 _cleanup_(network_unrefp) Network *network = NULL;
241
242+ assert_se(manager_new(&manager, /* test_mode = */ true) >= 0);
243 assert_se(network = new0(Network, 1));
244 network->n_ref = 1;
245+ network->manager = manager;
246 assert_se(network->filename = strdup("hogehoge.network"));
247+
248 assert_se(config_parse_match_ifnames("network", "filename", 1, "section", 1, "Name", 0, "*", &network->match.ifname, network) == 0);
249 assert_se(config_parse_address("network", "filename", 1, "section", 1, "Address", 0, rvalue, network, network) == 0);
250 assert_se(ordered_hashmap_size(network->addresses_by_section) == 1);
251--
2522.34.1
253
diff --git a/meta/recipes-core/systemd/systemd_250.4.bb b/meta/recipes-core/systemd/systemd_250.5.bb
index 15e2185dff..2cf3b7ca88 100644
--- a/meta/recipes-core/systemd/systemd_250.4.bb
+++ b/meta/recipes-core/systemd/systemd_250.5.bb
@@ -25,7 +25,6 @@ SRC_URI += "file://touchscreen.rules \
25 file://0003-implment-systemd-sysv-install-for-OE.patch \ 25 file://0003-implment-systemd-sysv-install-for-OE.patch \
26 file://0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch \ 26 file://0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch \
27 file://0001-test-parse-argument-Include-signal.h.patch \ 27 file://0001-test-parse-argument-Include-signal.h.patch \
28 file://0029-network-enable-KeepConfiguration-when-running-on-net.patch \
29 " 28 "
30 29
31# patches needed by musl 30# patches needed by musl
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-03 00:16:28 +0000