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 | 12 |
1 files changed, 5 insertions, 7 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 index 20c40c4039..5a022ebc8c 100644 --- 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 | |||
@@ -1,7 +1,7 @@ | |||
1 | From e7aa1dd2831f9bb5d0603c5e5027387ad7721b00 Mon Sep 17 00:00:00 2001 | 1 | From 6832501bbb90a3dab977a4625d0391804c0e795c Mon Sep 17 00:00:00 2001 |
2 | From: "Maxin B. John" <maxin.john@intel.com> | 2 | From: "Maxin B. John" <maxin.john@intel.com> |
3 | Date: Tue, 21 Feb 2017 11:49:07 +0200 | 3 | Date: Tue, 21 Feb 2017 11:49:07 +0200 |
4 | Subject: [PATCH 4/4] configure.ac: | 4 | Subject: [PATCH] configure.ac: |
5 | only-check-conntrack-when-libnfnetlink-enabled.patch | 5 | only-check-conntrack-when-libnfnetlink-enabled.patch |
6 | 6 | ||
7 | Package libnetfilter-conntrack depends on package libnfnetlink. iptables | 7 | Package libnetfilter-conntrack depends on package libnfnetlink. iptables |
@@ -23,15 +23,16 @@ Upstream-Status: Pending | |||
23 | 23 | ||
24 | 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> | 25 | Signed-off-by: Maxin B. John <maxin.john@intel.com> |
26 | |||
26 | --- | 27 | --- |
27 | configure.ac | 6 ++++-- | 28 | configure.ac | 6 ++++-- |
28 | 1 file changed, 4 insertions(+), 2 deletions(-) | 29 | 1 file changed, 4 insertions(+), 2 deletions(-) |
29 | 30 | ||
30 | diff --git a/configure.ac b/configure.ac | 31 | diff --git a/configure.ac b/configure.ac |
31 | index e27745e5..528f1bb5 100644 | 32 | index d607772..25a8e75 100644 |
32 | --- a/configure.ac | 33 | --- a/configure.ac |
33 | +++ b/configure.ac | 34 | +++ b/configure.ac |
34 | @@ -158,10 +158,12 @@ if test "$nftables" != 1; then | 35 | @@ -159,10 +159,12 @@ if test "$nftables" != 1; then |
35 | fi | 36 | fi |
36 | 37 | ||
37 | if test "x$enable_connlabel" = "xyes"; then | 38 | if test "x$enable_connlabel" = "xyes"; then |
@@ -46,6 +47,3 @@ index e27745e5..528f1bb5 100644 | |||
46 | if test "$nfconntrack" -ne 1; then | 47 | if test "$nfconntrack" -ne 1; then |
47 | blacklist_modules="$blacklist_modules connlabel"; | 48 | blacklist_modules="$blacklist_modules connlabel"; |
48 | echo "WARNING: libnetfilter_conntrack not found, connlabel match will not be built"; | 49 | echo "WARNING: libnetfilter_conntrack not found, connlabel match will not be built"; |
49 | -- | ||
50 | 2.30.2 | ||
51 | |||