summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch10
-rw-r--r--meta/recipes-extended/ethtool/ethtool_5.1.bb (renamed from meta/recipes-extended/ethtool/ethtool_5.0.bb)7
2 files changed, 10 insertions, 7 deletions
diff --git a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
index b145188d7f..7a0e38a394 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 1484545a150de79483b6e2a74be02ebd030f1920 Mon Sep 17 00:00:00 2001 1From 2ca4c2492c4a06b28012e3e1033d10aa48f153b4 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.
@@ -9,17 +9,16 @@ serial-tests is required to generate those targets.
9Signed-off-by: Tudor Florea <tudor.florea@enea.com> 9Signed-off-by: Tudor Florea <tudor.florea@enea.com>
10Upstream-Status: Inappropriate 10Upstream-Status: Inappropriate
11(default automake behavior incompatible with ptest) 11(default automake behavior incompatible with ptest)
12
13--- 12---
14 configure.ac | 2 +- 13 configure.ac | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
16 15
17diff --git a/configure.ac b/configure.ac 16diff --git a/configure.ac b/configure.ac
18index e891d91..600f8a8 100644 17index 2941a65..b0a1896 100644
19--- a/configure.ac 18--- a/configure.ac
20+++ b/configure.ac 19+++ b/configure.ac
21@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. 20@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
22 AC_INIT(ethtool, 5.0, netdev@vger.kernel.org) 21 AC_INIT(ethtool, 5.1, netdev@vger.kernel.org)
23 AC_PREREQ(2.52) 22 AC_PREREQ(2.52)
24 AC_CONFIG_SRCDIR([ethtool.c]) 23 AC_CONFIG_SRCDIR([ethtool.c])
25-AM_INIT_AUTOMAKE([gnu]) 24-AM_INIT_AUTOMAKE([gnu])
@@ -27,3 +26,6 @@ index e891d91..600f8a8 100644
27 AC_CONFIG_HEADERS([ethtool-config.h]) 26 AC_CONFIG_HEADERS([ethtool-config.h])
28 27
29 AM_MAINTAINER_MODE 28 AM_MAINTAINER_MODE
29--
302.17.1
31
diff --git a/meta/recipes-extended/ethtool/ethtool_5.0.bb b/meta/recipes-extended/ethtool/ethtool_5.1.bb
index 76cdf9c4e7..d379d93bcf 100644
--- a/meta/recipes-extended/ethtool/ethtool_5.0.bb
+++ b/meta/recipes-extended/ethtool/ethtool_5.1.bb
@@ -11,10 +11,11 @@ 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] = "8998c9eb7e491b0aec420a807ce52ba6" 14SRC_URI[md5sum] = "5d3aad86aec055348a37e867695a744a"
15SRC_URI[sha256sum] = "cc53a6d4d5643f8993ef20d6b638f88d9035529a9e777e222073c3a5b9237178" 15SRC_URI[sha256sum] = "4edb1fa4d7cf5667a5958d4213f61609f96d02cda90d2b6ec440561f8f8ffbf2"
16
17inherit autotools ptest bash-completion
16 18
17inherit autotools ptest
18RDEPENDS_${PN}-ptest += "make" 19RDEPENDS_${PN}-ptest += "make"
19 20
20do_compile_ptest() { 21do_compile_ptest() {