From 282785a4674638fac7f00ce38cf5beef1e35c2fc Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 22 Sep 2023 09:24:05 +0200 Subject: [PATCH] ethtool: upgrade 6.3 -> 6.5 Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- .../ethtool/ethtool/avoid_parallel_tests.patch | 8 ++++---- .../ethtool/{ethtool_6.3.bb => ethtool_6.5.bb} | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) rename meta/recipes-extended/ethtool/{ethtool_6.3.bb => ethtool_6.5.bb} (93%) diff --git a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch index 5e9024834cf..409c8de6858 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 @@ -From 08f887f4bc65684397bf8ec30cc61d91d894deac Mon Sep 17 00:00:00 2001 +From 0c77437267601d40d7ce9efd87eb4b82a5675d2f Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Wed, 28 May 2014 18:59:54 +0200 Subject: [PATCH] ethtool: use serial-tests config needed by ptest. @@ -15,12 +15,12 @@ Upstream-Status: Inappropriate 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index c1e0012..c460398 100644 +index 11efb99..b5ce018 100644 --- a/configure.ac +++ b/configure.ac -@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. - AC_INIT(ethtool, 6.3, netdev@vger.kernel.org) +@@ -3,7 +3,7 @@ AC_INIT(ethtool, 6.5, netdev@vger.kernel.org) AC_PREREQ(2.52) + AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([ethtool.c]) -AM_INIT_AUTOMAKE([gnu subdir-objects]) +AM_INIT_AUTOMAKE([gnu subdir-objects serial-tests]) diff --git a/meta/recipes-extended/ethtool/ethtool_6.3.bb b/meta/recipes-extended/ethtool/ethtool_6.5.bb similarity index 93% rename from meta/recipes-extended/ethtool/ethtool_6.3.bb rename to meta/recipes-extended/ethtool/ethtool_6.5.bb index 504e6459664..ef925e16b9c 100644 --- a/meta/recipes-extended/ethtool/ethtool_6.3.bb +++ b/meta/recipes-extended/ethtool/ethtool_6.5.bb @@ -11,7 +11,7 @@ SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ file://avoid_parallel_tests.patch \ " -SRC_URI[sha256sum] = "342d37d3fe19da79d0276c4c69c34c61f1ad8f87b06514d664bf1eeb29bfd525" +SRC_URI[sha256sum] = "aed41ca58b3129126f18429172064d214191d7e7ef52c6e3f6b2ff7503706c03" UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/" -- 2.47.3