diff options
Diffstat (limited to 'meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch')
-rw-r--r-- | meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch b/meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch new file mode 100644 index 0000000000..5a022ebc8c --- /dev/null +++ b/meta/recipes-extended/iptables/iptables/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | From 6832501bbb90a3dab977a4625d0391804c0e795c 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 | |||
7 | Package libnetfilter-conntrack depends on package libnfnetlink. iptables | ||
8 | checks package libnetfilter-conntrack whatever its package config | ||
9 | libnfnetlink is enabled or not. When libnfnetlink is disabled but | ||
10 | package libnetfilter-conntrack exists, it fails randomly with: | ||
11 | |||
12 | In file included from | ||
13 | .../iptables/1.4.21-r0/iptables-1.4.21/extensions/libxt_connlabel.c:8:0: | ||
14 | |||
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 | ||
17 | |||
18 | compilation terminated. | ||
19 | GNUmakefile:96: recipe for target 'libxt_connlabel.oo' failed | ||
20 | Only check libnetfilter-conntrack when libnfnetlink is enabled to fix it. | ||
21 | |||
22 | Upstream-Status: Pending | ||
23 | |||
24 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
25 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | ||
26 | |||
27 | --- | ||
28 | configure.ac | 6 ++++-- | ||
29 | 1 file changed, 4 insertions(+), 2 deletions(-) | ||
30 | |||
31 | diff --git a/configure.ac b/configure.ac | ||
32 | index d607772..25a8e75 100644 | ||
33 | --- a/configure.ac | ||
34 | +++ b/configure.ac | ||
35 | @@ -159,10 +159,12 @@ if test "$nftables" != 1; then | ||
36 | fi | ||
37 | |||
38 | if test "x$enable_connlabel" = "xyes"; then | ||
39 | - PKG_CHECK_MODULES([libnetfilter_conntrack], | ||
40 | + nfconntrack=0 | ||
41 | + AS_IF([test "x$enable_libnfnetlink" = "xyes"], [ | ||
42 | + PKG_CHECK_MODULES([libnetfilter_conntrack], | ||
43 | [libnetfilter_conntrack >= 1.0.6], | ||
44 | [nfconntrack=1], [nfconntrack=0]) | ||
45 | - | ||
46 | + ]) | ||
47 | if test "$nfconntrack" -ne 1; then | ||
48 | blacklist_modules="$blacklist_modules connlabel"; | ||
49 | echo "WARNING: libnetfilter_conntrack not found, connlabel match will not be built"; | ||