diff options
| author | Paul Barker <paul@paulbarker.me.uk> | 2014-08-20 12:21:12 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-23 09:25:04 +0100 |
| commit | 1d381aa15896c133ce0f5bc5b62e3a416e5deb02 (patch) | |
| tree | 0af00b1a5850995cfa85257ad1059cf0e5935bed /meta | |
| parent | 914c285de743af04b9dd1cd6436d6b672a4ddb09 (diff) | |
| download | openembedded-core-1d381aa15896c133ce0f5bc5b62e3a416e5deb02.tar.gz openembedded-core-1d381aa15896c133ce0f5bc5b62e3a416e5deb02.tar.bz2 openembedded-core-1d381aa15896c133ce0f5bc5b62e3a416e5deb02.zip | |
ethtool: Fix musl build failure
We just need to ensure the proper names for uint types are used.
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-extended/ethtool/ethtool/ethtool-uint.patch | 50 | ||||
| -rw-r--r-- | meta/recipes-extended/ethtool/ethtool_3.14.bb | 1 |
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 @@ +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/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 \ 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" |