diff options
Diffstat (limited to 'meta/recipes-extended/ethtool/ethtool')
3 files changed, 71 insertions, 0 deletions
diff --git a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch new file mode 100644 index 0000000000..bf66267e81 --- /dev/null +++ b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | ptest needs buildtest-TESTS and runtest-TESTS targets. | ||
2 | serial-tests is required to generate those targets. | ||
3 | |||
4 | Signed-off-by: Tudor Florea <tudor.florea@enea.com> | ||
5 | Upstream-Status: Inappropriate | ||
6 | (default automake behavior incompatible with ptest) | ||
7 | |||
8 | diff -ruN a/configure.ac b/configure.ac | ||
9 | --- a/configure.ac 2014-05-28 18:19:13.513980977 +0200 | ||
10 | +++ b/configure.ac 2014-05-28 18:19:21.129660215 +0200 | ||
11 | @@ -2,7 +2,7 @@ | ||
12 | AC_INIT(ethtool, 3.14, netdev@vger.kernel.org) | ||
13 | AC_PREREQ(2.52) | ||
14 | AC_CONFIG_SRCDIR([ethtool.c]) | ||
15 | -AM_INIT_AUTOMAKE([gnu]) | ||
16 | +AM_INIT_AUTOMAKE([gnu serial-tests]) | ||
17 | AC_CONFIG_HEADERS([ethtool-config.h]) | ||
18 | |||
19 | AM_MAINTAINER_MODE | ||
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 @@ | |||
1 | Fix build with musl by using correct uint type names. | ||
2 | |||
3 | This patch is taken from Sabotage Linux, the license statement for patches and | ||
4 | build 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 | |||
11 | Therefore this should be good to include in OpenEmbedded. | ||
12 | |||
13 | Signed-off-by: Paul Barker <paul@paulbarker.me.uk> | ||
14 | |||
15 | Upstream-status: Pending | ||
16 | |||
17 | diff -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/run-ptest b/meta/recipes-extended/ethtool/ethtool/run-ptest new file mode 100644 index 0000000000..1e245da112 --- /dev/null +++ b/meta/recipes-extended/ethtool/ethtool/run-ptest | |||
@@ -0,0 +1,2 @@ | |||
1 | #!/bin/sh | ||
2 | make -k runtest-TESTS | ||