From f00a81888ae0a44a6ac4680ac12073a1d4c04cac Mon Sep 17 00:00:00 2001 From: Alexandre Bard Date: Thu, 25 Nov 2021 15:11:42 +0100 Subject: [PATCH] backports ethtool to support broadr interfaces In ethtool 5.13, there is now support for configuring broadr interfaces, like changing the master / slave mode. With the upgrade of the kernel to 5.10, this replaces the sysfs interface. BugzID: 75479 --- .../ethtool/avoid_parallel_tests.patch | 29 +++++++++++++++ .../ethtool/ethtool/run-ptest | 2 + .../recipes-extended/ethtool/ethtool_5.13.bb | 37 +++++++++++++++++++ 3 files changed, 68 insertions(+) create mode 100644 backports/openembedded-layer/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch create mode 100644 backports/openembedded-layer/recipes-extended/ethtool/ethtool/run-ptest create mode 100644 backports/openembedded-layer/recipes-extended/ethtool/ethtool_5.13.bb diff --git a/backports/openembedded-layer/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/backports/openembedded-layer/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch new file mode 100644 index 0000000..3b639eb --- /dev/null +++ b/backports/openembedded-layer/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch @@ -0,0 +1,29 @@ +From e652ccd8965895087887c270fc0d380b61f96b11 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. + +ptest needs buildtest-TESTS and runtest-TESTS targets. +serial-tests is required to generate those targets. + +Signed-off-by: Tudor Florea +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 6b620bf..ff62b2a 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.13, netdev@vger.kernel.org) + 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/backports/openembedded-layer/recipes-extended/ethtool/ethtool/run-ptest b/backports/openembedded-layer/recipes-extended/ethtool/ethtool/run-ptest new file mode 100644 index 0000000..1e245da --- /dev/null +++ b/backports/openembedded-layer/recipes-extended/ethtool/ethtool/run-ptest @@ -0,0 +1,2 @@ +#!/bin/sh +make -k runtest-TESTS diff --git a/backports/openembedded-layer/recipes-extended/ethtool/ethtool_5.13.bb b/backports/openembedded-layer/recipes-extended/ethtool/ethtool_5.13.bb new file mode 100644 index 0000000..3c99deb --- /dev/null +++ b/backports/openembedded-layer/recipes-extended/ethtool/ethtool_5.13.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] = "e66ab0d74d2a888fd64a0053290dbea66ddc9b75b3d21d117b7edd9576b9db60" + +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 +}