summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-12-26 10:26:52 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-30 14:01:06 +0000
commit9ca51c8241883f0082d62e4aaa1278915d4d2912 (patch)
tree6e1bf7698f1c7f18ab7ec8f6f15b724edb4c15e7 /meta
parent8ff9bbd64f430e4f9c77a4c8606a919bc8ece000 (diff)
downloadpoky-9ca51c8241883f0082d62e4aaa1278915d4d2912.tar.gz
ethtool: upgrade 5.9 -> 5.10
(From OE-Core rev: 2a65abeee1888108c2cbcc989f2774fe9ce28366) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch6
-rw-r--r--meta/recipes-extended/ethtool/ethtool_5.10.bb (renamed from meta/recipes-extended/ethtool/ethtool_5.9.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 673b35033f..54aec01284 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 538bd5ec36d88f17803cb848cbbfe62ad51fc2f4 Mon Sep 17 00:00:00 2001 1From b493e2fb472307997576eef33cce784594070f44 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 0162155..6866e72 100644 18index 13c2bc0..0b6ca1d 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.9, netdev@vger.kernel.org) 22 AC_INIT(ethtool, 5.10, 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.9.bb b/meta/recipes-extended/ethtool/ethtool_5.10.bb
index 2d2f9b77f0..5c0df3acbc 100644
--- a/meta/recipes-extended/ethtool/ethtool_5.9.bb
+++ b/meta/recipes-extended/ethtool/ethtool_5.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] = "f934a830554c46d7d60b1a9147f4cab15589b7e09344c4b79b1948b740f0a725" 14SRC_URI[sha256sum] = "4b86adb3ed913c1ef14a276301981f696ab4ec360c19f0a5b68235c4756abae5"
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