projects / openwrt / staging / hauke.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c3a4cdd)
kmod-nft-reject: Fix for "nft_reject_ipv4.ko missing" warning
authorPhilip Prindeville <philipp@redfish-solutions.com>
Tue, 21 Apr 2020 08:29:51 +0000 (02:29 -0600)
committerDaniel Golle <daniel@makrotopia.org>
Fri, 30 Oct 2020 00:39:09 +0000 (00:39 +0000)
Seeing the following:

    ERROR: module '/home/philipp/lede/build_dir/target-x86_64_musl/linux-x86_64/linux-5.4.33/net/ipv4/netfilter/nft_reject_ipv4.ko' is missing.
    modules/netfilter.mk:1068: recipe for target '/home/philipp/lede/bin/targets/x86/64/packages/kmod-nft-core_5.4.33-1_x86_64.ipk' failed
    make[3]: *** [/home/philipp/lede/bin/targets/x86/64/packages/kmod-nft-core_5.4.33-1_x86_64.ipk] Error 1

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
include/netfilter.mk patch | blob | history
package/kernel/linux/modules/netfilter.mk patch | blob | history

diff --git a/include/netfilter.mk b/include/netfilter.mk
index 2c71c070565b7b62c42fb2d199bde47c39086de0..b00cdd81c626fcc73a87ee92d01470df6ec78e0a 100644 (file)
--- 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, $(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 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_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 83bb59be83e43a1115dc1b08426a317ac57be5c2..9f9798179f57c2f72a0eda2f596efa4b23b36f0e 100644 (file)
--- a/package/kernel/linux/modules/netfilter.mk
+++ b/package/kernel/linux/modules/netfilter.mk
@@ -1058,6 +1058,9 @@ 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
 
Hauke Mehrtens staging tree