[openwrt/openwrt] iptables: make mod depend on libxtables

LEDE Commits lede-commits at lists.infradead.org
Mon Feb 28 12:52:42 PST 2022


hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/d35a573004ff21e5a7bbdb896967454c63b7a363

commit d35a573004ff21e5a7bbdb896967454c63b7a363
Author: Etienne Champetier <champetier.etienne at gmail.com>
AuthorDate: Mon Feb 21 16:20:34 2022 -0500

    iptables: make mod depend on libxtables
    
    'iptables-mod-' can be used directly by firewall3, by
    iptables and by iptables-nft. They are not linked to
    iptables but to libxtables, so fix the dependencies to allow
    to remove iptables(-legacy)
    
    Signed-off-by: Etienne Champetier <champetier.etienne at gmail.com>
---
 package/network/utils/iptables/Makefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/package/network/utils/iptables/Makefile b/package/network/utils/iptables/Makefile
index 12021c21f1..c5310838a3 100644
--- a/package/network/utils/iptables/Makefile
+++ b/package/network/utils/iptables/Makefile
@@ -41,7 +41,7 @@ endef
 
 define Package/iptables/Module
 $(call Package/iptables/Default)
-  DEPENDS:=+iptables $(1)
+  DEPENDS:=+libxtables $(1)
 endef
 
 define Package/iptables
@@ -457,7 +457,6 @@ $(call Package/iptables/Default)
   DEPENDS:=@IPV6 +kmod-ip6tables +iptables
   CATEGORY:=Network
   TITLE:=IPv6 firewall administration tool
-  MENU:=1
   ALTERNATIVES:=\
     200:/usr/sbin/ip6tables:/usr/sbin/xtables-legacy-multi \
     200:/usr/sbin/ip6tables-restore:/usr/sbin/xtables-legacy-multi \
@@ -485,7 +484,7 @@ endef
 
 define Package/ip6tables-extra
 $(call Package/iptables/Default)
-  DEPENDS:=ip6tables +kmod-ip6tables-extra
+  DEPENDS:=+libxtables +kmod-ip6tables-extra
   TITLE:=IPv6 header matching modules
 endef
 
@@ -495,7 +494,7 @@ endef
 
 define Package/ip6tables-mod-nat
 $(call Package/iptables/Default)
-  DEPENDS:=ip6tables +kmod-ipt-nat6
+  DEPENDS:=+libxtables +kmod-ipt-nat6
   TITLE:=IPv6 NAT extensions
 endef
 




More information about the lede-commits mailing list