diff options
author | Adrian Dudau <adrian.dudau@enea.com> | 2013-12-12 13:38:32 +0100 |
---|---|---|
committer | Adrian Dudau <adrian.dudau@enea.com> | 2013-12-12 13:50:20 +0100 |
commit | e2e6f6fe07049f33cb6348780fa975162752e421 (patch) | |
tree | b1813295411235d1297a0ed642b1346b24fdfb12 /meta/recipes-extended/iptables/iptables | |
download | poky-e2e6f6fe07049f33cb6348780fa975162752e421.tar.gz |
initial commit of Enea Linux 3.1
Migrated from the internal git server on the dora-enea branch
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
Diffstat (limited to 'meta/recipes-extended/iptables/iptables')
2 files changed, 96 insertions, 0 deletions
diff --git a/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch b/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch new file mode 100644 index 0000000000..ab609e27e3 --- /dev/null +++ b/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From 5c47cf5061b852c02178f01e23690bfe38a99d93 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 17 Mar 2013 11:21:35 -0700 | ||
4 | Subject: [PATCH] configure: Add option to enable/disable libnfnetlink | ||
5 | |||
6 | This changes the configure behaviour from autodetecting | ||
7 | for libnfnetlink to having an option to disable it explicitly | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | --- | ||
13 | configure.ac | 11 ++++++++--- | ||
14 | 1 file changed, 8 insertions(+), 3 deletions(-) | ||
15 | |||
16 | diff --git a/configure.ac b/configure.ac | ||
17 | index ba616ab..ce2d315 100644 | ||
18 | --- a/configure.ac | ||
19 | +++ b/configure.ac | ||
20 | @@ -53,6 +53,9 @@ AC_ARG_ENABLE([libipq], | ||
21 | AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=PATH], | ||
22 | [Path to the pkgconfig directory [[LIBDIR/pkgconfig]]]), | ||
23 | [pkgconfigdir="$withval"], [pkgconfigdir='${libdir}/pkgconfig']) | ||
24 | +AC_ARG_ENABLE([libnfnetlink], | ||
25 | + AS_HELP_STRING([--disable-libnfnetlink], [Do not use netfilter netlink library]), | ||
26 | + [enable_libnfnetlink="$enableval"], [enable_libnfnetlink="yes"]) | ||
27 | |||
28 | libiptc_LDFLAGS2=""; | ||
29 | AX_CHECK_LINKER_FLAGS([-Wl,--no-as-needed], | ||
30 | @@ -89,9 +92,11 @@ AM_CONDITIONAL([ENABLE_LARGEFILE], [test "$enable_largefile" = "yes"]) | ||
31 | AM_CONDITIONAL([ENABLE_DEVEL], [test "$enable_devel" = "yes"]) | ||
32 | AM_CONDITIONAL([ENABLE_LIBIPQ], [test "$enable_libipq" = "yes"]) | ||
33 | |||
34 | -PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0], | ||
35 | - [nfnetlink=1], [nfnetlink=0]) | ||
36 | -AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "$nfnetlink" = 1]) | ||
37 | +AS_IF([test "x$enable_libnfnetlink" = "xyes"], [ | ||
38 | + PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0]) | ||
39 | + ]) | ||
40 | + | ||
41 | +AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "x$enable_libnfnetlink" = "xyes"]) | ||
42 | |||
43 | regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \ | ||
44 | -Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \ | ||
45 | -- | ||
46 | 1.7.9.5 | ||
47 | |||
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 | |||