ethtool:upgrade 5.6 -> 5.7

fix-printf.patch
Removed since this is included in 5.7

Refresh the following patch:
avoid_parallel_tests.patch

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
index 2f2d04ca07a5a3dcbbec884ca427e5d5c4812a61..8ecfde141713e3667625685ade90d71756d21f56 100644 (file)
--- a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
+++ b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
@@ -19,7 +19,7 @@ index 1169b7f..ed82524 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
- AC_INIT(ethtool, 5.6, netdev@vger.kernel.org)
+ AC_INIT(ethtool, 5.7, netdev@vger.kernel.org)
  AC_PREREQ(2.52)
  AC_CONFIG_SRCDIR([ethtool.c])
 -AM_INIT_AUTOMAKE([gnu subdir-objects])

diff --git a/meta/recipes-extended/ethtool/ethtool/fix-printf.patch b/meta/recipes-extended/ethtool/ethtool/fix-printf.patch
deleted file mode 100644 (file)
index 9effa4f..0000000
--- a/meta/recipes-extended/ethtool/ethtool/fix-printf.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 8dcdb3d22a66f18770e5566c0e72e86a0701aeac Mon Sep 17 00:00:00 2001
-From: Robert Scheck <robert@fedoraproject.org>
-Date: Tue, 12 May 2020 20:33:12 +0200
-Subject: Rewrite printf() due to -Werror=format-security
-
-Avoid -Werror=format-security leading to: netlink/settings.c:378:2: error:
-format not a string literal and no format arguments [-Werror=format-security]
-
-Upstream-Status: Backport
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-Signed-off-by: Robert Scheck <robert@fedoraproject.org>
-Signed-off-by: John W. Linville <linville@tuxdriver.com>
----
- netlink/settings.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/netlink/settings.c b/netlink/settings.c
-index c8a911d..0212465 100644
---- a/netlink/settings.c
-+++ b/netlink/settings.c
-@@ -375,7 +375,7 @@ static int dump_link_modes(struct nl_context *nlctx,
- after:
-       if (first && if_none)
-               printf("%s", if_none);
--      printf(after);
-+      printf("%s", after);
- 
-       return 0;
- err:
--- 
-cgit 1.2.3-1.el7
-

diff --git a/meta/recipes-extended/ethtool/ethtool_5.6.bb b/meta/recipes-extended/ethtool/ethtool_5.7.bb
similarity index 90%
rename from meta/recipes-extended/ethtool/ethtool_5.6.bb
rename to meta/recipes-extended/ethtool/ethtool_5.7.bb
index eda32c877c887146da9fd76ef6bbe0e36c935c79..d9fc30cb55901f4a50d93176668cad20ee214cdf 100644 (file)
--- a/meta/recipes-extended/ethtool/ethtool_5.6.bb
+++ b/meta/recipes-extended/ethtool/ethtool_5.7.bb
@@ -9,10 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \
            file://run-ptest \
            file://avoid_parallel_tests.patch \
-           file://fix-printf.patch \
            "
 
-SRC_URI[sha256sum] = "e904e980294baf5878df410ebcf1d660497ba19bc3a77f798a04dba569f44a7e"
+SRC_URI[sha256sum] = "c2e16f8bf510c5822f8e25061c2533972308a421767c54abcacb1038b08bb782"
 
 UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/"