summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/ethtool
diff options
context:
space:
mode:
authorPaul Barker <paul@paulbarker.me.uk>2014-08-20 12:21:12 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-23 09:26:09 +0100
commit06d529ce79c1a3a32d9885390e47f77405246cc3 (patch)
tree3b5a4037b16e273a092a03851bc968b38043a8a9 /meta/recipes-extended/ethtool
parente335d9519c883165e70cda5c1fde348391686e31 (diff)
downloadpoky-06d529ce79c1a3a32d9885390e47f77405246cc3.tar.gz
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>
Diffstat (limited to 'meta/recipes-extended/ethtool')
-rw-r--r--meta/recipes-extended/ethtool/ethtool/ethtool-uint.patch50
-rw-r--r--meta/recipes-extended/ethtool/ethtool_3.14.bb1
2 files changed, 51 insertions, 0 deletions
diff --git a/meta/recipes-extended/ethtool/ethtool/ethtool-uint.patch b/meta/recipes-extended/ethtool/ethtool/ethtool-uint.patch
new file mode 100644
index 0000000000..bb96a18d82
--- /dev/null
+++ b/meta/recipes-extended/ethtool/ethtool/ethtool-uint.patch
@@ -0,0 +1,50 @@
1Fix build with musl by using correct uint type names.
2
3This patch is taken from Sabotage Linux, the license statement for patches and
4build scripts in Sabotage Linux says:
5
6 To the extent possible under law, Christian Neukirchen has waived
7 all copyright and related or neighboring rights to this work.
8
9 http://creativecommons.org/publicdomain/zero/1.0/
10
11Therefore this should be good to include in OpenEmbedded.
12
13Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
14
15Upstream-status: Pending
16
17diff -u ethtool-3.14.org/internal.h ethtool-3.14/internal.h
18--- ethtool-3.14.org/internal.h
19+++ ethtool-3.14/internal.h
20@@ -7,6 +7,7 @@
21 #include "ethtool-config.h"
22 #endif
23 #include <stdio.h>
24+#include <stdint.h>
25 #include <stdlib.h>
26 #include <string.h>
27 #include <sys/types.h>
28@@ -17,16 +18,16 @@
29
30 /* ethtool.h expects these to be defined by <linux/types.h> */
31 #ifndef HAVE_BE_TYPES
32-typedef __uint16_t __be16;
33-typedef __uint32_t __be32;
34+typedef uint16_t __be16;
35+typedef uint32_t __be32;
36 typedef unsigned long long __be64;
37 #endif
38
39 typedef unsigned long long u64;
40-typedef __uint32_t u32;
41-typedef __uint16_t u16;
42-typedef __uint8_t u8;
43-typedef __int32_t s32;
44+typedef uint32_t u32;
45+typedef uint16_t u16;
46+typedef uint8_t u8;
47+typedef int32_t s32;
48
49 #include "ethtool-copy.h"
50 #include "net_tstamp-copy.h"
diff --git a/meta/recipes-extended/ethtool/ethtool_3.14.bb b/meta/recipes-extended/ethtool/ethtool_3.14.bb
index 49c79b68d7..bc3b295a46 100644
--- a/meta/recipes-extended/ethtool/ethtool_3.14.bb
+++ b/meta/recipes-extended/ethtool/ethtool_3.14.bb
@@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
9SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ 9SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \
10 file://run-ptest \ 10 file://run-ptest \
11 file://avoid_parallel_tests.patch \ 11 file://avoid_parallel_tests.patch \
12 file://ethtool-uint.patch \
12 " 13 "
13 14
14SRC_URI[md5sum] = "997e20c25c43ad5800f8ae3204455a8a" 15SRC_URI[md5sum] = "997e20c25c43ad5800f8ae3204455a8a"