Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 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 | |
Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame] | 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 | |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 12 | In file included from |
| 13 | .../iptables/1.4.21-r0/iptables-1.4.21/extensions/libxt_connlabel.c:8:0: |
Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame] | 14 | |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 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 |
Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame] | 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> |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 25 | Signed-off-by: Maxin B. John <maxin.john@intel.com> |
| 26 | --- |
| 27 | configure.ac | 6 ++++-- |
| 28 | 1 file changed, 4 insertions(+), 2 deletions(-) |
Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame] | 29 | |
| 30 | diff --git a/configure.ac b/configure.ac |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 31 | index 03ddc50..523caea 100644 |
Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame] | 32 | --- a/configure.ac |
| 33 | +++ b/configure.ac |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 34 | @@ -172,10 +172,12 @@ if test "$nftables" != 1; then |
| 35 | fi |
Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame] | 36 | |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 37 | if test "x$enable_connlabel" = "xyes"; then |
| 38 | - PKG_CHECK_MODULES([libnetfilter_conntrack], |
| 39 | + nfconntrack=0 |
| 40 | + AS_IF([test "x$enable_libnfnetlink" = "xyes"], [ |
| 41 | + PKG_CHECK_MODULES([libnetfilter_conntrack], |
| 42 | [libnetfilter_conntrack >= 1.0.6], |
| 43 | [nfconntrack=1], [nfconntrack=0]) |
| 44 | - |
| 45 | + ]) |
| 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 | |