summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2020-02-06 16:48:13 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-08 13:20:02 +0000
commit306820bad60c62a8096df8d1e4c7cc8e00dc38b7 (patch)
tree78fe9e9d90e19ca52f2cc462e1368e90484d4b4d
parentcc7164836097a4100dce65e93b24a3a8874f65b3 (diff)
downloadpoky-306820bad60c62a8096df8d1e4c7cc8e00dc38b7.tar.gz
systemd: upgrade 243.4 -> 244.1
Drop 0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch a variant on which was introduced in 2c1047310970 ("Upgrade to systemd 211+") in 2014. The oldest supported build machine is now CentOS 7 which has --relative support in ln, so there no longer appears to be any need for this change. Rebase/refresh musl patches: - replace missing.h with specific missing_... header - fix additional WRITE_STRING_FILE_DISABLE_BUFFER - fix more places that need netinet/if_ether.h (From OE-Core rev: 44a4ac2294da0f53cbbfabc7ece836fe97f4d3f7) Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd-boot_244.1.bb (renamed from meta/recipes-core/systemd/systemd-boot_243.4.bb)0
-rw-r--r--meta/recipes-core/systemd/systemd-conf_244.1.bb (renamed from meta/recipes-core/systemd/systemd-conf_243.2.bb)0
-rw-r--r--meta/recipes-core/systemd/systemd.inc6
-rw-r--r--meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch33
-rw-r--r--meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch168
-rw-r--r--meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch26
-rw-r--r--meta/recipes-core/systemd/systemd/0002-src-login-brightness.c-include-sys-wait.h.patch8
-rw-r--r--meta/recipes-core/systemd/systemd/0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch63
-rw-r--r--meta/recipes-core/systemd/systemd/0003-implment-systemd-sysv-install-for-OE.patch10
-rw-r--r--meta/recipes-core/systemd/systemd/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch37
-rw-r--r--meta/recipes-core/systemd/systemd/0003-src-basic-copy.c-include-signal.h.patch12
-rw-r--r--meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch29
-rw-r--r--meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch10
-rw-r--r--meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch381
-rw-r--r--meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch101
-rw-r--r--meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch30
-rw-r--r--meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch10
-rw-r--r--meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch14
-rw-r--r--meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch22
-rw-r--r--meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch15
-rw-r--r--meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch20
-rw-r--r--meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch18
-rw-r--r--meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch9
-rw-r--r--meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch14
-rw-r--r--meta/recipes-core/systemd/systemd/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch10
-rw-r--r--meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch10
-rw-r--r--meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch10
-rw-r--r--meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch10
-rw-r--r--meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch12
-rw-r--r--meta/recipes-core/systemd/systemd_244.1.bb (renamed from meta/recipes-core/systemd/systemd_243.4.bb)2
30 files changed, 659 insertions, 431 deletions
diff --git a/meta/recipes-core/systemd/systemd-boot_243.4.bb b/meta/recipes-core/systemd/systemd-boot_244.1.bb
index 515abc289b..515abc289b 100644
--- a/meta/recipes-core/systemd/systemd-boot_243.4.bb
+++ b/meta/recipes-core/systemd/systemd-boot_244.1.bb
diff --git a/meta/recipes-core/systemd/systemd-conf_243.2.bb b/meta/recipes-core/systemd/systemd-conf_244.1.bb
index d9ec023bfd..d9ec023bfd 100644
--- a/meta/recipes-core/systemd/systemd-conf_243.2.bb
+++ b/meta/recipes-core/systemd/systemd-conf_244.1.bb
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc
index 2fca6dca64..8c05a96ecc 100644
--- a/meta/recipes-core/systemd/systemd.inc
+++ b/meta/recipes-core/systemd/systemd.inc
@@ -14,10 +14,8 @@ LICENSE = "GPLv2 & LGPLv2.1"
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 = "70e8c1978a9a688662eb1b3983370dd1cc415083" 17SRCREV = "639dc9f4bfd2c09535bee079ae9bc7006b520a66"
18SRCBRANCH = "v243-stable" 18SRCBRANCH = "v244-stable"
19SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" 19SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}"
20 20
21PV = "243.4+git${SRCPV}"
22
23S = "${WORKDIR}/git" 21S = "${WORKDIR}/git"
diff --git a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch
index ea37680221..6eaaec71c5 100644
--- a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch
+++ b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch
@@ -1,8 +1,8 @@
1From 98254e4798e79d52ac6b562616cd244120f6e239 Mon Sep 17 00:00:00 2001 1From c73a87871df31b4f8d96c9d443759c6f702935f6 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Thu, 21 Feb 2019 16:23:24 +0800 3Date: Thu, 21 Feb 2019 16:23:24 +0800
4Subject: [PATCH 1/5] binfmt: Don't install dependency links at install time 4Subject: [PATCH] binfmt: Don't install dependency links at install time for
5 for the binfmt services 5 the binfmt services
6 6
7use [Install] blocks so that they get created when the service is enabled 7use [Install] blocks so that they get created when the service is enabled
8like a traditional service. 8like a traditional service.
@@ -18,16 +18,17 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
18Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 18Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
19[rebased for systemd 243] 19[rebased for systemd 243]
20Signed-off-by: Scott Murray <scott.murray@konsulko.com> 20Signed-off-by: Scott Murray <scott.murray@konsulko.com>
21
21--- 22---
22 units/meson.build | 6 ++---- 23 units/meson.build | 6 ++----
23 units/proc-sys-fs-binfmt_misc.automount | 3 +++ 24 units/proc-sys-fs-binfmt_misc.automount | 3 +++
24 units/systemd-binfmt.service.in | 4 ++++ 25 units/systemd-binfmt.service.in | 4 ++++
25 3 files changed, 9 insertions(+), 4 deletions(-) 26 3 files changed, 9 insertions(+), 4 deletions(-)
26 27
27Index: systemd-stable/units/meson.build 28diff --git a/units/meson.build b/units/meson.build
28=================================================================== 29index 6a3a0d0dea22..bbb1b78618c3 100644
29--- systemd-stable.orig/units/meson.build 30--- a/units/meson.build
30+++ systemd-stable/units/meson.build 31+++ b/units/meson.build
31@@ -46,8 +46,7 @@ units = [ 32@@ -46,8 +46,7 @@ units = [
32 ['poweroff.target', '', 33 ['poweroff.target', '',
33 'runlevel0.target'], 34 'runlevel0.target'],
@@ -48,10 +49,10 @@ Index: systemd-stable/units/meson.build
48 ['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'], 49 ['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'],
49 ['systemd-boot-check-no-failures.service', ''], 50 ['systemd-boot-check-no-failures.service', ''],
50 ['systemd-boot-system-token.service', 'ENABLE_EFI', 51 ['systemd-boot-system-token.service', 'ENABLE_EFI',
51Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount 52diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount
52=================================================================== 53index 30a6bc991844..4231f3b70fe9 100644
53--- systemd-stable.orig/units/proc-sys-fs-binfmt_misc.automount 54--- a/units/proc-sys-fs-binfmt_misc.automount
54+++ systemd-stable/units/proc-sys-fs-binfmt_misc.automount 55+++ b/units/proc-sys-fs-binfmt_misc.automount
55@@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/ 56@@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/
56 57
57 [Automount] 58 [Automount]
@@ -59,11 +60,11 @@ Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount
59+ 60+
60+[Install] 61+[Install]
61+WantedBy=sysinit.target 62+WantedBy=sysinit.target
62Index: systemd-stable/units/systemd-binfmt.service.in 63diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
63=================================================================== 64index 0c0f26451b67..763c4c466c16 100644
64--- systemd-stable.orig/units/systemd-binfmt.service.in 65--- a/units/systemd-binfmt.service.in
65+++ systemd-stable/units/systemd-binfmt.service.in 66+++ b/units/systemd-binfmt.service.in
66@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc 67@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm
67 Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems 68 Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
68 DefaultDependencies=no 69 DefaultDependencies=no
69 Conflicts=shutdown.target 70 Conflicts=shutdown.target
diff --git a/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch b/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch
index d6d68a09ac..f1c7181ef9 100644
--- a/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch
+++ b/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch
@@ -1,4 +1,4 @@
1From 85e3c3046562ec24fc2f09ebfd08bf9f168091d5 Mon Sep 17 00:00:00 2001 1From f4a0caaea346b70cf5064f9159a53a1b8020071e Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Fri, 1 Mar 2019 15:22:15 +0800 3Date: Fri, 1 Mar 2019 15:22:15 +0800
4Subject: [PATCH] do not disable buffer in writing files 4Subject: [PATCH] do not disable buffer in writing files
@@ -18,8 +18,9 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
18Signed-off-by: Andrej Valek <andrej.valek@siemens.com> 18Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
19[rebased for systemd 243] 19[rebased for systemd 243]
20Signed-off-by: Scott Murray <scott.murray@konsulko.com> 20Signed-off-by: Scott Murray <scott.murray@konsulko.com>
21
21--- 22---
22 src/basic/cgroup-util.c | 14 +++++++------- 23 src/basic/cgroup-util.c | 10 +++++-----
23 src/basic/procfs-util.c | 4 ++-- 24 src/basic/procfs-util.c | 4 ++--
24 src/basic/smack-util.c | 2 +- 25 src/basic/smack-util.c | 2 +-
25 src/basic/util.c | 2 +- 26 src/basic/util.c | 2 +-
@@ -31,25 +32,19 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
31 src/login/logind-dbus.c | 2 +- 32 src/login/logind-dbus.c | 2 +-
32 src/nspawn/nspawn-cgroup.c | 2 +- 33 src/nspawn/nspawn-cgroup.c | 2 +-
33 src/nspawn/nspawn.c | 6 +++--- 34 src/nspawn/nspawn.c | 6 +++---
35 src/shared/cgroup-setup.c | 4 ++--
34 src/shared/sysctl-util.c | 2 +- 36 src/shared/sysctl-util.c | 2 +-
35 src/sleep/sleep.c | 10 +++++----- 37 src/sleep/sleep.c | 8 ++++----
36 src/udev/udevadm-trigger.c | 2 +- 38 src/udev/udevadm-trigger.c | 2 +-
37 src/udev/udevd.c | 2 +- 39 src/udev/udevd.c | 2 +-
38 src/vconsole/vconsole-setup.c | 2 +- 40 src/vconsole/vconsole-setup.c | 2 +-
39 17 files changed, 36 insertions(+), 36 deletions(-) 41 18 files changed, 35 insertions(+), 35 deletions(-)
40 42
43diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
44index a5141f4cbedd..04c06e7a55cb 100644
41--- a/src/basic/cgroup-util.c 45--- a/src/basic/cgroup-util.c
42+++ b/src/basic/cgroup-util.c 46+++ b/src/basic/cgroup-util.c
43@@ -860,7 +860,7 @@ int cg_attach(const char *controller, co 47@@ -739,7 +739,7 @@ int cg_install_release_agent(const char *controller, const char *agent) {
44
45 xsprintf(c, PID_FMT "\n", pid);
46
47- r = write_string_file(fs, c, WRITE_STRING_FILE_DISABLE_BUFFER);
48+ r = write_string_file(fs, c, 0);
49 if (r < 0)
50 return r;
51
52@@ -1142,7 +1142,7 @@ int cg_install_release_agent(const char
53 48
54 sc = strstrip(contents); 49 sc = strstrip(contents);
55 if (isempty(sc)) { 50 if (isempty(sc)) {
@@ -58,7 +53,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
58 if (r < 0) 53 if (r < 0)
59 return r; 54 return r;
60 } else if (!path_equal(sc, agent)) 55 } else if (!path_equal(sc, agent))
61@@ -1160,7 +1160,7 @@ int cg_install_release_agent(const char 56@@ -757,7 +757,7 @@ int cg_install_release_agent(const char *controller, const char *agent) {
62 57
63 sc = strstrip(contents); 58 sc = strstrip(contents);
64 if (streq(sc, "0")) { 59 if (streq(sc, "0")) {
@@ -67,7 +62,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
67 if (r < 0) 62 if (r < 0)
68 return r; 63 return r;
69 64
70@@ -1187,7 +1187,7 @@ int cg_uninstall_release_agent(const cha 65@@ -784,7 +784,7 @@ int cg_uninstall_release_agent(const char *controller) {
71 if (r < 0) 66 if (r < 0)
72 return r; 67 return r;
73 68
@@ -76,7 +71,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
76 if (r < 0) 71 if (r < 0)
77 return r; 72 return r;
78 73
79@@ -1197,7 +1197,7 @@ int cg_uninstall_release_agent(const cha 74@@ -794,7 +794,7 @@ int cg_uninstall_release_agent(const char *controller) {
80 if (r < 0) 75 if (r < 0)
81 return r; 76 return r;
82 77
@@ -85,7 +80,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
85 if (r < 0) 80 if (r < 0)
86 return r; 81 return r;
87 82
88@@ -2053,7 +2053,7 @@ int cg_set_attribute(const char *control 83@@ -1650,7 +1650,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri
89 if (r < 0) 84 if (r < 0)
90 return r; 85 return r;
91 86
@@ -94,18 +89,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
94 } 89 }
95 90
96 int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) { 91 int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) {
97@@ -2697,7 +2697,7 @@ int cg_enable_everywhere( 92diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c
98 return log_debug_errno(errno, "Failed to open cgroup.subtree_control file of %s: %m", p); 93index da7e836f143e..2138f20bcc03 100644
99 }
100
101- r = write_string_stream(f, s, WRITE_STRING_FILE_DISABLE_BUFFER);
102+ r = write_string_stream(f, s, 0);
103 if (r < 0) {
104 log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m",
105 FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs);
106--- a/src/basic/procfs-util.c 94--- a/src/basic/procfs-util.c
107+++ b/src/basic/procfs-util.c 95+++ b/src/basic/procfs-util.c
108@@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limi 96@@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limit) {
109 * decrease it, as threads-max is the much more relevant sysctl. */ 97 * decrease it, as threads-max is the much more relevant sysctl. */
110 if (limit > pid_max-1) { 98 if (limit > pid_max-1) {
111 sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ 99 sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */
@@ -121,9 +109,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
121 if (r < 0) { 109 if (r < 0) {
122 uint64_t threads_max; 110 uint64_t threads_max;
123 111
112diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c
113index da9a2139d31a..5e91f5b8f5d9 100644
124--- a/src/basic/smack-util.c 114--- a/src/basic/smack-util.c
125+++ b/src/basic/smack-util.c 115+++ b/src/basic/smack-util.c
126@@ -115,7 +115,7 @@ int mac_smack_apply_pid(pid_t pid, const 116@@ -114,7 +114,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) {
127 return 0; 117 return 0;
128 118
129 p = procfs_file_alloca(pid, "attr/current"); 119 p = procfs_file_alloca(pid, "attr/current");
@@ -132,9 +122,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
132 if (r < 0) 122 if (r < 0)
133 return r; 123 return r;
134 124
125diff --git a/src/basic/util.c b/src/basic/util.c
126index 2b3b3918a32f..aff8d0fcd473 100644
135--- a/src/basic/util.c 127--- a/src/basic/util.c
136+++ b/src/basic/util.c 128+++ b/src/basic/util.c
137@@ -294,7 +294,7 @@ void disable_coredumps(void) { 129@@ -267,7 +267,7 @@ void disable_coredumps(void) {
138 if (detect_container() > 0) 130 if (detect_container() > 0)
139 return; 131 return;
140 132
@@ -143,9 +135,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
143 if (r < 0) 135 if (r < 0)
144 log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); 136 log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m");
145 } 137 }
138diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
139index 7ff844c78c3a..5c5721d7c2f7 100644
146--- a/src/binfmt/binfmt.c 140--- a/src/binfmt/binfmt.c
147+++ b/src/binfmt/binfmt.c 141+++ b/src/binfmt/binfmt.c
148@@ -48,7 +48,7 @@ static int delete_rule(const char *rule) 142@@ -47,7 +47,7 @@ static int delete_rule(const char *rule) {
149 if (!fn) 143 if (!fn)
150 return log_oom(); 144 return log_oom();
151 145
@@ -154,7 +148,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
154 } 148 }
155 149
156 static int apply_rule(const char *rule) { 150 static int apply_rule(const char *rule) {
157@@ -56,7 +56,7 @@ static int apply_rule(const char *rule) 151@@ -55,7 +55,7 @@ static int apply_rule(const char *rule) {
158 152
159 (void) delete_rule(rule); 153 (void) delete_rule(rule);
160 154
@@ -163,7 +157,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
163 if (r < 0) 157 if (r < 0)
164 return log_error_errno(r, "Failed to add binary format: %m"); 158 return log_error_errno(r, "Failed to add binary format: %m");
165 159
166@@ -213,7 +213,7 @@ static int run(int argc, char *argv[]) { 160@@ -212,7 +212,7 @@ static int run(int argc, char *argv[]) {
167 } 161 }
168 162
169 /* Flush out all rules */ 163 /* Flush out all rules */
@@ -172,9 +166,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
172 166
173 STRV_FOREACH(f, files) { 167 STRV_FOREACH(f, files) {
174 k = apply_file(*f, true); 168 k = apply_file(*f, true);
169diff --git a/src/core/main.c b/src/core/main.c
170index c24b696b1663..195be7d2df0d 100644
175--- a/src/core/main.c 171--- a/src/core/main.c
176+++ b/src/core/main.c 172+++ b/src/core/main.c
177@@ -1303,7 +1303,7 @@ static int bump_unix_max_dgram_qlen(void 173@@ -1303,7 +1303,7 @@ static int bump_unix_max_dgram_qlen(void) {
178 if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN) 174 if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN)
179 return 0; 175 return 0;
180 176
@@ -183,7 +179,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
183 if (r < 0) 179 if (r < 0)
184 return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r, 180 return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r,
185 "Failed to bump AF_UNIX datagram queue length, ignoring: %m"); 181 "Failed to bump AF_UNIX datagram queue length, ignoring: %m");
186@@ -1527,7 +1527,7 @@ static void initialize_core_pattern(bool 182@@ -1527,7 +1527,7 @@ static void initialize_core_pattern(bool skip_setup) {
187 if (getpid_cached() != 1) 183 if (getpid_cached() != 1)
188 return; 184 return;
189 185
@@ -192,9 +188,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
192 if (r < 0) 188 if (r < 0)
193 log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern); 189 log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern);
194 } 190 }
191diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c
192index 4427397f2715..8aeb5c829513 100644
195--- a/src/core/smack-setup.c 193--- a/src/core/smack-setup.c
196+++ b/src/core/smack-setup.c 194+++ b/src/core/smack-setup.c
197@@ -327,17 +327,17 @@ int mac_smack_setup(bool *loaded_policy) 195@@ -325,17 +325,17 @@ int mac_smack_setup(bool *loaded_policy) {
198 } 196 }
199 197
200 #ifdef SMACK_RUN_LABEL 198 #ifdef SMACK_RUN_LABEL
@@ -216,6 +214,8 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
216 if (r < 0) 214 if (r < 0)
217 log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); 215 log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m");
218 #endif 216 #endif
217diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c
218index 17e7cd1a009b..87a766771663 100644
219--- a/src/hibernate-resume/hibernate-resume.c 219--- a/src/hibernate-resume/hibernate-resume.c
220+++ b/src/hibernate-resume/hibernate-resume.c 220+++ b/src/hibernate-resume/hibernate-resume.c
221@@ -45,7 +45,7 @@ int main(int argc, char *argv[]) { 221@@ -45,7 +45,7 @@ int main(int argc, char *argv[]) {
@@ -227,9 +227,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
227 if (r < 0) { 227 if (r < 0) {
228 log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor); 228 log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor);
229 return EXIT_FAILURE; 229 return EXIT_FAILURE;
230diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c
231index f35612fe12bc..20351bf7fa70 100644
230--- a/src/libsystemd/sd-device/sd-device.c 232--- a/src/libsystemd/sd-device/sd-device.c
231+++ b/src/libsystemd/sd-device/sd-device.c 233+++ b/src/libsystemd/sd-device/sd-device.c
232@@ -1849,7 +1849,7 @@ _public_ int sd_device_set_sysattr_value 234@@ -1849,7 +1849,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr,
233 if (!value) 235 if (!value)
234 return -ENOMEM; 236 return -ENOMEM;
235 237
@@ -238,9 +240,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
238 if (r < 0) { 240 if (r < 0) {
239 if (r == -ELOOP) 241 if (r == -ELOOP)
240 return -EINVAL; 242 return -EINVAL;
243diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
244index 69b59948786f..b4973c596d48 100644
241--- a/src/login/logind-dbus.c 245--- a/src/login/logind-dbus.c
242+++ b/src/login/logind-dbus.c 246+++ b/src/login/logind-dbus.c
243@@ -1323,7 +1323,7 @@ static int trigger_device(Manager *m, sd 247@@ -1322,7 +1322,7 @@ static int trigger_device(Manager *m, sd_device *d) {
244 if (!t) 248 if (!t)
245 return -ENOMEM; 249 return -ENOMEM;
246 250
@@ -249,9 +253,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
249 } 253 }
250 254
251 return 0; 255 return 0;
256diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c
257index f5048d9473cb..b6383ab5c97e 100644
252--- a/src/nspawn/nspawn-cgroup.c 258--- a/src/nspawn/nspawn-cgroup.c
253+++ b/src/nspawn/nspawn-cgroup.c 259+++ b/src/nspawn/nspawn-cgroup.c
254@@ -123,7 +123,7 @@ int sync_cgroup(pid_t pid, CGroupUnified 260@@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) {
255 fn = strjoina(tree, cgroup, "/cgroup.procs"); 261 fn = strjoina(tree, cgroup, "/cgroup.procs");
256 262
257 sprintf(pid_string, PID_FMT, pid); 263 sprintf(pid_string, PID_FMT, pid);
@@ -260,9 +266,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
260 if (r < 0) { 266 if (r < 0) {
261 log_error_errno(r, "Failed to move process: %m"); 267 log_error_errno(r, "Failed to move process: %m");
262 goto finish; 268 goto finish;
269diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
270index 873a76596f0b..4e496548bb94 100644
263--- a/src/nspawn/nspawn.c 271--- a/src/nspawn/nspawn.c
264+++ b/src/nspawn/nspawn.c 272+++ b/src/nspawn/nspawn.c
265@@ -2403,7 +2403,7 @@ static int reset_audit_loginuid(void) { 273@@ -2425,7 +2425,7 @@ static int reset_audit_loginuid(void) {
266 if (streq(p, "4294967295")) 274 if (streq(p, "4294967295"))
267 return 0; 275 return 0;
268 276
@@ -271,7 +279,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
271 if (r < 0) { 279 if (r < 0) {
272 log_error_errno(r, 280 log_error_errno(r,
273 "Failed to reset audit login UID. This probably means that your kernel is too\n" 281 "Failed to reset audit login UID. This probably means that your kernel is too\n"
274@@ -3612,13 +3612,13 @@ static int setup_uid_map(pid_t pid) { 282@@ -3633,13 +3633,13 @@ static int setup_uid_map(pid_t pid) {
275 283
276 xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); 284 xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid);
277 xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, arg_uid_shift, arg_uid_range); 285 xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, arg_uid_shift, arg_uid_range);
@@ -287,9 +295,33 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
287 if (r < 0) 295 if (r < 0)
288 return log_error_errno(r, "Failed to write GID map: %m"); 296 return log_error_errno(r, "Failed to write GID map: %m");
289 297
298diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c
299index e8398cbde5ba..ba682ec0c9e7 100644
300--- a/src/shared/cgroup-setup.c
301+++ b/src/shared/cgroup-setup.c
302@@ -267,7 +267,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) {
303
304 xsprintf(c, PID_FMT "\n", pid);
305
306- r = write_string_file(fs, c, WRITE_STRING_FILE_DISABLE_BUFFER);
307+ r = write_string_file(fs, c, 0);
308 if (r < 0)
309 return r;
310
311@@ -817,7 +817,7 @@ int cg_enable_everywhere(
312 return log_debug_errno(errno, "Failed to open cgroup.subtree_control file of %s: %m", p);
313 }
314
315- r = write_string_stream(f, s, WRITE_STRING_FILE_DISABLE_BUFFER);
316+ r = write_string_stream(f, s, 0);
317 if (r < 0) {
318 log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m",
319 FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs);
320diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c
321index 12fb3ef7ea0e..132ac847c091 100644
290--- a/src/shared/sysctl-util.c 322--- a/src/shared/sysctl-util.c
291+++ b/src/shared/sysctl-util.c 323+++ b/src/shared/sysctl-util.c
292@@ -88,7 +88,7 @@ int sysctl_write_ip_property(int af, con 324@@ -87,7 +87,7 @@ int sysctl_write_ip_property(int af, const char *ifname, const char *property, c
293 325
294 log_debug("Setting '%s' to '%s'", p, value); 326 log_debug("Setting '%s' to '%s'", p, value);
295 327
@@ -298,35 +330,29 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
298 } 330 }
299 331
300 int sysctl_read(const char *property, char **content) { 332 int sysctl_read(const char *property, char **content) {
333diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
334index 89b80367f8f4..33dbb21364d0 100644
301--- a/src/sleep/sleep.c 335--- a/src/sleep/sleep.c
302+++ b/src/sleep/sleep.c 336+++ b/src/sleep/sleep.c
303@@ -54,7 +54,7 @@ static int write_hibernate_location_info 337@@ -45,7 +45,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca
338 assert(hibernate_location->swap);
339 assert(hibernate_location->resume);
304 340
305 /* if it's a swap partition, we just write the disk to /sys/power/resume */ 341- r = write_string_file("/sys/power/resume", hibernate_location->resume, WRITE_STRING_FILE_DISABLE_BUFFER);
306 if (streq(type, "partition")) { 342+ r = write_string_file("/sys/power/resume", hibernate_location->resume, 0);
307- r = write_string_file("/sys/power/resume", device, WRITE_STRING_FILE_DISABLE_BUFFER); 343 if (r < 0)
308+ r = write_string_file("/sys/power/resume", device, 0); 344 return log_debug_errno(r, "Failed to write partition device to /sys/power/resume for '%s': '%s': %m",
309 if (r < 0) 345 hibernate_location->swap->device, hibernate_location->resume);
310 return log_debug_errno(r, "Failed to write partition device to /sys/power/resume: %m"); 346@@ -72,7 +72,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca
311 347 }
312@@ -98,14 +98,14 @@ static int write_hibernate_location_info
313 348
314 offset = fiemap->fm_extents[0].fe_physical / page_size(); 349 xsprintf(offset_str, "%" PRIu64, hibernate_location->resume_offset);
315 xsprintf(offset_str, "%" PRIu64, offset);
316- r = write_string_file("/sys/power/resume_offset", offset_str, WRITE_STRING_FILE_DISABLE_BUFFER); 350- r = write_string_file("/sys/power/resume_offset", offset_str, WRITE_STRING_FILE_DISABLE_BUFFER);
317+ r = write_string_file("/sys/power/resume_offset", offset_str, 0); 351+ r = write_string_file("/sys/power/resume_offset", offset_str, 0);
318 if (r < 0) 352 if (r < 0)
319 return log_debug_errno(r, "Failed to write offset '%s': %m", offset_str); 353 return log_debug_errno(r, "Failed to write swap file offset to /sys/power/resume_offset for '%s': '%s': %m",
320 354 hibernate_location->swap->device, offset_str);
321 log_debug("Wrote calculated resume_offset value to /sys/power/resume_offset: %s", offset_str); 355@@ -89,7 +89,7 @@ static int write_mode(char **modes) {
322
323 xsprintf(device_str, "%lx", (unsigned long)stb.st_dev);
324- r = write_string_file("/sys/power/resume", device_str, WRITE_STRING_FILE_DISABLE_BUFFER);
325+ r = write_string_file("/sys/power/resume", device_str, 0);
326 if (r < 0)
327 return log_debug_errno(r, "Failed to write device '%s': %m", device_str);
328
329@@ -121,7 +121,7 @@ static int write_mode(char **modes) {
330 STRV_FOREACH(mode, modes) { 356 STRV_FOREACH(mode, modes) {
331 int k; 357 int k;
332 358
@@ -335,7 +361,7 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
335 if (k >= 0) 361 if (k >= 0)
336 return 0; 362 return 0;
337 363
338@@ -140,7 +140,7 @@ static int write_state(FILE **f, char ** 364@@ -108,7 +108,7 @@ static int write_state(FILE **f, char **states) {
339 STRV_FOREACH(state, states) { 365 STRV_FOREACH(state, states) {
340 int k; 366 int k;
341 367
@@ -344,9 +370,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
344 if (k >= 0) 370 if (k >= 0)
345 return 0; 371 return 0;
346 log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state); 372 log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state);
373diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c
374index 60c68b5029cf..fdca03d3d42c 100644
347--- a/src/udev/udevadm-trigger.c 375--- a/src/udev/udevadm-trigger.c
348+++ b/src/udev/udevadm-trigger.c 376+++ b/src/udev/udevadm-trigger.c
349@@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerato 377@@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerator *e, const char *action, Set *settle_se
350 if (!filename) 378 if (!filename)
351 return log_oom(); 379 return log_oom();
352 380
@@ -355,9 +383,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
355 if (r < 0) { 383 if (r < 0) {
356 bool ignore = IN_SET(r, -ENOENT, -EACCES, -ENODEV, -EROFS); 384 bool ignore = IN_SET(r, -ENOENT, -EACCES, -ENODEV, -EROFS);
357 385
386diff --git a/src/udev/udevd.c b/src/udev/udevd.c
387index 7678331897f5..6871cde7aa65 100644
358--- a/src/udev/udevd.c 388--- a/src/udev/udevd.c
359+++ b/src/udev/udevd.c 389+++ b/src/udev/udevd.c
360@@ -1113,7 +1113,7 @@ static int synthesize_change_one(sd_devi 390@@ -1089,7 +1089,7 @@ static int synthesize_change_one(sd_device *dev, const char *syspath) {
361 391
362 filename = strjoina(syspath, "/uevent"); 392 filename = strjoina(syspath, "/uevent");
363 log_device_debug(dev, "device is closed, synthesising 'change' on %s", syspath); 393 log_device_debug(dev, "device is closed, synthesising 'change' on %s", syspath);
@@ -366,9 +396,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
366 if (r < 0) 396 if (r < 0)
367 return log_device_debug_errno(dev, r, "Failed to write 'change' to %s: %m", filename); 397 return log_device_debug_errno(dev, r, "Failed to write 'change' to %s: %m", filename);
368 return 0; 398 return 0;
399diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
400index 9d706085fb47..30dcfa86f4d0 100644
369--- a/src/vconsole/vconsole-setup.c 401--- a/src/vconsole/vconsole-setup.c
370+++ b/src/vconsole/vconsole-setup.c 402+++ b/src/vconsole/vconsole-setup.c
371@@ -117,7 +117,7 @@ static int toggle_utf8_vc(const char *na 403@@ -116,7 +116,7 @@ static int toggle_utf8_vc(const char *name, int fd, bool utf8) {
372 static int toggle_utf8_sysfs(bool utf8) { 404 static int toggle_utf8_sysfs(bool utf8) {
373 int r; 405 int r;
374 406
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 c6213ab88e..6b85ff0f89 100644
--- a/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch
+++ b/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch
@@ -1,7 +1,7 @@
1From 1eb84534dea05d41afed1d898cba212ad7d310dd Mon Sep 17 00:00:00 2001 1From 49501c80d32c1bc5ecb07f40c324feb82af0b057 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 02/24] don't use glibc-specific qsort_r 4Subject: [PATCH] don't use glibc-specific qsort_r
5 5
6Upstream-Status: Inappropriate [musl specific] 6Upstream-Status: Inappropriate [musl specific]
7 7
@@ -10,14 +10,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
10Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 10Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
11[Rebased for v242] 11[Rebased for v242]
12Signed-off-by: Andrej Valek <andrej.valek@siemens.com> 12Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
13
13--- 14---
14 src/basic/sort-util.h | 14 -------------- 15 src/basic/sort-util.h | 14 ------------
15 src/libsystemd/sd-hwdb/hwdb-util.c | 19 ++++++++++++++----- 16 src/libsystemd/sd-hwdb/hwdb-util.c | 19 +++++++++++-----
16 src/shared/format-table.c | 36 ++++++++++++++++++++++++------------ 17 src/shared/format-table.c | 36 ++++++++++++++++++++----------
17 3 files changed, 38 insertions(+), 31 deletions(-) 18 3 files changed, 38 insertions(+), 31 deletions(-)
18 19
19diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h 20diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h
20index e029f8646e..27d68b341c 100644 21index e029f8646eb0..27d68b341cf3 100644
21--- a/src/basic/sort-util.h 22--- a/src/basic/sort-util.h
22+++ b/src/basic/sort-util.h 23+++ b/src/basic/sort-util.h
23@@ -54,17 +54,3 @@ static inline void qsort_safe(void *base, size_t nmemb, size_t size, __compar_fn 24@@ -54,17 +54,3 @@ static inline void qsort_safe(void *base, size_t nmemb, size_t size, __compar_fn
@@ -39,7 +40,7 @@ index e029f8646e..27d68b341c 100644
39- qsort_r_safe((p), (n), sizeof((p)[0]), (__compar_d_fn_t) _func_, userdata); \ 40- qsort_r_safe((p), (n), sizeof((p)[0]), (__compar_d_fn_t) _func_, userdata); \
40- }) 41- })
41diff --git a/src/libsystemd/sd-hwdb/hwdb-util.c b/src/libsystemd/sd-hwdb/hwdb-util.c 42diff --git a/src/libsystemd/sd-hwdb/hwdb-util.c b/src/libsystemd/sd-hwdb/hwdb-util.c
42index c83575c7c8..72f8f3a050 100644 43index c83575c7c876..72f8f3a05048 100644
43--- a/src/libsystemd/sd-hwdb/hwdb-util.c 44--- a/src/libsystemd/sd-hwdb/hwdb-util.c
44+++ b/src/libsystemd/sd-hwdb/hwdb-util.c 45+++ b/src/libsystemd/sd-hwdb/hwdb-util.c
45@@ -128,9 +128,13 @@ static void trie_free(struct trie *trie) { 46@@ -128,9 +128,13 @@ static void trie_free(struct trie *trie) {
@@ -83,10 +84,10 @@ index c83575c7c8..72f8f3a050 100644
83 } 84 }
84 85
85diff --git a/src/shared/format-table.c b/src/shared/format-table.c 86diff --git a/src/shared/format-table.c b/src/shared/format-table.c
86index a5c0a99b08..d595cbe372 100644 87index 4617ae8badc4..17d6b9616256 100644
87--- a/src/shared/format-table.c 88--- a/src/shared/format-table.c
88+++ b/src/shared/format-table.c 89+++ b/src/shared/format-table.c
89@@ -850,31 +850,33 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t 90@@ -1109,31 +1109,33 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t
90 return CMP(index_a, index_b); 91 return CMP(index_a, index_b);
91 } 92 }
92 93
@@ -130,7 +131,7 @@ index a5c0a99b08..d595cbe372 100644
130 } 131 }
131 132
132 /* Order identical lines by the order there were originally added in */ 133 /* Order identical lines by the order there were originally added in */
133@@ -1107,7 +1109,12 @@ int table_print(Table *t, FILE *f) { 134@@ -1533,7 +1535,12 @@ int table_print(Table *t, FILE *f) {
134 for (i = 0; i < n_rows; i++) 135 for (i = 0; i < n_rows; i++)
135 sorted[i] = i * t->n_columns; 136 sorted[i] = i * t->n_columns;
136 137
@@ -144,7 +145,7 @@ index a5c0a99b08..d595cbe372 100644
144 } 145 }
145 146
146 if (t->display_map) 147 if (t->display_map)
147@@ -1534,7 +1541,12 @@ int table_to_json(Table *t, JsonVariant **ret) { 148@@ -1997,7 +2004,12 @@ int table_to_json(Table *t, JsonVariant **ret) {
148 for (i = 0; i < n_rows; i++) 149 for (i = 0; i < n_rows; i++)
149 sorted[i] = i * t->n_columns; 150 sorted[i] = i * t->n_columns;
150 151
@@ -158,6 +159,3 @@ index a5c0a99b08..d595cbe372 100644
158 } 159 }
159 160
160 if (t->display_map) 161 if (t->display_map)
161--
1622.11.0
163
diff --git a/meta/recipes-core/systemd/systemd/0002-src-login-brightness.c-include-sys-wait.h.patch b/meta/recipes-core/systemd/systemd/0002-src-login-brightness.c-include-sys-wait.h.patch
index dcae668dcb..ba7424d876 100644
--- a/meta/recipes-core/systemd/systemd/0002-src-login-brightness.c-include-sys-wait.h.patch
+++ b/meta/recipes-core/systemd/systemd/0002-src-login-brightness.c-include-sys-wait.h.patch
@@ -1,4 +1,7 @@
1Include sys/wait.h 1From 106922335ec502bcb4451c54a89be49f88fa54de Mon Sep 17 00:00:00 2001
2From: Scott Murray <scott.murray@konsulko.com>
3Date: Fri, 13 Sep 2019 19:26:27 -0400
4Subject: [PATCH] Include sys/wait.h
2 5
3Fixes: 6Fixes:
4src/login/logind-brightness.c:158:85: error: 'WEXITED' undeclared (first use in this function); did you mean 'WIFEXITED'? 7src/login/logind-brightness.c:158:85: error: 'WEXITED' undeclared (first use in this function); did you mean 'WIFEXITED'?
@@ -8,12 +11,13 @@ src/login/logind-brightness.c:158:85: error: 'WEXITED' undeclared (first use in
8Upstream-Status: Pending 11Upstream-Status: Pending
9 12
10Signed-off-by: Scott Murray <scott.murray@konsulko.com> 13Signed-off-by: Scott Murray <scott.murray@konsulko.com>
14
11--- 15---
12 src/login/logind-brightness.c | 1 + 16 src/login/logind-brightness.c | 1 +
13 1 file changed, 1 insertion(+) 17 1 file changed, 1 insertion(+)
14 18
15diff --git a/src/login/logind-brightness.c b/src/login/logind-brightness.c 19diff --git a/src/login/logind-brightness.c b/src/login/logind-brightness.c
16index 8dfa97d7ae..bddd4a2727 100644 20index 3f4b65e1fdf1..5af7e3d5ce3f 100644
17--- a/src/login/logind-brightness.c 21--- a/src/login/logind-brightness.c
18+++ b/src/login/logind-brightness.c 22+++ b/src/login/logind-brightness.c
19@@ -1,5 +1,6 @@ 23@@ -1,5 +1,6 @@
diff --git a/meta/recipes-core/systemd/systemd/0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch b/meta/recipes-core/systemd/systemd/0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
deleted file mode 100644
index 49a334d090..0000000000
--- a/meta/recipes-core/systemd/systemd/0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
+++ /dev/null
@@ -1,63 +0,0 @@
1From bdbafe18c3bf99b3b691cd52b9ccff60f313892d Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Wed, 27 Jun 2018 16:09:24 +0800
4Subject: [PATCH 2/5] use lnr wrapper instead of looking for --relative option
5 for ln
6
7Remove file manually to avoid the 'File Exists' error when creating
8symlink. This is because the original 'ln' command uses '-f' option.
9
10Upstream-Status: Inappropriate [OE-Specific]
11
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
14[rebased for systemd 243]
15Signed-off-by: Scott Murray <scott.murray@konsulko.com>
16---
17 meson.build | 4 ----
18 tools/meson-make-symlink.sh | 3 ++-
19 units/meson-add-wants.sh | 7 ++++++-
20 3 files changed, 8 insertions(+), 6 deletions(-)
21
22diff --git a/meson.build b/meson.build
23index e5ceb1e169..79b762faeb 100644
24--- a/meson.build
25+++ b/meson.build
26@@ -579,10 +579,6 @@ endforeach
27
28 conf.set_quoted('TELINIT', get_option('telinit-path'))
29
30-if run_command('ln', '--relative', '--help').returncode() != 0
31- error('ln does not support --relative (added in coreutils 8.16)')
32-endif
33-
34 ############################################################
35
36 gperf = find_program('gperf')
37diff --git a/tools/meson-make-symlink.sh b/tools/meson-make-symlink.sh
38index da0d13a341..90bc0a93c2 100755
39--- a/tools/meson-make-symlink.sh
40+++ b/tools/meson-make-symlink.sh
41@@ -8,5 +8,6 @@ mkdir -vp "$(dirname "${DESTDIR:-}$2")"
42 if [ "$(dirname $1)" = . ]; then
43 ln -vfs -T "$1" "${DESTDIR:-}$2"
44 else
45- ln -vfs -T --relative "${DESTDIR:-}$1" "${DESTDIR:-}$2"
46+ rm -f "${DESTDIR:-}$2"
47+ lnr "${DESTDIR:-}$1" "${DESTDIR:-}$2"
48 fi
49diff --git a/units/meson-add-wants.sh b/units/meson-add-wants.sh
50index a483d75b86..3c01c523f1 100755
51--- a/units/meson-add-wants.sh
52+++ b/units/meson-add-wants.sh
53@@ -25,4 +25,9 @@ case "$target" in
54 ;;
55 esac
56
57-ln -vfs --relative "$unitpath" "$dir"
58+if [ -d "$dir" ]; then
59+ rm -f "$dir/$unit"
60+ lnr "$unitpath" "$dir/$unit"
61+else
62+ lnr "$unitpath" "$dir"
63+fi
diff --git a/meta/recipes-core/systemd/systemd/0003-implment-systemd-sysv-install-for-OE.patch b/meta/recipes-core/systemd/systemd/0003-implment-systemd-sysv-install-for-OE.patch
index 6695d56804..c6204786b3 100644
--- a/meta/recipes-core/systemd/systemd/0003-implment-systemd-sysv-install-for-OE.patch
+++ b/meta/recipes-core/systemd/systemd/0003-implment-systemd-sysv-install-for-OE.patch
@@ -1,7 +1,7 @@
1From 47864989388bcd04d647ecf618ad7e260399dbb6 Mon Sep 17 00:00:00 2001 1From f9078501a1495c9991431d1435d081cd2e830328 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 5 Sep 2015 06:31:47 +0000 3Date: Sat, 5 Sep 2015 06:31:47 +0000
4Subject: [PATCH 3/5] implment systemd-sysv-install for OE 4Subject: [PATCH] implment systemd-sysv-install for OE
5 5
6Use update-rc.d for enabling/disabling and status command 6Use update-rc.d for enabling/disabling and status command
7to check the status of the sysv service 7to check the status of the sysv service
@@ -9,12 +9,13 @@ to check the status of the sysv service
9Upstream-Status: Inappropriate [OE-Specific] 9Upstream-Status: Inappropriate [OE-Specific]
10 10
11Signed-off-by: Khem Raj <raj.khem@gmail.com> 11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12
12--- 13---
13 src/systemctl/systemd-sysv-install.SKELETON | 6 +++--- 14 src/systemctl/systemd-sysv-install.SKELETON | 6 +++---
14 1 file changed, 3 insertions(+), 3 deletions(-) 15 1 file changed, 3 insertions(+), 3 deletions(-)
15 16
16diff --git a/src/systemctl/systemd-sysv-install.SKELETON b/src/systemctl/systemd-sysv-install.SKELETON 17diff --git a/src/systemctl/systemd-sysv-install.SKELETON b/src/systemctl/systemd-sysv-install.SKELETON
17index 8c16cf9..9f078a1 100755 18index 8c16cf99913f..9f078a121469 100755
18--- a/src/systemctl/systemd-sysv-install.SKELETON 19--- a/src/systemctl/systemd-sysv-install.SKELETON
19+++ b/src/systemctl/systemd-sysv-install.SKELETON 20+++ b/src/systemctl/systemd-sysv-install.SKELETON
20@@ -32,17 +32,17 @@ case "$1" in 21@@ -32,17 +32,17 @@ case "$1" in
@@ -38,6 +39,3 @@ index 8c16cf9..9f078a1 100755
38 ;; 39 ;;
39 *) 40 *)
40 usage ;; 41 usage ;;
41--
422.7.4
43
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 2e39f7a2e1..1404895143 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,24 +1,28 @@
1From a9421d55102fc84f77f7c21a2479fcd00652b896 Mon Sep 17 00:00:00 2001 1From 233de872b9b033ec842c2135152d2e006ac44c16 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 03/24] missing_type.h: add __compare_fn_t and comparison_fn_t 4Subject: [PATCH] missing_type.h: add __compare_fn_t and comparison_fn_t
5 5
6Make it work with musl where comparison_fn_t and __compare_fn_t 6Make it work with musl where comparison_fn_t and __compare_fn_t
7is not provided. 7is not provided.
8 8
9Upstream-Status: Inappropriate [musl specific] 9Upstream-Status: Inappropriate [musl specific]
10 10
11Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
12[Rebased for v244]
11Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 13Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
12[Rebased for v242] 14[Rebased for v242]
13Signed-off-by: Andrej Valek <andrej.valek@siemens.com> 15Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
16
14--- 17---
15 src/basic/missing_type.h | 9 +++++++++ 18 src/basic/missing_type.h | 9 +++++++++
16 src/basic/sort-util.h | 1 + 19 src/basic/sort-util.h | 1 +
20 src/core/kmod-setup.c | 1 +
17 src/journal/catalog.c | 1 + 21 src/journal/catalog.c | 1 +
18 3 files changed, 11 insertions(+) 22 4 files changed, 12 insertions(+)
19 23
20diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h 24diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h
21index bf8a6caa1b..2134fe5095 100644 25index bf8a6caa1b46..c487e65e7bde 100644
22--- a/src/basic/missing_type.h 26--- a/src/basic/missing_type.h
23+++ b/src/basic/missing_type.h 27+++ b/src/basic/missing_type.h
24@@ -10,3 +10,12 @@ 28@@ -10,3 +10,12 @@
@@ -35,29 +39,38 @@ index bf8a6caa1b..2134fe5095 100644
35+typedef int (*__compar_fn_t)(const void *, const void *); 39+typedef int (*__compar_fn_t)(const void *, const void *);
36+#endif 40+#endif
37diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h 41diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h
38index e029f86..7247d40 100644 42index 27d68b341cf3..307ea4ac0e8e 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 @@
42 #include <stdlib.h> 46 #include <stdlib.h>
43 47
44 #include "macro.h" 48 #include "macro.h"
45+#include "missing.h" 49+#include "missing_type.h"
46 50
47 void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size, 51 void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size,
48 __compar_d_fn_t compar, void *arg); 52 __compar_d_fn_t compar, void *arg);
53diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
54index 128674327362..09ccd613e32c 100644
55--- a/src/core/kmod-setup.c
56+++ b/src/core/kmod-setup.c
57@@ -10,6 +10,7 @@
58 #include "kmod-setup.h"
59 #include "macro.h"
60 #include "string-util.h"
61+#include "missing_type.h"
62
63 #if HAVE_KMOD
64 #include "module-util.h"
49diff --git a/src/journal/catalog.c b/src/journal/catalog.c 65diff --git a/src/journal/catalog.c b/src/journal/catalog.c
50index 7beffc1e1a..4818a2e5cc 100644 66index 70b2c8b46c4e..d574a64586f1 100644
51--- a/src/journal/catalog.c 67--- a/src/journal/catalog.c
52+++ b/src/journal/catalog.c 68+++ b/src/journal/catalog.c
53@@ -29,6 +29,7 @@ 69@@ -28,6 +28,7 @@
54 #include "string-util.h" 70 #include "string-util.h"
55 #include "strv.h" 71 #include "strv.h"
56 #include "tmpfile-util.h" 72 #include "tmpfile-util.h"
57+#include "missing.h" 73+#include "missing_type.h"
58 74
59 const char * const catalog_file_dirs[] = { 75 const char * const catalog_file_dirs[] = {
60 "/usr/local/lib/systemd/catalog/", 76 "/usr/local/lib/systemd/catalog/",
61--
622.11.0
63
diff --git a/meta/recipes-core/systemd/systemd/0003-src-basic-copy.c-include-signal.h.patch b/meta/recipes-core/systemd/systemd/0003-src-basic-copy.c-include-signal.h.patch
index 7ee0d48fa6..538a99c7d7 100644
--- a/meta/recipes-core/systemd/systemd/0003-src-basic-copy.c-include-signal.h.patch
+++ b/meta/recipes-core/systemd/systemd/0003-src-basic-copy.c-include-signal.h.patch
@@ -1,4 +1,7 @@
1Include signal.h 1From 082d2eb2a65525890a913723764e67a36ee75384 Mon Sep 17 00:00:00 2001
2From: Scott Murray <scott.murray@konsulko.com>
3Date: Fri, 13 Sep 2019 19:26:27 -0400
4Subject: [PATCH] Include signal.h
2 5
3Fixes several signal set related errors: 6Fixes several signal set related errors:
4src/basic/copy.c:92:19: error: implicit declaration of function 'sigemptyset' [-Werror=implicit-function-declaration] 7src/basic/copy.c:92:19: error: implicit declaration of function 'sigemptyset' [-Werror=implicit-function-declaration]
@@ -9,17 +12,18 @@ src/basic/copy.c:95:13: error: implicit declaration of function 'sigtimedwait' [
9Upstream-Status: Pending 12Upstream-Status: Pending
10 13
11Signed-off-by: Scott Murray <scott.murray@konsulko.com> 14Signed-off-by: Scott Murray <scott.murray@konsulko.com>
15
12--- 16---
13 src/basic/copy.c | 1 + 17 src/basic/copy.c | 1 +
14 1 file changed, 1 insertion(+) 18 1 file changed, 1 insertion(+)
15 19
16diff --git a/src/basic/copy.c b/src/basic/copy.c 20diff --git a/src/basic/copy.c b/src/basic/copy.c
17index ca311e021e..3cf7fc1697 100644 21index 9028868f696d..5168586fa522 100644
18--- a/src/basic/copy.c 22--- a/src/basic/copy.c
19+++ b/src/basic/copy.c 23+++ b/src/basic/copy.c
20@@ -12,6 +12,7 @@ 24@@ -8,6 +8,7 @@
25 #include <sys/sendfile.h>
21 #include <sys/xattr.h> 26 #include <sys/xattr.h>
22 #include <time.h>
23 #include <unistd.h> 27 #include <unistd.h>
24+#include <signal.h> 28+#include <signal.h>
25 29
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 a2aad40ac2..71e52c4967 100644
--- a/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch
+++ b/meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch
@@ -1,7 +1,7 @@
1From 7bcf3b166694090497a0acd2c5299e4e04fcc9b6 Mon Sep 17 00:00:00 2001 1From 142dcaef0d24a78d3c0c94168b66fdf234497e97 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:04:21 +0800 3Date: Mon, 25 Feb 2019 14:04:21 +0800
4Subject: [PATCH 04/24] add fallback parse_printf_format implementation 4Subject: [PATCH] add fallback parse_printf_format implementation
5 5
6Upstream-Status: Inappropriate [musl specific] 6Upstream-Status: Inappropriate [musl specific]
7 7
@@ -10,11 +10,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
10Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 10Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
11[rebased for systemd 243] 11[rebased for systemd 243]
12Signed-off-by: Scott Murray <scott.murray@konsulko.com> 12Signed-off-by: Scott Murray <scott.murray@konsulko.com>
13
13--- 14---
14 meson.build | 1 + 15 meson.build | 1 +
15 src/basic/meson.build | 5 + 16 src/basic/meson.build | 5 +
16 src/basic/parse-printf-format.c | 273 ++++++++++++++++++++++++++++++++++++++++ 17 src/basic/parse-printf-format.c | 273 ++++++++++++++++++++++++++++++++
17 src/basic/parse-printf-format.h | 57 +++++++++ 18 src/basic/parse-printf-format.h | 57 +++++++
18 src/basic/stdio-util.h | 2 +- 19 src/basic/stdio-util.h | 2 +-
19 src/journal/journal-send.c | 2 +- 20 src/journal/journal-send.c | 2 +-
20 6 files changed, 338 insertions(+), 2 deletions(-) 21 6 files changed, 338 insertions(+), 2 deletions(-)
@@ -22,10 +23,10 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
22 create mode 100644 src/basic/parse-printf-format.h 23 create mode 100644 src/basic/parse-printf-format.h
23 24
24diff --git a/meson.build b/meson.build 25diff --git a/meson.build b/meson.build
25index 79b762faeb..7f8c679411 100644 26index 21d6968abdf4..bab0bf84806c 100644
26--- a/meson.build 27--- a/meson.build
27+++ b/meson.build 28+++ b/meson.build
28@@ -613,6 +613,7 @@ endif 29@@ -628,6 +628,7 @@ endif
29 foreach header : ['crypt.h', 30 foreach header : ['crypt.h',
30 'linux/memfd.h', 31 'linux/memfd.h',
31 'linux/vm_sockets.h', 32 'linux/vm_sockets.h',
@@ -34,10 +35,10 @@ index 79b762faeb..7f8c679411 100644
34 'valgrind/memcheck.h', 35 'valgrind/memcheck.h',
35 'valgrind/valgrind.h', 36 'valgrind/valgrind.h',
36diff --git a/src/basic/meson.build b/src/basic/meson.build 37diff --git a/src/basic/meson.build b/src/basic/meson.build
37index d6caf28f14..32c1acf349 100644 38index f70d1b8bf8a0..4cd57373e10d 100644
38--- a/src/basic/meson.build 39--- a/src/basic/meson.build
39+++ b/src/basic/meson.build 40+++ b/src/basic/meson.build
40@@ -312,6 +312,11 @@ foreach item : [['af', af_list_txt, 'af', ''], 41@@ -311,6 +311,11 @@ foreach item : [['af', af_list_txt, 'af', ''],
41 endforeach 42 endforeach
42 43
43 basic_sources += generated_gperf_headers 44 basic_sources += generated_gperf_headers
@@ -51,7 +52,7 @@ index d6caf28f14..32c1acf349 100644
51 'gcrypt-util.h') 52 'gcrypt-util.h')
52diff --git a/src/basic/parse-printf-format.c b/src/basic/parse-printf-format.c 53diff --git a/src/basic/parse-printf-format.c b/src/basic/parse-printf-format.c
53new file mode 100644 54new file mode 100644
54index 0000000000..49437e5445 55index 000000000000..49437e544540
55--- /dev/null 56--- /dev/null
56+++ b/src/basic/parse-printf-format.c 57+++ b/src/basic/parse-printf-format.c
57@@ -0,0 +1,273 @@ 58@@ -0,0 +1,273 @@
@@ -330,7 +331,7 @@ index 0000000000..49437e5445
330+} 331+}
331diff --git a/src/basic/parse-printf-format.h b/src/basic/parse-printf-format.h 332diff --git a/src/basic/parse-printf-format.h b/src/basic/parse-printf-format.h
332new file mode 100644 333new file mode 100644
333index 0000000000..47be7522d7 334index 000000000000..47be7522d7fa
334--- /dev/null 335--- /dev/null
335+++ b/src/basic/parse-printf-format.h 336+++ b/src/basic/parse-printf-format.h
336@@ -0,0 +1,57 @@ 337@@ -0,0 +1,57 @@
@@ -392,7 +393,7 @@ index 0000000000..47be7522d7
392+ 393+
393+#endif /* HAVE_PRINTF_H */ 394+#endif /* HAVE_PRINTF_H */
394diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h 395diff --git a/src/basic/stdio-util.h b/src/basic/stdio-util.h
395index c3b9448d4f..2937aa13b1 100644 396index c3b9448d4f4f..2937aa13b178 100644
396--- a/src/basic/stdio-util.h 397--- a/src/basic/stdio-util.h
397+++ b/src/basic/stdio-util.h 398+++ b/src/basic/stdio-util.h
398@@ -1,13 +1,13 @@ 399@@ -1,13 +1,13 @@
@@ -411,7 +412,7 @@ index c3b9448d4f..2937aa13b1 100644
411 #define snprintf_ok(buf, len, fmt, ...) \ 412 #define snprintf_ok(buf, len, fmt, ...) \
412 ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len)) 413 ((size_t) snprintf(buf, len, fmt, __VA_ARGS__) < (len))
413diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c 414diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c
414index 5ef11fa1a4..6384ab620c 100644 415index 912ecef73cce..43ed756bda53 100644
415--- a/src/journal/journal-send.c 416--- a/src/journal/journal-send.c
416+++ b/src/journal/journal-send.c 417+++ b/src/journal/journal-send.c
417@@ -2,7 +2,6 @@ 418@@ -2,7 +2,6 @@
@@ -420,9 +421,9 @@ index 5ef11fa1a4..6384ab620c 100644
420 #include <fcntl.h> 421 #include <fcntl.h>
421-#include <printf.h> 422-#include <printf.h>
422 #include <stddef.h> 423 #include <stddef.h>
423 #include <sys/socket.h>
424 #include <sys/un.h> 424 #include <sys/un.h>
425@@ -21,6 +20,7 @@ 425 #include <unistd.h>
426@@ -20,6 +19,7 @@
426 #include "stdio-util.h" 427 #include "stdio-util.h"
427 #include "string-util.h" 428 #include "string-util.h"
428 #include "tmpfile-util.h" 429 #include "tmpfile-util.h"
diff --git a/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch b/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch
index 0f75e8c12d..685df01a10 100644
--- a/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch
+++ b/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch
@@ -1,4 +1,7 @@
1Handle __cpu_mask usage 1From 6883ffc99168056101c667c6421f8353d5ad675a Mon Sep 17 00:00:00 2001
2From: Scott Murray <scott.murray@konsulko.com>
3Date: Fri, 13 Sep 2019 19:26:27 -0400
4Subject: [PATCH] Handle __cpu_mask usage
2 5
3Fixes errors: 6Fixes errors:
4 7
@@ -15,13 +18,14 @@ add a typedef to cpu-set-util.h defining __cpu_mask appropriately.
15Upstream-Status: Inappropriate [musl specific] 18Upstream-Status: Inappropriate [musl specific]
16 19
17Signed-off-by: Scott Murray <scott.murray@konsulko.com> 20Signed-off-by: Scott Murray <scott.murray@konsulko.com>
21
18--- 22---
19 src/shared/cpu-set-util.h | 2 ++ 23 src/shared/cpu-set-util.h | 2 ++
20 src/test/test-sizeof.c | 2 +- 24 src/test/test-sizeof.c | 2 +-
21 2 files changed, 3 insertions(+), 1 deletion(-) 25 2 files changed, 3 insertions(+), 1 deletion(-)
22 26
23diff --git a/src/shared/cpu-set-util.h b/src/shared/cpu-set-util.h 27diff --git a/src/shared/cpu-set-util.h b/src/shared/cpu-set-util.h
24index 27812dfd59..f698f9df83 100644 28index 27812dfd5923..0ab40731ea93 100644
25--- a/src/shared/cpu-set-util.h 29--- a/src/shared/cpu-set-util.h
26+++ b/src/shared/cpu-set-util.h 30+++ b/src/shared/cpu-set-util.h
27@@ -6,6 +6,8 @@ 31@@ -6,6 +6,8 @@
@@ -34,7 +38,7 @@ index 27812dfd59..f698f9df83 100644
34 typedef struct CPUSet { 38 typedef struct CPUSet {
35 cpu_set_t *set; 39 cpu_set_t *set;
36diff --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
37index a710db5370..d1601ad929 100644 41index a710db5370b8..d1601ad9292d 100644
38--- a/src/test/test-sizeof.c 42--- a/src/test/test-sizeof.c
39+++ b/src/test/test-sizeof.c 43+++ b/src/test/test-sizeof.c
40@@ -1,6 +1,5 @@ 44@@ -1,6 +1,5 @@
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 adfc3b7861..aa4bb063c9 100644
--- a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch
+++ b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch
@@ -1,7 +1,7 @@
1From 399fd3eda3045636a70da438a0fd1406cc332ed1 Mon Sep 17 00:00:00 2001 1From 9597196234a0ccf30d7f65cf185a8c24cb3158b3 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 05/24] src/basic/missing.h: check for missing strndupa 4Subject: [PATCH] src/basic/missing.h: check for missing strndupa
5 5
6include missing.h for definition of strndupa 6include missing.h for definition of strndupa
7 7
@@ -13,28 +13,47 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
13Signed-off-by: Andrej Valek <andrej.valek@siemens.com> 13Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
14[rebased for systemd 243] 14[rebased for systemd 243]
15Signed-off-by: Scott Murray <scott.murray@konsulko.com> 15Signed-off-by: Scott Murray <scott.murray@konsulko.com>
16Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
17[rebased for systemd 244]
18
16--- 19---
17 meson.build | 1 + 20 meson.build | 1 +
18 src/backlight/backlight.c | 1 + 21 src/backlight/backlight.c | 1 +
22 src/basic/cgroup-util.c | 1 +
19 src/basic/env-util.c | 1 + 23 src/basic/env-util.c | 1 +
24 src/basic/log.c | 1 +
20 src/basic/missing_stdlib.h | 12 ++++++++++++ 25 src/basic/missing_stdlib.h | 12 ++++++++++++
21 src/basic/mkdir.c | 1 + 26 src/basic/mkdir.c | 1 +
22 src/basic/parse-util.c | 1 + 27 src/basic/parse-util.c | 1 +
23 src/basic/proc-cmdline.c | 1 + 28 src/basic/proc-cmdline.c | 1 +
24 src/basic/procfs-util.c | 1 + 29 src/basic/procfs-util.c | 1 +
30 src/basic/selinux-util.c | 1 +
25 src/basic/time-util.c | 1 + 31 src/basic/time-util.c | 1 +
32 src/boot/bless-boot.c | 1 +
26 src/core/dbus-cgroup.c | 1 + 33 src/core/dbus-cgroup.c | 1 +
34 src/core/dbus-execute.c | 1 +
27 src/core/dbus-util.c | 1 + 35 src/core/dbus-util.c | 1 +
36 src/core/execute.c | 1 +
28 src/core/kmod-setup.c | 1 + 37 src/core/kmod-setup.c | 1 +
29 src/core/service.c | 1 + 38 src/core/service.c | 1 +
39 src/coredump/coredump-vacuum.c | 1 +
40 src/journal-remote/journal-remote-main.c | 1 +
30 src/journal/journalctl.c | 1 + 41 src/journal/journalctl.c | 1 +
31 src/libsystemd/sd-bus/bus-message.c | 1 + 42 src/libsystemd/sd-bus/bus-message.c | 1 +
32 src/libsystemd/sd-bus/bus-objects.c | 1 + 43 src/libsystemd/sd-bus/bus-objects.c | 1 +
44 src/libsystemd/sd-bus/bus-socket.c | 1 +
45 src/libsystemd/sd-bus/sd-bus.c | 1 +
33 src/libsystemd/sd-bus/test-bus-benchmark.c | 1 + 46 src/libsystemd/sd-bus/test-bus-benchmark.c | 1 +
34 src/locale/keymap-util.c | 1 + 47 src/locale/keymap-util.c | 1 +
35 src/login/pam_systemd.c | 1 + 48 src/login/pam_systemd.c | 1 +
36 src/network/generator/network-generator.c | 1 + 49 src/network/generator/network-generator.c | 1 +
37 src/nspawn/nspawn-settings.c | 1 + 50 src/nspawn/nspawn-settings.c | 1 +
51 src/nss-mymachines/nss-mymachines.c | 1 +
52 src/portable/portable.c | 1 +
53 src/resolve/resolvectl.c | 1 +
54 src/shared/bus-unit-procs.c | 1 +
55 src/shared/bus-unit-util.c | 1 +
56 src/shared/bus-util.c | 1 +
38 src/shared/dns-domain.c | 1 + 57 src/shared/dns-domain.c | 1 +
39 src/shared/journal-importer.c | 1 + 58 src/shared/journal-importer.c | 1 +
40 src/shared/logs-show.c | 1 + 59 src/shared/logs-show.c | 1 +
@@ -46,13 +65,13 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
46 src/udev/udev-builtin-path_id.c | 1 + 65 src/udev/udev-builtin-path_id.c | 1 +
47 src/udev/udev-event.c | 1 + 66 src/udev/udev-event.c | 1 +
48 src/udev/udev-rules.c | 1 + 67 src/udev/udev-rules.c | 1 +
49 32 files changed, 43 insertions(+) 68 48 files changed, 59 insertions(+)
50 69
51diff --git a/meson.build b/meson.build 70diff --git a/meson.build b/meson.build
52index 7f8c679411..81c061b768 100644 71index bab0bf84806c..f4e1736cf09e 100644
53--- a/meson.build 72--- a/meson.build
54+++ b/meson.build 73+++ b/meson.build
55@@ -506,6 +506,7 @@ foreach ident : [ 74@@ -517,6 +517,7 @@ foreach ident : [
56 #include <unistd.h>'''], 75 #include <unistd.h>'''],
57 ['get_mempolicy', '''#include <stdlib.h> 76 ['get_mempolicy', '''#include <stdlib.h>
58 #include <unistd.h>'''], 77 #include <unistd.h>'''],
@@ -61,31 +80,55 @@ index 7f8c679411..81c061b768 100644
61 80
62 have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE') 81 have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE')
63diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c 82diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
64index dfd6805398..c2b2ace6ec 100644 83index 048441429025..01d74ea0ed4e 100644
65--- a/src/backlight/backlight.c 84--- a/src/backlight/backlight.c
66+++ b/src/backlight/backlight.c 85+++ b/src/backlight/backlight.c
67@@ -17,6 +17,7 @@ 86@@ -17,6 +17,7 @@
68 #include "string-util.h" 87 #include "string-util.h"
69 #include "strv.h" 88 #include "strv.h"
70 #include "util.h" 89 #include "util.h"
71+#include "missing.h" 90+#include "missing_stdlib.h"
72 91
73 static int find_pci_or_platform_parent(sd_device *device, sd_device **ret) { 92 static int find_pci_or_platform_parent(sd_device *device, sd_device **ret) {
74 const char *subsystem, *sysname, *value; 93 const char *subsystem, *sysname, *value;
94diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
95index 54fc6ecf8b20..a5141f4cbedd 100644
96--- a/src/basic/cgroup-util.c
97+++ b/src/basic/cgroup-util.c
98@@ -37,6 +37,7 @@
99 #include "strv.h"
100 #include "unit-name.h"
101 #include "user-util.h"
102+#include "missing_stdlib.h"
103
104 static int cg_enumerate_items(const char *controller, const char *path, FILE **_f, const char *item) {
105 _cleanup_free_ char *fs = NULL;
75diff --git a/src/basic/env-util.c b/src/basic/env-util.c 106diff --git a/src/basic/env-util.c b/src/basic/env-util.c
76index a6503cf2b6..ceef9a62c8 100644 107index b8dc98915f81..5049b37594bc 100644
77--- a/src/basic/env-util.c 108--- a/src/basic/env-util.c
78+++ b/src/basic/env-util.c 109+++ b/src/basic/env-util.c
79@@ -16,6 +16,7 @@ 110@@ -15,6 +15,7 @@
80 #include "string-util.h" 111 #include "string-util.h"
81 #include "strv.h" 112 #include "strv.h"
82 #include "utf8.h" 113 #include "utf8.h"
83+#include "missing.h" 114+#include "missing_stdlib.h"
84 115
85 #define VALID_CHARS_ENV_NAME \ 116 #define VALID_CHARS_ENV_NAME \
86 DIGITS LETTERS \ 117 DIGITS LETTERS \
118diff --git a/src/basic/log.c b/src/basic/log.c
119index 17557e1844b2..6cec4d324aab 100644
120--- a/src/basic/log.c
121+++ b/src/basic/log.c
122@@ -34,6 +34,7 @@
123 #include "terminal-util.h"
124 #include "time-util.h"
125 #include "utf8.h"
126+#include "missing_stdlib.h"
127
128 #define SNDBUF_SIZE (8*1024*1024)
129
87diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h 130diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h
88index 188a8d4406..1e16ec287a 100644 131index 188a8d44066a..1e16ec287aad 100644
89--- a/src/basic/missing_stdlib.h 132--- a/src/basic/missing_stdlib.h
90+++ b/src/basic/missing_stdlib.h 133+++ b/src/basic/missing_stdlib.h
91@@ -11,3 +11,15 @@ 134@@ -11,3 +11,15 @@
@@ -105,338 +148,506 @@ index 188a8d4406..1e16ec287a 100644
105+ }) 148+ })
106+#endif 149+#endif
107diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c 150diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c
108index 6b82eab640..51c6b78615 100644 151index fa682d4c438e..37902551490a 100644
109--- a/src/basic/mkdir.c 152--- a/src/basic/mkdir.c
110+++ b/src/basic/mkdir.c 153+++ b/src/basic/mkdir.c
111@@ -14,6 +14,7 @@ 154@@ -13,6 +13,7 @@
112 #include "stat-util.h" 155 #include "stat-util.h"
113 #include "stdio-util.h" 156 #include "stdio-util.h"
114 #include "user-util.h" 157 #include "user-util.h"
115+#include "missing.h" 158+#include "missing_stdlib.h"
116 159
117 int mkdir_safe_internal(const char *path, mode_t mode, uid_t uid, gid_t gid, MkdirFlags flags, mkdir_func_t _mkdir) { 160 int mkdir_safe_internal(const char *path, mode_t mode, uid_t uid, gid_t gid, MkdirFlags flags, mkdir_func_t _mkdir) {
118 struct stat st; 161 struct stat st;
119diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c 162diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
120index 115a1494a2..07a34bfd53 100644 163index aec6099c9cc1..744b9b134ce4 100644
121--- a/src/basic/parse-util.c 164--- a/src/basic/parse-util.c
122+++ b/src/basic/parse-util.c 165+++ b/src/basic/parse-util.c
123@@ -20,6 +20,7 @@ 166@@ -18,6 +18,7 @@
124 #include "process-util.h" 167 #include "process-util.h"
125 #include "stat-util.h" 168 #include "stat-util.h"
126 #include "string-util.h" 169 #include "string-util.h"
127+#include "missing.h" 170+#include "missing_stdlib.h"
128 171
129 int parse_boolean(const char *v) { 172 int parse_boolean(const char *v) {
130 if (!v) 173 if (!v)
131diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c 174diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c
132index 09169cf963..f411ba897f 100644 175index d3d99d9a7f90..e0b9efad03a2 100644
133--- a/src/basic/proc-cmdline.c 176--- a/src/basic/proc-cmdline.c
134+++ b/src/basic/proc-cmdline.c 177+++ b/src/basic/proc-cmdline.c
135@@ -15,6 +15,7 @@ 178@@ -15,6 +15,7 @@
136 #include "string-util.h" 179 #include "string-util.h"
137 #include "util.h" 180 #include "util.h"
138 #include "virt.h" 181 #include "virt.h"
139+#include "missing.h" 182+#include "missing_stdlib.h"
140 183
141 int proc_cmdline(char **ret) { 184 int proc_cmdline(char **ret) {
142 const char *e; 185 const char *e;
143diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c 186diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c
144index 7aaf95bfce..42ce53d5aa 100644 187index 7aaf95bfced2..da7e836f143e 100644
145--- a/src/basic/procfs-util.c 188--- a/src/basic/procfs-util.c
146+++ b/src/basic/procfs-util.c 189+++ b/src/basic/procfs-util.c
147@@ -11,6 +11,7 @@ 190@@ -11,6 +11,7 @@
148 #include "procfs-util.h" 191 #include "procfs-util.h"
149 #include "stdio-util.h" 192 #include "stdio-util.h"
150 #include "string-util.h" 193 #include "string-util.h"
151+#include "missing.h" 194+#include "missing_stdlib.h"
152 195
153 int procfs_tasks_get_limit(uint64_t *ret) { 196 int procfs_tasks_get_limit(uint64_t *ret) {
154 _cleanup_free_ char *value = NULL; 197 _cleanup_free_ char *value = NULL;
198diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c
199index f35e760233be..e4b0a8aa445e 100644
200--- a/src/basic/selinux-util.c
201+++ b/src/basic/selinux-util.c
202@@ -26,6 +26,7 @@
203 #include "selinux-util.h"
204 #include "stdio-util.h"
205 #include "time-util.h"
206+#include "missing_stdlib.h"
207
208 #if HAVE_SELINUX
209 DEFINE_TRIVIAL_CLEANUP_FUNC(char*, freecon);
155diff --git a/src/basic/time-util.c b/src/basic/time-util.c 210diff --git a/src/basic/time-util.c b/src/basic/time-util.c
156index 3018e81acb..4e2b3b66c1 100644 211index bfe2c60da173..d7ef30d2fe52 100644
157--- a/src/basic/time-util.c 212--- a/src/basic/time-util.c
158+++ b/src/basic/time-util.c 213+++ b/src/basic/time-util.c
159@@ -28,6 +28,7 @@ 214@@ -26,6 +26,7 @@
160 #include "string-util.h" 215 #include "string-util.h"
161 #include "strv.h" 216 #include "strv.h"
162 #include "time-util.h" 217 #include "time-util.h"
163+#include "missing.h" 218+#include "missing_stdlib.h"
164 219
165 static clockid_t map_clock_id(clockid_t c) { 220 static clockid_t map_clock_id(clockid_t c) {
166 221
222diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c
223index b96e1f927fff..cba979baca3e 100644
224--- a/src/boot/bless-boot.c
225+++ b/src/boot/bless-boot.c
226@@ -18,6 +18,7 @@
227 #include "util.h"
228 #include "verbs.h"
229 #include "virt.h"
230+#include "missing_stdlib.h"
231
232 static char **arg_path = NULL;
233
167diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c 234diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c
168index 2f2313c599..c9937f9d62 100644 235index 27dc9e43c3e2..b1a83023600b 100644
169--- a/src/core/dbus-cgroup.c 236--- a/src/core/dbus-cgroup.c
170+++ b/src/core/dbus-cgroup.c 237+++ b/src/core/dbus-cgroup.c
171@@ -15,6 +15,7 @@ 238@@ -15,6 +15,7 @@
172 #include "fileio.h" 239 #include "fileio.h"
173 #include "limits-util.h" 240 #include "limits-util.h"
174 #include "path-util.h" 241 #include "path-util.h"
175+#include "missing.h" 242+#include "missing_stdlib.h"
176 243
177 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_cgroup_device_policy, cgroup_device_policy, CGroupDevicePolicy); 244 BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", TasksMax, tasks_max_resolve);
245
246diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
247index 1d0bc1ede3cb..313654913345 100644
248--- a/src/core/dbus-execute.c
249+++ b/src/core/dbus-execute.c
250@@ -41,6 +41,7 @@
251 #include "unit-printf.h"
252 #include "user-util.h"
253 #include "utf8.h"
254+#include "missing_stdlib.h"
178 255
256 BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_exec_output, exec_output, ExecOutput);
257 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exec_input, exec_input, ExecInput);
179diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c 258diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c
180index 7862beaacb..19f6968cfe 100644 259index 7862beaacb6d..3b1ea53a5f0d 100644
181--- a/src/core/dbus-util.c 260--- a/src/core/dbus-util.c
182+++ b/src/core/dbus-util.c 261+++ b/src/core/dbus-util.c
183@@ -7,6 +7,7 @@ 262@@ -7,6 +7,7 @@
184 #include "unit-printf.h" 263 #include "unit-printf.h"
185 #include "user-util.h" 264 #include "user-util.h"
186 #include "unit.h" 265 #include "unit.h"
187+#include "missing.h" 266+#include "missing_stdlib.h"
188 267
189 int bus_property_get_triggered_unit( 268 int bus_property_get_triggered_unit(
190 sd_bus *bus, 269 sd_bus *bus,
270diff --git a/src/core/execute.c b/src/core/execute.c
271index abc164ff5bef..f04b8ba05002 100644
272--- a/src/core/execute.c
273+++ b/src/core/execute.c
274@@ -88,6 +88,7 @@
275 #include "unit.h"
276 #include "user-util.h"
277 #include "utmp-wtmp.h"
278+#include "missing_stdlib.h"
279
280 #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC)
281 #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC)
191diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c 282diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
192index a91cfebc67..a45961013f 100644 283index 09ccd613e32c..f4e64fa283e9 100644
193--- a/src/core/kmod-setup.c 284--- a/src/core/kmod-setup.c
194+++ b/src/core/kmod-setup.c 285+++ b/src/core/kmod-setup.c
195@@ -11,6 +11,7 @@ 286@@ -11,6 +11,7 @@
196 #include "kmod-setup.h"
197 #include "macro.h" 287 #include "macro.h"
198 #include "string-util.h" 288 #include "string-util.h"
199+#include "missing.h" 289 #include "missing_type.h"
290+#include "missing_stdlib.h"
200 291
201 #if HAVE_KMOD 292 #if HAVE_KMOD
202 #include <libkmod.h> 293 #include "module-util.h"
203diff --git a/src/core/service.c b/src/core/service.c 294diff --git a/src/core/service.c b/src/core/service.c
204index 73b3c9c316..ef74f00a08 100644 295index 49ad166c2604..c3b14067e201 100644
205--- a/src/core/service.c 296--- a/src/core/service.c
206+++ b/src/core/service.c 297+++ b/src/core/service.c
207@@ -43,6 +43,7 @@ 298@@ -41,6 +41,7 @@
208 #include "unit.h" 299 #include "unit.h"
209 #include "utf8.h" 300 #include "utf8.h"
210 #include "util.h" 301 #include "util.h"
211+#include "missing.h" 302+#include "missing_stdlib.h"
212 303
213 static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { 304 static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = {
214 [SERVICE_DEAD] = UNIT_INACTIVE, 305 [SERVICE_DEAD] = UNIT_INACTIVE,
306diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c
307index 35885dfb47c4..bb9f0660a6a0 100644
308--- a/src/coredump/coredump-vacuum.c
309+++ b/src/coredump/coredump-vacuum.c
310@@ -16,6 +16,7 @@
311 #include "string-util.h"
312 #include "time-util.h"
313 #include "user-util.h"
314+#include "missing_stdlib.h"
315
316 #define DEFAULT_MAX_USE_LOWER (uint64_t) (1ULL*1024ULL*1024ULL) /* 1 MiB */
317 #define DEFAULT_MAX_USE_UPPER (uint64_t) (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */
318diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c
319index ac2bf648d2af..06c86f0201af 100644
320--- a/src/journal-remote/journal-remote-main.c
321+++ b/src/journal-remote/journal-remote-main.c
322@@ -21,6 +21,7 @@
323 #include "stat-util.h"
324 #include "string-table.h"
325 #include "strv.h"
326+#include "missing_stdlib.h"
327
328 #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-remote.pem"
329 #define CERT_FILE CERTIFICATE_ROOT "/certs/journal-remote.pem"
215diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c 330diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
216index 6d6bb1cf63..6666349a35 100644 331index 95b6bfee172a..e0bcfb9d4233 100644
217--- a/src/journal/journalctl.c 332--- a/src/journal/journalctl.c
218+++ b/src/journal/journalctl.c 333+++ b/src/journal/journalctl.c
219@@ -70,6 +70,7 @@ 334@@ -68,6 +68,7 @@
220 #include "unit-name.h" 335 #include "unit-name.h"
221 #include "user-util.h" 336 #include "user-util.h"
222 #include "varlink.h" 337 #include "varlink.h"
223+#include "missing.h" 338+#include "missing_stdlib.h"
224 339
225 #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) 340 #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE)
226 341
227diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c 342diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
228index eb029e4453..f31fe9d5a8 100644 343index eb029e445326..8da2c5d51a75 100644
229--- a/src/libsystemd/sd-bus/bus-message.c 344--- a/src/libsystemd/sd-bus/bus-message.c
230+++ b/src/libsystemd/sd-bus/bus-message.c 345+++ b/src/libsystemd/sd-bus/bus-message.c
231@@ -21,6 +21,7 @@ 346@@ -21,6 +21,7 @@
232 #include "strv.h" 347 #include "strv.h"
233 #include "time-util.h" 348 #include "time-util.h"
234 #include "utf8.h" 349 #include "utf8.h"
235+#include "missing.h" 350+#include "missing_stdlib.h"
236 351
237 static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); 352 static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored);
238 353
239diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c 354diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c
240index ae643cacc7..1b752271a5 100644 355index ae643cacc740..f766e235206d 100644
241--- a/src/libsystemd/sd-bus/bus-objects.c 356--- a/src/libsystemd/sd-bus/bus-objects.c
242+++ b/src/libsystemd/sd-bus/bus-objects.c 357+++ b/src/libsystemd/sd-bus/bus-objects.c
243@@ -13,6 +13,7 @@ 358@@ -13,6 +13,7 @@
244 #include "set.h" 359 #include "set.h"
245 #include "string-util.h" 360 #include "string-util.h"
246 #include "strv.h" 361 #include "strv.h"
247+#include "missing.h" 362+#include "missing_stdlib.h"
248 363
249 static int node_vtable_get_userdata( 364 static int node_vtable_get_userdata(
250 sd_bus *bus, 365 sd_bus *bus,
366diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c
367index 18d30d010a20..be2ab703f8ed 100644
368--- a/src/libsystemd/sd-bus/bus-socket.c
369+++ b/src/libsystemd/sd-bus/bus-socket.c
370@@ -28,6 +28,7 @@
371 #include "string-util.h"
372 #include "user-util.h"
373 #include "utf8.h"
374+#include "missing_stdlib.h"
375
376 #define SNDBUF_SIZE (8*1024*1024)
377
378diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
379index 058492a83eec..54c896f572b9 100644
380--- a/src/libsystemd/sd-bus/sd-bus.c
381+++ b/src/libsystemd/sd-bus/sd-bus.c
382@@ -41,6 +41,7 @@
383 #include "process-util.h"
384 #include "string-util.h"
385 #include "strv.h"
386+#include "missing_stdlib.h"
387
388 #define log_debug_bus_message(m) \
389 do { \
251diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c 390diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c
252index 8de0a859ee..4fd0a2e692 100644 391index 8de0a859ee94..58044b6ba908 100644
253--- a/src/libsystemd/sd-bus/test-bus-benchmark.c 392--- a/src/libsystemd/sd-bus/test-bus-benchmark.c
254+++ b/src/libsystemd/sd-bus/test-bus-benchmark.c 393+++ b/src/libsystemd/sd-bus/test-bus-benchmark.c
255@@ -14,6 +14,7 @@ 394@@ -14,6 +14,7 @@
256 #include "missing_resource.h" 395 #include "missing_resource.h"
257 #include "time-util.h" 396 #include "time-util.h"
258 #include "util.h" 397 #include "util.h"
259+#include "missing.h" 398+#include "missing_stdlib.h"
260 399
261 #define MAX_SIZE (2*1024*1024) 400 #define MAX_SIZE (2*1024*1024)
262 401
263diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c 402diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c
264index f8c36c94f5..41f5606aea 100644 403index 519dd0d188cf..a8f536915bb2 100644
265--- a/src/locale/keymap-util.c 404--- a/src/locale/keymap-util.c
266+++ b/src/locale/keymap-util.c 405+++ b/src/locale/keymap-util.c
267@@ -22,6 +22,7 @@ 406@@ -21,6 +21,7 @@
268 #include "string-util.h" 407 #include "string-util.h"
269 #include "strv.h" 408 #include "strv.h"
270 #include "tmpfile-util.h" 409 #include "tmpfile-util.h"
271+#include "missing.h" 410+#include "missing_stdlib.h"
272 411
273 static bool startswith_comma(const char *s, const char *prefix) { 412 static bool startswith_comma(const char *s, const char *prefix) {
274 s = startswith(s, prefix); 413 s = startswith(s, prefix);
275diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c 414diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c
276index 3f762cbbc3..005cfea658 100644 415index aa6e5ea7aca8..c439c21b2872 100644
277--- a/src/login/pam_systemd.c 416--- a/src/login/pam_systemd.c
278+++ b/src/login/pam_systemd.c 417+++ b/src/login/pam_systemd.c
279@@ -28,6 +28,7 @@ 418@@ -28,6 +28,7 @@
280 #include "hostname-util.h" 419 #include "hostname-util.h"
281 #include "login-util.h" 420 #include "login-util.h"
282 #include "macro.h" 421 #include "macro.h"
283+#include "missing.h" 422+#include "missing_stdlib.h"
284 #include "parse-util.h" 423 #include "parse-util.h"
285 #include "path-util.h" 424 #include "path-util.h"
286 #include "process-util.h" 425 #include "process-util.h"
287diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c 426diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c
288index 0b5af33566..9c808cd014 100644 427index 81afa9530762..2c5328f97c63 100644
289--- a/src/network/generator/network-generator.c 428--- a/src/network/generator/network-generator.c
290+++ b/src/network/generator/network-generator.c 429+++ b/src/network/generator/network-generator.c
291@@ -13,6 +13,7 @@ 430@@ -13,6 +13,7 @@
292 #include "string-table.h" 431 #include "string-table.h"
293 #include "string-util.h" 432 #include "string-util.h"
294 #include "strv.h" 433 #include "strv.h"
295+#include "missing.h" 434+#include "missing_stdlib.h"
296 435
297 /* 436 /*
298 # .network 437 # .network
299diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c 438diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c
300index 3a99736813..279fea4d88 100644 439index 5fb5b49bbcc3..785ccc2da307 100644
301--- a/src/nspawn/nspawn-settings.c 440--- a/src/nspawn/nspawn-settings.c
302+++ b/src/nspawn/nspawn-settings.c 441+++ b/src/nspawn/nspawn-settings.c
303@@ -16,6 +16,7 @@ 442@@ -16,6 +16,7 @@
304 #include "strv.h" 443 #include "strv.h"
305 #include "user-util.h" 444 #include "user-util.h"
306 #include "util.h" 445 #include "util.h"
307+#include "missing.h" 446+#include "missing_stdlib.h"
308 447
309 Settings *settings_new(void) { 448 Settings *settings_new(void) {
310 Settings *s; 449 Settings *s;
450diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c
451index 364356da5622..47d4ea44e40f 100644
452--- a/src/nss-mymachines/nss-mymachines.c
453+++ b/src/nss-mymachines/nss-mymachines.c
454@@ -19,6 +19,7 @@
455 #include "signal-util.h"
456 #include "string-util.h"
457 #include "user-util.h"
458+#include "missing_stdlib.h"
459
460 NSS_GETHOSTBYNAME_PROTOTYPES(mymachines);
461 NSS_GETPW_PROTOTYPES(mymachines);
462diff --git a/src/portable/portable.c b/src/portable/portable.c
463index 34b123e84692..5a48504d00ac 100644
464--- a/src/portable/portable.c
465+++ b/src/portable/portable.c
466@@ -29,6 +29,7 @@
467 #include "strv.h"
468 #include "tmpfile-util.h"
469 #include "user-util.h"
470+#include "missing_stdlib.h"
471
472 static const char profile_dirs[] = CONF_PATHS_NULSTR("systemd/portable/profile");
473
474diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c
475index 0a96a18b3836..432d6ebc3730 100644
476--- a/src/resolve/resolvectl.c
477+++ b/src/resolve/resolvectl.c
478@@ -31,6 +31,7 @@
479 #include "strv.h"
480 #include "terminal-util.h"
481 #include "verbs.h"
482+#include "missing_stdlib.h"
483
484 static int arg_family = AF_UNSPEC;
485 static int arg_ifindex = 0;
486diff --git a/src/shared/bus-unit-procs.c b/src/shared/bus-unit-procs.c
487index b21fe393265f..af2640005c1d 100644
488--- a/src/shared/bus-unit-procs.c
489+++ b/src/shared/bus-unit-procs.c
490@@ -10,6 +10,7 @@
491 #include "sort-util.h"
492 #include "string-util.h"
493 #include "terminal-util.h"
494+#include "missing_stdlib.h"
495
496 struct CGroupInfo {
497 char *cgroup_path;
498diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c
499index 22a15493d7f3..3f4c51975675 100644
500--- a/src/shared/bus-unit-util.c
501+++ b/src/shared/bus-unit-util.c
502@@ -34,6 +34,7 @@
503 #include "unit-def.h"
504 #include "user-util.h"
505 #include "utf8.h"
506+#include "missing_stdlib.h"
507
508 int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u) {
509 assert(message);
510diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
511index aea46d311996..223426298144 100644
512--- a/src/shared/bus-util.c
513+++ b/src/shared/bus-util.c
514@@ -34,6 +34,7 @@
515 #include "stdio-util.h"
516 #include "strv.h"
517 #include "user-util.h"
518+#include "missing_stdlib.h"
519
520 static int name_owner_change_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
521 sd_event *e = userdata;
311diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c 522diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c
312index f62ad0a0f5..f1a27e158d 100644 523index b812665315f6..8e68f7f8fc6c 100644
313--- a/src/shared/dns-domain.c 524--- a/src/shared/dns-domain.c
314+++ b/src/shared/dns-domain.c 525+++ b/src/shared/dns-domain.c
315@@ -24,6 +24,7 @@ 526@@ -23,6 +23,7 @@
316 #include "string-util.h" 527 #include "string-util.h"
317 #include "strv.h" 528 #include "strv.h"
318 #include "utf8.h" 529 #include "utf8.h"
319+#include "missing.h" 530+#include "missing_stdlib.h"
320 531
321 int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) { 532 int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) {
322 const char *n; 533 const char *n;
323diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c 534diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c
324index 7c4fc7021d..a6ff2214df 100644 535index 7c4fc7021dec..3fbaf5a63969 100644
325--- a/src/shared/journal-importer.c 536--- a/src/shared/journal-importer.c
326+++ b/src/shared/journal-importer.c 537+++ b/src/shared/journal-importer.c
327@@ -14,6 +14,7 @@ 538@@ -14,6 +14,7 @@
328 #include "parse-util.h" 539 #include "parse-util.h"
329 #include "string-util.h" 540 #include "string-util.h"
330 #include "unaligned.h" 541 #include "unaligned.h"
331+#include "missing.h" 542+#include "missing_stdlib.h"
332 543
333 enum { 544 enum {
334 IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */ 545 IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */
335diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c 546diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
336index b615c70dff..75b26e9c21 100644 547index 95b2e3376e9a..facc23aaecd5 100644
337--- a/src/shared/logs-show.c 548--- a/src/shared/logs-show.c
338+++ b/src/shared/logs-show.c 549+++ b/src/shared/logs-show.c
339@@ -39,6 +39,7 @@ 550@@ -37,6 +37,7 @@
340 #include "time-util.h" 551 #include "time-util.h"
341 #include "utf8.h" 552 #include "utf8.h"
342 #include "util.h" 553 #include "util.h"
343+#include "missing.h" 554+#include "missing_stdlib.h"
344 555
345 /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */ 556 /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */
346 #define PRINT_LINE_THRESHOLD 3 557 #define PRINT_LINE_THRESHOLD 3
347diff --git a/src/shared/pager.c b/src/shared/pager.c 558diff --git a/src/shared/pager.c b/src/shared/pager.c
348index 7c20b100b4..e4209d3a95 100644 559index 1fe9db179176..67954b5cab93 100644
349--- a/src/shared/pager.c 560--- a/src/shared/pager.c
350+++ b/src/shared/pager.c 561+++ b/src/shared/pager.c
351@@ -25,6 +25,7 @@ 562@@ -23,6 +23,7 @@
352 #include "strv.h" 563 #include "strv.h"
353 #include "terminal-util.h" 564 #include "terminal-util.h"
354 #include "util.h" 565 #include "util.h"
355+#include "missing.h" 566+#include "missing_stdlib.h"
356 567
357 static pid_t pager_pid = 0; 568 static pid_t pager_pid = 0;
358 569
359diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c 570diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
360index 6bf0ff0316..f6c8009cd2 100644 571index 5b1620974536..0e7cd1c2af12 100644
361--- a/src/shared/path-lookup.c 572--- a/src/shared/path-lookup.c
362+++ b/src/shared/path-lookup.c 573+++ b/src/shared/path-lookup.c
363@@ -20,6 +20,7 @@ 574@@ -19,6 +19,7 @@
364 #include "tmpfile-util.h" 575 #include "tmpfile-util.h"
365 #include "user-util.h" 576 #include "user-util.h"
366 #include "util.h" 577 #include "util.h"
367+#include "missing.h" 578+#include "missing_stdlib.h"
368 579
369 int xdg_user_runtime_dir(char **ret, const char *suffix) { 580 int xdg_user_runtime_dir(char **ret, const char *suffix) {
370 const char *e; 581 const char *e;
371diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c 582diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c
372index 7cb7d8a477..8b12b91084 100644 583index 7cb7d8a477e9..8e7d7f9e7ca6 100644
373--- a/src/shared/uid-range.c 584--- a/src/shared/uid-range.c
374+++ b/src/shared/uid-range.c 585+++ b/src/shared/uid-range.c
375@@ -9,6 +9,7 @@ 586@@ -9,6 +9,7 @@
376 #include "sort-util.h" 587 #include "sort-util.h"
377 #include "uid-range.h" 588 #include "uid-range.h"
378 #include "user-util.h" 589 #include "user-util.h"
379+#include "missing.h" 590+#include "missing_stdlib.h"
380 591
381 static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) { 592 static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) {
382 assert(range); 593 assert(range);
383diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c 594diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c
384index abbbc9f2d6..6179b5851e 100644 595index 2fb9c854fa50..58cef31458f7 100644
385--- a/src/socket-proxy/socket-proxyd.c 596--- a/src/socket-proxy/socket-proxyd.c
386+++ b/src/socket-proxy/socket-proxyd.c 597+++ b/src/socket-proxy/socket-proxyd.c
387@@ -28,6 +28,7 @@ 598@@ -26,6 +26,7 @@
388 #include "socket-util.h" 599 #include "socket-util.h"
389 #include "string-util.h" 600 #include "string-util.h"
390 #include "util.h" 601 #include "util.h"
391+#include "missing.h" 602+#include "missing_stdlib.h"
392 603
393 #define BUFFER_SIZE (256 * 1024) 604 #define BUFFER_SIZE (256 * 1024)
394 605
395diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c 606diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c
396index 52217429b1..a05e7782f6 100644 607index 52217429b154..70708dedf318 100644
397--- a/src/test/test-hexdecoct.c 608--- a/src/test/test-hexdecoct.c
398+++ b/src/test/test-hexdecoct.c 609+++ b/src/test/test-hexdecoct.c
399@@ -6,6 +6,7 @@ 610@@ -6,6 +6,7 @@
400 #include "hexdecoct.h" 611 #include "hexdecoct.h"
401 #include "macro.h" 612 #include "macro.h"
402 #include "string-util.h" 613 #include "string-util.h"
403+#include "missing.h" 614+#include "missing_stdlib.h"
404 615
405 static void test_hexchar(void) { 616 static void test_hexchar(void) {
406 assert_se(hexchar(0xa) == 'a'); 617 assert_se(hexchar(0xa) == 'a');
407diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c 618diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
408index e8f1ce1354..8693cb02a4 100644 619index ca38f5608791..9d8cf4d2807b 100644
409--- a/src/udev/udev-builtin-path_id.c 620--- a/src/udev/udev-builtin-path_id.c
410+++ b/src/udev/udev-builtin-path_id.c 621+++ b/src/udev/udev-builtin-path_id.c
411@@ -23,6 +23,7 @@ 622@@ -22,6 +22,7 @@
412 #include "strv.h" 623 #include "strv.h"
413 #include "sysexits.h" 624 #include "sysexits.h"
414 #include "udev-builtin.h" 625 #include "udev-builtin.h"
415+#include "missing.h" 626+#include "missing_stdlib.h"
416 627
417 _printf_(2,3) 628 _printf_(2,3)
418 static void path_prepend(char **path, const char *fmt, ...) { 629 static void path_prepend(char **path, const char *fmt, ...) {
419diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c 630diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
420index 8cfa2cdf23..b0670c77ec 100644 631index 58d484280aa5..90eab6806b55 100644
421--- a/src/udev/udev-event.c 632--- a/src/udev/udev-event.c
422+++ b/src/udev/udev-event.c 633+++ b/src/udev/udev-event.c
423@@ -35,6 +35,7 @@ 634@@ -34,6 +34,7 @@
424 #include "udev-util.h" 635 #include "udev-util.h"
425 #include "udev-watch.h" 636 #include "udev-watch.h"
426 #include "user-util.h" 637 #include "user-util.h"
427+#include "missing.h" 638+#include "missing_stdlib.h"
428 639
429 typedef struct Spawn { 640 typedef struct Spawn {
430 sd_device *device; 641 sd_device *device;
431diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c 642diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
432index 1642f10535..fe2aa75478 100644 643index 6168b332d3b2..245fe0a64d22 100644
433--- a/src/udev/udev-rules.c 644--- a/src/udev/udev-rules.c
434+++ b/src/udev/udev-rules.c 645+++ b/src/udev/udev-rules.c
435@@ -28,6 +28,7 @@ 646@@ -30,6 +30,7 @@
436 #include "udev-event.h"
437 #include "udev-rules.h" 647 #include "udev-rules.h"
438 #include "user-util.h" 648 #include "user-util.h"
439+#include "missing.h" 649 #include "virt.h"
650+#include "missing_stdlib.h"
440 651
441 #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d") 652 #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d")
442 653
diff --git a/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch b/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch
index 6d73d715ce..ea003fd7da 100644
--- a/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch
+++ b/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch
@@ -1,4 +1,7 @@
1Include netinet/if_ether.h 1From 3932ce7f6c8ace5e1210aad20e1a141cb29329b1 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 26 Oct 2017 22:10:42 -0700
4Subject: [PATCH] Include netinet/if_ether.h
2 5
3Fixes 6Fixes
4/path/to/systemd/recipe-sysroot/usr/include/netinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr' 7/path/to/systemd/recipe-sysroot/usr/include/netinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr'
@@ -26,11 +29,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
26Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 29Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
27[rebased for systemd 243] 30[rebased for systemd 243]
28Signed-off-by: Scott Murray <scott.murray@konsulko.com> 31Signed-off-by: Scott Murray <scott.murray@konsulko.com>
32
29--- 33---
30 src/libsystemd-network/sd-dhcp6-client.c | 1 - 34 src/libsystemd-network/sd-dhcp6-client.c | 1 -
31 src/libsystemd/sd-netlink/netlink-types.c | 1 + 35 src/libsystemd/sd-netlink/netlink-types.c | 1 +
32 src/machine/machine-dbus.c | 1 + 36 src/machine/machine-dbus.c | 1 +
37 src/network/netdev/bond.c | 1 +
38 src/network/netdev/bridge.c | 1 +
33 src/network/netdev/macsec.c | 1 + 39 src/network/netdev/macsec.c | 1 +
40 src/network/netdev/netdev-gperf.gperf | 1 +
34 src/network/netdev/netdev.c | 1 + 41 src/network/netdev/netdev.c | 1 +
35 src/network/networkd-brvlan.c | 1 + 42 src/network/networkd-brvlan.c | 1 +
36 src/network/networkd-dhcp-common.c | 1 + 43 src/network/networkd-dhcp-common.c | 1 +
@@ -38,26 +45,27 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
38 src/network/networkd-dhcp6.c | 2 +- 45 src/network/networkd-dhcp6.c | 2 +-
39 src/network/networkd-link.c | 2 +- 46 src/network/networkd-link.c | 2 +-
40 src/network/networkd-network.c | 1 + 47 src/network/networkd-network.c | 1 +
48 src/network/test-network-tables.c | 1 +
41 src/shared/ethtool-util.c | 1 + 49 src/shared/ethtool-util.c | 1 +
42 src/shared/ethtool-util.h | 1 + 50 src/shared/ethtool-util.h | 1 +
43 src/udev/net/link-config.c | 1 + 51 src/udev/net/link-config.c | 1 +
44 src/udev/udev-builtin-net_setup_link.c | 1 + 52 src/udev/udev-builtin-net_setup_link.c | 1 +
45 15 files changed, 14 insertions(+), 4 deletions(-) 53 19 files changed, 18 insertions(+), 4 deletions(-)
46 54
47diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c 55diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c
48index d7a5349c70..68b41dfb6c 100644 56index 5417ba8c5feb..d3aba928dd96 100644
49--- a/src/libsystemd-network/sd-dhcp6-client.c 57--- a/src/libsystemd-network/sd-dhcp6-client.c
50+++ b/src/libsystemd-network/sd-dhcp6-client.c 58+++ b/src/libsystemd-network/sd-dhcp6-client.c
51@@ -6,7 +6,6 @@ 59@@ -5,7 +5,6 @@
60
52 #include <errno.h> 61 #include <errno.h>
53 #include <string.h>
54 #include <sys/ioctl.h> 62 #include <sys/ioctl.h>
55-#include <linux/if_arp.h> 63-#include <linux/if_arp.h>
56 #include <linux/if_infiniband.h> 64 #include <linux/if_infiniband.h>
57 65
58 #include "sd-dhcp6-client.h" 66 #include "sd-dhcp6-client.h"
59diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c 67diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c
60index de9b8b21ab..f64f6500f7 100644 68index a55460f03407..6f9cd527c800 100644
61--- a/src/libsystemd/sd-netlink/netlink-types.c 69--- a/src/libsystemd/sd-netlink/netlink-types.c
62+++ b/src/libsystemd/sd-netlink/netlink-types.c 70+++ b/src/libsystemd/sd-netlink/netlink-types.c
63@@ -3,6 +3,7 @@ 71@@ -3,6 +3,7 @@
@@ -69,19 +77,41 @@ index de9b8b21ab..f64f6500f7 100644
69 #include <linux/netlink.h> 77 #include <linux/netlink.h>
70 #include <linux/rtnetlink.h> 78 #include <linux/rtnetlink.h>
71diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c 79diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
72index 0d58b5eb8b..01093c1f62 100644 80index 3b2ac3829859..760ccb445cd0 100644
73--- a/src/machine/machine-dbus.c 81--- a/src/machine/machine-dbus.c
74+++ b/src/machine/machine-dbus.c 82+++ b/src/machine/machine-dbus.c
75@@ -4,6 +4,7 @@ 83@@ -3,6 +3,7 @@
76 #include <string.h> 84 #include <errno.h>
77 #include <sys/mount.h> 85 #include <sys/mount.h>
78 #include <sys/wait.h> 86 #include <sys/wait.h>
79+#include <netinet/if_ether.h> 87+#include <netinet/if_ether.h>
80 88
81 /* When we include libgen.h because we need dirname() we immediately 89 /* When we include libgen.h because we need dirname() we immediately
82 * undefine basename() since libgen.h defines it as a macro to the POSIX 90 * undefine basename() since libgen.h defines it as a macro to the POSIX
91diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c
92index 185b155440e7..dc1cd236c814 100644
93--- a/src/network/netdev/bond.c
94+++ b/src/network/netdev/bond.c
95@@ -1,5 +1,6 @@
96 /* SPDX-License-Identifier: LGPL-2.1+ */
97
98+#include <netinet/if_ether.h>
99 #include "alloc-util.h"
100 #include "bond.h"
101 #include "conf-parser.h"
102diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c
103index 59a40faef8fa..8e821a3216b3 100644
104--- a/src/network/netdev/bridge.c
105+++ b/src/network/netdev/bridge.c
106@@ -1,5 +1,6 @@
107 /* SPDX-License-Identifier: LGPL-2.1+ */
108
109+#include <netinet/if_ether.h>
110 #include <net/if.h>
111
112 #include "bridge.h"
83diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c 113diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c
84index cf281e75a6..269dc618ff 100644 114index 25dc23ff0338..f20d11fbcf53 100644
85--- a/src/network/netdev/macsec.c 115--- a/src/network/netdev/macsec.c
86+++ b/src/network/netdev/macsec.c 116+++ b/src/network/netdev/macsec.c
87@@ -1,5 +1,6 @@ 117@@ -1,5 +1,6 @@
@@ -91,8 +121,20 @@ index cf281e75a6..269dc618ff 100644
91 #include <netinet/in.h> 121 #include <netinet/in.h>
92 #include <linux/if_ether.h> 122 #include <linux/if_ether.h>
93 #include <linux/if_macsec.h> 123 #include <linux/if_macsec.h>
124diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf
125index 09a5f4822e03..873299b1f98a 100644
126--- a/src/network/netdev/netdev-gperf.gperf
127+++ b/src/network/netdev/netdev-gperf.gperf
128@@ -2,6 +2,7 @@
129 #if __GNUC__ >= 7
130 _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"")
131 #endif
132+#include <netinet/if_ether.h>
133 #include <stddef.h>
134 #include "bond.h"
135 #include "bridge.h"
94diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c 136diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c
95index 7735b455b7..ed4eda4a44 100644 137index 6908c4e811b0..e0d8c459ab63 100644
96--- a/src/network/netdev/netdev.c 138--- a/src/network/netdev/netdev.c
97+++ b/src/network/netdev/netdev.c 139+++ b/src/network/netdev/netdev.c
98@@ -1,5 +1,6 @@ 140@@ -1,5 +1,6 @@
@@ -103,7 +145,7 @@ index 7735b455b7..ed4eda4a44 100644
103 #include <netinet/in.h> 145 #include <netinet/in.h>
104 146
105diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c 147diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c
106index c3c5d535ac..ebea408c89 100644 148index c3c5d535ac66..ebea408c89a8 100644
107--- a/src/network/networkd-brvlan.c 149--- a/src/network/networkd-brvlan.c
108+++ b/src/network/networkd-brvlan.c 150+++ b/src/network/networkd-brvlan.c
109@@ -4,6 +4,7 @@ 151@@ -4,6 +4,7 @@
@@ -115,19 +157,19 @@ index c3c5d535ac..ebea408c89 100644
115 #include <stdbool.h> 157 #include <stdbool.h>
116 158
117diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c 159diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c
118index 626b975839..42fe92f320 100644 160index 6465a8cfe9c7..bd4b2cdfac15 100644
119--- a/src/network/networkd-dhcp-common.c 161--- a/src/network/networkd-dhcp-common.c
120+++ b/src/network/networkd-dhcp-common.c 162+++ b/src/network/networkd-dhcp-common.c
121@@ -1,6 +1,7 @@ 163@@ -4,6 +4,7 @@
122 /* SPDX-License-Identifier: LGPL-2.1+ */ 164 #include "escape.h"
123 165 #include "in-addr-util.h"
124 #include "networkd-dhcp-common.h" 166 #include "networkd-dhcp-common.h"
125+#include <netinet/if_ether.h> 167+#include <netinet/if_ether.h>
126 #include "networkd-network.h" 168 #include "networkd-network.h"
127 #include "parse-util.h" 169 #include "parse-util.h"
128 #include "string-table.h" 170 #include "string-table.h"
129diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c 171diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
130index 662770b50e..c6ab62a94d 100644 172index 8ca87d99d4db..a66284896cf3 100644
131--- a/src/network/networkd-dhcp4.c 173--- a/src/network/networkd-dhcp4.c
132+++ b/src/network/networkd-dhcp4.c 174+++ b/src/network/networkd-dhcp4.c
133@@ -1,8 +1,8 @@ 175@@ -1,8 +1,8 @@
@@ -139,9 +181,9 @@ index 662770b50e..c6ab62a94d 100644
139-#include <linux/if_arp.h> 181-#include <linux/if_arp.h>
140 182
141 #include "alloc-util.h" 183 #include "alloc-util.h"
142 #include "hostname-util.h" 184 #include "dhcp-client-internal.h"
143diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c 185diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
144index 8ad736a82b..f41b4d834e 100644 186index 647623ac3778..325c641c6231 100644
145--- a/src/network/networkd-dhcp6.c 187--- a/src/network/networkd-dhcp6.c
146+++ b/src/network/networkd-dhcp6.c 188+++ b/src/network/networkd-dhcp6.c
147@@ -3,9 +3,9 @@ 189@@ -3,9 +3,9 @@
@@ -156,7 +198,7 @@ index 8ad736a82b..f41b4d834e 100644
156 198
157 #include "sd-dhcp6-client.h" 199 #include "sd-dhcp6-client.h"
158diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c 200diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
159index f5bb78890a..f13a36b791 100644 201index 2e60adbf7818..05aa8672d585 100644
160--- a/src/network/networkd-link.c 202--- a/src/network/networkd-link.c
161+++ b/src/network/networkd-link.c 203+++ b/src/network/networkd-link.c
162@@ -1,8 +1,8 @@ 204@@ -1,8 +1,8 @@
@@ -170,7 +212,7 @@ index f5bb78890a..f13a36b791 100644
170 212
171 #include "alloc-util.h" 213 #include "alloc-util.h"
172diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c 214diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
173index 2b8d0eb2fb..2f79ef25cd 100644 215index 6e443975f171..d1aab0ca5ba2 100644
174--- a/src/network/networkd-network.c 216--- a/src/network/networkd-network.c
175+++ b/src/network/networkd-network.c 217+++ b/src/network/networkd-network.c
176@@ -1,5 +1,6 @@ 218@@ -1,5 +1,6 @@
@@ -180,8 +222,17 @@ index 2b8d0eb2fb..2f79ef25cd 100644
180 #include <net/if.h> 222 #include <net/if.h>
181 #include <netinet/in.h> 223 #include <netinet/in.h>
182 #include <linux/netdevice.h> 224 #include <linux/netdevice.h>
225diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c
226index 25b939639775..530e4928835c 100644
227--- a/src/network/test-network-tables.c
228+++ b/src/network/test-network-tables.c
229@@ -1,3 +1,4 @@
230+#include <netinet/if_ether.h>
231 #include "bond.h"
232 #include "dhcp6-internal.h"
233 #include "dhcp6-protocol.h"
183diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c 234diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c
184index b0961df72e..53fcbbd84b 100644 235index 3119b2b92e3b..927ddd067eef 100644
185--- a/src/shared/ethtool-util.c 236--- a/src/shared/ethtool-util.c
186+++ b/src/shared/ethtool-util.c 237+++ b/src/shared/ethtool-util.c
187@@ -1,5 +1,6 @@ 238@@ -1,5 +1,6 @@
@@ -192,7 +243,7 @@ index b0961df72e..53fcbbd84b 100644
192 #include <sys/ioctl.h> 243 #include <sys/ioctl.h>
193 #include <linux/ethtool.h> 244 #include <linux/ethtool.h>
194diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h 245diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h
195index 8b32b243f3..262b819976 100644 246index d408bcd90a0b..7a1e399af023 100644
196--- a/src/shared/ethtool-util.h 247--- a/src/shared/ethtool-util.h
197+++ b/src/shared/ethtool-util.h 248+++ b/src/shared/ethtool-util.h
198@@ -2,6 +2,7 @@ 249@@ -2,6 +2,7 @@
@@ -204,7 +255,7 @@ index 8b32b243f3..262b819976 100644
204 255
205 #include "conf-parser.h" 256 #include "conf-parser.h"
206diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c 257diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
207index d44af64d5e..fd052f1591 100644 258index 7b07e2f38fa8..18680a8e5484 100644
208--- a/src/udev/net/link-config.c 259--- a/src/udev/net/link-config.c
209+++ b/src/udev/net/link-config.c 260+++ b/src/udev/net/link-config.c
210@@ -1,5 +1,6 @@ 261@@ -1,5 +1,6 @@
@@ -215,7 +266,7 @@ index d44af64d5e..fd052f1591 100644
215 #include <netinet/ether.h> 266 #include <netinet/ether.h>
216 267
217diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c 268diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c
218index ee3ca9fa38..9aa4e82874 100644 269index ee3ca9fa3846..9aa4e828741f 100644
219--- a/src/udev/udev-builtin-net_setup_link.c 270--- a/src/udev/udev-builtin-net_setup_link.c
220+++ b/src/udev/udev-builtin-net_setup_link.c 271+++ b/src/udev/udev-builtin-net_setup_link.c
221@@ -1,5 +1,6 @@ 272@@ -1,5 +1,6 @@
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 34f7f5fb74..580c49fecf 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,8 +1,7 @@
1From f8a239b182158ca0a537ba053cb0e6bad9c3a2fb Mon Sep 17 00:00:00 2001 1From 77f98727f1d19a8fb327b55c92f1a9ee7b859e9f 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 07/24] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not 4Subject: [PATCH] don't fail if GLOB_BRACE and GLOB_ALTDIRFUNC is not defined
5 defined
6 5
7If the standard library doesn't provide brace 6If the standard library doesn't provide brace
8expansion users just won't get it. 7expansion users just won't get it.
@@ -17,6 +16,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
17Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 16Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
18[rebased for systemd 243] 17[rebased for systemd 243]
19Signed-off-by: Scott Murray <scott.murray@konsulko.com> 18Signed-off-by: Scott Murray <scott.murray@konsulko.com>
19
20--- 20---
21 src/basic/glob-util.c | 12 ++++++++++++ 21 src/basic/glob-util.c | 12 ++++++++++++
22 src/test/test-glob-util.c | 16 ++++++++++++++++ 22 src/test/test-glob-util.c | 16 ++++++++++++++++
@@ -24,10 +24,10 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
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 26diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c
27index b335af8d97..2cdfc11f16 100644 27index e3aa6c2e152b..38070b79c83a 100644
28--- a/src/basic/glob-util.c 28--- a/src/basic/glob-util.c
29+++ b/src/basic/glob-util.c 29+++ b/src/basic/glob-util.c
30@@ -14,6 +14,12 @@ 30@@ -12,6 +12,12 @@
31 #include "path-util.h" 31 #include "path-util.h"
32 #include "strv.h" 32 #include "strv.h"
33 33
@@ -40,7 +40,7 @@ index b335af8d97..2cdfc11f16 100644
40 static void closedir_wrapper(void* v) { 40 static void closedir_wrapper(void* v) {
41 (void) closedir(v); 41 (void) closedir(v);
42 } 42 }
43@@ -21,6 +27,7 @@ static void closedir_wrapper(void* v) { 43@@ -19,6 +25,7 @@ static void closedir_wrapper(void* v) {
44 int safe_glob(const char *path, int flags, glob_t *pglob) { 44 int safe_glob(const char *path, int flags, glob_t *pglob) {
45 int k; 45 int k;
46 46
@@ -48,7 +48,7 @@ index b335af8d97..2cdfc11f16 100644
48 /* We want to set GLOB_ALTDIRFUNC ourselves, don't allow it to be set. */ 48 /* We want to set GLOB_ALTDIRFUNC ourselves, don't allow it to be set. */
49 assert(!(flags & GLOB_ALTDIRFUNC)); 49 assert(!(flags & GLOB_ALTDIRFUNC));
50 50
51@@ -34,9 +41,14 @@ int safe_glob(const char *path, int flags, glob_t *pglob) { 51@@ -32,9 +39,14 @@ int safe_glob(const char *path, int flags, glob_t *pglob) {
52 pglob->gl_lstat = lstat; 52 pglob->gl_lstat = lstat;
53 if (!pglob->gl_stat) 53 if (!pglob->gl_stat)
54 pglob->gl_stat = stat; 54 pglob->gl_stat = stat;
@@ -64,10 +64,10 @@ index b335af8d97..2cdfc11f16 100644
64 return -ENOENT; 64 return -ENOENT;
65 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 66diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c
67index b4f41445fe..f0d474ed14 100644 67index 667d15335fbf..76a84443aacf 100644
68--- a/src/test/test-glob-util.c 68--- a/src/test/test-glob-util.c
69+++ b/src/test/test-glob-util.c 69+++ b/src/test/test-glob-util.c
70@@ -13,6 +13,12 @@ 70@@ -12,6 +12,12 @@
71 #include "rm-rf.h" 71 #include "rm-rf.h"
72 #include "tmpfile-util.h" 72 #include "tmpfile-util.h"
73 73
@@ -80,7 +80,7 @@ index b4f41445fe..f0d474ed14 100644
80 static void test_glob_exists(void) { 80 static void test_glob_exists(void) {
81 char name[] = "/tmp/test-glob_exists.XXXXXX"; 81 char name[] = "/tmp/test-glob_exists.XXXXXX";
82 int fd = -1; 82 int fd = -1;
83@@ -40,11 +46,13 @@ static void test_glob_no_dot(void) { 83@@ -39,11 +45,13 @@ static void test_glob_no_dot(void) {
84 const char *fn; 84 const char *fn;
85 85
86 _cleanup_globfree_ glob_t g = { 86 _cleanup_globfree_ glob_t g = {
@@ -94,7 +94,7 @@ index b4f41445fe..f0d474ed14 100644
94 }; 94 };
95 95
96 int r; 96 int r;
97@@ -52,11 +60,19 @@ static void test_glob_no_dot(void) { 97@@ -51,11 +59,19 @@ static void test_glob_no_dot(void) {
98 assert_se(mkdtemp(template)); 98 assert_se(mkdtemp(template));
99 99
100 fn = strjoina(template, "/*"); 100 fn = strjoina(template, "/*");
@@ -115,10 +115,10 @@ index b4f41445fe..f0d474ed14 100644
115 115
116 (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 117diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
118index 3c30612af1..14bc428085 100644 118index 193ed0bc781b..2f94fd2efd8f 100644
119--- a/src/tmpfiles/tmpfiles.c 119--- a/src/tmpfiles/tmpfiles.c
120+++ b/src/tmpfiles/tmpfiles.c 120+++ b/src/tmpfiles/tmpfiles.c
121@@ -63,6 +63,12 @@ 121@@ -58,6 +58,12 @@
122 #include "umask-util.h" 122 #include "umask-util.h"
123 #include "user-util.h" 123 #include "user-util.h"
124 124
@@ -131,7 +131,7 @@ index 3c30612af1..14bc428085 100644
131 /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates 131 /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates
132 * them in the file system. This is intended to be used to create 132 * them in the file system. This is intended to be used to create
133 * properly owned directories beneath /tmp, /var/tmp, /run, which are 133 * properly owned directories beneath /tmp, /var/tmp, /run, which are
134@@ -1853,7 +1859,9 @@ finish: 134@@ -1850,7 +1856,9 @@ finish:
135 135
136 static int glob_item(Item *i, action_t action) { 136 static int glob_item(Item *i, action_t action) {
137 _cleanup_globfree_ glob_t g = { 137 _cleanup_globfree_ glob_t g = {
@@ -141,7 +141,7 @@ index 3c30612af1..14bc428085 100644
141 }; 141 };
142 int r = 0, k; 142 int r = 0, k;
143 char **fn; 143 char **fn;
144@@ -1873,7 +1881,9 @@ static int glob_item(Item *i, action_t action) { 144@@ -1870,7 +1878,9 @@ static int glob_item(Item *i, action_t action) {
145 145
146 static int glob_item_recursively(Item *i, fdaction_t action) { 146 static int glob_item_recursively(Item *i, fdaction_t action) {
147 _cleanup_globfree_ glob_t g = { 147 _cleanup_globfree_ glob_t g = {
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 d5f2349f2b..1f618932ea 100644
--- a/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch
+++ b/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch
@@ -1,7 +1,7 @@
1From 6cd17c753d2c0a90fc791f69bbc694cbc8556a4f Mon Sep 17 00:00:00 2001 1From 7c440cfc53aa52c9dc91c3a8c105bcf314c53af6 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 08/24] add missing FTW_ macros for musl 4Subject: [PATCH] add missing FTW_ macros for musl
5 5
6This is to avoid build failures like below for musl. 6This is to avoid build failures like below for musl.
7 7
@@ -10,12 +10,13 @@ This is to avoid build failures like below for musl.
10Upstream-Status: Inappropriate [musl specific] 10Upstream-Status: Inappropriate [musl specific]
11 11
12Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 12Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
13
13--- 14---
14 src/basic/missing_type.h | 20 ++++++++++++++++++++ 15 src/basic/missing_type.h | 20 ++++++++++++++++++++
15 1 file changed, 20 insertions(+) 16 1 file changed, 20 insertions(+)
16 17
17diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h 18diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h
18index c487e65..23602eb 100644 19index c487e65e7bde..23602ebbd533 100644
19--- a/src/basic/missing_type.h 20--- a/src/basic/missing_type.h
20+++ b/src/basic/missing_type.h 21+++ b/src/basic/missing_type.h
21@@ -19,3 +19,23 @@ typedef int (*comparison_fn_t)(const void *, const void *); 22@@ -19,3 +19,23 @@ typedef int (*comparison_fn_t)(const void *, const void *);
@@ -42,6 +43,3 @@ index c487e65..23602eb 100644
42+#ifndef FTW_SKIP_SIBLINGS 43+#ifndef FTW_SKIP_SIBLINGS
43+#define FTW_SKIP_SIBLINGS 3 44+#define FTW_SKIP_SIBLINGS 3
44+#endif 45+#endif
45--
462.7.4
47
diff --git a/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch b/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch
index 8bacd0289d..0de1121906 100644
--- a/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch
+++ b/meta/recipes-core/systemd/systemd/0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch
@@ -1,20 +1,21 @@
1From f1f4b4f9684fed185bfa8b9ed409cdf241657e99 Mon Sep 17 00:00:00 2001 1From 5166a6657570d4072cdce118621791e4a8186e07 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 10/24] fix missing of __register_atfork for non-glibc builds 4Subject: [PATCH] fix missing of __register_atfork for non-glibc builds
5 5
6Upstream-Status: Inappropriate [musl specific] 6Upstream-Status: Inappropriate [musl specific]
7 7
8Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 8Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
9
9--- 10---
10 src/basic/process-util.c | 7 +++++++ 11 src/basic/process-util.c | 7 +++++++
11 1 file changed, 7 insertions(+) 12 1 file changed, 7 insertions(+)
12 13
13diff --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
14index 78ce43b..aec2daf 100644 15index 9b6c4c31f713..24fec5ecb53a 100644
15--- a/src/basic/process-util.c 16--- a/src/basic/process-util.c
16+++ b/src/basic/process-util.c 17+++ b/src/basic/process-util.c
17@@ -22,6 +22,9 @@ 18@@ -18,6 +18,9 @@
18 #if HAVE_VALGRIND_VALGRIND_H 19 #if HAVE_VALGRIND_VALGRIND_H
19 #include <valgrind/valgrind.h> 20 #include <valgrind/valgrind.h>
20 #endif 21 #endif
@@ -24,7 +25,7 @@ index 78ce43b..aec2daf 100644
24 25
25 #include "alloc-util.h" 26 #include "alloc-util.h"
26 #include "architecture.h" 27 #include "architecture.h"
27@@ -1160,11 +1163,15 @@ void reset_cached_pid(void) { 28@@ -1114,11 +1117,15 @@ void reset_cached_pid(void) {
28 cached_pid = CACHED_PID_UNSET; 29 cached_pid = CACHED_PID_UNSET;
29 } 30 }
30 31
@@ -40,6 +41,3 @@ index 78ce43b..aec2daf 100644
40 41
41 pid_t getpid_cached(void) { 42 pid_t getpid_cached(void) {
42 static bool installed = false; 43 static bool installed = false;
43--
442.7.4
45
diff --git a/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch b/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch
index d6eda9c038..e00600ab7c 100644
--- a/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch
+++ b/meta/recipes-core/systemd/systemd/0011-Use-uintmax_t-for-handling-rlim_t.patch
@@ -1,7 +1,7 @@
1From e3f847bd0338d27aff3335b42661d8a4b66b965e Mon Sep 17 00:00:00 2001 1From f6df7f25a6bb00d5540915216adfff8afefec2b0 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 11/24] Use uintmax_t for handling rlim_t 4Subject: [PATCH] Use uintmax_t for handling rlim_t
5 5
6PRIu{32,64} is not right format to represent rlim_t type 6PRIu{32,64} is not right format to represent rlim_t type
7therefore use %ju and typecast the rlim_t variables to 7therefore use %ju and typecast the rlim_t variables to
@@ -20,6 +20,7 @@ Upstream-Status: Denied [https://github.com/systemd/systemd/pull/7199]
20Signed-off-by: Khem Raj <raj.khem@gmail.com> 20Signed-off-by: Khem Raj <raj.khem@gmail.com>
21[Rebased for v241] 21[Rebased for v241]
22Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 22Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
23
23--- 24---
24 src/basic/format-util.h | 8 +------- 25 src/basic/format-util.h | 8 +-------
25 src/basic/rlimit-util.c | 10 +++++----- 26 src/basic/rlimit-util.c | 10 +++++-----
@@ -27,10 +28,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
27 3 files changed, 8 insertions(+), 14 deletions(-) 28 3 files changed, 8 insertions(+), 14 deletions(-)
28 29
29diff --git a/src/basic/format-util.h b/src/basic/format-util.h 30diff --git a/src/basic/format-util.h b/src/basic/format-util.h
30index dece5d3..dbb87bc 100644 31index 59622508a333..779b6826d50e 100644
31--- a/src/basic/format-util.h 32--- a/src/basic/format-util.h
32+++ b/src/basic/format-util.h 33+++ b/src/basic/format-util.h
33@@ -42,13 +42,7 @@ 34@@ -44,13 +44,7 @@
34 # define PRI_TIMEX "li" 35 # define PRI_TIMEX "li"
35 #endif 36 #endif
36 37
@@ -46,10 +47,10 @@ index dece5d3..dbb87bc 100644
46 #if SIZEOF_DEV_T == 8 47 #if SIZEOF_DEV_T == 8
47 # define DEV_FMT "%" PRIu64 48 # define DEV_FMT "%" PRIu64
48diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c 49diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c
49index 74b3a02..b02c03c 100644 50index 2dc13eabc30d..0633cc67f417 100644
50--- a/src/basic/rlimit-util.c 51--- a/src/basic/rlimit-util.c
51+++ b/src/basic/rlimit-util.c 52+++ b/src/basic/rlimit-util.c
52@@ -307,13 +307,13 @@ int rlimit_format(const struct rlimit *rl, char **ret) { 53@@ -306,13 +306,13 @@ int rlimit_format(const struct rlimit *rl, char **ret) {
53 if (rl->rlim_cur >= RLIM_INFINITY && rl->rlim_max >= RLIM_INFINITY) 54 if (rl->rlim_cur >= RLIM_INFINITY && rl->rlim_max >= RLIM_INFINITY)
54 s = strdup("infinity"); 55 s = strdup("infinity");
55 else if (rl->rlim_cur >= RLIM_INFINITY) 56 else if (rl->rlim_cur >= RLIM_INFINITY)
@@ -67,7 +68,7 @@ index 74b3a02..b02c03c 100644
67 68
68 if (!s) 69 if (!s)
69 return -ENOMEM; 70 return -ENOMEM;
70@@ -404,7 +404,7 @@ int rlimit_nofile_safe(void) { 71@@ -403,7 +403,7 @@ int rlimit_nofile_safe(void) {
71 72
72 rl.rlim_cur = FD_SETSIZE; 73 rl.rlim_cur = FD_SETSIZE;
73 if (setrlimit(RLIMIT_NOFILE, &rl) < 0) 74 if (setrlimit(RLIMIT_NOFILE, &rl) < 0)
@@ -77,10 +78,10 @@ index 74b3a02..b02c03c 100644
77 return 1; 78 return 1;
78 } 79 }
79diff --git a/src/core/execute.c b/src/core/execute.c 80diff --git a/src/core/execute.c b/src/core/execute.c
80index a708231..e2b8748 100644 81index f04b8ba05002..084cf1420078 100644
81--- a/src/core/execute.c 82--- a/src/core/execute.c
82+++ b/src/core/execute.c 83+++ b/src/core/execute.c
83@@ -4220,9 +4220,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) { 84@@ -4455,9 +4455,9 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) {
84 for (i = 0; i < RLIM_NLIMITS; i++) 85 for (i = 0; i < RLIM_NLIMITS; i++)
85 if (c->rlimit[i]) { 86 if (c->rlimit[i]) {
86 fprintf(f, "%sLimit%s: " RLIM_FMT "\n", 87 fprintf(f, "%sLimit%s: " RLIM_FMT "\n",
@@ -92,6 +93,3 @@ index a708231..e2b8748 100644
92 } 93 }
93 94
94 if (c->ioprio_set) { 95 if (c->ioprio_set) {
95--
962.7.4
97
diff --git a/meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch b/meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch
index 914589dbd3..aa23c7ab7d 100644
--- a/meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch
+++ b/meta/recipes-core/systemd/systemd/0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch
@@ -1,22 +1,22 @@
1From d3d65d4036670cbd5129fe55c09ca391286ef4b3 Mon Sep 17 00:00:00 2001 1From 7874912817b5ac7ed7f8557359a12d9d4b2f53eb 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 14/24] test-sizeof.c: Disable tests for missing typedefs in 4Subject: [PATCH] test-sizeof.c: Disable tests for missing typedefs in musl
5 musl
6 5
7Upstream-Status: Inappropriate [musl specific] 6Upstream-Status: Inappropriate [musl specific]
8 7
9Signed-off-by: Khem Raj <raj.khem@gmail.com> 8Signed-off-by: Khem Raj <raj.khem@gmail.com>
10Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 9Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
10
11--- 11---
12 src/test/test-sizeof.c | 4 ++++ 12 src/test/test-sizeof.c | 4 ++++
13 1 file changed, 4 insertions(+) 13 1 file changed, 4 insertions(+)
14 14
15diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c 15diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c
16index 35b0876..e78e7ca 100644 16index 7fc16a62b656..a710db5370b8 100644
17--- a/src/test/test-sizeof.c 17--- a/src/test/test-sizeof.c
18+++ b/src/test/test-sizeof.c 18+++ b/src/test/test-sizeof.c
19@@ -41,8 +41,10 @@ int main(void) { 19@@ -42,8 +42,10 @@ int main(void) {
20 info(unsigned); 20 info(unsigned);
21 info(long unsigned); 21 info(long unsigned);
22 info(long long unsigned); 22 info(long long unsigned);
@@ -27,7 +27,7 @@ index 35b0876..e78e7ca 100644
27 27
28 info(float); 28 info(float);
29 info(double); 29 info(double);
30@@ -60,7 +62,9 @@ int main(void) { 30@@ -61,7 +63,9 @@ int main(void) {
31 info(ssize_t); 31 info(ssize_t);
32 info(time_t); 32 info(time_t);
33 info(usec_t); 33 info(usec_t);
@@ -37,6 +37,3 @@ index 35b0876..e78e7ca 100644
37 info(pid_t); 37 info(pid_t);
38 info(uid_t); 38 info(uid_t);
39 info(gid_t); 39 info(gid_t);
40--
412.7.4
42
diff --git a/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch b/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
index fd407f604d..efeef07295 100644
--- a/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
+++ b/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch
@@ -1,7 +1,7 @@
1From 48c628f532f6025c2d1646b6819cd81eb789d7fb Mon Sep 17 00:00:00 2001 1From e6f871078d8d6f076c84f908fa57af15417ab87d 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 15/24] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() 4Subject: [PATCH] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat()
5 5
6Avoid using AT_SYMLINK_NOFOLLOW flag. It doesn't seem like the right 6Avoid using AT_SYMLINK_NOFOLLOW flag. It doesn't seem like the right
7thing to do and it's not portable (not supported by musl). See: 7thing to do and it's not portable (not supported by musl). See:
@@ -25,16 +25,17 @@ just historical and not actually necessary or desired behaviour?
25Upstream-Status: Inappropriate [musl specific] 25Upstream-Status: Inappropriate [musl specific]
26 26
27Signed-off-by: Andre McCurdy <armccurdy@gmail.com> 27Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
28
28--- 29---
29 src/basic/fs-util.h | 22 +++++++++++++++++++++- 30 src/basic/fs-util.h | 22 +++++++++++++++++++++-
30 src/shared/base-filesystem.c | 6 +++--- 31 src/shared/base-filesystem.c | 6 +++---
31 2 files changed, 24 insertions(+), 4 deletions(-) 32 2 files changed, 24 insertions(+), 4 deletions(-)
32 33
33diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h 34diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h
34index 7ad030b..d4cb1e9 100644 35index 78d68be9fd85..c5dc84d41868 100644
35--- a/src/basic/fs-util.h 36--- a/src/basic/fs-util.h
36+++ b/src/basic/fs-util.h 37+++ b/src/basic/fs-util.h
37@@ -32,7 +32,27 @@ int fchmod_opath(int fd, mode_t m); 38@@ -40,7 +40,27 @@ int fchmod_opath(int fd, mode_t m);
38 39
39 int fd_warn_permissions(const char *path, int fd); 40 int fd_warn_permissions(const char *path, int fd);
40 41
@@ -64,10 +65,10 @@ index 7ad030b..d4cb1e9 100644
64 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);
65 int touch(const char *path); 66 int touch(const char *path);
66diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c 67diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c
67index 89d7a7d..34b4ad5 100644 68index 657407da2d37..fbd5782d84fc 100644
68--- a/src/shared/base-filesystem.c 69--- a/src/shared/base-filesystem.c
69+++ b/src/shared/base-filesystem.c 70+++ b/src/shared/base-filesystem.c
70@@ -53,7 +53,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { 71@@ -54,7 +54,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) {
71 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");
72 73
73 for (i = 0; i < ELEMENTSOF(table); i ++) { 74 for (i = 0; i < ELEMENTSOF(table); i ++) {
@@ -76,7 +77,7 @@ index 89d7a7d..34b4ad5 100644
76 continue; 77 continue;
77 78
78 if (table[i].target) { 79 if (table[i].target) {
79@@ -61,7 +61,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { 80@@ -62,7 +62,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) {
80 81
81 /* check if one of the targets exists */ 82 /* check if one of the targets exists */
82 NULSTR_FOREACH(s, table[i].target) { 83 NULSTR_FOREACH(s, table[i].target) {
@@ -85,7 +86,7 @@ index 89d7a7d..34b4ad5 100644
85 continue; 86 continue;
86 87
87 /* check if a specific file exists at the target path */ 88 /* check if a specific file exists at the target path */
88@@ -72,7 +72,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { 89@@ -73,7 +73,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) {
89 if (!p) 90 if (!p)
90 return log_oom(); 91 return log_oom();
91 92
@@ -94,6 +95,3 @@ index 89d7a7d..34b4ad5 100644
94 continue; 95 continue;
95 } 96 }
96 97
97--
982.7.4
99
diff --git a/meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch b/meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch
index d5565698aa..19a3eef847 100644
--- a/meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch
+++ b/meta/recipes-core/systemd/systemd/0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch
@@ -1,8 +1,7 @@
1From af76c973e41929360a6e021f2ff9a7fc1d7994e9 Mon Sep 17 00:00:00 2001 1From ec335ef3bb903a7eaf054103cc51411e71e6448c 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 16/24] Define glibc compatible basename() for non-glibc 4Subject: [PATCH] Define glibc compatible basename() for non-glibc systems
5 systems
6 5
7Fixes builds with musl, even though systemd is adamant about 6Fixes builds with musl, even though systemd is adamant about
8using non-posix basename implementation, we have a way out 7using non-posix basename implementation, we have a way out
@@ -10,25 +9,24 @@ using non-posix basename implementation, we have a way out
10Upstream-Status: Inappropriate [musl specific] 9Upstream-Status: Inappropriate [musl specific]
11 10
12Signed-off-by: Khem Raj <raj.khem@gmail.com> 11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12
13--- 13---
14 src/machine/machine-dbus.c | 4 ++++ 14 src/machine/machine-dbus.c | 5 +++++
15 1 file changed, 4 insertions(+) 15 1 file changed, 5 insertions(+)
16 16
17diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c 17diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
18index 7a558df..eca7d4b 100644 18index 760ccb445cd0..0df20f3864b3 100644
19--- a/src/machine/machine-dbus.c 19--- a/src/machine/machine-dbus.c
20+++ b/src/machine/machine-dbus.c 20+++ b/src/machine/machine-dbus.c
21@@ -11,6 +11,10 @@ 21@@ -11,6 +11,11 @@
22 #include <libgen.h> 22 #include <libgen.h>
23 #undef basename 23 #undef basename
24 24
25+#if !defined(__GLIBC__) 25+#if !defined(__GLIBC__)
26+#include <string.h>
26+#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) 27+#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src)
27+#endif 28+#endif
28+ 29+
29 #include "alloc-util.h" 30 #include "alloc-util.h"
30 #include "bus-common-errors.h" 31 #include "bus-common-errors.h"
31 #include "bus-internal.h" 32 #include "bus-internal.h"
32--
332.7.4
34
diff --git a/meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch b/meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
index 24e24e8e5a..56f45381de 100644
--- a/meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
+++ b/meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch
@@ -1,7 +1,7 @@
1From c7a4efb8bccb52e1714c151929c23e12bde59b82 Mon Sep 17 00:00:00 2001 1From a6f3359042219abaa8ae06dfcce41a4721e8c21f 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 17/24] Do not disable buffering when writing to oom_score_adj 4Subject: [PATCH] Do not disable buffering when writing to oom_score_adj
5 5
6On musl, disabling buffering when writing to oom_score_adj will 6On musl, disabling buffering when writing to oom_score_adj will
7cause the following error. 7cause the following error.
@@ -19,15 +19,16 @@ Upstream-Status: Inappropriate [musl specific]
19Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 19Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
20[rebased for systemd 243] 20[rebased for systemd 243]
21Signed-off-by: Scott Murray <scott.murray@konsulko.com> 21Signed-off-by: Scott Murray <scott.murray@konsulko.com>
22
22--- 23---
23 src/basic/process-util.c | 2 +- 24 src/basic/process-util.c | 2 +-
24 1 file changed, 1 insertion(+), 1 deletion(-) 25 1 file changed, 1 insertion(+), 1 deletion(-)
25 26
26diff --git a/src/basic/process-util.c b/src/basic/process-util.c 27diff --git a/src/basic/process-util.c b/src/basic/process-util.c
27index b1c08fcade..0a7a1f7d89 100644 28index 24fec5ecb53a..642b02443c85 100644
28--- a/src/basic/process-util.c 29--- a/src/basic/process-util.c
29+++ b/src/basic/process-util.c 30+++ b/src/basic/process-util.c
30@@ -1474,7 +1474,7 @@ int set_oom_score_adjust(int value) { 31@@ -1492,7 +1492,7 @@ int set_oom_score_adjust(int value) {
31 sprintf(t, "%i", value); 32 sprintf(t, "%i", value);
32 33
33 return write_string_file("/proc/self/oom_score_adj", t, 34 return write_string_file("/proc/self/oom_score_adj", t,
diff --git a/meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch b/meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
index 5901772998..84a492f290 100644
--- a/meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
+++ b/meta/recipes-core/systemd/systemd/0018-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch
@@ -1,7 +1,7 @@
1From fffb2810611b4a26f5c6c0958093b5b3b7d4cd99 Mon Sep 17 00:00:00 2001 1From 4938705454cf46cfe8deac8ce457d5d2432cbead 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 18/24] distinguish XSI-compliant strerror_r from GNU-specifi 4Subject: [PATCH] distinguish XSI-compliant strerror_r from GNU-specifi
5 strerror_r 5 strerror_r
6 6
7XSI-compliant strerror_r and GNU-specifi strerror_r are different. 7XSI-compliant strerror_r and GNU-specifi strerror_r are different.
@@ -18,16 +18,17 @@ assigned to (char *) variable, resulting in segment fault.
18Upstream-Status: Inappropriate [musl specific] 18Upstream-Status: Inappropriate [musl specific]
19 19
20Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 20Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
21
21--- 22---
22 src/journal/journal-send.c | 5 +++++ 23 src/journal/journal-send.c | 5 +++++
23 src/libsystemd/sd-bus/bus-error.c | 5 +++++ 24 src/libsystemd/sd-bus/bus-error.c | 5 +++++
24 2 files changed, 10 insertions(+) 25 2 files changed, 10 insertions(+)
25 26
26diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c 27diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c
27index 3fea912..4f1e592 100644 28index 43ed756bda53..227ea64dbb48 100644
28--- a/src/journal/journal-send.c 29--- a/src/journal/journal-send.c
29+++ b/src/journal/journal-send.c 30+++ b/src/journal/journal-send.c
30@@ -337,7 +337,12 @@ static int fill_iovec_perror_and_send(const char *message, int skip, struct iove 31@@ -336,7 +336,12 @@ static int fill_iovec_perror_and_send(const char *message, int skip, struct iove
31 char* j; 32 char* j;
32 33
33 errno = 0; 34 errno = 0;
@@ -41,7 +42,7 @@ index 3fea912..4f1e592 100644
41 char error[STRLEN("ERRNO=") + DECIMAL_STR_MAX(int) + 1]; 42 char error[STRLEN("ERRNO=") + DECIMAL_STR_MAX(int) + 1];
42 43
43diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c 44diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c
44index dc95237..bdda30f 100644 45index f760f0fdd21c..28a5159c4480 100644
45--- a/src/libsystemd/sd-bus/bus-error.c 46--- a/src/libsystemd/sd-bus/bus-error.c
46+++ b/src/libsystemd/sd-bus/bus-error.c 47+++ b/src/libsystemd/sd-bus/bus-error.c
47@@ -379,7 +379,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) { 48@@ -379,7 +379,12 @@ static void bus_error_strerror(sd_bus_error *e, int error) {
@@ -57,6 +58,3 @@ index dc95237..bdda30f 100644
57 if (errno == ERANGE || strlen(x) >= k - 1) { 58 if (errno == ERANGE || strlen(x) >= k - 1) {
58 free(m); 59 free(m);
59 k *= 2; 60 k *= 2;
60--
612.7.4
62
diff --git a/meta/recipes-core/systemd/systemd/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch b/meta/recipes-core/systemd/systemd/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch
index 35cc66ff66..3b8064677f 100644
--- a/meta/recipes-core/systemd/systemd/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch
+++ b/meta/recipes-core/systemd/systemd/0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch
@@ -1,7 +1,7 @@
1From 969ab9e68249fd383f4b513b1c9306bdac4ae9b2 Mon Sep 17 00:00:00 2001 1From 1c4c73a7cc0fb59eb68ab70699f7f51af5c163b2 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 19/24] Hide __start_BUS_ERROR_MAP and __stop_BUS_ERROR_MAP 4Subject: [PATCH] Hide __start_BUS_ERROR_MAP and __stop_BUS_ERROR_MAP
5 5
6for currently unknown reasons they get exported to the shared libries 6for currently unknown reasons they get exported to the shared libries
7even without being listed in the sym file 7even without being listed in the sym file
@@ -11,12 +11,13 @@ Upstream-Status: Pending
11Signed-off-by: Khem Raj <raj.khem@gmail.com> 11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12[Rebased for v241] 12[Rebased for v241]
13Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 13Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
14
14--- 15---
15 src/libsystemd/sd-bus/bus-error.c | 4 ++-- 16 src/libsystemd/sd-bus/bus-error.c | 4 ++--
16 1 file changed, 2 insertions(+), 2 deletions(-) 17 1 file changed, 2 insertions(+), 2 deletions(-)
17 18
18diff --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
19index bdda30f..e21853c 100644 20index 28a5159c4480..962a4de10c56 100644
20--- a/src/libsystemd/sd-bus/bus-error.c 21--- a/src/libsystemd/sd-bus/bus-error.c
21+++ b/src/libsystemd/sd-bus/bus-error.c 22+++ b/src/libsystemd/sd-bus/bus-error.c
22@@ -54,8 +54,8 @@ BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_standard_errors[] = { 23@@ -54,8 +54,8 @@ BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_standard_errors[] = {
@@ -30,6 +31,3 @@ index bdda30f..e21853c 100644
30 31
31 /* Additional maps registered with sd_bus_error_add_map() are in this 32 /* Additional maps registered with sd_bus_error_add_map() are in this
32 * NULL terminated array */ 33 * NULL terminated array */
33--
342.7.4
35
diff --git a/meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch b/meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch
index 753d5116ac..db4041bbb1 100644
--- a/meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch
+++ b/meta/recipes-core/systemd/systemd/0020-missing_type.h-add-__compar_d_fn_t-definition.patch
@@ -1,7 +1,7 @@
1From 75c06e3e2a4760b36fffd95cdf5535b8ad73c481 Mon Sep 17 00:00:00 2001 1From 8303d49cabaf3ab8890ba1d266972c721dfe6ee8 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 20/24] missing_type.h: add __compar_d_fn_t definition 4Subject: [PATCH] missing_type.h: add __compar_d_fn_t definition
5 5
6Fix the following compile failure: 6Fix the following compile failure:
7src/basic/util.h:71:18: error: unknown type name '__compar_d_fn_t'; did you mean '__compar_fn_t'? 7src/basic/util.h:71:18: error: unknown type name '__compar_d_fn_t'; did you mean '__compar_fn_t'?
@@ -9,12 +9,13 @@ src/basic/util.h:71:18: error: unknown type name '__compar_d_fn_t'; did you mean
9Upstream-Status: Inappropriate [musl specific] 9Upstream-Status: Inappropriate [musl specific]
10 10
11Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 11Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
12
12--- 13---
13 src/basic/missing_type.h | 1 + 14 src/basic/missing_type.h | 1 +
14 1 file changed, 1 insertion(+) 15 1 file changed, 1 insertion(+)
15 16
16diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h 17diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h
17index 7d7c1e4..85902ab 100644 18index 23602ebbd533..917d314a81bf 100644
18--- a/src/basic/missing_type.h 19--- a/src/basic/missing_type.h
19+++ b/src/basic/missing_type.h 20+++ b/src/basic/missing_type.h
20@@ -13,6 +13,7 @@ 21@@ -13,6 +13,7 @@
@@ -25,6 +26,3 @@ index 7d7c1e4..85902ab 100644
25 #endif 26 #endif
26 27
27 #ifndef __COMPAR_FN_T 28 #ifndef __COMPAR_FN_T
28--
292.7.4
30
diff --git a/meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch b/meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch
index cdddf83890..7dacc36837 100644
--- a/meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch
+++ b/meta/recipes-core/systemd/systemd/0021-avoid-redefinition-of-prctl_mm_map-structure.patch
@@ -1,7 +1,7 @@
1From 3fbf61d54b82fc9bf21d8039bfd89dc9efc5bbcd Mon Sep 17 00:00:00 2001 1From 6364ff5534678c158a7fb8d4e50d0a6ce72c1ad8 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 21/24] avoid redefinition of prctl_mm_map structure 4Subject: [PATCH] avoid redefinition of prctl_mm_map structure
5 5
6Fix the following compile failure: 6Fix the following compile failure:
7error: redefinition of 'struct prctl_mm_map' 7error: redefinition of 'struct prctl_mm_map'
@@ -9,12 +9,13 @@ error: redefinition of 'struct prctl_mm_map'
9Upstream-Status: Inappropriate [musl specific] 9Upstream-Status: Inappropriate [musl specific]
10 10
11Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 11Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
12
12--- 13---
13 src/basic/missing_prctl.h | 2 ++ 14 src/basic/missing_prctl.h | 2 ++
14 1 file changed, 2 insertions(+) 15 1 file changed, 2 insertions(+)
15 16
16diff --git a/src/basic/missing_prctl.h b/src/basic/missing_prctl.h 17diff --git a/src/basic/missing_prctl.h b/src/basic/missing_prctl.h
17index f80cd17..47e4893 100644 18index f80cd17f346b..47e489354053 100644
18--- a/src/basic/missing_prctl.h 19--- a/src/basic/missing_prctl.h
19+++ b/src/basic/missing_prctl.h 20+++ b/src/basic/missing_prctl.h
20@@ -1,7 +1,9 @@ 21@@ -1,7 +1,9 @@
@@ -27,6 +28,3 @@ index f80cd17..47e4893 100644
27 28
28 /* 58319057b7847667f0c9585b9de0e8932b0fdb08 (4.3) */ 29 /* 58319057b7847667f0c9585b9de0e8932b0fdb08 (4.3) */
29 #ifndef PR_CAP_AMBIENT 30 #ifndef PR_CAP_AMBIENT
30--
312.11.0
32
diff --git a/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch b/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch
index e266b9b125..33c575871c 100644
--- a/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch
+++ b/meta/recipes-core/systemd/systemd/0022-Use-INT_MAX-instead-of-TIME_T_MAX-for-timerfd_settim.patch
@@ -1,4 +1,4 @@
1From 6bcf562bd1e541c7aa46923d9a14201c7f785261 Mon Sep 17 00:00:00 2001 1From 3cc30186f9d9adb565dc29f2d4e68889974676ae Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 16 Dec 2019 12:49:07 -0800 3Date: Mon, 16 Dec 2019 12:49:07 -0800
4Subject: [PATCH] Use INT_MAX instead of TIME_T_MAX for timerfd_settime timeout 4Subject: [PATCH] Use INT_MAX instead of TIME_T_MAX for timerfd_settime timeout
@@ -11,15 +11,16 @@ purposes
11Upstream-Status: Pending 11Upstream-Status: Pending
12Signed-off-by: Khem Raj <raj.khem@gmail.com> 12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13Upstream-Status: Pending 13Upstream-Status: Pending
14
14--- 15---
15 src/basic/time-util.c | 2 +- 16 src/basic/time-util.c | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-) 17 1 file changed, 1 insertion(+), 1 deletion(-)
17 18
18diff --git a/src/basic/time-util.c b/src/basic/time-util.c 19diff --git a/src/basic/time-util.c b/src/basic/time-util.c
19index bfe2c60da1..8cf682b36a 100644 20index d7ef30d2fe52..4d3219f114b5 100644
20--- a/src/basic/time-util.c 21--- a/src/basic/time-util.c
21+++ b/src/basic/time-util.c 22+++ b/src/basic/time-util.c
22@@ -1486,7 +1486,7 @@ int time_change_fd(void) { 23@@ -1487,7 +1487,7 @@ int time_change_fd(void) {
23 24
24 /* We only care for the cancellation event, hence we set the timeout to the latest possible value. */ 25 /* We only care for the cancellation event, hence we set the timeout to the latest possible value. */
25 static const struct itimerspec its = { 26 static const struct itimerspec its = {
@@ -28,6 +29,3 @@ index bfe2c60da1..8cf682b36a 100644
28 }; 29 };
29 30
30 _cleanup_close_ int fd; 31 _cleanup_close_ int fd;
31--
322.24.1
33
diff --git a/meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch b/meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch
index 0e5629d37b..80beada3d3 100644
--- a/meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch
+++ b/meta/recipes-core/systemd/systemd/0024-test-json.c-define-M_PIl.patch
@@ -1,7 +1,7 @@
1From 902412c271e0c5d9cb93b10ec0fb5b119b393474 Mon Sep 17 00:00:00 2001 1From a05cc5fb3dc0e51682c40196285cdda34ec90783 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 24/24] test-json.c: define M_PIl 4Subject: [PATCH] test-json.c: define M_PIl
5 5
6Fix the following compile failure: 6Fix the following compile failure:
7src/test/test-json.c:305:50: error: 'M_PIl' undeclared (first use in this function); did you mean 'M_PI'? 7src/test/test-json.c:305:50: error: 'M_PIl' undeclared (first use in this function); did you mean 'M_PI'?
@@ -9,15 +9,16 @@ src/test/test-json.c:305:50: error: 'M_PIl' undeclared (first use in this functi
9Upstream-Status: Inappropriate [musl specific] 9Upstream-Status: Inappropriate [musl specific]
10 10
11Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 11Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
12
12--- 13---
13 src/test/test-json.c | 4 ++++ 14 src/test/test-json.c | 4 ++++
14 1 file changed, 4 insertions(+) 15 1 file changed, 4 insertions(+)
15 16
16diff --git a/src/test/test-json.c b/src/test/test-json.c 17diff --git a/src/test/test-json.c b/src/test/test-json.c
17index 9b8a2a9..efc746c 100644 18index a6613043b924..ca823ea79f05 100644
18--- a/src/test/test-json.c 19--- a/src/test/test-json.c
19+++ b/src/test/test-json.c 20+++ b/src/test/test-json.c
20@@ -11,6 +11,10 @@ 21@@ -12,6 +12,10 @@
21 #include "tests.h" 22 #include "tests.h"
22 #include "util.h" 23 #include "util.h"
23 24
@@ -28,6 +29,3 @@ index 9b8a2a9..efc746c 100644
28 static void test_tokenizer(const char *data, ...) { 29 static void test_tokenizer(const char *data, ...) {
29 unsigned line = 0, column = 0; 30 unsigned line = 0, column = 0;
30 void *state = NULL; 31 void *state = NULL;
31--
322.11.0
33
diff --git a/meta/recipes-core/systemd/systemd_243.4.bb b/meta/recipes-core/systemd/systemd_244.1.bb
index a0d10e03be..b686519482 100644
--- a/meta/recipes-core/systemd/systemd_243.4.bb
+++ b/meta/recipes-core/systemd/systemd_244.1.bb
@@ -18,7 +18,6 @@ SRC_URI += "file://touchscreen.rules \
18 file://00-create-volatile.conf \ 18 file://00-create-volatile.conf \
19 file://init \ 19 file://init \
20 file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ 20 file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \
21 file://0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch \
22 file://0003-implment-systemd-sysv-install-for-OE.patch \ 21 file://0003-implment-systemd-sysv-install-for-OE.patch \
23 file://99-default.preset \ 22 file://99-default.preset \
24 " 23 "
@@ -591,6 +590,7 @@ FILES_udev += "${base_sbindir}/udevd \
591 ${rootlibexecdir}/udev/ata_id \ 590 ${rootlibexecdir}/udev/ata_id \
592 ${rootlibexecdir}/udev/cdrom_id \ 591 ${rootlibexecdir}/udev/cdrom_id \
593 ${rootlibexecdir}/udev/collect \ 592 ${rootlibexecdir}/udev/collect \
593 ${rootlibexecdir}/udev/fido_id \
594 ${rootlibexecdir}/udev/findkeyboards \ 594 ${rootlibexecdir}/udev/findkeyboards \
595 ${rootlibexecdir}/udev/keyboard-force-release.sh \ 595 ${rootlibexecdir}/udev/keyboard-force-release.sh \
596 ${rootlibexecdir}/udev/keymap \ 596 ${rootlibexecdir}/udev/keymap \