aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2022-08-07 14:06:14 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2022-08-14 00:29:19 +0200
commit534e256c029bc47920d8b2544a43e568491b1af2 (patch)
tree25a0fd3447d901595bae9e002e921af982c7faf7 /package
parent2a6fa77b779272ca87e62ef3ae66cb415160d61d (diff)
downloadupstream-534e256c029bc47920d8b2544a43e568491b1af2.tar.gz
upstream-534e256c029bc47920d8b2544a43e568491b1af2.tar.bz2
upstream-534e256c029bc47920d8b2544a43e568491b1af2.zip
kernel: kmod-nft-nat6: Remove package
The nft NAT packages for IPv4 and IPv6 were merged into the common packages with kernel 5.1. The kmod-nft-nat6 package was empty in our build, remove it. Multiple kernel configuration options were also removed, remove them from our generic kernel configuration too. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit b75425370d8de747457c137463bc4d15f6f44d00)
Diffstat (limited to 'package')
-rw-r--r--package/kernel/linux/modules/netfilter.mk11
-rw-r--r--package/network/config/firewall4/Makefile2
2 files changed, 1 insertions, 12 deletions
diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk
index b70c6fa09f..abcbaac54d 100644
--- a/package/kernel/linux/modules/netfilter.mk
+++ b/package/kernel/linux/modules/netfilter.mk
@@ -1187,17 +1187,6 @@ endef
$(eval $(call KernelPackage,nft-offload))
-define KernelPackage/nft-nat6
- SUBMENU:=$(NF_MENU)
- TITLE:=Netfilter nf_tables IPv6-NAT support
- DEPENDS:=+kmod-nft-nat +kmod-nf-nat6
- FILES:=$(foreach mod,$(NFT_NAT6-m),$(LINUX_DIR)/net/$(mod).ko)
- AUTOLOAD:=$(call AutoProbe,$(notdir $(NFT_NAT6-m)))
- KCONFIG:=$(KCONFIG_NFT_NAT6)
-endef
-
-$(eval $(call KernelPackage,nft-nat6))
-
define KernelPackage/nft-netdev
SUBMENU:=$(NF_MENU)
TITLE:=Netfilter nf_tables netdev support
diff --git a/package/network/config/firewall4/Makefile b/package/network/config/firewall4/Makefile
index d6f363f3c8..0003fc09c3 100644
--- a/package/network/config/firewall4/Makefile
+++ b/package/network/config/firewall4/Makefile
@@ -23,7 +23,7 @@ define Package/firewall4
TITLE:=OpenWrt 4th gen firewall
DEPENDS:= \
+kmod-nft-core +kmod-nft-fib +kmod-nft-offload \
- +kmod-nft-nat +kmod-nft-nat6 \
+ +kmod-nft-nat \
+nftables-json \
+ucode +ucode-mod-fs +ucode-mod-ubus +ucode-mod-uci
EXTRA_DEPENDS:=ucode (>= 2022-03-22)