summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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.bb3
2 files changed, 42 insertions, 2 deletions
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
new file mode 100644
index 0000000000..33f482ae9b
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0006-network-remove-redunant-link-name-in-message.patch
@@ -0,0 +1,41 @@
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 69b1f7ed0e..3012f20b11 100644
--- a/meta/recipes-core/systemd/systemd_242.bb
+++ b/meta/recipes-core/systemd/systemd_242.bb
@@ -22,6 +22,7 @@ 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 \
25 file://99-default.preset \ 26 file://99-default.preset \
26 " 27 "
27 28
@@ -204,8 +205,6 @@ EXTRA_OEMESON += "-Dkexec-path=${sbindir}/kexec \
204 -Dsulogin-path=${base_sbindir}/sulogin \ 205 -Dsulogin-path=${base_sbindir}/sulogin \
205 -Dumount-path=${base_bindir}/umount" 206 -Dumount-path=${base_bindir}/umount"
206 207
207CFLAGS += "-Wno-error=format-overflow"
208
209do_install() { 208do_install() {
210 meson_do_install 209 meson_do_install
211 install -d ${D}/${base_sbindir} 210 install -d ${D}/${base_sbindir}