[PATCH] ethtool: temporarily overlay 3.16 from master, as daisy provides 3.13

[PATCH] ethtool: temporarily overlay 3.16 from master, as daisy provides 3.13

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@ti.com>

Need 3.14+ for switch config options.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 .../ethtool/ethtool/avoid_parallel_tests.patch     | 19 ++++++++
 .../ethtool/ethtool/ethtool-uint.patch             | 50 ++++++++++++++++++++++
 .../recipes-extended/ethtool/ethtool/run-ptest     |  2 +
 .../recipes-extended/ethtool/ethtool_3.16.bb       | 31 ++++++++++++++
 4 files changed, 102 insertions(+)
 create mode 100644 meta-arago-extras/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
 create mode 100644 meta-arago-extras/recipes-extended/ethtool/ethtool/ethtool-uint.patch
 create mode 100644 meta-arago-extras/recipes-extended/ethtool/ethtool/run-ptest
 create mode 100644 meta-arago-extras/recipes-extended/ethtool/ethtool_3.16.bb

diff --git a/meta-arago-extras/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/meta-arago-extras/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
new file mode 100644
index 0000000..bf66267
--- /dev/null
+++ b/meta-arago-extras/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch
@@ -0,0 +1,19 @@
+ptest needs buildtest-TESTS and runtest-TESTS targets.
+serial-tests is required to generate those targets.
+
+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)
+ AC_PREREQ(2.52)
+ AC_CONFIG_SRCDIR([ethtool.c])
+-AM_INIT_AUTOMAKE([gnu])
++AM_INIT_AUTOMAKE([gnu serial-tests])
+ AC_CONFIG_HEADERS([ethtool-config.h])
+ 
+ AM_MAINTAINER_MODE
diff --git a/meta-arago-extras/recipes-extended/ethtool/ethtool/ethtool-uint.patch b/meta-arago-extras/recipes-extended/ethtool/ethtool/ethtool-uint.patch
new file mode 100644
index 0000000..bb96a18
--- /dev/null
+++ b/meta-arago-extras/recipes-extended/ethtool/ethtool/ethtool-uint.patch
@@ -0,0 +1,50 @@
+Fix build with musl by using correct uint type names.
+
+This patch is taken from Sabotage Linux, the license statement for patches and
+build scripts in Sabotage Linux says:
+
+    To the extent possible under law, Christian Neukirchen has waived
+    all copyright and related or neighboring rights to this work.
+
+    http://creativecommons.org/publicdomain/zero/1.0/
+
+Therefore this should be good to include in OpenEmbedded.
+
+Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
+
+Upstream-status: Pending
+
+diff -u ethtool-3.14.org/internal.h ethtool-3.14/internal.h
+--- ethtool-3.14.org/internal.h
++++ ethtool-3.14/internal.h
+@@ -7,6 +7,7 @@
+ #include "ethtool-config.h"
+ #endif
+ #include <stdio.h>
++#include <stdint.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/types.h>
+@@ -17,16 +18,16 @@
+ 
+ /* ethtool.h expects these to be defined by <linux/types.h> */
+ #ifndef HAVE_BE_TYPES
+-typedef __uint16_t __be16;
+-typedef __uint32_t __be32;
++typedef uint16_t __be16;
++typedef uint32_t __be32;
+ typedef unsigned long long __be64;
+ #endif
+ 
+ typedef unsigned long long u64;
+-typedef __uint32_t u32;
+-typedef __uint16_t u16;
+-typedef __uint8_t u8;
+-typedef __int32_t s32;
++typedef uint32_t u32;
++typedef uint16_t u16;
++typedef uint8_t u8;
++typedef int32_t s32;
+ 
+ #include "ethtool-copy.h"
+ #include "net_tstamp-copy.h"
diff --git a/meta-arago-extras/recipes-extended/ethtool/ethtool/run-ptest b/meta-arago-extras/recipes-extended/ethtool/ethtool/run-ptest
new file mode 100644
index 0000000..1e245da
--- /dev/null
+++ b/meta-arago-extras/recipes-extended/ethtool/ethtool/run-ptest
@@ -0,0 +1,2 @@
+#!/bin/sh
+make -k runtest-TESTS
diff --git a/meta-arago-extras/recipes-extended/ethtool/ethtool_3.16.bb b/meta-arago-extras/recipes-extended/ethtool/ethtool_3.16.bb
new file mode 100644
index 0000000..92a0704
--- /dev/null
+++ b/meta-arago-extras/recipes-extended/ethtool/ethtool_3.16.bb
@@ -0,0 +1,31 @@
+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 \
+           file://ethtool-uint.patch \
+           "
+
+SRC_URI[md5sum] = "3806bae34c153e2b9e2859e85c54788d"
+SRC_URI[sha256sum] = "a6f1433824af7b390ed4e66dfc7cee047d6d1f56dbb8ceef9fe905d63aef5275"
+
+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
+}
-- 
2.2.0