diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2012-03-23 14:36:04 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-24 00:12:05 +0000 |
commit | 1c19181599c41d8f0bd7f06efc654fe61c3d0bb1 (patch) | |
tree | e5e925800a0633b5bb20818f3d21658d4069f62e /meta/recipes-extended/iptables/iptables | |
parent | 6c77a0f0fa0c97bfbe93f4a930a1549566a7f016 (diff) | |
download | poky-1c19181599c41d8f0bd7f06efc654fe61c3d0bb1.tar.gz |
iptables: fix build error against 3.2+ kernel headers
The iptables local linux/types.h overrides the kernel/sysroot
types.h. As such, we need to provide some defines that are required
to build against 3.2+ kernel headers.
ifndef protection is provided for the defines to ensure that
configuration that already have these defines are still buildable.
This commit is temporary until a new version of iptables can be
used that contains the defines.
(From OE-Core rev: 1642f519bb30b3ebcfb6170cdbbc0e327d057012)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/iptables/iptables')
-rw-r--r-- | meta/recipes-extended/iptables/iptables/types.h-add-defines-that-are-required-for-if_packet.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/meta/recipes-extended/iptables/iptables/types.h-add-defines-that-are-required-for-if_packet.patch b/meta/recipes-extended/iptables/iptables/types.h-add-defines-that-are-required-for-if_packet.patch new file mode 100644 index 0000000000..24ee29e2d1 --- /dev/null +++ b/meta/recipes-extended/iptables/iptables/types.h-add-defines-that-are-required-for-if_packet.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | From 19593491f43b70c1a71c3b9b8f4ff4fd14500014 Mon Sep 17 00:00:00 2001 | ||
2 | From: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
3 | Date: Fri, 23 Mar 2012 14:27:20 -0400 | ||
4 | Subject: [PATCH] types.h: add defines that are required for if_packet.h | ||
5 | |||
6 | The iptables local linux/types.h overrides the kernel/sysroot | ||
7 | types.h. As such, we need to provide some defines that are required | ||
8 | to build against 3.2+ kernel headers. | ||
9 | |||
10 | ifndef protection is provided for the defines to ensure that | ||
11 | configuration that already have these defines are still buildable. | ||
12 | |||
13 | This commit is temporary until a new version of iptables can be | ||
14 | used that contains the defines. | ||
15 | |||
16 | This is similar to the commit in the iptables git repository: | ||
17 | |||
18 | https://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commit;h=dbe77cc974cee656eae37e75039dd1a410a4535b | ||
19 | |||
20 | Upstream-Status: Backport | ||
21 | |||
22 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
23 | --- | ||
24 | include/linux/types.h | 10 ++++++++++ | ||
25 | 1 files changed, 10 insertions(+), 0 deletions(-) | ||
26 | |||
27 | diff --git a/include/linux/types.h b/include/linux/types.h | ||
28 | index 8b483c8..ebf6432 100644 | ||
29 | --- a/include/linux/types.h | ||
30 | +++ b/include/linux/types.h | ||
31 | @@ -34,5 +34,15 @@ typedef __u64 __bitwise __be64; | ||
32 | typedef __u16 __bitwise __sum16; | ||
33 | typedef __u32 __bitwise __wsum; | ||
34 | |||
35 | +#ifndef __aligned_u64 | ||
36 | +#define __aligned_u64 __u64 __attribute__((aligned(8))) | ||
37 | +#endif | ||
38 | +#ifndef __aligned_be64 | ||
39 | +#define __aligned_be64 __be64 __attribute__((aligned(8))) | ||
40 | +#endif | ||
41 | +#ifndef __aligned_le64 | ||
42 | +#define __aligned_le64 __le64 __attribute__((aligned(8))) | ||
43 | +#endif | ||
44 | + | ||
45 | #endif /* __ASSEMBLY__ */ | ||
46 | #endif /* _LINUX_TYPES_H */ | ||
47 | -- | ||
48 | 1.7.0.4 | ||
49 | |||