summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-06-02 02:55:28 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-03 16:38:49 +0100
commit359585a8b67dda54e4b1e3f769d92ed532d3b950 (patch)
tree251d44fc31f9e6ac24b6a8f610c0bc02964586fc /meta
parent46ccf0a8f0c8e1036dc2da17bc68034a2793a160 (diff)
downloadpoky-359585a8b67dda54e4b1e3f769d92ed532d3b950.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/ethtool/ethtool/ethtool-uint.patch50
-rw-r--r--meta/recipes-extended/ethtool/ethtool_4.0.bb (renamed from meta/recipes-extended/ethtool/ethtool_3.16.bb)5
2 files changed, 2 insertions, 53 deletions
diff --git a/meta/recipes-extended/ethtool/ethtool/ethtool-uint.patch b/meta/recipes-extended/ethtool/ethtool/ethtool-uint.patch
deleted file mode 100644
index bb96a18d82..0000000000
--- a/meta/recipes-extended/ethtool/ethtool/ethtool-uint.patch
+++ /dev/null
@@ -1,50 +0,0 @@
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.16.bb b/meta/recipes-extended/ethtool/ethtool_4.0.bb
index 92a0704800..13f2b1cf56 100644
--- a/meta/recipes-extended/ethtool/ethtool_3.16.bb
+++ b/meta/recipes-extended/ethtool/ethtool_4.0.bb
@@ -9,11 +9,10 @@ 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 \
13 " 12 "
14 13
15SRC_URI[md5sum] = "3806bae34c153e2b9e2859e85c54788d" 14SRC_URI[md5sum] = "0a1c78787c7dcf077016ed86372a472f"
16SRC_URI[sha256sum] = "a6f1433824af7b390ed4e66dfc7cee047d6d1f56dbb8ceef9fe905d63aef5275" 15SRC_URI[sha256sum] = "e200516727cc9583e8b63fd6e72f667f9ed41bb4f0577ff4803b60c64cfd1dbc"
17 16
18inherit autotools ptest 17inherit autotools ptest
19RDEPENDS_${PN}-ptest += "make" 18RDEPENDS_${PN}-ptest += "make"