diff options
-rw-r--r-- | meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch | 10 | ||||
-rw-r--r-- | meta/recipes-extended/ethtool/ethtool_5.2.bb (renamed from meta/recipes-extended/ethtool/ethtool_5.1.bb) | 4 |
2 files changed, 6 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 7a0e38a394..7c5d4f956b 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 @@ | |||
1 | From 2ca4c2492c4a06b28012e3e1033d10aa48f153b4 Mon Sep 17 00:00:00 2001 | 1 | From f8333f7759717b4d163cfe8e3ef8861c5a667324 Mon Sep 17 00:00:00 2001 |
2 | From: Tudor Florea <tudor.florea@enea.com> | 2 | From: Tudor Florea <tudor.florea@enea.com> |
3 | Date: Wed, 28 May 2014 18:59:54 +0200 | 3 | Date: Wed, 28 May 2014 18:59:54 +0200 |
4 | Subject: [PATCH] ethtool: use serial-tests config needed by ptest. | 4 | Subject: [PATCH] ethtool: use serial-tests config needed by ptest. |
@@ -9,16 +9,17 @@ serial-tests is required to generate those targets. | |||
9 | Signed-off-by: Tudor Florea <tudor.florea@enea.com> | 9 | Signed-off-by: Tudor Florea <tudor.florea@enea.com> |
10 | Upstream-Status: Inappropriate | 10 | Upstream-Status: Inappropriate |
11 | (default automake behavior incompatible with ptest) | 11 | (default automake behavior incompatible with ptest) |
12 | |||
12 | --- | 13 | --- |
13 | configure.ac | 2 +- | 14 | configure.ac | 2 +- |
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 16 | ||
16 | diff --git a/configure.ac b/configure.ac | 17 | diff --git a/configure.ac b/configure.ac |
17 | index 2941a65..b0a1896 100644 | 18 | index 2127fdb..4910e6f 100644 |
18 | --- a/configure.ac | 19 | --- a/configure.ac |
19 | +++ b/configure.ac | 20 | +++ b/configure.ac |
20 | @@ -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. |
21 | AC_INIT(ethtool, 5.1, netdev@vger.kernel.org) | 22 | AC_INIT(ethtool, 5.2, netdev@vger.kernel.org) |
22 | AC_PREREQ(2.52) | 23 | AC_PREREQ(2.52) |
23 | AC_CONFIG_SRCDIR([ethtool.c]) | 24 | AC_CONFIG_SRCDIR([ethtool.c]) |
24 | -AM_INIT_AUTOMAKE([gnu]) | 25 | -AM_INIT_AUTOMAKE([gnu]) |
@@ -26,6 +27,3 @@ index 2941a65..b0a1896 100644 | |||
26 | AC_CONFIG_HEADERS([ethtool-config.h]) | 27 | AC_CONFIG_HEADERS([ethtool-config.h]) |
27 | 28 | ||
28 | AM_MAINTAINER_MODE | 29 | AM_MAINTAINER_MODE |
29 | -- | ||
30 | 2.17.1 | ||
31 | |||
diff --git a/meta/recipes-extended/ethtool/ethtool_5.1.bb b/meta/recipes-extended/ethtool/ethtool_5.2.bb index d379d93bcf..e9759bd21b 100644 --- a/meta/recipes-extended/ethtool/ethtool_5.1.bb +++ b/meta/recipes-extended/ethtool/ethtool_5.2.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 | ||
14 | SRC_URI[md5sum] = "5d3aad86aec055348a37e867695a744a" | 14 | SRC_URI[md5sum] = "79cff0d4af62b030ad28be90414b5c4a" |
15 | SRC_URI[sha256sum] = "4edb1fa4d7cf5667a5958d4213f61609f96d02cda90d2b6ec440561f8f8ffbf2" | 15 | SRC_URI[sha256sum] = "8ad6cb30f6e1767d9d23a5cb5f606f3b51f83e85ebf0153c1506194f6709e90b" |
16 | 16 | ||
17 | inherit autotools ptest bash-completion | 17 | inherit autotools ptest bash-completion |
18 | 18 | ||