ethtool: Fix musl build failure

We just need to ensure the proper names for uint types are used.

(From OE-Core rev: 1d381aa15896c133ce0f5bc5b62e3a416e5deb02)

Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Barker 2014-08-20 12:21:12 +00:00 committed by Richard Purdie
parent e335d9519c
commit 06d529ce79
2 changed files with 51 additions and 0 deletions

View File

@ -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"

View File

@ -9,6 +9,7 @@ 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] = "997e20c25c43ad5800f8ae3204455a8a"