summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/ethtool
diff options
context:
space:
mode:
authorChanghyeok Bae <changhyeok.bae@gmail.com>2018-03-27 00:50:30 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-04 13:28:01 +0100
commitc2a7441ae1e31951cbd762e7dd9414b2f92258ce (patch)
tree5c8e430c07ac4258417ab379f732c0d76343064a /meta/recipes-extended/ethtool
parent72f7e1d9337795233154b8bf8a5ae9d5f74e7d75 (diff)
downloadpoky-c2a7441ae1e31951cbd762e7dd9414b2f92258ce.tar.gz
ethtool: update 4.13 -> 4.15
(From OE-Core rev: 75ae2a49149da1b81476555af744a35c700af53e) Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/ethtool')
-rw-r--r--meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch21
-rw-r--r--meta/recipes-extended/ethtool/ethtool_4.15.bb (renamed from meta/recipes-extended/ethtool/ethtool_4.13.bb)4
2 files changed, 17 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 de38104044..59299e24ef 100644
--- a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
+++ b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
@@ -1,3 +1,8 @@
1From d069dada68b063e386cdb61707f0b22fb1799029 Mon Sep 17 00:00:00 2001
2From: Tudor Florea <tudor.florea@enea.com>
3Date: Wed, 28 May 2014 18:59:54 +0200
4Subject: [PATCH] ethtool: use serial-tests config needed by ptest.
5
1ptest needs buildtest-TESTS and runtest-TESTS targets. 6ptest needs buildtest-TESTS and runtest-TESTS targets.
2serial-tests is required to generate those targets. 7serial-tests is required to generate those targets.
3 8
@@ -5,12 +10,16 @@ Signed-off-by: Tudor Florea <tudor.florea@enea.com>
5Upstream-Status: Inappropriate 10Upstream-Status: Inappropriate
6(default automake behavior incompatible with ptest) 11(default automake behavior incompatible with ptest)
7 12
8Index: ethtool-4.13/configure.ac 13---
9=================================================================== 14 configure.ac | 2 +-
10--- ethtool-4.13.orig/configure.ac 15 1 file changed, 1 insertion(+), 1 deletion(-)
11+++ ethtool-4.13/configure.ac 16
12@@ -2,7 +2,7 @@ dnl Process this file with autoconf to p 17diff --git a/configure.ac b/configure.ac
13 AC_INIT(ethtool, 4.13, netdev@vger.kernel.org) 18index cb61a02..c75b9a9 100644
19--- a/configure.ac
20+++ b/configure.ac
21@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
22 AC_INIT(ethtool, 4.15, netdev@vger.kernel.org)
14 AC_PREREQ(2.52) 23 AC_PREREQ(2.52)
15 AC_CONFIG_SRCDIR([ethtool.c]) 24 AC_CONFIG_SRCDIR([ethtool.c])
16-AM_INIT_AUTOMAKE([gnu]) 25-AM_INIT_AUTOMAKE([gnu])
diff --git a/meta/recipes-extended/ethtool/ethtool_4.13.bb b/meta/recipes-extended/ethtool/ethtool_4.15.bb
index c862a57955..8538a75204 100644
--- a/meta/recipes-extended/ethtool/ethtool_4.13.bb
+++ b/meta/recipes-extended/ethtool/ethtool_4.15.bb
@@ -11,8 +11,8 @@ SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \
11 file://avoid_parallel_tests.patch \ 11 file://avoid_parallel_tests.patch \
12 " 12 "
13 13
14SRC_URI[md5sum] = "2ba44eb0ca96752392e9bf8dc83ba302" 14SRC_URI[md5sum] = "a4b83b35a4bc7d3646d973b0baf36c78"
15SRC_URI[sha256sum] = "d311c4b557c44c5248ac5436b9e19c391a60d8e4830b6a7f41be16d89c0556de" 15SRC_URI[sha256sum] = "3996127fc22950b865287bd9d28c0aa3fcd44e914a5a4ef01de64872106dc178"
16 16
17inherit autotools ptest 17inherit autotools ptest
18RDEPENDS_${PN}-ptest += "make" 18RDEPENDS_${PN}-ptest += "make"