summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHong Liu <hongl.fnst@cn.fujitsu.com>2018-07-10 10:42:01 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-15 16:16:16 +0100
commit46ac750de62fd7cb3bc763db35d187fd7b445f2d (patch)
tree7feaa01a9e928adcca9a3be04d767cc258221840
parent3c16339f7321ca9476f16f5235974b42b6d6d4ad (diff)
downloadpoky-46ac750de62fd7cb3bc763db35d187fd7b445f2d.tar.gz
ethtool:4.16 -> 4.17
Upgrade ethtool from 4.16 to 4.17 (From OE-Core rev: 11dc07b0d2f3b3c0ff9edc5e6aac3da100cbf588) Signed-off-by: Hong Liu <hongl.fnst@cn.fujitsu.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch6
-rw-r--r--meta/recipes-extended/ethtool/ethtool_4.17.bb (renamed from meta/recipes-extended/ethtool/ethtool_4.16.bb)4
2 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
index ccb4dd3adb..d81320a94d 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 d069dada68b063e386cdb61707f0b22fb1799029 Mon Sep 17 00:00:00 2001 1From 1484545a150de79483b6e2a74be02ebd030f1920 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,11 +15,11 @@ 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 cb61a02..c75b9a9 100644 18index e891d91..600f8a8 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, 4.16, netdev@vger.kernel.org) 22 AC_INIT(ethtool, 4.17, 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])
diff --git a/meta/recipes-extended/ethtool/ethtool_4.16.bb b/meta/recipes-extended/ethtool/ethtool_4.17.bb
index 5ccb16294a..844a958ed9 100644
--- a/meta/recipes-extended/ethtool/ethtool_4.16.bb
+++ b/meta/recipes-extended/ethtool/ethtool_4.17.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] = "2b50adf06fc1b033951edef5987c32f3" 14SRC_URI[md5sum] = "4dba0345a4ab9f51b4a4a9739284238d"
15SRC_URI[sha256sum] = "25f8fc3a4b2cb2cbfe8741148d8e743127dd7c951df96d8d6dccb88741f8a27d" 15SRC_URI[sha256sum] = "4130142a15f7409d18de3667998f3c99fba52fd7c8d94be7ecdabf8dcab3d6c1"
16 16
17inherit autotools ptest 17inherit autotools ptest
18RDEPENDS_${PN}-ptest += "make" 18RDEPENDS_${PN}-ptest += "make"