gwrx/openwrt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iptables: make kmod-ipt-debug part of default ALL build

Browse Source 
The iptables TRACE target is only available in raw table that's why the
dependency was moved from iptables-mod-trace into kmod-ipt-debug

Fixes FS#1219

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
This commit is contained in:
Yousong Zhou 2018-01-26 14:40:25 +08:00
parent dc555d003c
commit e6de92cdcc
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package/kernel/linux/modules/netfilter.mk
View File

@ -447,10 +447,9 @@ $(eval $(call KernelPackage,ipt-nfqueue))
define KernelPackage/ipt-debug define KernelPackage/ipt-debug
TITLE:=Module for debugging/development TITLE:=Module for debugging/development
KCONFIG:=$(KCONFIG_IPT_DEBUG) KCONFIG:=$(KCONFIG_IPT_DEBUG)
DEFAULT:=n
FILES:=$(foreach mod,$(IPT_DEBUG-m),$(LINUX_DIR)/net/$(mod).ko) FILES:=$(foreach mod,$(IPT_DEBUG-m),$(LINUX_DIR)/net/$(mod).ko)
AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_DEBUG-m))) AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_DEBUG-m)))
$(call AddDepends/ipt) $(call AddDepends/ipt,+kmod-ipt-raw +IPV6:kmod-ipt-raw6)
endef endef
define KernelPackage/ipt-debug/description define KernelPackage/ipt-debug/description

4
package/network/utils/iptables/Makefile
View File

@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=iptables PKG_NAME:=iptables
PKG_VERSION:=1.6.1 PKG_VERSION:=1.6.1
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://git.netfilter.org/iptables PKG_SOURCE_URL:=https://git.netfilter.org/iptables
@ -218,7 +218,7 @@ define Package/iptables-mod-nflog/description
endef endef
define Package/iptables-mod-trace define Package/iptables-mod-trace
$(call Package/iptables/Module, +kmod-ipt-debug +kmod-ipt-raw) $(call Package/iptables/Module, +kmod-ipt-debug)
TITLE:=Netfilter TRACE target TITLE:=Netfilter TRACE target
endef endef