From: Alexander Kanavin <a...@linutronix.de> Signed-off-by: Alexander Kanavin <a...@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.bell...@bootlin.com> Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org> (cherry picked from commit 67f6c3534a18520f3b7c5eed27dc2744c5bf44c2) Signed-off-by: Steve Sakoman <st...@sakoman.com> --- ...ption-to-enable-disable-libnfnetlink.patch | 44 +++++++++++-------- 1 file changed, 26 insertions(+), 18 deletions(-)
diff --git a/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch b/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch index 8824bf2af7..0fe2261511 100644 --- a/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch +++ b/meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch @@ -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.j...@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 -This changes the configure behaviour from autodetecting -for libnfnetlink to having an option to disable it explicitly - -Upstream-Status: Pending +Default behavior (autodetecting) does not change, but specifying +either option would explicitly disable or enable libnfnetlink support, +and if the library is not found in the latter case, ./configure will error +out. +Upstream-Status: Backport [https://git.netfilter.org/iptables/commit/?id=653db8b938166db7833135f615b90c38a3f27a30] Signed-off-by: Khem Raj <raj.k...@gmail.com> Signed-off-by: Maxin B. John <maxin.j...@intel.com> - +Signed-off-by: Alexander Kanavin <a...@linutronix.de> +Signed-off-by: Phil Sutter <p...@nwl.cc> --- - configure.ac | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) + configure.ac | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index d99fa3b..d607772 100644 +index d99fa3b9..2293702b 100644 --- a/configure.ac +++ b/configure.ac @@ -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"]) +AC_ARG_ENABLE([libnfnetlink], + 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], AS_HELP_STRING([--disable-connlabel], [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_CONNLABEL], [test "$enable_connlabel" = "yes"]) -PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0], - [nfnetlink=1], [nfnetlink=0]) --AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "$nfnetlink" = 1]) -+AS_IF([test "x$enable_libnfnetlink" = "xyes"], [ -+ PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0]) -+ ]) -+AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "x$enable_libnfnetlink" = "xyes"]) ++# If specified explicitly on the command line, error out when library was not found ++# Otherwise, disable and continue ++AS_IF([test "x$enable_libnfnetlink" = "xyes"], ++ [PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0], ++ [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 - PKG_CHECK_MODULES([libpcap], [libpcap], [], [ +-- +2.39.2 + -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#201883): https://lists.openembedded.org/g/openembedded-core/message/201883 Mute This Topic: https://lists.openembedded.org/mt/107213111/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
