summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2023-06-14 11:28:40 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-06-15 21:25:42 +0100
commit6b3bf71b60b98c6810a1c8f91255fef0a113872c (patch)
tree306c10c621f60a953090ae746733770dee69b909
parent7ef460054911a293c0082abc09c93198873fe1ec (diff)
downloadpoky-6b3bf71b60b98c6810a1c8f91255fef0a113872c.tar.gz
ethtool: upgrade 6.2 -> 6.3
(From OE-Core rev: 6a83cc790fd479be5321f659edfa9641ecb80da5) Signed-off-by: Alexander Kanavin <alex@linutronix.de> 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.3.bb (renamed from meta/recipes-extended/ethtool/ethtool_6.2.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 d5cb8705c2..5e9024834c 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 b4ec6635af4d4a47e9ab7bbd5347e78710d19362 Mon Sep 17 00:00:00 2001 1From 08f887f4bc65684397bf8ec30cc61d91d894deac 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 ebdfd39..c93b79a 100644 18index c1e0012..c460398 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, 6.2, netdev@vger.kernel.org) 22 AC_INIT(ethtool, 6.3, 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_6.2.bb b/meta/recipes-extended/ethtool/ethtool_6.3.bb
index aea03b729d..504e645966 100644
--- a/meta/recipes-extended/ethtool/ethtool_6.2.bb
+++ b/meta/recipes-extended/ethtool/ethtool_6.3.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] = "1a9f95c3d8c1795a942220912d72c06a208f1c122a78f7690259402856ff06a0" 14SRC_URI[sha256sum] = "342d37d3fe19da79d0276c4c69c34c61f1ad8f87b06514d664bf1eeb29bfd525"
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