diff options
Diffstat (limited to 'meta/recipes-extended/ethtool')
| -rw-r--r-- | meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch | 24 | ||||
| -rw-r--r-- | meta/recipes-extended/ethtool/ethtool_6.7.bb (renamed from meta/recipes-extended/ethtool/ethtool_4.13.bb) | 19 |
2 files changed, 30 insertions, 13 deletions
diff --git a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch index bf66267e81..69df8632f2 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 758fde7186730ee331a0ee6149276cd412766ee0 Mon Sep 17 00:00:00 2001 +From: Tudor Florea <tudor.florea@enea.com> +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,15 +10,20 @@ Signed-off-by: Tudor Florea <tudor.florea@enea.com> Upstream-Status: Inappropriate (default automake behavior incompatible with ptest) -diff -ruN a/configure.ac b/configure.ac ---- a/configure.ac 2014-05-28 18:19:13.513980977 +0200 -+++ b/configure.ac 2014-05-28 18:19:21.129660215 +0200 -@@ -2,7 +2,7 @@ - AC_INIT(ethtool, 3.14, netdev@vger.kernel.org) +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index c871558..8ea1eaa 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3,7 +3,7 @@ AC_INIT(ethtool, 6.7, netdev@vger.kernel.org) AC_PREREQ(2.52) + AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([ethtool.c]) --AM_INIT_AUTOMAKE([gnu]) -+AM_INIT_AUTOMAKE([gnu serial-tests]) +-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/recipes-extended/ethtool/ethtool_4.13.bb b/meta/recipes-extended/ethtool/ethtool_6.7.bb index c862a57955..33df0e0e80 100644 --- a/meta/recipes-extended/ethtool/ethtool_4.13.bb +++ b/meta/recipes-extended/ethtool/ethtool_6.7.bb @@ -2,7 +2,7 @@ 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+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://ethtool.c;beginline=4;endline=17;md5=c19b30548c582577fc6b443626fc1216" @@ -11,11 +11,16 @@ SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ file://avoid_parallel_tests.patch \ " -SRC_URI[md5sum] = "2ba44eb0ca96752392e9bf8dc83ba302" -SRC_URI[sha256sum] = "d311c4b557c44c5248ac5436b9e19c391a60d8e4830b6a7f41be16d89c0556de" +SRC_URI[sha256sum] = "ace0e95a03b38208af4ebacb415244568ace44c5d5a279ea434844f900179c75" -inherit autotools ptest -RDEPENDS_${PN}-ptest += "make" +UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/" + +inherit autotools ptest bash-completion pkgconfig + +RDEPENDS:${PN}-ptest += "make bash" + +PACKAGECONFIG ?= "netlink" +PACKAGECONFIG[netlink] = "--enable-netlink,--disable-netlink,libmnl," do_compile_ptest() { oe_runmake buildtest-TESTS @@ -24,7 +29,9 @@ do_compile_ptest() { do_install_ptest () { cp ${B}/Makefile ${D}${PTEST_PATH} install ${B}/test-cmdline ${D}${PTEST_PATH} - install ${B}/test-features ${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 } |