From c91650a05cc1b0de7ec338dc589caec656132d89 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 22 Mar 2014 21:03:17 +0100
Subject: fix ethtool for musl

---
 package/ethtool/Makefile                 | 10 ++++++----
 package/ethtool/patches/patch-internal_h | 25 +++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 package/ethtool/patches/patch-internal_h

(limited to 'package/ethtool')

diff --git a/package/ethtool/Makefile b/package/ethtool/Makefile
index f6be14fb9..73bd1d886 100644
--- a/package/ethtool/Makefile
+++ b/package/ethtool/Makefile
@@ -4,12 +4,14 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ethtool
-PKG_VERSION:=		2.6.36
+PKG_VERSION:=		3.13
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		3b2322695e9ee7bf447ebcdb85f93e83
-PKG_DESCR:=		Display or change ethernet card settings
+PKG_MD5SUM:=		dcb8f345d44ee79108282e7d0bdf5013
+PKG_DESCR:=		display or change ethernet card settings
 PKG_SECTION:=		net
-PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=gkernel/}
+PKG_SITES:=		https://www.kernel.org/pub/software/network/ethtool/
+
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/ethtool/patches/patch-internal_h b/package/ethtool/patches/patch-internal_h
new file mode 100644
index 000000000..ceb246c07
--- /dev/null
+++ b/package/ethtool/patches/patch-internal_h
@@ -0,0 +1,25 @@
+--- ethtool-3.13.orig/internal.h	2014-01-27 02:27:14.000000000 +0100
++++ ethtool-3.13/internal.h	2014-03-22 20:49:34.000000000 +0100
+@@ -17,16 +17,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"
-- 
cgit v1.2.3


From 83d2d4b2a47526c67cd93d6a677e7b2c2d2f4d4c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 23 Mar 2014 13:49:35 +0100
Subject: fix uclibc compile

---
 package/ethtool/Makefile                 |  2 +-
 package/ethtool/patches/patch-internal_h | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'package/ethtool')

diff --git a/package/ethtool/Makefile b/package/ethtool/Makefile
index 73bd1d886..7834dcfdb 100644
--- a/package/ethtool/Makefile
+++ b/package/ethtool/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ethtool
 PKG_VERSION:=		3.13
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		dcb8f345d44ee79108282e7d0bdf5013
 PKG_DESCR:=		display or change ethernet card settings
 PKG_SECTION:=		net
diff --git a/package/ethtool/patches/patch-internal_h b/package/ethtool/patches/patch-internal_h
index ceb246c07..280f92ce7 100644
--- a/package/ethtool/patches/patch-internal_h
+++ b/package/ethtool/patches/patch-internal_h
@@ -1,6 +1,14 @@
 --- ethtool-3.13.orig/internal.h	2014-01-27 02:27:14.000000000 +0100
-+++ ethtool-3.13/internal.h	2014-03-22 20:49:34.000000000 +0100
-@@ -17,16 +17,16 @@
++++ ethtool-3.13/internal.h	2014-03-23 13:47:54.000000000 +0100
+@@ -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
-- 
cgit v1.2.3