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

(From OE-Core rev: 6abcc7b13a3d28471be63af0809fd25106386083)

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
zangrc
2020-06-15 22:25:18 +08:00
committed by Richard Purdie
parent 4db392007e
commit 8f8cd4dbab
3 changed files with 2 additions and 35 deletions

View File

@@ -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])

View File

@@ -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

View File

@@ -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/"