From c2a7441ae1e31951cbd762e7dd9414b2f92258ce Mon Sep 17 00:00:00 2001 From: Changhyeok Bae Date: Tue, 27 Mar 2018 00:50:30 +0000 Subject: ethtool: update 4.13 -> 4.15 (From OE-Core rev: 75ae2a49149da1b81476555af744a35c700af53e) Signed-off-by: Changhyeok Bae Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../ethtool/ethtool/avoid_parallel_tests.patch | 21 ++++++++++----- meta/recipes-extended/ethtool/ethtool_4.13.bb | 30 ---------------------- meta/recipes-extended/ethtool/ethtool_4.15.bb | 30 ++++++++++++++++++++++ 3 files changed, 45 insertions(+), 36 deletions(-) delete mode 100644 meta/recipes-extended/ethtool/ethtool_4.13.bb create mode 100644 meta/recipes-extended/ethtool/ethtool_4.15.bb (limited to 'meta/recipes-extended/ethtool') diff --git a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch index de38104044..59299e24ef 100644 --- a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch +++ b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch @@ -1,3 +1,8 @@ +From d069dada68b063e386cdb61707f0b22fb1799029 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. @@ -5,12 +10,16 @@ Signed-off-by: Tudor Florea Upstream-Status: Inappropriate (default automake behavior incompatible with ptest) -Index: ethtool-4.13/configure.ac -=================================================================== ---- ethtool-4.13.orig/configure.ac -+++ ethtool-4.13/configure.ac -@@ -2,7 +2,7 @@ dnl Process this file with autoconf to p - AC_INIT(ethtool, 4.13, netdev@vger.kernel.org) +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index cb61a02..c75b9a9 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, 4.15, netdev@vger.kernel.org) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([ethtool.c]) -AM_INIT_AUTOMAKE([gnu]) diff --git a/meta/recipes-extended/ethtool/ethtool_4.13.bb b/meta/recipes-extended/ethtool/ethtool_4.13.bb deleted file mode 100644 index c862a57955..0000000000 --- a/meta/recipes-extended/ethtool/ethtool_4.13.bb +++ /dev/null @@ -1,30 +0,0 @@ -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[md5sum] = "2ba44eb0ca96752392e9bf8dc83ba302" -SRC_URI[sha256sum] = "d311c4b557c44c5248ac5436b9e19c391a60d8e4830b6a7f41be16d89c0556de" - -inherit autotools ptest -RDEPENDS_${PN}-ptest += "make" - -do_compile_ptest() { - oe_runmake buildtest-TESTS -} - -do_install_ptest () { - cp ${B}/Makefile ${D}${PTEST_PATH} - install ${B}/test-cmdline ${D}${PTEST_PATH} - install ${B}/test-features ${D}${PTEST_PATH} - install ${B}/ethtool ${D}${PTEST_PATH}/ethtool - sed -i 's/^Makefile/_Makefile/' ${D}${PTEST_PATH}/Makefile -} diff --git a/meta/recipes-extended/ethtool/ethtool_4.15.bb b/meta/recipes-extended/ethtool/ethtool_4.15.bb new file mode 100644 index 0000000000..8538a75204 --- /dev/null +++ b/meta/recipes-extended/ethtool/ethtool_4.15.bb @@ -0,0 +1,30 @@ +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[md5sum] = "a4b83b35a4bc7d3646d973b0baf36c78" +SRC_URI[sha256sum] = "3996127fc22950b865287bd9d28c0aa3fcd44e914a5a4ef01de64872106dc178" + +inherit autotools ptest +RDEPENDS_${PN}-ptest += "make" + +do_compile_ptest() { + oe_runmake buildtest-TESTS +} + +do_install_ptest () { + cp ${B}/Makefile ${D}${PTEST_PATH} + install ${B}/test-cmdline ${D}${PTEST_PATH} + install ${B}/test-features ${D}${PTEST_PATH} + install ${B}/ethtool ${D}${PTEST_PATH}/ethtool + sed -i 's/^Makefile/_Makefile/' ${D}${PTEST_PATH}/Makefile +} -- cgit v1.2.3-54-g00ecf