[openwrt/openwrt] netfilter: correct some dependencies

LEDE Commits lede-commits at lists.infradead.org
Thu Jan 27 00:58:24 PST 2022


aparcar pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/ef4c97576b5a61b12190f54c52906bac2433932c

commit ef4c97576b5a61b12190f54c52906bac2433932c
Author: Tiago Gaspar <tiagogaspar8 at gmail.com>
AuthorDate: Sun Jan 23 00:44:01 2022 +0000

    netfilter: correct some dependencies
    
    nf-nathelper-extra and nf-conntrack-netlink had iptables related
    dependencies, yet, when looking for the respective kernel symbols and
    checking it's dependencies it was confirmed that iptables wasn't
    required and that these were either it's own moodule or tool independent
    (nftables or iptables).
    
    Correct these and make sure no unneeded extras are pulled in.
    
    Signed-off-by: Tiago Gaspar <tiagogaspar8 at gmail.com>
---
 package/kernel/linux/modules/netfilter.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk
index e2bb1d0681..f204b257d1 100644
--- a/package/kernel/linux/modules/netfilter.mk
+++ b/package/kernel/linux/modules/netfilter.mk
@@ -542,7 +542,7 @@ define KernelPackage/nf-nathelper-extra
   KCONFIG:=$(KCONFIG_NF_NATHELPER_EXTRA)
   FILES:=$(foreach mod,$(NF_NATHELPER_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko)
   AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_NATHELPER_EXTRA-m)))
-  DEPENDS:=+kmod-nf-nat +kmod-lib-textsearch +kmod-ipt-raw +kmod-asn1-decoder
+  DEPENDS:=+kmod-nf-nat +kmod-lib-textsearch +kmod-asn1-decoder
 endef
 
 define KernelPackage/nf-nathelper-extra/description
@@ -1004,7 +1004,7 @@ define KernelPackage/nf-conntrack-netlink
   FILES:=$(LINUX_DIR)/net/netfilter/nf_conntrack_netlink.ko
   KCONFIG:=CONFIG_NF_CT_NETLINK CONFIG_NF_CONNTRACK_EVENTS=y CONFIG_NETFILTER_NETLINK_GLUE_CT=y
   AUTOLOAD:=$(call AutoProbe,nf_conntrack_netlink)
-  $(call AddDepends/nfnetlink,+kmod-ipt-conntrack)
+  $(call AddDepends/nfnetlink,+kmod-nf-conntrack)
 endef
 
 define KernelPackage/nf-conntrack-netlink/description



More information about the lede-commits mailing list