diff options
| author | Yousong Zhou <yszhou4tech@gmail.com> | 2018-01-26 14:40:25 +0800 |
|---|---|---|
| committer | Yousong Zhou <yszhou4tech@gmail.com> | 2018-01-26 15:37:28 +0800 |
| commit | fbeae9d891e7661cfb9f9d5209f9656234466127 (patch) | |
| tree | 15754d9a7ebd586404523b062455a67ee0a59c1e /package | |
| parent | 6ea9a702c5b6ff0866ae93241d6b2bdd80ead5e4 (diff) | |
| download | upstream-fbeae9d891e7661cfb9f9d5209f9656234466127.tar.gz upstream-fbeae9d891e7661cfb9f9d5209f9656234466127.tar.bz2 upstream-fbeae9d891e7661cfb9f9d5209f9656234466127.zip | |
iptables: make kmod-ipt-debug part of default ALL build
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>
Diffstat (limited to 'package')
| -rw-r--r-- | package/kernel/linux/modules/netfilter.mk | 3 | ||||
| -rw-r--r-- | package/network/utils/iptables/Makefile | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk index 4b3e442237..3b26ad1fbf 100644 --- a/package/kernel/linux/modules/netfilter.mk +++ b/package/kernel/linux/modules/netfilter.mk @@ -446,10 +446,9 @@ $(eval $(call KernelPackage,ipt-nfqueue)) define KernelPackage/ipt-debug TITLE:=Module for debugging/development KCONFIG:=$(KCONFIG_IPT_DEBUG) - DEFAULT:=n FILES:=$(foreach mod,$(IPT_DEBUG-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_DEBUG-m))) - $(call AddDepends/ipt) + $(call AddDepends/ipt,+kmod-ipt-raw +IPV6:kmod-ipt-raw6) endef define KernelPackage/ipt-debug/description diff --git a/package/network/utils/iptables/Makefile b/package/network/utils/iptables/Makefile index 89922d17f4..9761ed1820 100644 --- a/package/network/utils/iptables/Makefile +++ b/package/network/utils/iptables/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=iptables PKG_VERSION:=1.4.21 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \ @@ -204,7 +204,7 @@ define Package/iptables-mod-nflog/description endef 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 endef |