remove patches dropped from spec in 1bbe830 and f06261c
authorJan Palus <atler@pld-linux.org>
Fri, 22 May 2020 10:19:11 +0000 (12:19 +0200)
committerJan Palus <atler@pld-linux.org>
Fri, 22 May 2020 10:20:40 +0000 (12:20 +0200)
gcc9.patch [deleted file]
systemd-lz4.patch [deleted file]

diff --git a/gcc9.patch b/gcc9.patch
deleted file mode 100644 (file)
index e12d657..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-From c98b3545008d8e984ab456dcf79787418fcbfe13 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Tue, 7 May 2019 13:46:55 +0200
-Subject: [PATCH] network: remove redunant link name in message
-
-Fixes #12454.
-
-gcc was complaining that the link->ifname argument is NULL. Adding
-assert(link->ifname) right before the call has no effect. It seems that
-gcc is confused by the fact that log_link_warning_errno() internally
-calls log_object(), with link->ifname passed as the object. log_object()
-is also a macro and is does a check whether the passed object is NULL.
-So we have a check if something is NULL right next an unconditional use
-of it where it cannot be NULL. I think it's a bug in gcc.
-
-Anyway, we don't need to use link->ifname here. log_object() already prepends
-the object name to the message.
----
- src/network/networkd-link.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
-index 533193ac932..6fc82940033 100644
---- a/src/network/networkd-link.c
-+++ b/src/network/networkd-link.c
-@@ -338,8 +338,7 @@ static int link_enable_ipv6(Link *link) {
-         r = sysctl_write_ip_property_boolean(AF_INET6, link->ifname, "disable_ipv6", disabled);
-         if (r < 0)
--                log_link_warning_errno(link, r, "Cannot %s IPv6 for interface %s: %m",
--                                       enable_disable(!disabled), link->ifname);
-+                log_link_warning_errno(link, r, "Cannot %s IPv6: %m", enable_disable(!disabled));
-         else
-                 log_link_info(link, "IPv6 successfully %sd", enable_disable(!disabled));
diff --git a/systemd-lz4.patch b/systemd-lz4.patch
deleted file mode 100644 (file)
index c0763d2..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
---- systemd-232/Makefile.am.orig       2017-04-05 19:08:21.126447292 +0200
-+++ systemd-232/Makefile.am    2017-04-05 19:17:46.589774170 +0200
-@@ -4255,6 +4255,10 @@
-       libsystemd-shared.la
-+test_compress_CFLAGS =
- if HAVE_LZ4
-+test_compress_CFLAGS += \
-+      $(LZ4_CFLAGS)
-+
- test_compress_LDADD += \
-       -llz4
- endif
-@@ -4402,6 +4405,9 @@
- endif
- if HAVE_LZ4
-+libsystemd_journal_internal_la_CFLAGS += \
-+      $(LZ4_CFLAGS)
-+
- libsystemd_journal_internal_la_LIBADD += \
-       -llz4
- endif
This page took 0.098116 seconds and 4 git commands to generate.