summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2024-08-20 14:51:27 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-08-21 21:51:49 +0100
commitccf38a6bcf49268a934c1aeb4ba4dad077a75f1a (patch)
tree532026dc5c67ea27e48b4ecf47be49448e40e906
parent195d8ea2e95af24df4b77f0d38a004725a017896 (diff)
downloadpoky-ccf38a6bcf49268a934c1aeb4ba4dad077a75f1a.tar.gz
ethtool: upgrade 6.9 -> 6.10
avoid_parallel_tests.patch refreshed for 6.10 Changelog: ========== * Feature: suport for PoE in PSE (--show-pse and --set-pse) * Feature: add statistics support to tsinfo (-T) * Feature: add JSON output to base command (no option) * Feature: add JSON output to EEE info (--show-eee) * Fix: qsfp: better handling on page 03h read failure (-m) * Fix: handle zero arguments for module eeprom dump (-m) * Fix: check for missing arguments in do_srxfh() (-X) * Misc: compiler warnings in "make check" * Misc: more descriptive error when JSON output is not available (From OE-Core rev: ffcffccfec29c18c1b97394d7d707f4b8dd5362e) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch7
-rw-r--r--meta/recipes-extended/ethtool/ethtool_6.10.bb (renamed from meta/recipes-extended/ethtool/ethtool_6.9.bb)2
2 files changed, 4 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 ad4aabaa96..0fe482545a 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 758fde7186730ee331a0ee6149276cd412766ee0 Mon Sep 17 00:00:00 2001 1From 74902bef8123b596437587bb48ad9b720cb06f64 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,16 +9,15 @@ 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 c871558..8ea1eaa 100644 17index f6fe260..65a0566 100644
19--- a/configure.ac 18--- a/configure.ac
20+++ b/configure.ac 19+++ b/configure.ac
21@@ -3,7 +3,7 @@ AC_INIT(ethtool, 6.9, netdev@vger.kernel.org) 20@@ -3,7 +3,7 @@ AC_INIT(ethtool, 6.10, netdev@vger.kernel.org)
22 AC_PREREQ(2.52) 21 AC_PREREQ(2.52)
23 AC_CONFIG_MACRO_DIR([m4]) 22 AC_CONFIG_MACRO_DIR([m4])
24 AC_CONFIG_SRCDIR([ethtool.c]) 23 AC_CONFIG_SRCDIR([ethtool.c])
diff --git a/meta/recipes-extended/ethtool/ethtool_6.9.bb b/meta/recipes-extended/ethtool/ethtool_6.10.bb
index 1837b1ed1e..8a7b2607f3 100644
--- a/meta/recipes-extended/ethtool/ethtool_6.9.bb
+++ b/meta/recipes-extended/ethtool/ethtool_6.10.bb
@@ -11,7 +11,7 @@ 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[sha256sum] = "0011fb1b20101879f2d01d39cd2bc1d9646990d07d64de893415404a3afc53ef" 14SRC_URI[sha256sum] = "2b266c45c0fe00e5f5b462ee4e795879fa4247003bf73c5a07a2279d801be058"
15 15
16UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/" 16UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/"
17 17