mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-01 06:32:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

ethtool: upgrade 5.4 -> 5.6

Browse Source 
(From OE-Core rev: 081122f0413a547842a41860c270713201c168ac)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2020-05-31 17:52:47 +02:00
committed by Richard Purdie
parent d45d7cff6b
commit 94c710cf11
3 changed files with 43 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
View File

@@ -1,4 +1,4 @@
From f8333f7759717b4d163cfe8e3ef8861c5a667324 Mon Sep 17 00:00:00 2001
From 1c6c017e56ec536f5cceacdb02092777d390debb Mon Sep 17 00:00:00 2001
From: Tudor Florea <tudor.florea@enea.com>
Date: Wed, 28 May 2014 18:59:54 +0200
Subject: [PATCH] ethtool: use serial-tests config needed by ptest.
@@ -15,15 +15,15 @@ Upstream-Status: Inappropriate
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 2127fdb..4910e6f 100644
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.4, netdev@vger.kernel.org)
AC_INIT(ethtool, 5.6, netdev@vger.kernel.org)
AC_PREREQ(2.52)
AC_CONFIG_SRCDIR([ethtool.c])
-AM_INIT_AUTOMAKE([gnu])
+AM_INIT_AUTOMAKE([gnu serial-tests])
-AM_INIT_AUTOMAKE([gnu subdir-objects])
+AM_INIT_AUTOMAKE([gnu subdir-objects serial-tests])
AC_CONFIG_HEADERS([ethtool-config.h])
AM_MAINTAINER_MODE

32
meta/recipes-extended/ethtool/ethtool/fix-printf.patch Normal file
View File

@@ -0,0 +1,32 @@
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

9
meta/recipes-extended/ethtool/ethtool_5.4.bb → meta/recipes-extended/ethtool/ethtool_5.6.bb
View File

@@ -9,17 +9,20 @@ 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[md5sum] = "fbb24aa414ab9a11ff66d351b5b8493b"
SRC_URI[sha256sum] = "0b25a46b61bc6e26f56dcb973fc28acea159e2c32c9d6da42c0fa8d1a6339829"
SRC_URI[sha256sum] = "e904e980294baf5878df410ebcf1d660497ba19bc3a77f798a04dba569f44a7e"
UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/"
inherit autotools ptest bash-completion
inherit autotools ptest bash-completion pkgconfig
RDEPENDS_${PN}-ptest += "make"
PACKAGECONFIG ?= "netlink"
PACKAGECONFIG[netlink] = "--enable-netlink,--disable-netlink,libmnl,"
do_compile_ptest() {
oe_runmake buildtest-TESTS
}