diff options
Diffstat (limited to 'meta/recipes-extended/iptables/iptables/0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch')
-rw-r--r-- | meta/recipes-extended/iptables/iptables/0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch | 53 |
1 files changed, 35 insertions, 18 deletions
diff --git a/meta/recipes-extended/iptables/iptables/0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch b/meta/recipes-extended/iptables/iptables/0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch index 89ad8f6668..7842c6408a 100644 --- a/meta/recipes-extended/iptables/iptables/0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch +++ b/meta/recipes-extended/iptables/iptables/0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch | |||
@@ -1,34 +1,51 @@ | |||
1 | From 26090b3dbcdf6a11e60535da949b726a6e86426d Mon Sep 17 00:00:00 2001 | ||
2 | From: "Maxin B. John" <maxin.john@intel.com> | ||
3 | Date: Tue, 21 Feb 2017 11:49:07 +0200 | ||
4 | Subject: [PATCH] configure.ac: | ||
5 | only-check-conntrack-when-libnfnetlink-enabled.patch | ||
6 | |||
1 | Package libnetfilter-conntrack depends on package libnfnetlink. iptables | 7 | Package libnetfilter-conntrack depends on package libnfnetlink. iptables |
2 | checks package libnetfilter-conntrack whatever its package config | 8 | checks package libnetfilter-conntrack whatever its package config |
3 | libnfnetlink is enabled or not. When libnfnetlink is disabled but | 9 | libnfnetlink is enabled or not. When libnfnetlink is disabled but |
4 | package libnetfilter-conntrack exists, it fails randomly with: | 10 | package libnetfilter-conntrack exists, it fails randomly with: |
5 | 11 | ||
6 | | In file included from .../iptables/1.4.21-r0/iptables-1.4.21/extensions/libxt_connlabel.c:8:0: | 12 | In file included from |
7 | | .../tmp/sysroots/qemumips/usr/include/libnetfilter_conntrack/libnetfilter_conntrack.h:14:42: fatal error: libnfnetlink/linux_nfnetlink.h: No such file or directory | 13 | .../iptables/1.4.21-r0/iptables-1.4.21/extensions/libxt_connlabel.c:8:0: |
8 | | compilation terminated. | 14 | |
9 | | GNUmakefile:96: recipe for target 'libxt_connlabel.oo' failed | 15 | .../tmp/sysroots/qemumips/usr/include/libnetfilter_conntrack/libnetfilter_conntrack.h:14:42: |
16 | fatal error: libnfnetlink/linux_nfnetlink.h: No such file or directory | ||
10 | 17 | ||
18 | compilation terminated. | ||
19 | GNUmakefile:96: recipe for target 'libxt_connlabel.oo' failed | ||
11 | Only check libnetfilter-conntrack when libnfnetlink is enabled to fix it. | 20 | Only check libnetfilter-conntrack when libnfnetlink is enabled to fix it. |
12 | 21 | ||
13 | Upstream-Status: Pending | 22 | Upstream-Status: Pending |
14 | 23 | ||
15 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | 24 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
25 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | ||
26 | --- | ||
27 | configure.ac | 6 ++++-- | ||
28 | 1 file changed, 4 insertions(+), 2 deletions(-) | ||
16 | 29 | ||
17 | diff --git a/configure.ac b/configure.ac | 30 | diff --git a/configure.ac b/configure.ac |
18 | index 5d7e62b..e331ee7 100644 | 31 | index 03ddc50..523caea 100644 |
19 | --- a/configure.ac | 32 | --- a/configure.ac |
20 | +++ b/configure.ac | 33 | +++ b/configure.ac |
21 | @@ -88,8 +88,12 @@ if test "$ac_cv_header_linux_ip_vs_h" != "yes"; then | 34 | @@ -172,10 +172,12 @@ if test "$nftables" != 1; then |
22 | blacklist_modules="$blacklist_modules ipvs"; | 35 | fi |
23 | fi; | ||
24 | 36 | ||
25 | -PKG_CHECK_MODULES([libnetfilter_conntrack], [libnetfilter_conntrack >= 1.0.4], | 37 | if test "x$enable_connlabel" = "xyes"; then |
26 | +nfconntrack=0 | 38 | - PKG_CHECK_MODULES([libnetfilter_conntrack], |
27 | +AS_IF([test "x$enable_libnfnetlink" = "xyes"], [ | 39 | + nfconntrack=0 |
28 | + PKG_CHECK_MODULES([libnetfilter_conntrack], [libnetfilter_conntrack >= 1.0.4], | 40 | + AS_IF([test "x$enable_libnfnetlink" = "xyes"], [ |
29 | [nfconntrack=1], [nfconntrack=0]) | 41 | + PKG_CHECK_MODULES([libnetfilter_conntrack], |
30 | + ]) | 42 | [libnetfilter_conntrack >= 1.0.6], |
31 | + | 43 | [nfconntrack=1], [nfconntrack=0]) |
32 | AM_CONDITIONAL([HAVE_LIBNETFILTER_CONNTRACK], [test "$nfconntrack" = 1]) | 44 | - |
33 | 45 | + ]) | |
34 | if test "$nfconntrack" -ne 1; then | 46 | if test "$nfconntrack" -ne 1; then |
47 | blacklist_modules="$blacklist_modules connlabel"; | ||
48 | echo "WARNING: libnetfilter_conntrack not found, connlabel match will not be built"; | ||
49 | -- | ||
50 | 2.4.0 | ||
51 | |||