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:11:52 +0000 |
| commit | 1642f519bb30b3ebcfb6170cdbbc0e327d057012 (patch) | |
| tree | ca32b2014246b0e952bd9bd0b96f52d8719f4912 /meta/recipes-extended/iptables | |
| parent | 7ad7c837bac0cd086098be0d7cdf5cd8388a8696 (diff) | |
| download | openembedded-core-1642f519bb30b3ebcfb6170cdbbc0e327d057012.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.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta/recipes-extended/iptables')
| -rw-r--r-- | meta/recipes-extended/iptables/iptables/types.h-add-defines-that-are-required-for-if_packet.patch | 49 | ||||
| -rw-r--r-- | meta/recipes-extended/iptables/iptables_1.4.12.2.bb | 3 |
2 files changed, 51 insertions, 1 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 @@ +From 19593491f43b70c1a71c3b9b8f4ff4fd14500014 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@windriver.com> +Date: Fri, 23 Mar 2012 14:27:20 -0400 +Subject: [PATCH] types.h: add defines that are required for if_packet.h + +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. + +This is similar to the commit in the iptables git repository: + + https://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commit;h=dbe77cc974cee656eae37e75039dd1a410a4535b + +Upstream-Status: Backport + +Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> +--- + include/linux/types.h | 10 ++++++++++ + 1 files changed, 10 insertions(+), 0 deletions(-) + +diff --git a/include/linux/types.h b/include/linux/types.h +index 8b483c8..ebf6432 100644 +--- a/include/linux/types.h ++++ b/include/linux/types.h +@@ -34,5 +34,15 @@ typedef __u64 __bitwise __be64; + typedef __u16 __bitwise __sum16; + typedef __u32 __bitwise __wsum; + ++#ifndef __aligned_u64 ++#define __aligned_u64 __u64 __attribute__((aligned(8))) ++#endif ++#ifndef __aligned_be64 ++#define __aligned_be64 __be64 __attribute__((aligned(8))) ++#endif ++#ifndef __aligned_le64 ++#define __aligned_le64 __le64 __attribute__((aligned(8))) ++#endif ++ + #endif /* __ASSEMBLY__ */ + #endif /* _LINUX_TYPES_H */ +-- +1.7.0.4 + diff --git a/meta/recipes-extended/iptables/iptables_1.4.12.2.bb b/meta/recipes-extended/iptables/iptables_1.4.12.2.bb index 2d3d3113bb..663ddadd40 100644 --- a/meta/recipes-extended/iptables/iptables_1.4.12.2.bb +++ b/meta/recipes-extended/iptables/iptables_1.4.12.2.bb @@ -22,7 +22,8 @@ FILES_${PN} =+ "${libdir}/xtables/" FILES_${PN}-dbg =+ "${libdir}/xtables/.debug" SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ - file://GNUmakefile.patch" + file://GNUmakefile.patch \ + file://types.h-add-defines-that-are-required-for-if_packet.patch" SRC_URI[md5sum] = "212112389c7f10c72efb31a4ed193a4c" SRC_URI[sha256sum] = "09fff7dfe6af95675474fd5d0fc67622fac5a0f3d6e02ee614deae9a2e5dae13" |