diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2020-10-30 01:37:54 +0000 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2020-10-30 01:39:01 +0000 |
| commit | 499924adf077428e88010230ecf5c363fe018623 (patch) | |
| tree | 5fb71e486c67594dcb0a858de53ad49b805af72f | |
| parent | 0fdbd2e61f742d9fbd6263bd86da3013ebcb1b9c (diff) | |
| download | upstream-499924adf077428e88010230ecf5c363fe018623.tar.gz upstream-499924adf077428e88010230ecf5c363fe018623.tar.bz2 upstream-499924adf077428e88010230ecf5c363fe018623.zip | |
Revert "kmod-nft-reject: Fix for "nft_reject_ipv4.ko missing" warning"
This reverts commit 7f94e2afcf090f751c9f7f7ea46e8ef8d93ee84b.
Package kmod-nft-core is missing dependencies for the following libraries:
nft_reject.ko
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
| -rw-r--r-- | include/netfilter.mk | 2 | ||||
| -rw-r--r-- | package/kernel/linux/modules/netfilter.mk | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/netfilter.mk b/include/netfilter.mk index b00cdd81c6..2c71c07056 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -344,7 +344,7 @@ $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_NUMGEN, $(P_XT)nft_numg $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_OBJREF, $(P_XT)nft_objref),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_QUOTA, $(P_XT)nft_quota),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_REDIR, $(P_XT)nft_redir),)) -$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_REJECT CONFIG_NFT_REJECT_IPV4 CONFIG_NFT_REJECT_IPV6, $(P_XT)nft_reject $(P_V4)nft_reject_ipv4 $(P_V6)nft_reject_ipv6),)) +$(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_REJECT, $(P_XT)nft_reject $(P_V4)nft_reject_ipv4 $(P_V6)nft_reject_ipv6),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_CORE,CONFIG_NFT_REJECT_INET, $(P_XT)nft_reject_inet),)) $(eval $(if $(NF_KMOD),$(call nf_add,NFT_BRIDGE,CONFIG_NFT_BRIDGE_META, $(P_EBT)nft_meta_bridge),)) diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk index 9f9798179f..83bb59be83 100644 --- a/package/kernel/linux/modules/netfilter.mk +++ b/package/kernel/linux/modules/netfilter.mk @@ -1058,9 +1058,6 @@ define KernelPackage/nft-core KCONFIG:= \ CONFIG_NFT_COMPAT=n \ CONFIG_NFT_QUEUE=n \ - CONFIG_NFT_REJECT_INET \ - CONFIG_NFT_REJECT_IPV4 \ - CONFIG_NFT_REJECT_IPV6 \ $(KCONFIG_NFT_CORE) endef |