summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-core/systemd/systemd-boot_243.bb (renamed from meta/recipes-core/systemd/systemd-boot_242.bb)0
-rw-r--r--meta/recipes-core/systemd/systemd-conf_243.bb (renamed from meta/recipes-core/systemd/systemd-conf_242.bb)0
-rw-r--r--meta/recipes-core/systemd/systemd.inc4
-rw-r--r--meta/recipes-core/systemd/systemd/0001-Replace-the-legacy-ULONG_LONG_MAX-with-the-C99-ULLON.patch50
-rw-r--r--meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch17
-rw-r--r--meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch148
-rw-r--r--meta/recipes-core/systemd/systemd/0001-src-udev-udev-event.c-must-include-sys-wait.h.patch35
-rw-r--r--meta/recipes-core/systemd/systemd/0002-src-login-brightness.c-include-sys-wait.h.patch25
-rw-r--r--meta/recipes-core/systemd/systemd/0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch23
-rw-r--r--meta/recipes-core/systemd/systemd/0003-src-basic-copy.c-include-signal.h.patch27
-rw-r--r--meta/recipes-core/systemd/systemd/0004-add-fallback-parse_printf_format-implementation.patch15
-rw-r--r--meta/recipes-core/systemd/systemd/0004-rules-whitelist-hd-devices.patch11
-rw-r--r--meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch54
-rw-r--r--meta/recipes-core/systemd/systemd/0005-rules-watch-metadata-changes-in-ide-devices.patch16
-rw-r--r--meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch139
-rw-r--r--meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch195
-rw-r--r--meta/recipes-core/systemd/systemd/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not.patch26
-rw-r--r--meta/recipes-core/systemd/systemd/0017-Do-not-disable-buffering-when-writing-to-oom_score_a.patch12
-rw-r--r--meta/recipes-core/systemd/systemd/0023-socket-util.h-include-string.h.patch30
-rw-r--r--meta/recipes-core/systemd/systemd/0025-fs-utilh-add-missing-sys-stat-include.patch30
-rw-r--r--meta/recipes-core/systemd/systemd_243.bb (renamed from meta/recipes-core/systemd/systemd_242.bb)11
21 files changed, 507 insertions, 361 deletions
diff --git a/meta/recipes-core/systemd/systemd-boot_242.bb b/meta/recipes-core/systemd/systemd-boot_243.bb
index 56a25c35ba..56a25c35ba 100644
--- a/meta/recipes-core/systemd/systemd-boot_242.bb
+++ b/meta/recipes-core/systemd/systemd-boot_243.bb
diff --git a/meta/recipes-core/systemd/systemd-conf_242.bb b/meta/recipes-core/systemd/systemd-conf_243.bb
index d9ec023bfd..d9ec023bfd 100644
--- a/meta/recipes-core/systemd/systemd-conf_242.bb
+++ b/meta/recipes-core/systemd/systemd-conf_243.bb
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc
index 1912715617..7f3a59c208 100644
--- a/meta/recipes-core/systemd/systemd.inc
+++ b/meta/recipes-core/systemd/systemd.inc
@@ -14,8 +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 = "f875dced33462641e1fb7875d2f9a8cd8e8c2fcc" 17SRCREV = "efb536d0cbe2e58f80e501d19999928c75e08f6a"
18SRCBRANCH = "v242-stable" 18SRCBRANCH = "v243-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
21S = "${WORKDIR}/git" 21S = "${WORKDIR}/git"
diff --git a/meta/recipes-core/systemd/systemd/0001-Replace-the-legacy-ULONG_LONG_MAX-with-the-C99-ULLON.patch b/meta/recipes-core/systemd/systemd/0001-Replace-the-legacy-ULONG_LONG_MAX-with-the-C99-ULLON.patch
deleted file mode 100644
index 6f192a2ad2..0000000000
--- a/meta/recipes-core/systemd/systemd/0001-Replace-the-legacy-ULONG_LONG_MAX-with-the-C99-ULLON.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1From f491dfdc88ddbba36a24a75b2063aff027461b83 Mon Sep 17 00:00:00 2001
2From: Adrian Bunk <bunk@stusta.de>
3Date: Thu, 16 May 2019 22:20:07 +0300
4Subject: Replace the legacy ULONG_LONG_MAX with the C99 ULLONG_MAX
5
6Upstream-Status: Backport
7Signed-off-by: Adrian Bunk <bunk@stusta.de>
8---
9 src/journal-remote/journal-remote-main.c | 4 ++--
10 src/shutdown/shutdown.c | 2 +-
11 2 files changed, 3 insertions(+), 3 deletions(-)
12
13diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c
14index 2321a91e7b..d32c51c3ce 100644
15--- a/src/journal-remote/journal-remote-main.c
16+++ b/src/journal-remote/journal-remote-main.c
17@@ -528,7 +528,7 @@ static int dispatch_http_event(sd_event_source *event,
18 void *userdata) {
19 MHDDaemonWrapper *d = userdata;
20 int r;
21- MHD_UNSIGNED_LONG_LONG timeout = ULONG_LONG_MAX;
22+ MHD_UNSIGNED_LONG_LONG timeout = ULLONG_MAX;
23
24 assert(d);
25
26@@ -538,7 +538,7 @@ static int dispatch_http_event(sd_event_source *event,
27 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
28 "MHD_run failed!");
29 if (MHD_get_timeout(d->daemon, &timeout) == MHD_NO)
30- timeout = ULONG_LONG_MAX;
31+ timeout = ULLONG_MAX;
32
33 r = sd_event_source_set_time(d->timer_event, timeout);
34 if (r < 0) {
35diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c
36index 35b2c2aa46..9623fe9ea2 100644
37--- a/src/shutdown/shutdown.c
38+++ b/src/shutdown/shutdown.c
39@@ -212,7 +212,7 @@ static int sync_making_progress(unsigned long long *prev_dirty) {
40 }
41
42 static void sync_with_progress(void) {
43- unsigned long long dirty = ULONG_LONG_MAX;
44+ unsigned long long dirty = ULLONG_MAX;
45 unsigned checks;
46 pid_t pid;
47 int r;
48--
492.20.1
50
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 00670ca2b1..73e65ff798 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
@@ -16,6 +16,8 @@ Upstream-Status: Denied
16Signed-off-by: Ross Burton <ross.burton@intel.com> 16Signed-off-by: Ross Burton <ross.burton@intel.com>
17Signed-off-by: Khem Raj <raj.khem@gmail.com> 17Signed-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]
20Signed-off-by: Scott Murray <scott.murray@konsulko.com>
19--- 21---
20 units/meson.build | 6 ++---- 22 units/meson.build | 6 ++----
21 units/proc-sys-fs-binfmt_misc.automount | 3 +++ 23 units/proc-sys-fs-binfmt_misc.automount | 3 +++
@@ -23,10 +25,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
23 3 files changed, 9 insertions(+), 4 deletions(-) 25 3 files changed, 9 insertions(+), 4 deletions(-)
24 26
25diff --git a/units/meson.build b/units/meson.build 27diff --git a/units/meson.build b/units/meson.build
26index d695084..7b1f14a 100644 28index e1ee9f86c3..6bb7771b36 100644
27--- a/units/meson.build 29--- a/units/meson.build
28+++ b/units/meson.build 30+++ b/units/meson.build
29@@ -47,8 +47,7 @@ units = [ 31@@ -46,8 +46,7 @@ units = [
30 ['poweroff.target', '', 32 ['poweroff.target', '',
31 'runlevel0.target'], 33 'runlevel0.target'],
32 ['printer.target', ''], 34 ['printer.target', ''],
@@ -36,7 +38,7 @@ index d695084..7b1f14a 100644
36 ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'], 38 ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'],
37 ['reboot.target', '', 39 ['reboot.target', '',
38 'runlevel6.target ctrl-alt-del.target'], 40 'runlevel6.target ctrl-alt-del.target'],
39@@ -134,8 +133,7 @@ in_units = [ 41@@ -130,8 +129,7 @@ in_units = [
40 ['systemd-ask-password-console.service', ''], 42 ['systemd-ask-password-console.service', ''],
41 ['systemd-ask-password-wall.service', ''], 43 ['systemd-ask-password-wall.service', ''],
42 ['systemd-backlight@.service', 'ENABLE_BACKLIGHT'], 44 ['systemd-backlight@.service', 'ENABLE_BACKLIGHT'],
@@ -45,9 +47,9 @@ index d695084..7b1f14a 100644
45+ ['systemd-binfmt.service', 'ENABLE_BINFMT'], 47+ ['systemd-binfmt.service', 'ENABLE_BINFMT'],
46 ['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'], 48 ['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'],
47 ['systemd-boot-check-no-failures.service', ''], 49 ['systemd-boot-check-no-failures.service', ''],
48 ['systemd-coredump@.service', 'ENABLE_COREDUMP'], 50 ['systemd-boot-system-token.service', 'ENABLE_EFI',
49diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount 51diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount
50index 30a6bc9..4231f3b 100644 52index 30a6bc9918..4231f3b70f 100644
51--- a/units/proc-sys-fs-binfmt_misc.automount 53--- a/units/proc-sys-fs-binfmt_misc.automount
52+++ b/units/proc-sys-fs-binfmt_misc.automount 54+++ b/units/proc-sys-fs-binfmt_misc.automount
53@@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/ 55@@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/
@@ -58,7 +60,7 @@ index 30a6bc9..4231f3b 100644
58+[Install] 60+[Install]
59+WantedBy=sysinit.target 61+WantedBy=sysinit.target
60diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in 62diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
61index e940c7c..6be7f5c 100644 63index e940c7c9ad..6be7f5cc9b 100644
62--- a/units/systemd-binfmt.service.in 64--- a/units/systemd-binfmt.service.in
63+++ b/units/systemd-binfmt.service.in 65+++ b/units/systemd-binfmt.service.in
64@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm 66@@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm
@@ -76,6 +78,3 @@ index e940c7c..6be7f5c 100644
76+ 78+
77+[Install] 79+[Install]
78+WantedBy=sysinit.target 80+WantedBy=sysinit.target
79--
802.7.4
81
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 68ca604d6d..2f4daf8665 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
@@ -16,6 +16,8 @@ Upstream-Status: Inappropriate [musl]
16Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 16Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
17[Rebased for v242] 17[Rebased for v242]
18Signed-off-by: Andrej Valek <andrej.valek@siemens.com> 18Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
19[rebased for systemd 243]
20Signed-off-by: Scott Murray <scott.murray@konsulko.com>
19--- 21---
20 src/basic/cgroup-util.c | 14 +++++++------- 22 src/basic/cgroup-util.c | 14 +++++++-------
21 src/basic/procfs-util.c | 4 ++-- 23 src/basic/procfs-util.c | 4 ++--
@@ -30,17 +32,17 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
30 src/nspawn/nspawn-cgroup.c | 2 +- 32 src/nspawn/nspawn-cgroup.c | 2 +-
31 src/nspawn/nspawn.c | 6 +++--- 33 src/nspawn/nspawn.c | 6 +++---
32 src/shared/sysctl-util.c | 2 +- 34 src/shared/sysctl-util.c | 2 +-
33 src/sleep/sleep.c | 12 ++++++------ 35 src/sleep/sleep.c | 10 +++++-----
34 src/udev/udevadm-trigger.c | 2 +- 36 src/udev/udevadm-trigger.c | 2 +-
35 src/udev/udevd.c | 6 +++--- 37 src/udev/udevd.c | 2 +-
36 src/vconsole/vconsole-setup.c | 2 +- 38 src/vconsole/vconsole-setup.c | 2 +-
37 17 files changed, 39 insertions(+), 39 deletions(-) 39 17 files changed, 36 insertions(+), 36 deletions(-)
38 40
39diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c 41diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
40index fc28109..44fe985 100644 42index 7b5839ccd6..18f6e8ffc8 100644
41--- a/src/basic/cgroup-util.c 43--- a/src/basic/cgroup-util.c
42+++ b/src/basic/cgroup-util.c 44+++ b/src/basic/cgroup-util.c
43@@ -822,7 +822,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { 45@@ -860,7 +860,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) {
44 46
45 xsprintf(c, PID_FMT "\n", pid); 47 xsprintf(c, PID_FMT "\n", pid);
46 48
@@ -49,7 +51,7 @@ index fc28109..44fe985 100644
49 if (r < 0) 51 if (r < 0)
50 return r; 52 return r;
51 53
52@@ -1104,7 +1104,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { 54@@ -1142,7 +1142,7 @@ int cg_install_release_agent(const char *controller, const char *agent) {
53 55
54 sc = strstrip(contents); 56 sc = strstrip(contents);
55 if (isempty(sc)) { 57 if (isempty(sc)) {
@@ -58,7 +60,7 @@ index fc28109..44fe985 100644
58 if (r < 0) 60 if (r < 0)
59 return r; 61 return r;
60 } else if (!path_equal(sc, agent)) 62 } else if (!path_equal(sc, agent))
61@@ -1122,7 +1122,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { 63@@ -1160,7 +1160,7 @@ int cg_install_release_agent(const char *controller, const char *agent) {
62 64
63 sc = strstrip(contents); 65 sc = strstrip(contents);
64 if (streq(sc, "0")) { 66 if (streq(sc, "0")) {
@@ -67,7 +69,7 @@ index fc28109..44fe985 100644
67 if (r < 0) 69 if (r < 0)
68 return r; 70 return r;
69 71
70@@ -1149,7 +1149,7 @@ int cg_uninstall_release_agent(const char *controller) { 72@@ -1187,7 +1187,7 @@ int cg_uninstall_release_agent(const char *controller) {
71 if (r < 0) 73 if (r < 0)
72 return r; 74 return r;
73 75
@@ -76,7 +78,7 @@ index fc28109..44fe985 100644
76 if (r < 0) 78 if (r < 0)
77 return r; 79 return r;
78 80
79@@ -1159,7 +1159,7 @@ int cg_uninstall_release_agent(const char *controller) { 81@@ -1197,7 +1197,7 @@ int cg_uninstall_release_agent(const char *controller) {
80 if (r < 0) 82 if (r < 0)
81 return r; 83 return r;
82 84
@@ -85,7 +87,7 @@ index fc28109..44fe985 100644
85 if (r < 0) 87 if (r < 0)
86 return r; 88 return r;
87 89
88@@ -2016,7 +2016,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri 90@@ -2053,7 +2053,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri
89 if (r < 0) 91 if (r < 0)
90 return r; 92 return r;
91 93
@@ -94,7 +96,7 @@ index fc28109..44fe985 100644
94 } 96 }
95 97
96 int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) { 98 int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) {
97@@ -2664,7 +2664,7 @@ int cg_enable_everywhere( 99@@ -2697,7 +2697,7 @@ int cg_enable_everywhere(
98 return log_debug_errno(errno, "Failed to open cgroup.subtree_control file of %s: %m", p); 100 return log_debug_errno(errno, "Failed to open cgroup.subtree_control file of %s: %m", p);
99 } 101 }
100 102
@@ -104,10 +106,10 @@ index fc28109..44fe985 100644
104 log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", 106 log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m",
105 FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); 107 FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs);
106diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c 108diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c
107index 7aaf95b..25fc3de 100644 109index 42ce53d5aa..57512532a6 100644
108--- a/src/basic/procfs-util.c 110--- a/src/basic/procfs-util.c
109+++ b/src/basic/procfs-util.c 111+++ b/src/basic/procfs-util.c
110@@ -85,13 +85,13 @@ int procfs_tasks_set_limit(uint64_t limit) { 112@@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limit) {
111 * decrease it, as threads-max is the much more relevant sysctl. */ 113 * decrease it, as threads-max is the much more relevant sysctl. */
112 if (limit > pid_max-1) { 114 if (limit > pid_max-1) {
113 sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ 115 sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */
@@ -124,7 +126,7 @@ index 7aaf95b..25fc3de 100644
124 uint64_t threads_max; 126 uint64_t threads_max;
125 127
126diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c 128diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c
127index 123d00e..e7ea78f 100644 129index 123d00e13e..e7ea78f349 100644
128--- a/src/basic/smack-util.c 130--- a/src/basic/smack-util.c
129+++ b/src/basic/smack-util.c 131+++ b/src/basic/smack-util.c
130@@ -115,7 +115,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) { 132@@ -115,7 +115,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) {
@@ -137,7 +139,7 @@ index 123d00e..e7ea78f 100644
137 return r; 139 return r;
138 140
139diff --git a/src/basic/util.c b/src/basic/util.c 141diff --git a/src/basic/util.c b/src/basic/util.c
140index 93d610b..97dca64 100644 142index 93d610bc98..97dca64f73 100644
141--- a/src/basic/util.c 143--- a/src/basic/util.c
142+++ b/src/basic/util.c 144+++ b/src/basic/util.c
143@@ -294,7 +294,7 @@ void disable_coredumps(void) { 145@@ -294,7 +294,7 @@ void disable_coredumps(void) {
@@ -150,7 +152,7 @@ index 93d610b..97dca64 100644
150 log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); 152 log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m");
151 } 153 }
152diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c 154diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
153index 66e2f01..5daa43b 100644 155index aa9d811f2e..8c7f2dae7a 100644
154--- a/src/binfmt/binfmt.c 156--- a/src/binfmt/binfmt.c
155+++ b/src/binfmt/binfmt.c 157+++ b/src/binfmt/binfmt.c
156@@ -48,7 +48,7 @@ static int delete_rule(const char *rule) { 158@@ -48,7 +48,7 @@ static int delete_rule(const char *rule) {
@@ -175,16 +177,16 @@ index 66e2f01..5daa43b 100644
175 } 177 }
176 178
177 /* Flush out all rules */ 179 /* Flush out all rules */
178- write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", WRITE_STRING_FILE_DISABLE_BUFFER); 180- (void) write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", WRITE_STRING_FILE_DISABLE_BUFFER);
179+ write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", 0); 181+ (void) write_string_file("/proc/sys/fs/binfmt_misc/status", "-1", 0);
180 182
181 STRV_FOREACH(f, files) { 183 STRV_FOREACH(f, files) {
182 k = apply_file(*f, true); 184 k = apply_file(*f, true);
183diff --git a/src/core/main.c b/src/core/main.c 185diff --git a/src/core/main.c b/src/core/main.c
184index 46db471..726ccaf 100644 186index bcce7178a8..4199cedab9 100644
185--- a/src/core/main.c 187--- a/src/core/main.c
186+++ b/src/core/main.c 188+++ b/src/core/main.c
187@@ -1469,7 +1469,7 @@ static int bump_unix_max_dgram_qlen(void) { 189@@ -1285,7 +1285,7 @@ static int bump_unix_max_dgram_qlen(void) {
188 if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN) 190 if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN)
189 return 0; 191 return 0;
190 192
@@ -193,7 +195,7 @@ index 46db471..726ccaf 100644
193 if (r < 0) 195 if (r < 0)
194 return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r, 196 return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r,
195 "Failed to bump AF_UNIX datagram queue length, ignoring: %m"); 197 "Failed to bump AF_UNIX datagram queue length, ignoring: %m");
196@@ -1684,7 +1684,7 @@ static void initialize_core_pattern(bool skip_setup) { 198@@ -1509,7 +1509,7 @@ static void initialize_core_pattern(bool skip_setup) {
197 if (getpid_cached() != 1) 199 if (getpid_cached() != 1)
198 return; 200 return;
199 201
@@ -203,10 +205,10 @@ index 46db471..726ccaf 100644
203 log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern); 205 log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern);
204 } 206 }
205diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c 207diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c
206index cd7fb01..077e861 100644 208index b95e6239d4..fdbdaaaccb 100644
207--- a/src/core/smack-setup.c 209--- a/src/core/smack-setup.c
208+++ b/src/core/smack-setup.c 210+++ b/src/core/smack-setup.c
209@@ -351,17 +351,17 @@ int mac_smack_setup(bool *loaded_policy) { 211@@ -325,17 +325,17 @@ int mac_smack_setup(bool *loaded_policy) {
210 } 212 }
211 213
212 #ifdef SMACK_RUN_LABEL 214 #ifdef SMACK_RUN_LABEL
@@ -229,7 +231,7 @@ index cd7fb01..077e861 100644
229 log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); 231 log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m");
230 #endif 232 #endif
231diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c 233diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c
232index 17e7cd1..87a7667 100644 234index 17e7cd1a00..87a7667716 100644
233--- a/src/hibernate-resume/hibernate-resume.c 235--- a/src/hibernate-resume/hibernate-resume.c
234+++ b/src/hibernate-resume/hibernate-resume.c 236+++ b/src/hibernate-resume/hibernate-resume.c
235@@ -45,7 +45,7 @@ int main(int argc, char *argv[]) { 237@@ -45,7 +45,7 @@ int main(int argc, char *argv[]) {
@@ -242,10 +244,10 @@ index 17e7cd1..87a7667 100644
242 log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor); 244 log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor);
243 return EXIT_FAILURE; 245 return EXIT_FAILURE;
244diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c 246diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c
245index c2315c0..00f81b4 100644 247index c4a7f2f3d3..bcac758284 100644
246--- a/src/libsystemd/sd-device/sd-device.c 248--- a/src/libsystemd/sd-device/sd-device.c
247+++ b/src/libsystemd/sd-device/sd-device.c 249+++ b/src/libsystemd/sd-device/sd-device.c
248@@ -1852,7 +1852,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, 250@@ -1849,7 +1849,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr,
249 if (!value) 251 if (!value)
250 return -ENOMEM; 252 return -ENOMEM;
251 253
@@ -255,10 +257,10 @@ index c2315c0..00f81b4 100644
255 if (r == -ELOOP) 257 if (r == -ELOOP)
256 return -EINVAL; 258 return -EINVAL;
257diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c 259diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
258index 2cebcce..7111fc1 100644 260index 30b9a66334..cc1d577933 100644
259--- a/src/login/logind-dbus.c 261--- a/src/login/logind-dbus.c
260+++ b/src/login/logind-dbus.c 262+++ b/src/login/logind-dbus.c
261@@ -1285,7 +1285,7 @@ static int trigger_device(Manager *m, sd_device *d) { 263@@ -1325,7 +1325,7 @@ static int trigger_device(Manager *m, sd_device *d) {
262 if (!t) 264 if (!t)
263 return -ENOMEM; 265 return -ENOMEM;
264 266
@@ -268,23 +270,23 @@ index 2cebcce..7111fc1 100644
268 270
269 return 0; 271 return 0;
270diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c 272diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c
271index 168125d..dd0ab79 100644 273index 0462b46413..7c53d41483 100644
272--- a/src/nspawn/nspawn-cgroup.c 274--- a/src/nspawn/nspawn-cgroup.c
273+++ b/src/nspawn/nspawn-cgroup.c 275+++ b/src/nspawn/nspawn-cgroup.c
274@@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) { 276@@ -123,7 +123,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) {
275 (void) mkdir_parents(fn, 0755); 277 fn = strjoina(tree, cgroup, "/cgroup.procs");
276 278
277 sprintf(pid_string, PID_FMT, pid); 279 sprintf(pid_string, PID_FMT, pid);
278- r = write_string_file(fn, pid_string, WRITE_STRING_FILE_DISABLE_BUFFER); 280- r = write_string_file(fn, pid_string, WRITE_STRING_FILE_DISABLE_BUFFER|WRITE_STRING_FILE_MKDIR_0755);
279+ r = write_string_file(fn, pid_string, 0); 281+ r = write_string_file(fn, pid_string, WRITE_STRING_FILE_MKDIR_0755);
280 if (r < 0) { 282 if (r < 0) {
281 log_error_errno(r, "Failed to move process: %m"); 283 log_error_errno(r, "Failed to move process: %m");
282 goto finish; 284 goto finish;
283diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c 285diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
284index 3b0ecb1..a1b5240 100644 286index 2aec8041f0..841542f2f3 100644
285--- a/src/nspawn/nspawn.c 287--- a/src/nspawn/nspawn.c
286+++ b/src/nspawn/nspawn.c 288+++ b/src/nspawn/nspawn.c
287@@ -2341,7 +2341,7 @@ static int reset_audit_loginuid(void) { 289@@ -2357,7 +2357,7 @@ static int reset_audit_loginuid(void) {
288 if (streq(p, "4294967295")) 290 if (streq(p, "4294967295"))
289 return 0; 291 return 0;
290 292
@@ -293,7 +295,7 @@ index 3b0ecb1..a1b5240 100644
293 if (r < 0) { 295 if (r < 0) {
294 log_error_errno(r, 296 log_error_errno(r,
295 "Failed to reset audit login UID. This probably means that your kernel is too\n" 297 "Failed to reset audit login UID. This probably means that your kernel is too\n"
296@@ -3531,13 +3531,13 @@ static int setup_uid_map(pid_t pid) { 298@@ -3566,13 +3566,13 @@ static int setup_uid_map(pid_t pid) {
297 299
298 xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); 300 xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid);
299 xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, arg_uid_shift, arg_uid_range); 301 xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, arg_uid_shift, arg_uid_range);
@@ -310,10 +312,10 @@ index 3b0ecb1..a1b5240 100644
310 return log_error_errno(r, "Failed to write GID map: %m"); 312 return log_error_errno(r, "Failed to write GID map: %m");
311 313
312diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c 314diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c
313index 9be4055..f935cde 100644 315index 93bdcf11bf..68cddb7a9f 100644
314--- a/src/shared/sysctl-util.c 316--- a/src/shared/sysctl-util.c
315+++ b/src/shared/sysctl-util.c 317+++ b/src/shared/sysctl-util.c
316@@ -73,7 +73,7 @@ int sysctl_write_ip_property(int af, const char *ifname, const char *property, c 318@@ -88,7 +88,7 @@ int sysctl_write_ip_property(int af, const char *ifname, const char *property, c
317 319
318 log_debug("Setting '%s' to '%s'", p, value); 320 log_debug("Setting '%s' to '%s'", p, value);
319 321
@@ -323,19 +325,19 @@ index 9be4055..f935cde 100644
323 325
324 int sysctl_read(const char *property, char **content) { 326 int sysctl_read(const char *property, char **content) {
325diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c 327diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
326index 11aabaf..6aa5d37 100644 328index b9fe96635d..f168d7f890 100644
327--- a/src/sleep/sleep.c 329--- a/src/sleep/sleep.c
328+++ b/src/sleep/sleep.c 330+++ b/src/sleep/sleep.c
329@@ -48,7 +48,7 @@ static int write_hibernate_location_info(void) { 331@@ -54,7 +54,7 @@ static int write_hibernate_location_info(void) {
330 332
331 /* if it's a swap partition, we just write the disk to /sys/power/resume */ 333 /* if it's a swap partition, we just write the disk to /sys/power/resume */
332 if (streq(type, "partition")) { 334 if (streq(type, "partition")) {
333- r = write_string_file("/sys/power/resume", device, WRITE_STRING_FILE_DISABLE_BUFFER); 335- r = write_string_file("/sys/power/resume", device, WRITE_STRING_FILE_DISABLE_BUFFER);
334+ r = write_string_file("/sys/power/resume", device, 0); 336+ r = write_string_file("/sys/power/resume", device, 0);
335 if (r < 0) 337 if (r < 0)
336 return log_debug_errno(r, "Faileed to write partitoin device to /sys/power/resume: %m"); 338 return log_debug_errno(r, "Failed to write partition device to /sys/power/resume: %m");
337 339
338@@ -84,12 +84,12 @@ static int write_hibernate_location_info(void) { 340@@ -98,14 +98,14 @@ static int write_hibernate_location_info(void) {
339 341
340 offset = fiemap->fm_extents[0].fe_physical / page_size(); 342 offset = fiemap->fm_extents[0].fe_physical / page_size();
341 xsprintf(offset_str, "%" PRIu64, offset); 343 xsprintf(offset_str, "%" PRIu64, offset);
@@ -344,13 +346,15 @@ index 11aabaf..6aa5d37 100644
344 if (r < 0) 346 if (r < 0)
345 return log_debug_errno(r, "Failed to write offset '%s': %m", offset_str); 347 return log_debug_errno(r, "Failed to write offset '%s': %m", offset_str);
346 348
349 log_debug("Wrote calculated resume_offset value to /sys/power/resume_offset: %s", offset_str);
350
347 xsprintf(device_str, "%lx", (unsigned long)stb.st_dev); 351 xsprintf(device_str, "%lx", (unsigned long)stb.st_dev);
348- r = write_string_file("/sys/power/resume", device_str, WRITE_STRING_FILE_DISABLE_BUFFER); 352- r = write_string_file("/sys/power/resume", device_str, WRITE_STRING_FILE_DISABLE_BUFFER);
349+ r = write_string_file("/sys/power/resume", device_str, 0); 353+ r = write_string_file("/sys/power/resume", device_str, 0);
350 if (r < 0) 354 if (r < 0)
351 return log_debug_errno(r, "Failed to write device '%s': %m", device_str); 355 return log_debug_errno(r, "Failed to write device '%s': %m", device_str);
352 356
353@@ -103,7 +103,7 @@ static int write_mode(char **modes) { 357@@ -121,7 +121,7 @@ static int write_mode(char **modes) {
354 STRV_FOREACH(mode, modes) { 358 STRV_FOREACH(mode, modes) {
355 int k; 359 int k;
356 360
@@ -359,7 +363,7 @@ index 11aabaf..6aa5d37 100644
359 if (k >= 0) 363 if (k >= 0)
360 return 0; 364 return 0;
361 365
362@@ -122,7 +122,7 @@ static int write_state(FILE **f, char **states) { 366@@ -140,7 +140,7 @@ static int write_state(FILE **f, char **states) {
363 STRV_FOREACH(state, states) { 367 STRV_FOREACH(state, states) {
364 int k; 368 int k;
365 369
@@ -368,17 +372,8 @@ index 11aabaf..6aa5d37 100644
368 if (k >= 0) 372 if (k >= 0)
369 return 0; 373 return 0;
370 log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state); 374 log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state);
371@@ -217,7 +217,7 @@ static int rtc_write_wake_alarm(uint64_t sec) {
372
373 xsprintf(buf, "%" PRIu64, sec);
374
375- r = write_string_file("/sys/class/rtc/rtc0/wakealarm", buf, WRITE_STRING_FILE_DISABLE_BUFFER);
376+ r = write_string_file("/sys/class/rtc/rtc0/wakealarm", buf, 0);
377 if (r < 0)
378 return log_error_errno(r, "Failed to write '%s' to /sys/class/rtc/rtc0/wakealarm: %m", buf);
379
380diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c 375diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c
381index b7dafb7..bab4907 100644 376index 77d95e513f..25ce4abfb1 100644
382--- a/src/udev/udevadm-trigger.c 377--- a/src/udev/udevadm-trigger.c
383+++ b/src/udev/udevadm-trigger.c 378+++ b/src/udev/udevadm-trigger.c
384@@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerator *e, const char *action, Set *settle_se 379@@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerator *e, const char *action, Set *settle_se
@@ -388,44 +383,26 @@ index b7dafb7..bab4907 100644
388- r = write_string_file(filename, action, WRITE_STRING_FILE_DISABLE_BUFFER); 383- r = write_string_file(filename, action, WRITE_STRING_FILE_DISABLE_BUFFER);
389+ r = write_string_file(filename, action, 0); 384+ r = write_string_file(filename, action, 0);
390 if (r < 0) { 385 if (r < 0) {
391 log_debug_errno(r, "Failed to write '%s' to '%s', ignoring: %m", action, filename); 386 log_full_errno(r == -ENOENT ? LOG_DEBUG : LOG_ERR, r,
392 continue; 387 "Failed to write '%s' to '%s': %m", action, filename);
393diff --git a/src/udev/udevd.c b/src/udev/udevd.c 388diff --git a/src/udev/udevd.c b/src/udev/udevd.c
394index 140ec35..33063a9 100644 389index cb5123042a..ea309a9e7f 100644
395--- a/src/udev/udevd.c 390--- a/src/udev/udevd.c
396+++ b/src/udev/udevd.c 391+++ b/src/udev/udevd.c
397@@ -1185,7 +1185,7 @@ static int synthesize_change(sd_device *dev) { 392@@ -1113,7 +1113,7 @@ static int synthesize_change_one(sd_device *dev, const char *syspath) {
398 */
399 log_debug("Device '%s' is closed, synthesising 'change'", devname);
400 strscpyl(filename, sizeof(filename), syspath, "/uevent", NULL);
401- write_string_file(filename, "change", WRITE_STRING_FILE_DISABLE_BUFFER);
402+ write_string_file(filename, "change", 0);
403
404 FOREACH_DEVICE(e, d) {
405 const char *t, *n, *s;
406@@ -1200,7 +1200,7 @@ static int synthesize_change(sd_device *dev) {
407
408 log_debug("Device '%s' is closed, synthesising partition '%s' 'change'", devname, n);
409 strscpyl(filename, sizeof(filename), s, "/uevent", NULL);
410- write_string_file(filename, "change", WRITE_STRING_FILE_DISABLE_BUFFER);
411+ write_string_file(filename, "change", 0);
412 }
413
414 return 0;
415@@ -1208,7 +1208,7 @@ static int synthesize_change(sd_device *dev) {
416
417 log_debug("Device %s is closed, synthesising 'change'", devname);
418 strscpyl(filename, sizeof(filename), syspath, "/uevent", NULL);
419- write_string_file(filename, "change", WRITE_STRING_FILE_DISABLE_BUFFER);
420+ write_string_file(filename, "change", 0);
421 393
394 filename = strjoina(syspath, "/uevent");
395 log_device_debug(dev, "device is closed, synthesising 'change' on %s", syspath);
396- r = write_string_file(filename, "change", WRITE_STRING_FILE_DISABLE_BUFFER);
397+ r = write_string_file(filename, "change", 0);
398 if (r < 0)
399 return log_device_debug_errno(dev, r, "Failed to write 'change' to %s: %m", filename);
422 return 0; 400 return 0;
423 }
424diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c 401diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
425index 67dc2e4..01b83d0 100644 402index 75d052ae70..5a15c939d8 100644
426--- a/src/vconsole/vconsole-setup.c 403--- a/src/vconsole/vconsole-setup.c
427+++ b/src/vconsole/vconsole-setup.c 404+++ b/src/vconsole/vconsole-setup.c
428@@ -116,7 +116,7 @@ static int toggle_utf8(const char *name, int fd, bool utf8) { 405@@ -117,7 +117,7 @@ static int toggle_utf8_vc(const char *name, int fd, bool utf8) {
429 static int toggle_utf8_sysfs(bool utf8) { 406 static int toggle_utf8_sysfs(bool utf8) {
430 int r; 407 int r;
431 408
@@ -434,6 +411,3 @@ index 67dc2e4..01b83d0 100644
434 if (r < 0) 411 if (r < 0)
435 return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8)); 412 return log_warning_errno(r, "Failed to %s sysfs UTF-8 flag: %m", enable_disable(utf8));
436 413
437--
4382.11.0
439
diff --git a/meta/recipes-core/systemd/systemd/0001-src-udev-udev-event.c-must-include-sys-wait.h.patch b/meta/recipes-core/systemd/systemd/0001-src-udev-udev-event.c-must-include-sys-wait.h.patch
deleted file mode 100644
index 565deba1d0..0000000000
--- a/meta/recipes-core/systemd/systemd/0001-src-udev-udev-event.c-must-include-sys-wait.h.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 010f917cf222d2c7205584056fe0e4c581a2e1b1 Mon Sep 17 00:00:00 2001
2From: Adrian Bunk <bunk@stusta.de>
3Date: Thu, 16 May 2019 22:09:46 +0300
4Subject: src/udev/udev-event.c must #include <sys/wait.h>
5
6Fixes the following build failure with musl:
7../git/src/udev/udev-event.c: In function 'spawn_wait':
8../git/src/udev/udev-event.c:600:53: error: 'WEXITED' undeclared (first use in this function); did you mean 'WIFEXITED'?
9 r = sd_event_add_child(e, NULL, spawn->pid, WEXITED, on_spawn_sigchld, spawn);
10 ^~~~~~~
11
12This looks like a bug in udev-event.c that could also have broken
13the compilation after some future glibc header reshuffle.
14
15Upstream-Status: Backport
16Signed-off-by: Adrian Bunk <bunk@stusta.de>
17---
18 src/udev/udev-event.c | 1 +
19 1 file changed, 1 insertion(+)
20
21diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
22index cab1b5ac0c..a0a7ac0f9e 100644
23--- a/src/udev/udev-event.c
24+++ b/src/udev/udev-event.c
25@@ -7,6 +7,7 @@
26 #include <stddef.h>
27 #include <stdio.h>
28 #include <stdlib.h>
29+#include <sys/wait.h>
30 #include <unistd.h>
31
32 #include "sd-event.h"
33--
342.20.1
35
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
new file mode 100644
index 0000000000..dcae668dcb
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0002-src-login-brightness.c-include-sys-wait.h.patch
@@ -0,0 +1,25 @@
1Include sys/wait.h
2
3Fixes:
4src/login/logind-brightness.c:158:85: error: 'WEXITED' undeclared (first use in this function); did you mean 'WIFEXITED'?
5 158 | r = sd_event_add_child(w->manager->event, &w->child_event_source, w->child, WEXITED, on_brightness_writer_exit, w);
6 | ^~~~~~~
7
8Upstream-Status: Pending
9
10Signed-off-by: Scott Murray <scott.murray@konsulko.com>
11---
12 src/login/logind-brightness.c | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/src/login/logind-brightness.c b/src/login/logind-brightness.c
16index 8dfa97d7ae..bddd4a2727 100644
17--- a/src/login/logind-brightness.c
18+++ b/src/login/logind-brightness.c
19@@ -1,5 +1,6 @@
20 /* SPDX-License-Identifier: LGPL-2.1+ */
21
22+#include <sys/wait.h>
23 #include "bus-util.h"
24 #include "device-util.h"
25 #include "hash-funcs.h"
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
index df5506cc2b..49a334d090 100644
--- 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
@@ -11,6 +11,8 @@ Upstream-Status: Inappropriate [OE-Specific]
11 11
12Signed-off-by: Khem Raj <raj.khem@gmail.com> 12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 13Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
14[rebased for systemd 243]
15Signed-off-by: Scott Murray <scott.murray@konsulko.com>
14--- 16---
15 meson.build | 4 ---- 17 meson.build | 4 ----
16 tools/meson-make-symlink.sh | 3 ++- 18 tools/meson-make-symlink.sh | 3 ++-
@@ -18,10 +20,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
18 3 files changed, 8 insertions(+), 6 deletions(-) 20 3 files changed, 8 insertions(+), 6 deletions(-)
19 21
20diff --git a/meson.build b/meson.build 22diff --git a/meson.build b/meson.build
21index 56c98b9..3386546 100644 23index e5ceb1e169..79b762faeb 100644
22--- a/meson.build 24--- a/meson.build
23+++ b/meson.build 25+++ b/meson.build
24@@ -630,10 +630,6 @@ endforeach 26@@ -579,10 +579,6 @@ endforeach
25 27
26 conf.set_quoted('TELINIT', get_option('telinit-path')) 28 conf.set_quoted('TELINIT', get_option('telinit-path'))
27 29
@@ -33,23 +35,23 @@ index 56c98b9..3386546 100644
33 35
34 gperf = find_program('gperf') 36 gperf = find_program('gperf')
35diff --git a/tools/meson-make-symlink.sh b/tools/meson-make-symlink.sh 37diff --git a/tools/meson-make-symlink.sh b/tools/meson-make-symlink.sh
36index 501cd43..f4e4ac9 100755 38index da0d13a341..90bc0a93c2 100755
37--- a/tools/meson-make-symlink.sh 39--- a/tools/meson-make-symlink.sh
38+++ b/tools/meson-make-symlink.sh 40+++ b/tools/meson-make-symlink.sh
39@@ -8,5 +8,6 @@ mkdir -vp "$(dirname "${DESTDIR:-}$2")" 41@@ -8,5 +8,6 @@ mkdir -vp "$(dirname "${DESTDIR:-}$2")"
40 if [ "$(dirname $1)" = . ]; then 42 if [ "$(dirname $1)" = . ]; then
41 ln -vfs -T "$1" "${DESTDIR:-}$2" 43 ln -vfs -T "$1" "${DESTDIR:-}$2"
42 else 44 else
43- ln -vfs -T --relative "${DESTDIR:-}$1" "${DESTDIR:-}$2" 45- ln -vfs -T --relative "${DESTDIR:-}$1" "${DESTDIR:-}$2"
44+ rm -f "${DESTDIR:-}$2" 46+ rm -f "${DESTDIR:-}$2"
45+ lnr "${DESTDIR:-}$1" "${DESTDIR:-}$2" 47+ lnr "${DESTDIR:-}$1" "${DESTDIR:-}$2"
46 fi 48 fi
47diff --git a/units/meson-add-wants.sh b/units/meson-add-wants.sh 49diff --git a/units/meson-add-wants.sh b/units/meson-add-wants.sh
48index e2b2603..210d604 100755 50index a483d75b86..3c01c523f1 100755
49--- a/units/meson-add-wants.sh 51--- a/units/meson-add-wants.sh
50+++ b/units/meson-add-wants.sh 52+++ b/units/meson-add-wants.sh
51@@ -25,4 +25,9 @@ case "$target" in 53@@ -25,4 +25,9 @@ case "$target" in
52 ;; 54 ;;
53 esac 55 esac
54 56
55-ln -vfs --relative "$unitpath" "$dir" 57-ln -vfs --relative "$unitpath" "$dir"
@@ -59,6 +61,3 @@ index e2b2603..210d604 100755
59+else 61+else
60+ lnr "$unitpath" "$dir" 62+ lnr "$unitpath" "$dir"
61+fi 63+fi
62--
632.7.4
64
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
new file mode 100644
index 0000000000..7ee0d48fa6
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0003-src-basic-copy.c-include-signal.h.patch
@@ -0,0 +1,27 @@
1Include signal.h
2
3Fixes several signal set related errors:
4src/basic/copy.c:92:19: error: implicit declaration of function 'sigemptyset' [-Werror=implicit-function-declaration]
5src/basic/copy.c:93:19: error: implicit declaration of function 'sigaddset' [-Werror=implicit-function-declaration]
6src/basic/copy.c:93:34: error: 'SIGINT' undeclared (first use in this function)
7src/basic/copy.c:95:13: error: implicit declaration of function 'sigtimedwait' [-Werror=implicit-function-declaration]
8
9Upstream-Status: Pending
10
11Signed-off-by: Scott Murray <scott.murray@konsulko.com>
12---
13 src/basic/copy.c | 1 +
14 1 file changed, 1 insertion(+)
15
16diff --git a/src/basic/copy.c b/src/basic/copy.c
17index ca311e021e..3cf7fc1697 100644
18--- a/src/basic/copy.c
19+++ b/src/basic/copy.c
20@@ -12,6 +12,7 @@
21 #include <sys/xattr.h>
22 #include <time.h>
23 #include <unistd.h>
24+#include <signal.h>
25
26 #include "alloc-util.h"
27 #include "btrfs-util.h"
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 fa8217e3da..a2aad40ac2 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
@@ -8,6 +8,8 @@ Upstream-Status: Inappropriate [musl specific]
8Signed-off-by: Emil Renner Berthing <systemd@esmil.dk> 8Signed-off-by: Emil Renner Berthing <systemd@esmil.dk>
9Signed-off-by: Khem Raj <raj.khem@gmail.com> 9Signed-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]
12Signed-off-by: Scott Murray <scott.murray@konsulko.com>
11--- 13---
12 meson.build | 1 + 14 meson.build | 1 +
13 src/basic/meson.build | 5 + 15 src/basic/meson.build | 5 +
@@ -20,22 +22,22 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
20 create mode 100644 src/basic/parse-printf-format.h 22 create mode 100644 src/basic/parse-printf-format.h
21 23
22diff --git a/meson.build b/meson.build 24diff --git a/meson.build b/meson.build
23index 79195c9748..0bffbf29c5 100644 25index 79b762faeb..7f8c679411 100644
24--- a/meson.build 26--- a/meson.build
25+++ b/meson.build 27+++ b/meson.build
26@@ -685,6 +685,7 @@ foreach header : ['crypt.h', 28@@ -613,6 +613,7 @@ endif
29 foreach header : ['crypt.h',
27 'linux/memfd.h', 30 'linux/memfd.h',
28 'linux/vm_sockets.h', 31 'linux/vm_sockets.h',
29 'linux/can/vxcan.h',
30+ 'printf.h', 32+ 'printf.h',
31 'sys/auxv.h', 33 'sys/auxv.h',
32 'valgrind/memcheck.h', 34 'valgrind/memcheck.h',
33 'valgrind/valgrind.h', 35 'valgrind/valgrind.h',
34diff --git a/src/basic/meson.build b/src/basic/meson.build 36diff --git a/src/basic/meson.build b/src/basic/meson.build
35index 91e0df3d2f..a732b554da 100644 37index d6caf28f14..32c1acf349 100644
36--- a/src/basic/meson.build 38--- a/src/basic/meson.build
37+++ b/src/basic/meson.build 39+++ b/src/basic/meson.build
38@@ -298,6 +298,11 @@ foreach item : [['af', af_list_txt, 'af', ''], 40@@ -312,6 +312,11 @@ foreach item : [['af', af_list_txt, 'af', ''],
39 endforeach 41 endforeach
40 42
41 basic_sources += generated_gperf_headers 43 basic_sources += generated_gperf_headers
@@ -428,6 +430,3 @@ index 5ef11fa1a4..6384ab620c 100644
428 430
429 #define SNDBUF_SIZE (8*1024*1024) 431 #define SNDBUF_SIZE (8*1024*1024)
430 432
431--
4322.11.0
433
diff --git a/meta/recipes-core/systemd/systemd/0004-rules-whitelist-hd-devices.patch b/meta/recipes-core/systemd/systemd/0004-rules-whitelist-hd-devices.patch
index 738f8eb7b6..f9c5996ffb 100644
--- a/meta/recipes-core/systemd/systemd/0004-rules-whitelist-hd-devices.patch
+++ b/meta/recipes-core/systemd/systemd/0004-rules-whitelist-hd-devices.patch
@@ -13,23 +13,22 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
13Signed-off-by: Khem Raj <raj.khem@gmail.com> 13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14[rebased for systemd 241] 14[rebased for systemd 241]
15Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 15Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
16[rebased for systemd 243]
17Signed-off-by: Scott Murray <scott.murray@konsulko.com>
16--- 18---
17 rules/60-persistent-storage.rules | 2 +- 19 rules/60-persistent-storage.rules | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-) 20 1 file changed, 1 insertion(+), 1 deletion(-)
19 21
20diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules 22diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules
21index 1d8880e..e53c8ea 100644 23index 7802b1c94f..c0534ae26a 100644
22--- a/rules/60-persistent-storage.rules 24--- a/rules/60-persistent-storage.rules
23+++ b/rules/60-persistent-storage.rules 25+++ b/rules/60-persistent-storage.rules
24@@ -7,7 +7,7 @@ ACTION=="remove", GOTO="persistent_storage_end" 26@@ -7,7 +7,7 @@ ACTION=="remove", GOTO="persistent_storage_end"
25 ENV{UDEV_DISABLE_PERSISTENT_STORAGE_RULES_FLAG}=="1", GOTO="persistent_storage_end" 27 ENV{UDEV_DISABLE_PERSISTENT_STORAGE_RULES_FLAG}=="1", GOTO="persistent_storage_end"
26 28
27 SUBSYSTEM!="block", GOTO="persistent_storage_end" 29 SUBSYSTEM!="block", GOTO="persistent_storage_end"
28-KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|scm*|pmem*|nbd*|zd*", GOTO="persistent_storage_end" 30-KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|ubi*|scm*|pmem*|nbd*|zd*", GOTO="persistent_storage_end"
29+KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|scm*|pmem*|nbd*|zd*|hd*", GOTO="persistent_storage_end" 31+KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|ubi*|scm*|pmem*|nbd*|zd*|hd*", GOTO="persistent_storage_end"
30 32
31 # ignore partitions that span the entire disk 33 # ignore partitions that span the entire disk
32 TEST=="whole_disk", GOTO="persistent_storage_end" 34 TEST=="whole_disk", GOTO="persistent_storage_end"
33--
342.7.4
35
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
new file mode 100644
index 0000000000..0f75e8c12d
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch
@@ -0,0 +1,54 @@
1Handle __cpu_mask usage
2
3Fixes errors:
4
5src/test/test-cpu-set-util.c:18:54: error: '__cpu_mask' undeclared (first use in this function)
6src/test/test-sizeof.c:73:14: error: '__cpu_mask' undeclared (first use in this function)
7
8__cpu_mask is an internal type of glibc's cpu_set implementation, not
9part of the POSIX definition, which is problematic when building with
10musl, which does not define a matching type. From inspection of musl's
11sched.h, however, it is clear that the corresponding type would be
12unsigned long, which does match glibc's actual __CPU_MASK_TYPE. So,
13add a typedef to cpu-set-util.h defining __cpu_mask appropriately.
14
15Upstream-Status: Inappropriate [musl specific]
16
17Signed-off-by: Scott Murray <scott.murray@konsulko.com>
18---
19 src/shared/cpu-set-util.h | 2 ++
20 src/test/test-sizeof.c | 2 +-
21 2 files changed, 3 insertions(+), 1 deletion(-)
22
23diff --git a/src/shared/cpu-set-util.h b/src/shared/cpu-set-util.h
24index 27812dfd59..f698f9df83 100644
25--- a/src/shared/cpu-set-util.h
26+++ b/src/shared/cpu-set-util.h
27@@ -6,6 +6,8 @@
28 #include "macro.h"
29 #include "missing_syscall.h"
30
31+typedef unsigned long __cpu_mask;
32+
33 /* This wraps the libc interface with a variable to keep the allocated size. */
34 typedef struct CPUSet {
35 cpu_set_t *set;
36diff --git a/src/test/test-sizeof.c b/src/test/test-sizeof.c
37index a710db5370..d1601ad929 100644
38--- a/src/test/test-sizeof.c
39+++ b/src/test/test-sizeof.c
40@@ -1,6 +1,5 @@
41 /* SPDX-License-Identifier: LGPL-2.1+ */
42
43-#include <sched.h>
44 #include <stdio.h>
45 #include <string.h>
46
47@@ -8,6 +7,7 @@
48 #include <float.h>
49
50 #include "time-util.h"
51+#include "cpu-set-util.h"
52
53 /* Print information about various types. Useful when diagnosing
54 * gcc diagnostics on an unfamiliar architecture. */
diff --git a/meta/recipes-core/systemd/systemd/0005-rules-watch-metadata-changes-in-ide-devices.patch b/meta/recipes-core/systemd/systemd/0005-rules-watch-metadata-changes-in-ide-devices.patch
index 5312083fdd..96175b5b5e 100644
--- a/meta/recipes-core/systemd/systemd/0005-rules-watch-metadata-changes-in-ide-devices.patch
+++ b/meta/recipes-core/systemd/systemd/0005-rules-watch-metadata-changes-in-ide-devices.patch
@@ -26,20 +26,20 @@ is deprecated.
26Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 26Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
27[rebased for systemd 241] 27[rebased for systemd 241]
28Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 28Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
29[rebased for systemd 243]
30Signed-off-by: Scott Murray <scott.murray@konsulko.com>
29--- 31---
30 rules/60-block.rules | 2 +- 32 rules/60-block.rules | 2 +-
31 1 file changed, 1 insertion(+), 1 deletion(-) 33 1 file changed, 1 insertion(+), 1 deletion(-)
32 34
33diff --git a/rules/60-block.rules b/rules/60-block.rules 35diff --git a/rules/60-block.rules b/rules/60-block.rules
34index a1458e9..3ba4b6b4 100644 36index 3134ab995e..cd72a494a1 100644
35--- a/rules/60-block.rules 37--- a/rules/60-block.rules
36+++ b/rules/60-block.rules 38+++ b/rules/60-block.rules
37@@ -8,4 +8,4 @@ ACTION=="add", SUBSYSTEM=="module", KERNEL=="block", ATTR{parameters/events_dfl_ 39@@ -9,5 +9,5 @@ ACTION=="change", SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST=="block",
38 ACTION=="change", SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST=="block", ATTR{block/*/uevent}="change"
39 40
40 # watch metadata changes, caused by tools closing the device node which was opened for writing 41 # watch metadata changes, caused by tools closing the device node which was opened for writing
41-ACTION!="remove", SUBSYSTEM=="block", KERNEL=="loop*|nvme*|sd*|vd*|xvd*|pmem*|mmcblk*|dasd*|nbd*", OPTIONS+="watch" 42 ACTION!="remove", SUBSYSTEM=="block", \
42+ACTION!="remove", SUBSYSTEM=="block", KERNEL=="loop*|nvme*|sd*|vd*|xvd*|pmem*|mmcblk*|dasd*|nbd*|hd*", OPTIONS+="watch" 43- KERNEL=="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|ubi*|scm*|pmem*|nbd*|zd*", \
43-- 44+ KERNEL=="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|ubi*|scm*|pmem*|nbd*|zd*|hd*", \
442.7.4 45 OPTIONS+="watch"
45
diff --git a/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch b/meta/recipes-core/systemd/systemd/0005-src-basic-missing.h-check-for-missing-strndupa.patch
index 47ee2795a7..adfc3b7861 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
@@ -11,6 +11,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
11Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 11Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
12[Rebased for v242] 12[Rebased for v242]
13Signed-off-by: Andrej Valek <andrej.valek@siemens.com> 13Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
14[rebased for systemd 243]
15Signed-off-by: Scott Murray <scott.murray@konsulko.com>
14--- 16---
15 meson.build | 1 + 17 meson.build | 1 +
16 src/backlight/backlight.c | 1 + 18 src/backlight/backlight.c | 1 +
@@ -30,6 +32,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
30 src/libsystemd/sd-bus/bus-objects.c | 1 + 32 src/libsystemd/sd-bus/bus-objects.c | 1 +
31 src/libsystemd/sd-bus/test-bus-benchmark.c | 1 + 33 src/libsystemd/sd-bus/test-bus-benchmark.c | 1 +
32 src/locale/keymap-util.c | 1 + 34 src/locale/keymap-util.c | 1 +
35 src/login/pam_systemd.c | 1 +
36 src/network/generator/network-generator.c | 1 +
33 src/nspawn/nspawn-settings.c | 1 + 37 src/nspawn/nspawn-settings.c | 1 +
34 src/shared/dns-domain.c | 1 + 38 src/shared/dns-domain.c | 1 +
35 src/shared/journal-importer.c | 1 + 39 src/shared/journal-importer.c | 1 +
@@ -40,19 +44,24 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
40 src/socket-proxy/socket-proxyd.c | 1 + 44 src/socket-proxy/socket-proxyd.c | 1 +
41 src/test/test-hexdecoct.c | 1 + 45 src/test/test-hexdecoct.c | 1 +
42 src/udev/udev-builtin-path_id.c | 1 + 46 src/udev/udev-builtin-path_id.c | 1 +
47 src/udev/udev-event.c | 1 +
43 src/udev/udev-rules.c | 1 + 48 src/udev/udev-rules.c | 1 +
44 29 files changed, 40 insertions(+) 49 32 files changed, 43 insertions(+)
45 50
51diff --git a/meson.build b/meson.build
52index 7f8c679411..81c061b768 100644
46--- a/meson.build 53--- a/meson.build
47+++ b/meson.build 54+++ b/meson.build
48@@ -572,6 +572,7 @@ foreach ident : [ 55@@ -506,6 +506,7 @@ foreach ident : [
56 #include <unistd.h>'''],
57 ['get_mempolicy', '''#include <stdlib.h>
49 #include <unistd.h>'''], 58 #include <unistd.h>'''],
50 ['explicit_bzero' , '''#include <string.h>'''],
51 ['reallocarray', '''#include <malloc.h>'''],
52+ ['strndupa' , '''#include <string.h>'''], 59+ ['strndupa' , '''#include <string.h>'''],
53 ] 60 ]
54 61
55 have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE') 62 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
64index dfd6805398..c2b2ace6ec 100644
56--- a/src/backlight/backlight.c 65--- a/src/backlight/backlight.c
57+++ b/src/backlight/backlight.c 66+++ b/src/backlight/backlight.c
58@@ -17,6 +17,7 @@ 67@@ -17,6 +17,7 @@
@@ -63,6 +72,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
63 72
64 static int find_pci_or_platform_parent(sd_device *device, sd_device **ret) { 73 static int find_pci_or_platform_parent(sd_device *device, sd_device **ret) {
65 const char *subsystem, *sysname, *value; 74 const char *subsystem, *sysname, *value;
75diff --git a/src/basic/env-util.c b/src/basic/env-util.c
76index a6503cf2b6..ceef9a62c8 100644
66--- a/src/basic/env-util.c 77--- a/src/basic/env-util.c
67+++ b/src/basic/env-util.c 78+++ b/src/basic/env-util.c
68@@ -16,6 +16,7 @@ 79@@ -16,6 +16,7 @@
@@ -73,6 +84,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
73 84
74 #define VALID_CHARS_ENV_NAME \ 85 #define VALID_CHARS_ENV_NAME \
75 DIGITS LETTERS \ 86 DIGITS LETTERS \
87diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h
88index 188a8d4406..1e16ec287a 100644
76--- a/src/basic/missing_stdlib.h 89--- a/src/basic/missing_stdlib.h
77+++ b/src/basic/missing_stdlib.h 90+++ b/src/basic/missing_stdlib.h
78@@ -11,3 +11,15 @@ 91@@ -11,3 +11,15 @@
@@ -91,6 +104,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
91+ (char *)memcpy(__new, __old, __len); \ 104+ (char *)memcpy(__new, __old, __len); \
92+ }) 105+ })
93+#endif 106+#endif
107diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c
108index 6b82eab640..51c6b78615 100644
94--- a/src/basic/mkdir.c 109--- a/src/basic/mkdir.c
95+++ b/src/basic/mkdir.c 110+++ b/src/basic/mkdir.c
96@@ -14,6 +14,7 @@ 111@@ -14,6 +14,7 @@
@@ -101,9 +116,11 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
101 116
102 int mkdir_safe_internal(const char *path, mode_t mode, uid_t uid, gid_t gid, MkdirFlags flags, mkdir_func_t _mkdir) { 117 int mkdir_safe_internal(const char *path, mode_t mode, uid_t uid, gid_t gid, MkdirFlags flags, mkdir_func_t _mkdir) {
103 struct stat st; 118 struct stat st;
119diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
120index 115a1494a2..07a34bfd53 100644
104--- a/src/basic/parse-util.c 121--- a/src/basic/parse-util.c
105+++ b/src/basic/parse-util.c 122+++ b/src/basic/parse-util.c
106@@ -19,6 +19,7 @@ 123@@ -20,6 +20,7 @@
107 #include "process-util.h" 124 #include "process-util.h"
108 #include "stat-util.h" 125 #include "stat-util.h"
109 #include "string-util.h" 126 #include "string-util.h"
@@ -111,6 +128,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
111 128
112 int parse_boolean(const char *v) { 129 int parse_boolean(const char *v) {
113 if (!v) 130 if (!v)
131diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c
132index 09169cf963..f411ba897f 100644
114--- a/src/basic/proc-cmdline.c 133--- a/src/basic/proc-cmdline.c
115+++ b/src/basic/proc-cmdline.c 134+++ b/src/basic/proc-cmdline.c
116@@ -15,6 +15,7 @@ 135@@ -15,6 +15,7 @@
@@ -121,6 +140,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
121 140
122 int proc_cmdline(char **ret) { 141 int proc_cmdline(char **ret) {
123 const char *e; 142 const char *e;
143diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c
144index 7aaf95bfce..42ce53d5aa 100644
124--- a/src/basic/procfs-util.c 145--- a/src/basic/procfs-util.c
125+++ b/src/basic/procfs-util.c 146+++ b/src/basic/procfs-util.c
126@@ -11,6 +11,7 @@ 147@@ -11,6 +11,7 @@
@@ -131,6 +152,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
131 152
132 int procfs_tasks_get_limit(uint64_t *ret) { 153 int procfs_tasks_get_limit(uint64_t *ret) {
133 _cleanup_free_ char *value = NULL; 154 _cleanup_free_ char *value = NULL;
155diff --git a/src/basic/time-util.c b/src/basic/time-util.c
156index 3018e81acb..4e2b3b66c1 100644
134--- a/src/basic/time-util.c 157--- a/src/basic/time-util.c
135+++ b/src/basic/time-util.c 158+++ b/src/basic/time-util.c
136@@ -28,6 +28,7 @@ 159@@ -28,6 +28,7 @@
@@ -141,6 +164,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
141 164
142 static clockid_t map_clock_id(clockid_t c) { 165 static clockid_t map_clock_id(clockid_t c) {
143 166
167diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c
168index 2f2313c599..c9937f9d62 100644
144--- a/src/core/dbus-cgroup.c 169--- a/src/core/dbus-cgroup.c
145+++ b/src/core/dbus-cgroup.c 170+++ b/src/core/dbus-cgroup.c
146@@ -15,6 +15,7 @@ 171@@ -15,6 +15,7 @@
@@ -151,6 +176,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
151 176
152 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_cgroup_device_policy, cgroup_device_policy, CGroupDevicePolicy); 177 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_cgroup_device_policy, cgroup_device_policy, CGroupDevicePolicy);
153 178
179diff --git a/src/core/dbus-util.c b/src/core/dbus-util.c
180index 7862beaacb..19f6968cfe 100644
154--- a/src/core/dbus-util.c 181--- a/src/core/dbus-util.c
155+++ b/src/core/dbus-util.c 182+++ b/src/core/dbus-util.c
156@@ -7,6 +7,7 @@ 183@@ -7,6 +7,7 @@
@@ -161,6 +188,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
161 188
162 int bus_property_get_triggered_unit( 189 int bus_property_get_triggered_unit(
163 sd_bus *bus, 190 sd_bus *bus,
191diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
192index a91cfebc67..a45961013f 100644
164--- a/src/core/kmod-setup.c 193--- a/src/core/kmod-setup.c
165+++ b/src/core/kmod-setup.c 194+++ b/src/core/kmod-setup.c
166@@ -11,6 +11,7 @@ 195@@ -11,6 +11,7 @@
@@ -171,9 +200,11 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
171 200
172 #if HAVE_KMOD 201 #if HAVE_KMOD
173 #include <libkmod.h> 202 #include <libkmod.h>
203diff --git a/src/core/service.c b/src/core/service.c
204index 73b3c9c316..ef74f00a08 100644
174--- a/src/core/service.c 205--- a/src/core/service.c
175+++ b/src/core/service.c 206+++ b/src/core/service.c
176@@ -42,6 +42,7 @@ 207@@ -43,6 +43,7 @@
177 #include "unit.h" 208 #include "unit.h"
178 #include "utf8.h" 209 #include "utf8.h"
179 #include "util.h" 210 #include "util.h"
@@ -181,16 +212,20 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
181 212
182 static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { 213 static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = {
183 [SERVICE_DEAD] = UNIT_INACTIVE, 214 [SERVICE_DEAD] = UNIT_INACTIVE,
215diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
216index 6d6bb1cf63..6666349a35 100644
184--- a/src/journal/journalctl.c 217--- a/src/journal/journalctl.c
185+++ b/src/journal/journalctl.c 218+++ b/src/journal/journalctl.c
186@@ -67,6 +67,7 @@ 219@@ -70,6 +70,7 @@
187 #include "tmpfile-util.h"
188 #include "unit-name.h" 220 #include "unit-name.h"
189 #include "user-util.h" 221 #include "user-util.h"
222 #include "varlink.h"
190+#include "missing.h" 223+#include "missing.h"
191 224
192 #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) 225 #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE)
193 226
227diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
228index eb029e4453..f31fe9d5a8 100644
194--- a/src/libsystemd/sd-bus/bus-message.c 229--- a/src/libsystemd/sd-bus/bus-message.c
195+++ b/src/libsystemd/sd-bus/bus-message.c 230+++ b/src/libsystemd/sd-bus/bus-message.c
196@@ -21,6 +21,7 @@ 231@@ -21,6 +21,7 @@
@@ -201,6 +236,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
201 236
202 static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored); 237 static int message_append_basic(sd_bus_message *m, char type, const void *p, const void **stored);
203 238
239diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c
240index ae643cacc7..1b752271a5 100644
204--- a/src/libsystemd/sd-bus/bus-objects.c 241--- a/src/libsystemd/sd-bus/bus-objects.c
205+++ b/src/libsystemd/sd-bus/bus-objects.c 242+++ b/src/libsystemd/sd-bus/bus-objects.c
206@@ -13,6 +13,7 @@ 243@@ -13,6 +13,7 @@
@@ -211,6 +248,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
211 248
212 static int node_vtable_get_userdata( 249 static int node_vtable_get_userdata(
213 sd_bus *bus, 250 sd_bus *bus,
251diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c
252index 8de0a859ee..4fd0a2e692 100644
214--- a/src/libsystemd/sd-bus/test-bus-benchmark.c 253--- a/src/libsystemd/sd-bus/test-bus-benchmark.c
215+++ b/src/libsystemd/sd-bus/test-bus-benchmark.c 254+++ b/src/libsystemd/sd-bus/test-bus-benchmark.c
216@@ -14,6 +14,7 @@ 255@@ -14,6 +14,7 @@
@@ -221,9 +260,11 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
221 260
222 #define MAX_SIZE (2*1024*1024) 261 #define MAX_SIZE (2*1024*1024)
223 262
263diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c
264index f8c36c94f5..41f5606aea 100644
224--- a/src/locale/keymap-util.c 265--- a/src/locale/keymap-util.c
225+++ b/src/locale/keymap-util.c 266+++ b/src/locale/keymap-util.c
226@@ -23,6 +23,7 @@ 267@@ -22,6 +22,7 @@
227 #include "string-util.h" 268 #include "string-util.h"
228 #include "strv.h" 269 #include "strv.h"
229 #include "tmpfile-util.h" 270 #include "tmpfile-util.h"
@@ -231,6 +272,32 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
231 272
232 static bool startswith_comma(const char *s, const char *prefix) { 273 static bool startswith_comma(const char *s, const char *prefix) {
233 s = startswith(s, prefix); 274 s = startswith(s, prefix);
275diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c
276index 3f762cbbc3..005cfea658 100644
277--- a/src/login/pam_systemd.c
278+++ b/src/login/pam_systemd.c
279@@ -28,6 +28,7 @@
280 #include "hostname-util.h"
281 #include "login-util.h"
282 #include "macro.h"
283+#include "missing.h"
284 #include "parse-util.h"
285 #include "path-util.h"
286 #include "process-util.h"
287diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c
288index 0b5af33566..9c808cd014 100644
289--- a/src/network/generator/network-generator.c
290+++ b/src/network/generator/network-generator.c
291@@ -13,6 +13,7 @@
292 #include "string-table.h"
293 #include "string-util.h"
294 #include "strv.h"
295+#include "missing.h"
296
297 /*
298 # .network
299diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c
300index 3a99736813..279fea4d88 100644
234--- a/src/nspawn/nspawn-settings.c 301--- a/src/nspawn/nspawn-settings.c
235+++ b/src/nspawn/nspawn-settings.c 302+++ b/src/nspawn/nspawn-settings.c
236@@ -16,6 +16,7 @@ 303@@ -16,6 +16,7 @@
@@ -241,6 +308,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
241 308
242 Settings *settings_new(void) { 309 Settings *settings_new(void) {
243 Settings *s; 310 Settings *s;
311diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c
312index f62ad0a0f5..f1a27e158d 100644
244--- a/src/shared/dns-domain.c 313--- a/src/shared/dns-domain.c
245+++ b/src/shared/dns-domain.c 314+++ b/src/shared/dns-domain.c
246@@ -24,6 +24,7 @@ 315@@ -24,6 +24,7 @@
@@ -251,9 +320,11 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
251 320
252 int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) { 321 int dns_label_unescape(const char **name, char *dest, size_t sz, DNSLabelFlags flags) {
253 const char *n; 322 const char *n;
323diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c
324index 7c4fc7021d..a6ff2214df 100644
254--- a/src/shared/journal-importer.c 325--- a/src/shared/journal-importer.c
255+++ b/src/shared/journal-importer.c 326+++ b/src/shared/journal-importer.c
256@@ -13,6 +13,7 @@ 327@@ -14,6 +14,7 @@
257 #include "parse-util.h" 328 #include "parse-util.h"
258 #include "string-util.h" 329 #include "string-util.h"
259 #include "unaligned.h" 330 #include "unaligned.h"
@@ -261,9 +332,11 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
261 332
262 enum { 333 enum {
263 IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */ 334 IMPORTER_STATE_LINE = 0, /* waiting to read, or reading line */
335diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
336index b615c70dff..75b26e9c21 100644
264--- a/src/shared/logs-show.c 337--- a/src/shared/logs-show.c
265+++ b/src/shared/logs-show.c 338+++ b/src/shared/logs-show.c
266@@ -38,6 +38,7 @@ 339@@ -39,6 +39,7 @@
267 #include "time-util.h" 340 #include "time-util.h"
268 #include "utf8.h" 341 #include "utf8.h"
269 #include "util.h" 342 #include "util.h"
@@ -271,6 +344,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
271 344
272 /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */ 345 /* up to three lines (each up to 100 characters) or 300 characters, whichever is less */
273 #define PRINT_LINE_THRESHOLD 3 346 #define PRINT_LINE_THRESHOLD 3
347diff --git a/src/shared/pager.c b/src/shared/pager.c
348index 7c20b100b4..e4209d3a95 100644
274--- a/src/shared/pager.c 349--- a/src/shared/pager.c
275+++ b/src/shared/pager.c 350+++ b/src/shared/pager.c
276@@ -25,6 +25,7 @@ 351@@ -25,6 +25,7 @@
@@ -281,6 +356,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
281 356
282 static pid_t pager_pid = 0; 357 static pid_t pager_pid = 0;
283 358
359diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
360index 6bf0ff0316..f6c8009cd2 100644
284--- a/src/shared/path-lookup.c 361--- a/src/shared/path-lookup.c
285+++ b/src/shared/path-lookup.c 362+++ b/src/shared/path-lookup.c
286@@ -20,6 +20,7 @@ 363@@ -20,6 +20,7 @@
@@ -291,6 +368,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
291 368
292 int xdg_user_runtime_dir(char **ret, const char *suffix) { 369 int xdg_user_runtime_dir(char **ret, const char *suffix) {
293 const char *e; 370 const char *e;
371diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c
372index 7cb7d8a477..8b12b91084 100644
294--- a/src/shared/uid-range.c 373--- a/src/shared/uid-range.c
295+++ b/src/shared/uid-range.c 374+++ b/src/shared/uid-range.c
296@@ -9,6 +9,7 @@ 375@@ -9,6 +9,7 @@
@@ -301,6 +380,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
301 380
302 static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) { 381 static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) {
303 assert(range); 382 assert(range);
383diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c
384index abbbc9f2d6..6179b5851e 100644
304--- a/src/socket-proxy/socket-proxyd.c 385--- a/src/socket-proxy/socket-proxyd.c
305+++ b/src/socket-proxy/socket-proxyd.c 386+++ b/src/socket-proxy/socket-proxyd.c
306@@ -28,6 +28,7 @@ 387@@ -28,6 +28,7 @@
@@ -311,6 +392,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
311 392
312 #define BUFFER_SIZE (256 * 1024) 393 #define BUFFER_SIZE (256 * 1024)
313 394
395diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c
396index 52217429b1..a05e7782f6 100644
314--- a/src/test/test-hexdecoct.c 397--- a/src/test/test-hexdecoct.c
315+++ b/src/test/test-hexdecoct.c 398+++ b/src/test/test-hexdecoct.c
316@@ -6,6 +6,7 @@ 399@@ -6,6 +6,7 @@
@@ -321,6 +404,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
321 404
322 static void test_hexchar(void) { 405 static void test_hexchar(void) {
323 assert_se(hexchar(0xa) == 'a'); 406 assert_se(hexchar(0xa) == 'a');
407diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
408index e8f1ce1354..8693cb02a4 100644
324--- a/src/udev/udev-builtin-path_id.c 409--- a/src/udev/udev-builtin-path_id.c
325+++ b/src/udev/udev-builtin-path_id.c 410+++ b/src/udev/udev-builtin-path_id.c
326@@ -23,6 +23,7 @@ 411@@ -23,6 +23,7 @@
@@ -331,23 +416,27 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
331 416
332 _printf_(2,3) 417 _printf_(2,3)
333 static void path_prepend(char **path, const char *fmt, ...) { 418 static void path_prepend(char **path, const char *fmt, ...) {
419diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
420index 8cfa2cdf23..b0670c77ec 100644
421--- a/src/udev/udev-event.c
422+++ b/src/udev/udev-event.c
423@@ -35,6 +35,7 @@
424 #include "udev-util.h"
425 #include "udev-watch.h"
426 #include "user-util.h"
427+#include "missing.h"
428
429 typedef struct Spawn {
430 sd_device *device;
431diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
432index 1642f10535..fe2aa75478 100644
334--- a/src/udev/udev-rules.c 433--- a/src/udev/udev-rules.c
335+++ b/src/udev/udev-rules.c 434+++ b/src/udev/udev-rules.c
336@@ -40,6 +40,7 @@ 435@@ -28,6 +28,7 @@
337 #include "udev.h" 436 #include "udev-event.h"
437 #include "udev-rules.h"
338 #include "user-util.h" 438 #include "user-util.h"
339 #include "util.h"
340+#include "missing.h" 439+#include "missing.h"
341 440
342 #define PREALLOC_TOKEN 2048
343 #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d") 441 #define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d")
344--- a/src/login/pam_systemd.c 442
345+++ b/src/login/pam_systemd.c
346@@ -27,6 +27,7 @@
347 #include "hostname-util.h"
348 #include "login-util.h"
349 #include "macro.h"
350+#include "missing.h"
351 #include "parse-util.h"
352 #include "path-util.h"
353 #include "process-util.h"
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 b41f6c7bee..6d73d715ce 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,28 +1,63 @@
1From 67a988ae82c776d11be76de7180d50ea027ac442 Mon Sep 17 00:00:00 2001 1Include netinet/if_ether.h
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Mon, 25 Feb 2019 14:24:20 +0800
4Subject: [PATCH 06/24] Include netinet/if_ether.h
5 2
6Fixes 3Fixes
7/path/to/systemd/recipe-sysroot/usr/include/netinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr' 4/path/to/systemd/recipe-sysroot/usr/include/netinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr'
8 struct ethhdr { 5 struct ethhdr {
9 ^~~~~~ 6 ^~~~~~
10 7
8and related arphdr, arpreq, and arpreq_old errors
9/path/to/systemd/recipe-sysroot/usr/include/net/if_arp.h:22:8: error: redefinition of 'struct arphdr'
10 struct arphdr {
11 ^~~~~~
12
13The latter requires removing some includes of net/if_arp.h to avoid
14conflicting with netinet/if_ether.h.
15
16Upstream-Status: Inappropriate [musl specific]
17
18Signed-off-by: Khem Raj <raj.khem@gmail.com>
19Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
20[rebased for systemd 243]
21Signed-off-by: Scott Murray <scott.murray@konsulko.com>
22
11Upstream-Status: Inappropriate [musl specific] 23Upstream-Status: Inappropriate [musl specific]
12 24
13Signed-off-by: Khem Raj <raj.khem@gmail.com> 25Signed-off-by: Khem Raj <raj.khem@gmail.com>
14Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 26Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
27[rebased for systemd 243]
28Signed-off-by: Scott Murray <scott.murray@konsulko.com>
15--- 29---
30 src/libsystemd-network/sd-dhcp6-client.c | 1 -
16 src/libsystemd/sd-netlink/netlink-types.c | 1 + 31 src/libsystemd/sd-netlink/netlink-types.c | 1 +
17 src/network/netdev/tuntap.c | 1 + 32 src/machine/machine-dbus.c | 1 +
33 src/network/netdev/macsec.c | 1 +
34 src/network/netdev/netdev.c | 1 +
18 src/network/networkd-brvlan.c | 1 + 35 src/network/networkd-brvlan.c | 1 +
19 src/udev/net/ethtool-util.c | 1 + 36 src/network/networkd-dhcp-common.c | 1 +
20 src/udev/net/ethtool-util.h | 1 + 37 src/network/networkd-dhcp4.c | 2 +-
38 src/network/networkd-dhcp6.c | 2 +-
39 src/network/networkd-link.c | 2 +-
40 src/network/networkd-network.c | 1 +
41 src/shared/ethtool-util.c | 1 +
42 src/shared/ethtool-util.h | 1 +
43 src/udev/net/link-config.c | 1 +
21 src/udev/udev-builtin-net_setup_link.c | 1 + 44 src/udev/udev-builtin-net_setup_link.c | 1 +
22 6 files changed, 6 insertions(+) 45 15 files changed, 14 insertions(+), 4 deletions(-)
23 46
47diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c
48index d7a5349c70..68b41dfb6c 100644
49--- a/src/libsystemd-network/sd-dhcp6-client.c
50+++ b/src/libsystemd-network/sd-dhcp6-client.c
51@@ -6,7 +6,6 @@
52 #include <errno.h>
53 #include <string.h>
54 #include <sys/ioctl.h>
55-#include <linux/if_arp.h>
56 #include <linux/if_infiniband.h>
57
58 #include "sd-dhcp6-client.h"
24diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c 59diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c
25index 9dcd3f2..e23ff4c 100644 60index de9b8b21ab..f64f6500f7 100644
26--- a/src/libsystemd/sd-netlink/netlink-types.c 61--- a/src/libsystemd/sd-netlink/netlink-types.c
27+++ b/src/libsystemd/sd-netlink/netlink-types.c 62+++ b/src/libsystemd/sd-netlink/netlink-types.c
28@@ -3,6 +3,7 @@ 63@@ -3,6 +3,7 @@
@@ -30,23 +65,45 @@ index 9dcd3f2..e23ff4c 100644
30 #include <stdint.h> 65 #include <stdint.h>
31 #include <sys/socket.h> 66 #include <sys/socket.h>
32+#include <netinet/if_ether.h> 67+#include <netinet/if_ether.h>
68 #include <linux/can/vxcan.h>
33 #include <linux/netlink.h> 69 #include <linux/netlink.h>
34 #include <linux/rtnetlink.h> 70 #include <linux/rtnetlink.h>
35 #include <linux/genetlink.h> 71diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
36diff --git a/src/network/netdev/tuntap.c b/src/network/netdev/tuntap.c 72index 0d58b5eb8b..01093c1f62 100644
37index 951138d..1ad499d 100644 73--- a/src/machine/machine-dbus.c
38--- a/src/network/netdev/tuntap.c 74+++ b/src/machine/machine-dbus.c
39+++ b/src/network/netdev/tuntap.c 75@@ -4,6 +4,7 @@
40@@ -2,6 +2,7 @@ 76 #include <string.h>
77 #include <sys/mount.h>
78 #include <sys/wait.h>
79+#include <netinet/if_ether.h>
80
81 /* 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
83diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c
84index cf281e75a6..269dc618ff 100644
85--- a/src/network/netdev/macsec.c
86+++ b/src/network/netdev/macsec.c
87@@ -1,5 +1,6 @@
88 /* SPDX-License-Identifier: LGPL-2.1+ */
89
90+#include <netinet/if_ether.h>
91 #include <netinet/in.h>
92 #include <linux/if_ether.h>
93 #include <linux/if_macsec.h>
94diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c
95index 7735b455b7..ed4eda4a44 100644
96--- a/src/network/netdev/netdev.c
97+++ b/src/network/netdev/netdev.c
98@@ -1,5 +1,6 @@
99 /* SPDX-License-Identifier: LGPL-2.1+ */
41 100
42 #include <errno.h>
43 #include <fcntl.h>
44+#include <netinet/if_ether.h> 101+#include <netinet/if_ether.h>
45 #include <linux/if_tun.h>
46 #include <net/if.h> 102 #include <net/if.h>
47 #include <netinet/if_ether.h> 103 #include <netinet/in.h>
104
48diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c 105diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c
49index 8377623..132af60 100644 106index c3c5d535ac..ebea408c89 100644
50--- a/src/network/networkd-brvlan.c 107--- a/src/network/networkd-brvlan.c
51+++ b/src/network/networkd-brvlan.c 108+++ b/src/network/networkd-brvlan.c
52@@ -4,6 +4,7 @@ 109@@ -4,6 +4,7 @@
@@ -57,10 +114,76 @@ index 8377623..132af60 100644
57 #include <linux/if_bridge.h> 114 #include <linux/if_bridge.h>
58 #include <stdbool.h> 115 #include <stdbool.h>
59 116
60diff --git a/src/udev/net/ethtool-util.c b/src/udev/net/ethtool-util.c 117diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c
61index 0dcec03..3695b10 100644 118index 626b975839..42fe92f320 100644
62--- a/src/udev/net/ethtool-util.c 119--- a/src/network/networkd-dhcp-common.c
63+++ b/src/udev/net/ethtool-util.c 120+++ b/src/network/networkd-dhcp-common.c
121@@ -1,6 +1,7 @@
122 /* SPDX-License-Identifier: LGPL-2.1+ */
123
124 #include "networkd-dhcp-common.h"
125+#include <netinet/if_ether.h>
126 #include "networkd-network.h"
127 #include "parse-util.h"
128 #include "string-table.h"
129diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
130index 662770b50e..c6ab62a94d 100644
131--- a/src/network/networkd-dhcp4.c
132+++ b/src/network/networkd-dhcp4.c
133@@ -1,8 +1,8 @@
134 /* SPDX-License-Identifier: LGPL-2.1+ */
135
136+#include <netinet/if_ether.h>
137 #include <netinet/in.h>
138 #include <linux/if.h>
139-#include <linux/if_arp.h>
140
141 #include "alloc-util.h"
142 #include "hostname-util.h"
143diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
144index 8ad736a82b..f41b4d834e 100644
145--- a/src/network/networkd-dhcp6.c
146+++ b/src/network/networkd-dhcp6.c
147@@ -3,9 +3,9 @@
148 Copyright © 2014 Intel Corporation. All rights reserved.
149 ***/
150
151+#include <netinet/if_ether.h>
152 #include <netinet/in.h>
153 #include <linux/if.h>
154-#include <linux/if_arp.h>
155 #include "sd-radv.h"
156
157 #include "sd-dhcp6-client.h"
158diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
159index f5bb78890a..f13a36b791 100644
160--- a/src/network/networkd-link.c
161+++ b/src/network/networkd-link.c
162@@ -1,8 +1,8 @@
163 /* SPDX-License-Identifier: LGPL-2.1+ */
164
165+#include <netinet/if_ether.h>
166 #include <netinet/in.h>
167 #include <linux/if.h>
168-#include <linux/if_arp.h>
169 #include <unistd.h>
170
171 #include "alloc-util.h"
172diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
173index 2b8d0eb2fb..2f79ef25cd 100644
174--- a/src/network/networkd-network.c
175+++ b/src/network/networkd-network.c
176@@ -1,5 +1,6 @@
177 /* SPDX-License-Identifier: LGPL-2.1+ */
178
179+#include <netinet/if_ether.h>
180 #include <net/if.h>
181 #include <netinet/in.h>
182 #include <linux/netdevice.h>
183diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c
184index b0961df72e..53fcbbd84b 100644
185--- a/src/shared/ethtool-util.c
186+++ b/src/shared/ethtool-util.c
64@@ -1,5 +1,6 @@ 187@@ -1,5 +1,6 @@
65 /* SPDX-License-Identifier: LGPL-2.1+ */ 188 /* SPDX-License-Identifier: LGPL-2.1+ */
66 189
@@ -68,10 +191,10 @@ index 0dcec03..3695b10 100644
68 #include <net/if.h> 191 #include <net/if.h>
69 #include <sys/ioctl.h> 192 #include <sys/ioctl.h>
70 #include <linux/ethtool.h> 193 #include <linux/ethtool.h>
71diff --git a/src/udev/net/ethtool-util.h b/src/udev/net/ethtool-util.h 194diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h
72index 618b26b..ebfe82a 100644 195index 8b32b243f3..262b819976 100644
73--- a/src/udev/net/ethtool-util.h 196--- a/src/shared/ethtool-util.h
74+++ b/src/udev/net/ethtool-util.h 197+++ b/src/shared/ethtool-util.h
75@@ -2,6 +2,7 @@ 198@@ -2,6 +2,7 @@
76 #pragma once 199 #pragma once
77 200
@@ -80,8 +203,19 @@ index 618b26b..ebfe82a 100644
80 #include <linux/ethtool.h> 203 #include <linux/ethtool.h>
81 204
82 #include "conf-parser.h" 205 #include "conf-parser.h"
206diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
207index d44af64d5e..fd052f1591 100644
208--- a/src/udev/net/link-config.c
209+++ b/src/udev/net/link-config.c
210@@ -1,5 +1,6 @@
211 /* SPDX-License-Identifier: LGPL-2.1+ */
212
213+#include <netinet/if_ether.h>
214 #include <linux/netdevice.h>
215 #include <netinet/ether.h>
216
83diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c 217diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c
84index a845dfa..177289a 100644 218index ee3ca9fa38..9aa4e82874 100644
85--- a/src/udev/udev-builtin-net_setup_link.c 219--- a/src/udev/udev-builtin-net_setup_link.c
86+++ b/src/udev/udev-builtin-net_setup_link.c 220+++ b/src/udev/udev-builtin-net_setup_link.c
87@@ -1,5 +1,6 @@ 221@@ -1,5 +1,6 @@
@@ -91,6 +225,3 @@ index a845dfa..177289a 100644
91 #include "device-util.h" 225 #include "device-util.h"
92 #include "alloc-util.h" 226 #include "alloc-util.h"
93 #include "link-config.h" 227 #include "link-config.h"
94--
952.7.4
96
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 aa2b4cbcf1..34f7f5fb74 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
@@ -15,17 +15,19 @@ Upstream-Status: Inappropriate [musl specific]
15 15
16Signed-off-by: Khem Raj <raj.khem@gmail.com> 16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 17Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
18[rebased for systemd 243]
19Signed-off-by: Scott Murray <scott.murray@konsulko.com>
18--- 20---
19 src/basic/glob-util.c | 13 ++++++++++++- 21 src/basic/glob-util.c | 12 ++++++++++++
20 src/test/test-glob-util.c | 16 ++++++++++++++++ 22 src/test/test-glob-util.c | 16 ++++++++++++++++
21 src/tmpfiles/tmpfiles.c | 10 ++++++++++ 23 src/tmpfiles/tmpfiles.c | 10 ++++++++++
22 3 files changed, 38 insertions(+), 1 deletion(-) 24 3 files changed, 38 insertions(+)
23 25
24diff --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
25index 32c53f8..ae358d9 100644 27index b335af8d97..2cdfc11f16 100644
26--- a/src/basic/glob-util.c 28--- a/src/basic/glob-util.c
27+++ b/src/basic/glob-util.c 29+++ b/src/basic/glob-util.c
28@@ -13,6 +13,12 @@ 30@@ -14,6 +14,12 @@
29 #include "path-util.h" 31 #include "path-util.h"
30 #include "strv.h" 32 #include "strv.h"
31 33
@@ -38,7 +40,7 @@ index 32c53f8..ae358d9 100644
38 static void closedir_wrapper(void* v) { 40 static void closedir_wrapper(void* v) {
39 (void) closedir(v); 41 (void) closedir(v);
40 } 42 }
41@@ -20,6 +26,7 @@ static void closedir_wrapper(void* v) { 43@@ -21,6 +27,7 @@ static void closedir_wrapper(void* v) {
42 int safe_glob(const char *path, int flags, glob_t *pglob) { 44 int safe_glob(const char *path, int flags, glob_t *pglob) {
43 int k; 45 int k;
44 46
@@ -46,7 +48,7 @@ index 32c53f8..ae358d9 100644
46 /* We want to set GLOB_ALTDIRFUNC ourselves, don't allow it to be set. */ 48 /* We want to set GLOB_ALTDIRFUNC ourselves, don't allow it to be set. */
47 assert(!(flags & GLOB_ALTDIRFUNC)); 49 assert(!(flags & GLOB_ALTDIRFUNC));
48 50
49@@ -33,10 +40,14 @@ int safe_glob(const char *path, int flags, glob_t *pglob) { 51@@ -34,9 +41,14 @@ int safe_glob(const char *path, int flags, glob_t *pglob) {
50 pglob->gl_lstat = lstat; 52 pglob->gl_lstat = lstat;
51 if (!pglob->gl_stat) 53 if (!pglob->gl_stat)
52 pglob->gl_stat = stat; 54 pglob->gl_stat = stat;
@@ -55,7 +57,6 @@ index 32c53f8..ae358d9 100644
55 errno = 0; 57 errno = 0;
56+#ifdef GLOB_ALTDIRFUNC 58+#ifdef GLOB_ALTDIRFUNC
57 k = glob(path, flags | GLOB_ALTDIRFUNC, NULL, pglob); 59 k = glob(path, flags | GLOB_ALTDIRFUNC, NULL, pglob);
58-
59+#else 60+#else
60+ k = glob(path, flags, NULL, pglob); 61+ k = glob(path, flags, NULL, pglob);
61+#endif 62+#endif
@@ -63,7 +64,7 @@ index 32c53f8..ae358d9 100644
63 return -ENOENT; 64 return -ENOENT;
64 if (k == GLOB_NOSPACE) 65 if (k == GLOB_NOSPACE)
65diff --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
66index b4f4144..f0d474e 100644 67index b4f41445fe..f0d474ed14 100644
67--- a/src/test/test-glob-util.c 68--- a/src/test/test-glob-util.c
68+++ b/src/test/test-glob-util.c 69+++ b/src/test/test-glob-util.c
69@@ -13,6 +13,12 @@ 70@@ -13,6 +13,12 @@
@@ -114,7 +115,7 @@ index b4f4144..f0d474e 100644
114 115
115 (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL); 116 (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL);
116diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c 117diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
117index d9d1cc1..477d1e3 100644 118index 3c30612af1..14bc428085 100644
118--- a/src/tmpfiles/tmpfiles.c 119--- a/src/tmpfiles/tmpfiles.c
119+++ b/src/tmpfiles/tmpfiles.c 120+++ b/src/tmpfiles/tmpfiles.c
120@@ -63,6 +63,12 @@ 121@@ -63,6 +63,12 @@
@@ -130,7 +131,7 @@ index d9d1cc1..477d1e3 100644
130 /* 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
131 * 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
132 * properly owned directories beneath /tmp, /var/tmp, /run, which are 133 * properly owned directories beneath /tmp, /var/tmp, /run, which are
133@@ -1839,7 +1845,9 @@ finish: 134@@ -1853,7 +1859,9 @@ finish:
134 135
135 static int glob_item(Item *i, action_t action) { 136 static int glob_item(Item *i, action_t action) {
136 _cleanup_globfree_ glob_t g = { 137 _cleanup_globfree_ glob_t g = {
@@ -140,7 +141,7 @@ index d9d1cc1..477d1e3 100644
140 }; 141 };
141 int r = 0, k; 142 int r = 0, k;
142 char **fn; 143 char **fn;
143@@ -1859,7 +1867,9 @@ static int glob_item(Item *i, action_t action) { 144@@ -1873,7 +1881,9 @@ static int glob_item(Item *i, action_t action) {
144 145
145 static int glob_item_recursively(Item *i, fdaction_t action) { 146 static int glob_item_recursively(Item *i, fdaction_t action) {
146 _cleanup_globfree_ glob_t g = { 147 _cleanup_globfree_ glob_t g = {
@@ -150,6 +151,3 @@ index d9d1cc1..477d1e3 100644
150 }; 151 };
151 int r = 0, k; 152 int r = 0, k;
152 char **fn; 153 char **fn;
153--
1542.11.0
155
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 b54635e8a9..24e24e8e5a 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
@@ -17,15 +17,17 @@ This is libc implementation specific, as glibc does not have this issue.
17Upstream-Status: Inappropriate [musl specific] 17Upstream-Status: Inappropriate [musl specific]
18 18
19Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 19Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
20[rebased for systemd 243]
21Signed-off-by: Scott Murray <scott.murray@konsulko.com>
20--- 22---
21 src/basic/process-util.c | 2 +- 23 src/basic/process-util.c | 2 +-
22 1 file changed, 1 insertion(+), 1 deletion(-) 24 1 file changed, 1 insertion(+), 1 deletion(-)
23 25
24diff --git a/src/basic/process-util.c b/src/basic/process-util.c 26diff --git a/src/basic/process-util.c b/src/basic/process-util.c
25index f773eea..79af915 100644 27index b1c08fcade..0a7a1f7d89 100644
26--- a/src/basic/process-util.c 28--- a/src/basic/process-util.c
27+++ b/src/basic/process-util.c 29+++ b/src/basic/process-util.c
28@@ -1546,7 +1546,7 @@ int set_oom_score_adjust(int value) { 30@@ -1474,7 +1474,7 @@ int set_oom_score_adjust(int value) {
29 sprintf(t, "%i", value); 31 sprintf(t, "%i", value);
30 32
31 return write_string_file("/proc/self/oom_score_adj", t, 33 return write_string_file("/proc/self/oom_score_adj", t,
@@ -33,8 +35,4 @@ index f773eea..79af915 100644
33+ WRITE_STRING_FILE_VERIFY_ON_FAILURE); 35+ WRITE_STRING_FILE_VERIFY_ON_FAILURE);
34 } 36 }
35 37
36 int cpus_in_affinity_mask(void) { 38 static const char *const ioprio_class_table[] = {
37--
382.11.0
39
40
diff --git a/meta/recipes-core/systemd/systemd/0023-socket-util.h-include-string.h.patch b/meta/recipes-core/systemd/systemd/0023-socket-util.h-include-string.h.patch
deleted file mode 100644
index 37987b57f6..0000000000
--- a/meta/recipes-core/systemd/systemd/0023-socket-util.h-include-string.h.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 56fb30d93e96d7f983af0cb4dff9155da91dd671 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Mon, 25 Feb 2019 16:37:19 +0800
4Subject: socket-util.h: include string.h
5
6Fix the following compile error:
7src/basic/socket-util.h:187:30: error: implicit declaration of function 'strnlen'; did you mean 'strlen'? [-Werror=implicit-function-declaration]
8
9Upstream-Status: Accepted
10
11Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
12---
13 src/basic/socket-util.h | 1 +
14 1 file changed, 1 insertion(+)
15
16diff --git a/src/basic/socket-util.h b/src/basic/socket-util.h
17index 6920fd99ba..36ec422f2c 100644
18--- a/src/basic/socket-util.h
19+++ b/src/basic/socket-util.h
20@@ -9,6 +9,7 @@
21 #include <netinet/in.h>
22 #include <stdbool.h>
23 #include <stddef.h>
24+#include <string.h>
25 #include <sys/socket.h>
26 #include <sys/types.h>
27 #include <sys/un.h>
28--
292.20.1
30
diff --git a/meta/recipes-core/systemd/systemd/0025-fs-utilh-add-missing-sys-stat-include.patch b/meta/recipes-core/systemd/systemd/0025-fs-utilh-add-missing-sys-stat-include.patch
deleted file mode 100644
index ada404b053..0000000000
--- a/meta/recipes-core/systemd/systemd/0025-fs-utilh-add-missing-sys-stat-include.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 56e3c9581e2c9b7435d5fcbd74b47c7ccf6b3891 Mon Sep 17 00:00:00 2001
2From: Andrej Valek <andrej.valek@siemens.com>
3Date: Thu, 18 Apr 2019 10:47:11 +0200
4Subject: fs-util.h: add missing sys/stat include
5
6fix error:
7| error: passing argument 5 of 'chase_symlinks_and_stat' from incompatible pointer type [-Werror=incompatible-pointer-types]
8
9Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
10
11Upstream-Status: Accepted
12---
13 src/basic/fs-util.h | 1 +
14 1 file changed, 1 insertion(+)
15
16diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h
17index b9651205e6..c153bc4448 100644
18--- a/src/basic/fs-util.h
19+++ b/src/basic/fs-util.h
20@@ -7,6 +7,7 @@
21 #include <stdbool.h>
22 #include <stdint.h>
23 #include <sys/inotify.h>
24+#include <sys/stat.h>
25 #include <sys/types.h>
26 #include <unistd.h>
27
28--
292.20.1
30
diff --git a/meta/recipes-core/systemd/systemd_242.bb b/meta/recipes-core/systemd/systemd_243.bb
index 0684ee76ca..3ae1516dfb 100644
--- a/meta/recipes-core/systemd/systemd_242.bb
+++ b/meta/recipes-core/systemd/systemd_243.bb
@@ -37,7 +37,6 @@ SRC_URI_MUSL = "\
37 file://0008-add-missing-FTW_-macros-for-musl.patch \ 37 file://0008-add-missing-FTW_-macros-for-musl.patch \
38 file://0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch \ 38 file://0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch \
39 file://0011-Use-uintmax_t-for-handling-rlim_t.patch \ 39 file://0011-Use-uintmax_t-for-handling-rlim_t.patch \
40 file://0001-Replace-the-legacy-ULONG_LONG_MAX-with-the-C99-ULLON.patch \
41 file://0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch \ 40 file://0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch \
42 file://0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch \ 41 file://0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch \
43 file://0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch \ 42 file://0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch \
@@ -46,11 +45,11 @@ SRC_URI_MUSL = "\
46 file://0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch \ 45 file://0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch \
47 file://0020-missing_type.h-add-__compar_d_fn_t-definition.patch \ 46 file://0020-missing_type.h-add-__compar_d_fn_t-definition.patch \
48 file://0021-avoid-redefinition-of-prctl_mm_map-structure.patch \ 47 file://0021-avoid-redefinition-of-prctl_mm_map-structure.patch \
49 file://0001-src-udev-udev-event.c-must-include-sys-wait.h.patch \
50 file://0023-socket-util.h-include-string.h.patch \
51 file://0024-test-json.c-define-M_PIl.patch \ 48 file://0024-test-json.c-define-M_PIl.patch \
52 file://0025-fs-utilh-add-missing-sys-stat-include.patch \
53 file://0001-do-not-disable-buffer-in-writing-files.patch \ 49 file://0001-do-not-disable-buffer-in-writing-files.patch \
50 file://0002-src-login-brightness.c-include-sys-wait.h.patch \
51 file://0003-src-basic-copy.c-include-signal.h.patch \
52 file://0004-src-shared-cpu-set-util.h-add-__cpu_mask-definition.patch \
54 " 53 "
55 54
56PAM_PLUGINS = " \ 55PAM_PLUGINS = " \
@@ -657,13 +656,13 @@ ALTERNATIVE_TARGET[runlevel] = "${base_bindir}/systemctl"
657ALTERNATIVE_LINK_NAME[runlevel] = "${base_sbindir}/runlevel" 656ALTERNATIVE_LINK_NAME[runlevel] = "${base_sbindir}/runlevel"
658ALTERNATIVE_PRIORITY[runlevel] ?= "300" 657ALTERNATIVE_PRIORITY[runlevel] ?= "300"
659 658
660pkg_postinst_${PN} () { 659pkg_postinst_${PN}_libc-glibc () {
661 sed -e '/^hosts:/s/\s*\<myhostname\>//' \ 660 sed -e '/^hosts:/s/\s*\<myhostname\>//' \
662 -e 's/\(^hosts:.*\)\(\<files\>\)\(.*\)\(\<dns\>\)\(.*\)/\1\2 myhostname \3\4\5/' \ 661 -e 's/\(^hosts:.*\)\(\<files\>\)\(.*\)\(\<dns\>\)\(.*\)/\1\2 myhostname \3\4\5/' \
663 -i $D${sysconfdir}/nsswitch.conf 662 -i $D${sysconfdir}/nsswitch.conf
664} 663}
665 664
666pkg_prerm_${PN} () { 665pkg_prerm_${PN}_libc-glibc () {
667 sed -e '/^hosts:/s/\s*\<myhostname\>//' \ 666 sed -e '/^hosts:/s/\s*\<myhostname\>//' \
668 -e '/^hosts:/s/\s*myhostname//' \ 667 -e '/^hosts:/s/\s*myhostname//' \
669 -i $D${sysconfdir}/nsswitch.conf 668 -i $D${sysconfdir}/nsswitch.conf
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-12 02:13:04 +0000