[Buildroot] [PATCH 1/1] package/iptables: drop duplicated dependency

[Buildroot] [PATCH 1/1] package/iptables: drop duplicated dependency

[Fabrice Fontaine]

libnetfilter_conntrack dependency is wrongly duplicated since commit
b835171cf9db23095c669b872dbaa15fc1e99898

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/iptables/iptables.mk | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
index a54194a8c3..682e23a091 100644
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -19,11 +19,6 @@ IPTABLES_SELINUX_MODULES = iptables
 IPTABLES_CONF_OPTS = --libexecdir=/usr/lib --with-kernel=$(STAGING_DIR)/usr \
 	$(if $(BR2_STATIC_LIBS),,--disable-static)
 
-# For connlabel match
-ifeq ($(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),y)
-IPTABLES_DEPENDENCIES += libnetfilter_conntrack
-endif
-
 # For nfnl_osf
 ifeq ($(BR2_PACKAGE_LIBNFNETLINK),y)
 IPTABLES_DEPENDENCIES += libnfnetlink
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/iptables: drop duplicated dependency

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > libnetfilter_conntrack dependency is wrongly duplicated since commit
 > b835171cf9db23095c669b872dbaa15fc1e99898

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 > ---
 >  package/iptables/iptables.mk | 5 -----
 >  1 file changed, 5 deletions(-)

 > diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
 > index a54194a8c3..682e23a091 100644
 > --- a/package/iptables/iptables.mk
 > +++ b/package/iptables/iptables.mk
 > @@ -19,11 +19,6 @@ IPTABLES_SELINUX_MODULES = iptables
 >  IPTABLES_CONF_OPTS = --libexecdir=/usr/lib --with-kernel=$(STAGING_DIR)/usr \
 >  	$(if $(BR2_STATIC_LIBS),,--disable-static)
 
 > -# For connlabel match
 > -ifeq ($(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),y)
 > -IPTABLES_DEPENDENCIES += libnetfilter_conntrack
 > -endif

I think it is nicer to instead drop it from the "main" _DEPENDENCIES
line for consistency with the other optional dependencies, so I've
committed with that change, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/iptables: drop duplicated dependency

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > libnetfilter_conntrack dependency is wrongly duplicated since commit
 > b835171cf9db23095c669b872dbaa15fc1e99898

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2022.05.x and 2022.02.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot