summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChanghyeok Bae <changhyeok.bae@gmail.com>2022-10-28 19:32:56 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-10-29 16:28:36 +0100
commit756e940f15a6a02878b9c694d6eeafb4bba81960 (patch)
tree1cec496eaf390ce7a3ee7fdd6a6b08ada39381a0
parent65e3e1917edc04a7503eb455a6381fb66fbc455e (diff)
downloadpoky-756e940f15a6a02878b9c694d6eeafb4bba81960.tar.gz
ethtool: upgrade 5.19 -> 6.0
(From OE-Core rev: f1c8f93fdf5abecb58fef58a32c7ab066270ac7c) Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.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_6.0.bb (renamed from meta/recipes-extended/ethtool/ethtool_5.19.bb)2
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
index f8703d8145..c3cefbb5e6 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 2ceea729810475ca8988e2955dc33b5843520e6b Mon Sep 17 00:00:00 2001 1From dea90ab711acad251b5d8536c534409979ea8be4 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 cc3525c..873af9b 100644 18index 89d0e70..ab2be9c 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, 5.19, netdev@vger.kernel.org) 22 AC_INIT(ethtool, 6.0, 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 subdir-objects]) 25-AM_INIT_AUTOMAKE([gnu subdir-objects])
diff --git a/meta/recipes-extended/ethtool/ethtool_5.19.bb b/meta/recipes-extended/ethtool/ethtool_6.0.bb
index 8c995b21e1..8f36520b00 100644
--- a/meta/recipes-extended/ethtool/ethtool_5.19.bb
+++ b/meta/recipes-extended/ethtool/ethtool_6.0.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] = "24412dcd4ac886177abd68282efa98914a4dd2497218e298e7049e9cb72b2336" 14SRC_URI[sha256sum] = "f2168e2b45d7e58ed5b76e5533fd607ca0720c9e631f4271bfe997bf72330796"
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