On Wed, Jul 21, 2021 at 06:28:53PM +0300, Grygorii Strashko wrote:
> Upgrade ethtool to 5.10

If this is being backported from master of later release of oe-core, might 
want to mention that in the commit log, so can be dropped when migrating to 
the new LTS next year.


> Signed-off-by: Grygorii Strashko <[email protected]>
> ---
>  .../ethtool/avoid_parallel_tests.patch        | 29 +++++++++++++++
>  .../ethtool/ethtool/run-ptest                 |  2 +
>  .../ethtool/ethtool_5.10.bb                   | 37 +++++++++++++++++++
>  3 files changed, 68 insertions(+)
>  create mode 100644 
> meta-arago-distro/recipes-connectivity/ethtool/ethtool/avoid_parallel_tests.patch
>  create mode 100644 
> meta-arago-distro/recipes-connectivity/ethtool/ethtool/run-ptest
>  create mode 100644 
> meta-arago-distro/recipes-connectivity/ethtool/ethtool_5.10.bb
> 
> diff --git 
> a/meta-arago-distro/recipes-connectivity/ethtool/ethtool/avoid_parallel_tests.patch
>  
> b/meta-arago-distro/recipes-connectivity/ethtool/ethtool/avoid_parallel_tests.patch
> new file mode 100644
> index 00000000..54aec012
> --- /dev/null
> +++ 
> b/meta-arago-distro/recipes-connectivity/ethtool/ethtool/avoid_parallel_tests.patch
> @@ -0,0 +1,29 @@
> +From b493e2fb472307997576eef33cce784594070f44 Mon Sep 17 00:00:00 2001
> +From: Tudor Florea <[email protected]>
> +Date: Wed, 28 May 2014 18:59:54 +0200
> +Subject: [PATCH] ethtool: use serial-tests config needed by ptest.
> +
> +ptest needs buildtest-TESTS and runtest-TESTS targets.
> +serial-tests is required to generate those targets.
> +
> +Signed-off-by: Tudor Florea <[email protected]>
> +Upstream-Status: Inappropriate
> +(default automake behavior incompatible with ptest)
> +
> +---
> + configure.ac | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index 13c2bc0..0b6ca1d 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, 5.10, [email protected])
> + AC_PREREQ(2.52)
> + AC_CONFIG_SRCDIR([ethtool.c])
> +-AM_INIT_AUTOMAKE([gnu subdir-objects])
> ++AM_INIT_AUTOMAKE([gnu subdir-objects serial-tests])
> + AC_CONFIG_HEADERS([ethtool-config.h])
> + 
> + AM_MAINTAINER_MODE
> diff --git a/meta-arago-distro/recipes-connectivity/ethtool/ethtool/run-ptest 
> b/meta-arago-distro/recipes-connectivity/ethtool/ethtool/run-ptest
> new file mode 100644
> index 00000000..1e245da1
> --- /dev/null
> +++ b/meta-arago-distro/recipes-connectivity/ethtool/ethtool/run-ptest
> @@ -0,0 +1,2 @@
> +#!/bin/sh
> +make -k runtest-TESTS
> diff --git a/meta-arago-distro/recipes-connectivity/ethtool/ethtool_5.10.bb 
> b/meta-arago-distro/recipes-connectivity/ethtool/ethtool_5.10.bb
> new file mode 100644
> index 00000000..5c0df3ac
> --- /dev/null
> +++ b/meta-arago-distro/recipes-connectivity/ethtool/ethtool_5.10.bb
> @@ -0,0 +1,37 @@
> +SUMMARY = "Display or change ethernet card settings"
> +DESCRIPTION = "A small utility for examining and tuning the settings of your 
> ethernet-based network interfaces."
> +HOMEPAGE = "http://www.kernel.org/pub/software/network/ethtool/";
> +SECTION = "console/network"
> +LICENSE = "GPLv2+"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
> +                    
> file://ethtool.c;beginline=4;endline=17;md5=c19b30548c582577fc6b443626fc1216"
> +
> +SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz 
> \
> +           file://run-ptest \
> +           file://avoid_parallel_tests.patch \
> +           "
> +
> +SRC_URI[sha256sum] = 
> "4b86adb3ed913c1ef14a276301981f696ab4ec360c19f0a5b68235c4756abae5"
> +
> +UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/";
> +
> +inherit autotools ptest bash-completion pkgconfig
> +
> +RDEPENDS_${PN}-ptest += "make"
> +
> +PACKAGECONFIG ?= "netlink"
> +PACKAGECONFIG[netlink] = "--enable-netlink,--disable-netlink,libmnl,"
> +
> +do_compile_ptest() {
> +   oe_runmake buildtest-TESTS
> +}
> +
> +do_install_ptest () {
> +   cp ${B}/Makefile                 ${D}${PTEST_PATH}
> +   install ${B}/test-cmdline        ${D}${PTEST_PATH}
> +   if ${@bb.utils.contains('PACKAGECONFIG', 'netlink', 'false', 'true', d)}; 
> then
> +       install ${B}/test-features       ${D}${PTEST_PATH}
> +   fi
> +   install ${B}/ethtool             ${D}${PTEST_PATH}/ethtool
> +   sed -i 's/^Makefile/_Makefile/'  ${D}${PTEST_PATH}/Makefile
> +}
> -- 
> 2.17.1
> 

-- 
Regards,
Denys Dmytriyenko <[email protected]>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186  6D76 4209 0272 9A92 C964
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Reply via email to