summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/systemd/systemd.inc2
-rw-r--r--meta/recipes-core/systemd/systemd/0001-core-set-fs.file-max-sysctl-to-LONG_MAX-rather-than-.patch39
-rw-r--r--meta/recipes-core/systemd/systemd/0001-networkd-fix-link-up.patch66
-rw-r--r--meta/recipes-core/systemd/systemd/0002-network-do-not-send-ipv6.patch96
-rw-r--r--meta/recipes-core/systemd/systemd/0006-network-remove-redunant-link-name-in-message.patch41
-rw-r--r--meta/recipes-core/systemd/systemd_242.bb4
6 files changed, 1 insertions, 247 deletions
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc
index 3a353b009b..491361ccca 100644
--- a/meta/recipes-core/systemd/systemd.inc
+++ b/meta/recipes-core/systemd/systemd.inc
@@ -14,7 +14,7 @@ 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 = "db2e367bfc3b119609f837eb973d915f6c550b2f" 17SRCREV = "07f0549ffe3413f0e78b656dd34d64681cbd8f00"
18SRCBRANCH = "v242-stable" 18SRCBRANCH = "v242-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
diff --git a/meta/recipes-core/systemd/systemd/0001-core-set-fs.file-max-sysctl-to-LONG_MAX-rather-than-.patch b/meta/recipes-core/systemd/systemd/0001-core-set-fs.file-max-sysctl-to-LONG_MAX-rather-than-.patch
deleted file mode 100644
index ff64f58c9c..0000000000
--- a/meta/recipes-core/systemd/systemd/0001-core-set-fs.file-max-sysctl-to-LONG_MAX-rather-than-.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 6e2f78948403a4cce45b9e34311c9577c624f066 Mon Sep 17 00:00:00 2001
2From: Lennart Poettering <lennart@poettering.net>
3Date: Mon, 17 Jun 2019 10:51:25 +0200
4Subject: [PATCH] core: set fs.file-max sysctl to LONG_MAX rather than
5 ULONG_MAX
6
7Since kernel 5.2 the kernel thankfully returns proper errors when we
8write a value out of range to the sysctl. Which however breaks writing
9ULONG_MAX to request the maximum value. Hence let's write the new
10maximum value instead, LONG_MAX.
11
12/cc @brauner
13
14Fixes: #12803
15
16Upstream-Status: Backport
17
18Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
19---
20 src/core/main.c | 6 +++---
21 1 file changed, 3 insertions(+), 3 deletions(-)
22
23diff --git a/src/core/main.c b/src/core/main.c
24index b33ea1b5b5..e7f51815f0 100644
25--- a/src/core/main.c
26+++ b/src/core/main.c
27@@ -1245,9 +1245,9 @@ static void bump_file_max_and_nr_open(void) {
28 #endif
29
30 #if BUMP_PROC_SYS_FS_FILE_MAX
31- /* I so wanted to use STRINGIFY(ULONG_MAX) here, but alas we can't as glibc/gcc define that as
32- * "(0x7fffffffffffffffL * 2UL + 1UL)". Seriously. 😢 */
33- if (asprintf(&t, "%lu\n", ULONG_MAX) < 0) {
34+ /* The maximum the kernel allows for this since 5.2 is LONG_MAX, use that. (Previously thing where
35+ * different but the operation would fail silently.) */
36+ if (asprintf(&t, "%li\n", LONG_MAX) < 0) {
37 log_oom();
38 return;
39 }
diff --git a/meta/recipes-core/systemd/systemd/0001-networkd-fix-link-up.patch b/meta/recipes-core/systemd/systemd/0001-networkd-fix-link-up.patch
deleted file mode 100644
index 4c7a0a33a3..0000000000
--- a/meta/recipes-core/systemd/systemd/0001-networkd-fix-link-up.patch
+++ /dev/null
@@ -1,66 +0,0 @@
1From 6bd76d2d4ff130decd3aa13e0c2dbfd56ff8d7b7 Mon Sep 17 00:00:00 2001
2From: Susant Sahani <ssahani@gmail.com>
3Date: Thu, 9 May 2019 07:35:35 +0530
4Subject: [PATCH] networkd: fix link_up() (#12505)
5
6Fillup IFLA_INET6_ADDR_GEN_MODE while we do link_up.
7
8Fixes the following error:
9```
10dummy-test: Could not bring up interface: Invalid argument
11```
12
13After reading the kernel code when we do a link up
14```
15net/core/rtnetlink.c
16IFLA_AF_SPEC
17 af_ops->set_link_af(dev, af);
18 inet6_set_link_af
19 if (tb[IFLA_INET6_ADDR_GEN_MODE])
20 Here it looks for IFLA_INET6_ADDR_GEN_MODE
21```
22Since link up we didn't filling up that it's failing.
23
24Closes #12504.
25
26Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
27
28Upstream-Status: Backport [https://github.com/systemd/systemd/commit/4eb086a38712ea98faf41e075b84555b11b54362.patch]
29
30---
31 src/network/networkd-link.c | 15 +++++++++++++++
32 1 file changed, 15 insertions(+)
33
34diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
35index e466b96792..042496173c 100644
36--- a/src/network/networkd-link.c
37+++ b/src/network/networkd-link.c
38@@ -2034,6 +2034,8 @@ static int link_up(Link *link) {
39 }
40
41 if (link_ipv6_enabled(link)) {
42+ uint8_t ipv6ll_mode;
43+
44 r = sd_netlink_message_open_container(req, IFLA_AF_SPEC);
45 if (r < 0)
46 return log_link_error_errno(link, r, "Could not open IFLA_AF_SPEC container: %m");
47@@ -2049,6 +2051,19 @@ static int link_up(Link *link) {
48 return log_link_error_errno(link, r, "Could not append IFLA_INET6_TOKEN: %m");
49 }
50
51+ if (!link_ipv6ll_enabled(link))
52+ ipv6ll_mode = IN6_ADDR_GEN_MODE_NONE;
53+ else if (sysctl_read_ip_property(AF_INET6, link->ifname, "stable_secret", NULL) < 0)
54+ /* The file may not exist. And event if it exists, when stable_secret is unset,
55+ * reading the file fails with EIO. */
56+ ipv6ll_mode = IN6_ADDR_GEN_MODE_EUI64;
57+ else
58+ ipv6ll_mode = IN6_ADDR_GEN_MODE_STABLE_PRIVACY;
59+
60+ r = sd_netlink_message_append_u8(req, IFLA_INET6_ADDR_GEN_MODE, ipv6ll_mode);
61+ if (r < 0)
62+ return log_link_error_errno(link, r, "Could not append IFLA_INET6_ADDR_GEN_MODE: %m");
63+
64 r = sd_netlink_message_close_container(req);
65 if (r < 0)
66 return log_link_error_errno(link, r, "Could not close AF_INET6 container: %m");
diff --git a/meta/recipes-core/systemd/systemd/0002-network-do-not-send-ipv6.patch b/meta/recipes-core/systemd/systemd/0002-network-do-not-send-ipv6.patch
deleted file mode 100644
index 2565314876..0000000000
--- a/meta/recipes-core/systemd/systemd/0002-network-do-not-send-ipv6.patch
+++ /dev/null
@@ -1,96 +0,0 @@
1From b5c4eb818101127a606849e822937b15b8497c75 Mon Sep 17 00:00:00 2001
2From: Yu Watanabe <watanabe.yu+github@gmail.com>
3Date: Thu, 9 May 2019 14:39:46 +0900
4Subject: [PATCH] network: do not send ipv6 token to kernel
5
6We disabled kernel RA support. Then, we should not send
7IFLA_INET6_TOKEN.
8Thus, we do not need to send IFLA_INET6_ADDR_GEN_MODE twice.
9
10Follow-up for 0e2fdb83bb5e22047e0c7cc058b415d0e93f02cf and
114eb086a38712ea98faf41e075b84555b11b54362.
12
13Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
14
15Upstream-Status: Backport [https://github.com/systemd/systemd/commit/9f6e82e6eb3b6e73d66d00d1d6eee60691fb702f]
16
17---
18 src/network/networkd-link.c | 51 +++++--------------------------------
19 1 file changed, 6 insertions(+), 45 deletions(-)
20
21diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
22index 042496173c..c49dba33da 100644
23--- a/src/network/networkd-link.c
24+++ b/src/network/networkd-link.c
25@@ -1940,6 +1940,9 @@ static int link_configure_addrgen_mode(Link *link) {
26 assert(link->manager);
27 assert(link->manager->rtnl);
28
29+ if (!socket_ipv6_is_supported())
30+ return 0;
31+
32 log_link_debug(link, "Setting address genmode for link");
33
34 r = sd_rtnl_message_new_link(link->manager->rtnl, &req, RTM_SETLINK, link->ifindex);
35@@ -2033,46 +2036,6 @@ static int link_up(Link *link) {
36 return log_link_error_errno(link, r, "Could not set MAC address: %m");
37 }
38
39- if (link_ipv6_enabled(link)) {
40- uint8_t ipv6ll_mode;
41-
42- r = sd_netlink_message_open_container(req, IFLA_AF_SPEC);
43- if (r < 0)
44- return log_link_error_errno(link, r, "Could not open IFLA_AF_SPEC container: %m");
45-
46- /* if the kernel lacks ipv6 support setting IFF_UP fails if any ipv6 options are passed */
47- r = sd_netlink_message_open_container(req, AF_INET6);
48- if (r < 0)
49- return log_link_error_errno(link, r, "Could not open AF_INET6 container: %m");
50-
51- if (!in_addr_is_null(AF_INET6, &link->network->ipv6_token)) {
52- r = sd_netlink_message_append_in6_addr(req, IFLA_INET6_TOKEN, &link->network->ipv6_token.in6);
53- if (r < 0)
54- return log_link_error_errno(link, r, "Could not append IFLA_INET6_TOKEN: %m");
55- }
56-
57- if (!link_ipv6ll_enabled(link))
58- ipv6ll_mode = IN6_ADDR_GEN_MODE_NONE;
59- else if (sysctl_read_ip_property(AF_INET6, link->ifname, "stable_secret", NULL) < 0)
60- /* The file may not exist. And event if it exists, when stable_secret is unset,
61- * reading the file fails with EIO. */
62- ipv6ll_mode = IN6_ADDR_GEN_MODE_EUI64;
63- else
64- ipv6ll_mode = IN6_ADDR_GEN_MODE_STABLE_PRIVACY;
65-
66- r = sd_netlink_message_append_u8(req, IFLA_INET6_ADDR_GEN_MODE, ipv6ll_mode);
67- if (r < 0)
68- return log_link_error_errno(link, r, "Could not append IFLA_INET6_ADDR_GEN_MODE: %m");
69-
70- r = sd_netlink_message_close_container(req);
71- if (r < 0)
72- return log_link_error_errno(link, r, "Could not close AF_INET6 container: %m");
73-
74- r = sd_netlink_message_close_container(req);
75- if (r < 0)
76- return log_link_error_errno(link, r, "Could not close IFLA_AF_SPEC container: %m");
77- }
78-
79 r = netlink_call_async(link->manager->rtnl, NULL, req, link_up_handler,
80 link_netlink_destroy_callback, link);
81 if (r < 0)
82@@ -3208,11 +3171,9 @@ static int link_configure(Link *link) {
83 if (r < 0)
84 return r;
85
86- if (socket_ipv6_is_supported()) {
87- r = link_configure_addrgen_mode(link);
88- if (r < 0)
89- return r;
90- }
91+ r = link_configure_addrgen_mode(link);
92+ if (r < 0)
93+ return r;
94
95 return link_configure_after_setting_mtu(link);
96 }
diff --git a/meta/recipes-core/systemd/systemd/0006-network-remove-redunant-link-name-in-message.patch b/meta/recipes-core/systemd/systemd/0006-network-remove-redunant-link-name-in-message.patch
deleted file mode 100644
index 33f482ae9b..0000000000
--- a/meta/recipes-core/systemd/systemd/0006-network-remove-redunant-link-name-in-message.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 9e6940858c7dbdd56b297bdf49f58d623e3430b7 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
3Date: Tue, 7 May 2019 13:46:55 +0200
4Subject: [PATCH] network: remove redunant link name in message
5
6Fixes #12454.
7
8gcc was complaining that the link->ifname argument is NULL. Adding
9assert(link->ifname) right before the call has no effect. It seems that
10gcc is confused by the fact that log_link_warning_errno() internally
11calls log_object(), with link->ifname passed as the object. log_object()
12is also a macro and is does a check whether the passed object is NULL.
13So we have a check if something is NULL right next an unconditional use
14of it where it cannot be NULL. I think it's a bug in gcc.
15
16Anyway, we don't need to use link->ifname here. log_object() already prepends
17the object name to the message.
18
19Signed-off-by: Khem Raj <raj.khem@gmail.com>
20Upstream-Status: backport [https://github.com/systemd/systemd/commit/c98b3545008d8e984ab456dcf79787418fcbfe13]
21---
22 src/network/networkd-link.c | 3 +--
23 1 file changed, 1 insertion(+), 2 deletions(-)
24
25diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
26index 3e334c8d29..a158c01bbd 100644
27--- a/src/network/networkd-link.c
28+++ b/src/network/networkd-link.c
29@@ -321,8 +321,7 @@ static int link_enable_ipv6(Link *link) {
30
31 r = sysctl_write_ip_property_boolean(AF_INET6, link->ifname, "disable_ipv6", disabled);
32 if (r < 0)
33- log_link_warning_errno(link, r, "Cannot %s IPv6 for interface %s: %m",
34- enable_disable(!disabled), link->ifname);
35+ log_link_warning_errno(link, r, "Cannot %s IPv6: %m", enable_disable(!disabled));
36 else
37 log_link_info(link, "IPv6 successfully %sd", enable_disable(!disabled));
38
39--
402.21.0
41
diff --git a/meta/recipes-core/systemd/systemd_242.bb b/meta/recipes-core/systemd/systemd_242.bb
index cfa9c079ab..6fbb854886 100644
--- a/meta/recipes-core/systemd/systemd_242.bb
+++ b/meta/recipes-core/systemd/systemd_242.bb
@@ -22,12 +22,8 @@ SRC_URI += "file://touchscreen.rules \
22 file://0003-implment-systemd-sysv-install-for-OE.patch \ 22 file://0003-implment-systemd-sysv-install-for-OE.patch \
23 file://0004-rules-whitelist-hd-devices.patch \ 23 file://0004-rules-whitelist-hd-devices.patch \
24 file://0005-rules-watch-metadata-changes-in-ide-devices.patch \ 24 file://0005-rules-watch-metadata-changes-in-ide-devices.patch \
25 file://0006-network-remove-redunant-link-name-in-message.patch \
26 file://99-default.preset \ 25 file://99-default.preset \
27 file://0001-resolved-Fix-incorrect-use-of-OpenSSL-BUF_MEM.patch \ 26 file://0001-resolved-Fix-incorrect-use-of-OpenSSL-BUF_MEM.patch \
28 file://0001-core-set-fs.file-max-sysctl-to-LONG_MAX-rather-than-.patch \
29 file://0001-networkd-fix-link-up.patch \
30 file://0002-network-do-not-send-ipv6.patch \
31 " 27 "
32 28
33# patches needed by musl 29# patches needed by musl