summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-05-31 17:52:47 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-04 13:27:31 +0100
commit94c710cf1139d8fb98598d91b8d6fad82f21aaf8 (patch)
tree4417281aa428d9f27973e637b676ca85675c481f /meta/recipes-extended
parentd45d7cff6b8d169f1b090d9857dfc866957f5ea1 (diff)
downloadpoky-94c710cf1139d8fb98598d91b8d6fad82f21aaf8.tar.gz
ethtool: upgrade 5.4 -> 5.6
(From OE-Core rev: 081122f0413a547842a41860c270713201c168ac) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch10
-rw-r--r--meta/recipes-extended/ethtool/ethtool/fix-printf.patch32
-rw-r--r--meta/recipes-extended/ethtool/ethtool_5.6.bb (renamed from meta/recipes-extended/ethtool/ethtool_5.4.bb)9
3 files changed, 43 insertions, 8 deletions
diff --git a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
index d5c93244fa..2f2d04ca07 100644
--- a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
+++ b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
@@ -1,4 +1,4 @@
1From f8333f7759717b4d163cfe8e3ef8861c5a667324 Mon Sep 17 00:00:00 2001 1From 1c6c017e56ec536f5cceacdb02092777d390debb Mon Sep 17 00:00:00 2001
2From: Tudor Florea <tudor.florea@enea.com> 2From: Tudor Florea <tudor.florea@enea.com>
3Date: Wed, 28 May 2014 18:59:54 +0200 3Date: Wed, 28 May 2014 18:59:54 +0200
4Subject: [PATCH] ethtool: use serial-tests config needed by ptest. 4Subject: [PATCH] ethtool: use serial-tests config needed by ptest.
@@ -15,15 +15,15 @@ Upstream-Status: Inappropriate
15 1 file changed, 1 insertion(+), 1 deletion(-) 15 1 file changed, 1 insertion(+), 1 deletion(-)
16 16
17diff --git a/configure.ac b/configure.ac 17diff --git a/configure.ac b/configure.ac
18index 2127fdb..4910e6f 100644 18index 1169b7f..ed82524 100644
19--- a/configure.ac 19--- a/configure.ac
20+++ b/configure.ac 20+++ b/configure.ac
21@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. 21@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
22 AC_INIT(ethtool, 5.4, netdev@vger.kernel.org) 22 AC_INIT(ethtool, 5.6, netdev@vger.kernel.org)
23 AC_PREREQ(2.52) 23 AC_PREREQ(2.52)
24 AC_CONFIG_SRCDIR([ethtool.c]) 24 AC_CONFIG_SRCDIR([ethtool.c])
25-AM_INIT_AUTOMAKE([gnu]) 25-AM_INIT_AUTOMAKE([gnu subdir-objects])
26+AM_INIT_AUTOMAKE([gnu serial-tests]) 26+AM_INIT_AUTOMAKE([gnu subdir-objects serial-tests])
27 AC_CONFIG_HEADERS([ethtool-config.h]) 27 AC_CONFIG_HEADERS([ethtool-config.h])
28 28
29 AM_MAINTAINER_MODE 29 AM_MAINTAINER_MODE
diff --git a/meta/recipes-extended/ethtool/ethtool/fix-printf.patch b/meta/recipes-extended/ethtool/ethtool/fix-printf.patch
new file mode 100644
index 0000000000..9effa4f3f4
--- /dev/null
+++ b/meta/recipes-extended/ethtool/ethtool/fix-printf.patch
@@ -0,0 +1,32 @@
1From 8dcdb3d22a66f18770e5566c0e72e86a0701aeac Mon Sep 17 00:00:00 2001
2From: Robert Scheck <robert@fedoraproject.org>
3Date: Tue, 12 May 2020 20:33:12 +0200
4Subject: Rewrite printf() due to -Werror=format-security
5
6Avoid -Werror=format-security leading to: netlink/settings.c:378:2: error:
7format not a string literal and no format arguments [-Werror=format-security]
8
9Upstream-Status: Backport
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11Signed-off-by: Robert Scheck <robert@fedoraproject.org>
12Signed-off-by: John W. Linville <linville@tuxdriver.com>
13---
14 netlink/settings.c | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/netlink/settings.c b/netlink/settings.c
18index c8a911d..0212465 100644
19--- a/netlink/settings.c
20+++ b/netlink/settings.c
21@@ -375,7 +375,7 @@ static int dump_link_modes(struct nl_context *nlctx,
22 after:
23 if (first && if_none)
24 printf("%s", if_none);
25- printf(after);
26+ printf("%s", after);
27
28 return 0;
29 err:
30--
31cgit 1.2.3-1.el7
32
diff --git a/meta/recipes-extended/ethtool/ethtool_5.4.bb b/meta/recipes-extended/ethtool/ethtool_5.6.bb
index d6eafaa8dc..eda32c877c 100644
--- a/meta/recipes-extended/ethtool/ethtool_5.4.bb
+++ b/meta/recipes-extended/ethtool/ethtool_5.6.bb
@@ -9,17 +9,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
9SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ 9SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \
10 file://run-ptest \ 10 file://run-ptest \
11 file://avoid_parallel_tests.patch \ 11 file://avoid_parallel_tests.patch \
12 file://fix-printf.patch \
12 " 13 "
13 14
14SRC_URI[md5sum] = "fbb24aa414ab9a11ff66d351b5b8493b" 15SRC_URI[sha256sum] = "e904e980294baf5878df410ebcf1d660497ba19bc3a77f798a04dba569f44a7e"
15SRC_URI[sha256sum] = "0b25a46b61bc6e26f56dcb973fc28acea159e2c32c9d6da42c0fa8d1a6339829"
16 16
17UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/" 17UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/"
18 18
19inherit autotools ptest bash-completion 19inherit autotools ptest bash-completion pkgconfig
20 20
21RDEPENDS_${PN}-ptest += "make" 21RDEPENDS_${PN}-ptest += "make"
22 22
23PACKAGECONFIG ?= "netlink"
24PACKAGECONFIG[netlink] = "--enable-netlink,--disable-netlink,libmnl,"
25
23do_compile_ptest() { 26do_compile_ptest() {
24 oe_runmake buildtest-TESTS 27 oe_runmake buildtest-TESTS
25} 28}