diff options
Diffstat (limited to 'meta/recipes-extended/ethtool')
-rw-r--r-- | meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch | 8 | ||||
-rw-r--r-- | meta/recipes-extended/ethtool/ethtool_6.7.bb (renamed from meta/recipes-extended/ethtool/ethtool_5.10.bb) | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch index 54aec01284..69df8632f2 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 @@ | |||
1 | From b493e2fb472307997576eef33cce784594070f44 Mon Sep 17 00:00:00 2001 | 1 | From 758fde7186730ee331a0ee6149276cd412766ee0 Mon Sep 17 00:00:00 2001 |
2 | From: Tudor Florea <tudor.florea@enea.com> | 2 | From: Tudor Florea <tudor.florea@enea.com> |
3 | Date: Wed, 28 May 2014 18:59:54 +0200 | 3 | Date: Wed, 28 May 2014 18:59:54 +0200 |
4 | Subject: [PATCH] ethtool: use serial-tests config needed by ptest. | 4 | Subject: [PATCH] ethtool: use serial-tests config needed by ptest. |
@@ -15,12 +15,12 @@ Upstream-Status: Inappropriate | |||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
16 | 16 | ||
17 | diff --git a/configure.ac b/configure.ac | 17 | diff --git a/configure.ac b/configure.ac |
18 | index 13c2bc0..0b6ca1d 100644 | 18 | index c871558..8ea1eaa 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 | @@ -3,7 +3,7 @@ AC_INIT(ethtool, 6.7, netdev@vger.kernel.org) |
22 | AC_INIT(ethtool, 5.10, netdev@vger.kernel.org) | ||
23 | AC_PREREQ(2.52) | 22 | AC_PREREQ(2.52) |
23 | AC_CONFIG_MACRO_DIR([m4]) | ||
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]) |
26 | +AM_INIT_AUTOMAKE([gnu subdir-objects serial-tests]) | 26 | +AM_INIT_AUTOMAKE([gnu subdir-objects serial-tests]) |
diff --git a/meta/recipes-extended/ethtool/ethtool_5.10.bb b/meta/recipes-extended/ethtool/ethtool_6.7.bb index 5c0df3acbc..33df0e0e80 100644 --- a/meta/recipes-extended/ethtool/ethtool_5.10.bb +++ b/meta/recipes-extended/ethtool/ethtool_6.7.bb | |||
@@ -2,7 +2,7 @@ SUMMARY = "Display or change ethernet card settings" | |||
2 | DESCRIPTION = "A small utility for examining and tuning the settings of your ethernet-based network interfaces." | 2 | DESCRIPTION = "A small utility for examining and tuning the settings of your ethernet-based network interfaces." |
3 | HOMEPAGE = "http://www.kernel.org/pub/software/network/ethtool/" | 3 | HOMEPAGE = "http://www.kernel.org/pub/software/network/ethtool/" |
4 | SECTION = "console/network" | 4 | SECTION = "console/network" |
5 | LICENSE = "GPLv2+" | 5 | LICENSE = "GPL-2.0-or-later" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |
7 | file://ethtool.c;beginline=4;endline=17;md5=c19b30548c582577fc6b443626fc1216" | 7 | file://ethtool.c;beginline=4;endline=17;md5=c19b30548c582577fc6b443626fc1216" |
8 | 8 | ||
@@ -11,13 +11,13 @@ 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 | ||
14 | SRC_URI[sha256sum] = "4b86adb3ed913c1ef14a276301981f696ab4ec360c19f0a5b68235c4756abae5" | 14 | SRC_URI[sha256sum] = "ace0e95a03b38208af4ebacb415244568ace44c5d5a279ea434844f900179c75" |
15 | 15 | ||
16 | UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/" | 16 | UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/" |
17 | 17 | ||
18 | inherit autotools ptest bash-completion pkgconfig | 18 | inherit autotools ptest bash-completion pkgconfig |
19 | 19 | ||
20 | RDEPENDS_${PN}-ptest += "make" | 20 | RDEPENDS:${PN}-ptest += "make bash" |
21 | 21 | ||
22 | PACKAGECONFIG ?= "netlink" | 22 | PACKAGECONFIG ?= "netlink" |
23 | PACKAGECONFIG[netlink] = "--enable-netlink,--disable-netlink,libmnl," | 23 | PACKAGECONFIG[netlink] = "--enable-netlink,--disable-netlink,libmnl," |