ethtool: 3.16 -> 4.0

Removed ethtool-uint.patch since it is already in the source.

(From OE-Core rev: 0a5bb9f617dffbfddf599555cff5f5536f10b93f)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Robert Yang 2015-06-02 02:55:28 -07:00 committed by Richard Purdie
parent 46ccf0a8f0
commit 359585a8b6
2 changed files with 2 additions and 53 deletions

View File

@ -1,50 +0,0 @@
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"

View File

@ -9,11 +9,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
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"
SRC_URI[md5sum] = "0a1c78787c7dcf077016ed86372a472f"
SRC_URI[sha256sum] = "e200516727cc9583e8b63fd6e72f667f9ed41bb4f0577ff4803b60c64cfd1dbc"
inherit autotools ptest
RDEPENDS_${PN}-ptest += "make"