mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 05:09:24 +00:00
Code Issues Projects Releases Wiki Activity

iptables: submit 0001-configure-Add-option-to-enable-disable-libnfnetlink.patch upstream

Browse Source 
(From OE-Core rev: 20276890b2e08512bb04206d6cc6be5867d5f8a4)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 67f6c3534a18520f3b7c5eed27dc2744c5bf44c2)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
Alexander Kanavin
2024-05-16 13:26:36 +02:00
committed by Steve Sakoman
parent 76e5603fb7
commit 5b73e77b50
1 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch
+26 -18
View File
@@ -1,22 +1,24 @@
From 0096c854d5015918ed154dccb3ad472fd06c1010 Mon Sep 17 00:00:00 2001 From 653db8b938166db7833135f615b90c38a3f27a30 Mon Sep 17 00:00:00 2001
From: "Maxin B. John" <maxin.john@intel.com> From: "Maxin B. John" <maxin.john@intel.com>
Date: Tue, 21 Feb 2017 11:16:31 +0200 Date: Thu, 25 Apr 2024 10:51:02 +0200
Subject: [PATCH] configure: Add option to enable/disable libnfnetlink Subject: [PATCH] configure: Add option to enable/disable libnfnetlink
This changes the configure behaviour from autodetecting Default behavior (autodetecting) does not change, but specifying
for libnfnetlink to having an option to disable it explicitly either option would explicitly disable or enable libnfnetlink support,
and if the library is not found in the latter case, ./configure will error
Upstream-Status: Pending out.
Upstream-Status: Backport [https://git.netfilter.org/iptables/commit/?id=653db8b938166db7833135f615b90c38a3f27a30]
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Phil Sutter <phil@nwl.cc>
--- ---
configure.ac | 10 +++++++--- configure.ac | 13 +++++++++++--
1 file changed, 7 insertions(+), 3 deletions(-) 1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index d99fa3b..d607772 100644 index d99fa3b9..2293702b 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -63,6 +63,9 @@ AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=PATH], @@ -63,6 +63,9 @@ AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=PATH],
@@ -25,21 +27,27 @@ index d99fa3b..d607772 100644
[enable_nftables="$enableval"], [enable_nftables="yes"]) [enable_nftables="$enableval"], [enable_nftables="yes"])
+AC_ARG_ENABLE([libnfnetlink], +AC_ARG_ENABLE([libnfnetlink],
+ AS_HELP_STRING([--disable-libnfnetlink], [Do not use netfilter netlink library]), + AS_HELP_STRING([--disable-libnfnetlink], [Do not use netfilter netlink library]),
+ [enable_libnfnetlink="$enableval"], [enable_libnfnetlink="yes"]) + [enable_libnfnetlink="$enableval"], [enable_libnfnetlink="auto"])
AC_ARG_ENABLE([connlabel], AC_ARG_ENABLE([connlabel],
AS_HELP_STRING([--disable-connlabel], AS_HELP_STRING([--disable-connlabel],
[Do not build libnetfilter_conntrack]), [Do not build libnetfilter_conntrack]),
@@ -113,9 +116,10 @@ AM_CONDITIONAL([ENABLE_SYNCONF], [test "$enable_nfsynproxy" = "yes"]) @@ -113,8 +116,14 @@ AM_CONDITIONAL([ENABLE_SYNCONF], [test "$enable_nfsynproxy" = "yes"])
AM_CONDITIONAL([ENABLE_NFTABLES], [test "$enable_nftables" = "yes"]) AM_CONDITIONAL([ENABLE_NFTABLES], [test "$enable_nftables" = "yes"])
AM_CONDITIONAL([ENABLE_CONNLABEL], [test "$enable_connlabel" = "yes"]) AM_CONDITIONAL([ENABLE_CONNLABEL], [test "$enable_connlabel" = "yes"])
-PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0], -PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0],
- [nfnetlink=1], [nfnetlink=0]) - [nfnetlink=1], [nfnetlink=0])
-AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "$nfnetlink" = 1]) +# If specified explicitly on the command line, error out when library was not found
+AS_IF([test "x$enable_libnfnetlink" = "xyes"], [ +# Otherwise, disable and continue
+ PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0]) +AS_IF([test "x$enable_libnfnetlink" = "xyes"],
+ ]) + [PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0],
+AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "x$enable_libnfnetlink" = "xyes"]) + [nfnetlink=1])],
+ [test "x$enable_libnfnetlink" = "xauto"],
+ [PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0],
+ [nfnetlink=1], [nfnetlink=0])])
AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "$nfnetlink" = 1])
if test "x$enable_bpfc" = "xyes" || test "x$enable_nfsynproxy" = "xyes"; then if test "x$enable_bpfc" = "xyes" || test "x$enable_nfsynproxy" = "xyes"; then
PKG_CHECK_MODULES([libpcap], [libpcap], [], [ --
2.39.2