diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2018-04-09 19:41:26 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2018-04-09 19:41:48 +0200 |
| commit | 177fa14340ebd1784ea87b7c914cde3ffea81c97 (patch) | |
| tree | 4598125b26f1fa77bdd666b4895c5e0fbe23aaf7 /package | |
| parent | ff9a2ab8302c88b10bb75446b2a371ec305487c0 (diff) | |
| download | upstream-177fa14340ebd1784ea87b7c914cde3ffea81c97.tar.gz upstream-177fa14340ebd1784ea87b7c914cde3ffea81c97.tar.bz2 upstream-177fa14340ebd1784ea87b7c914cde3ffea81c97.zip | |
iptables: split physdev match out as a separate package
Split physdev match out of ipt-extra to allow installing ipt-extra without
pulling in br-netfilter.
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
Diffstat (limited to 'package')
| -rw-r--r-- | package/kernel/linux/modules/netfilter.mk | 18 | ||||
| -rw-r--r-- | package/network/utils/iptables/Makefile | 11 |
2 files changed, 26 insertions, 3 deletions
diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk index 48db5d0599..99c24cc042 100644 --- a/package/kernel/linux/modules/netfilter.mk +++ b/package/kernel/linux/modules/netfilter.mk @@ -686,7 +686,7 @@ define KernelPackage/ipt-extra KCONFIG:=$(KCONFIG_IPT_EXTRA) FILES:=$(foreach mod,$(IPT_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_EXTRA-m))) - $(call AddDepends/ipt,+kmod-br-netfilter) + $(call AddDepends/ipt) endef define KernelPackage/ipt-extra/description @@ -694,7 +694,6 @@ define KernelPackage/ipt-extra/description Includes: - addrtype - owner - - physdev (if bridge support was enabled in kernel) - pkttype - quota endef @@ -702,6 +701,21 @@ endef $(eval $(call KernelPackage,ipt-extra)) +define KernelPackage/ipt-physdev + TITLE:=physdev module + KCONFIG:=$(KCONFIG_IPT_PHYSDEV) + FILES:=$(foreach mod,$(IPT_PHYSDEV-m),$(LINUX_DIR)/net/$(mod).ko) + AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_PHYSDEV-m))) + $(call AddDepends/ipt,+kmod-br-netfilter) +endef + +define KernelPackage/ipt-physdev/description + The iptables physdev kernel module +endef + +$(eval $(call KernelPackage,ipt-physdev)) + + define KernelPackage/ip6tables SUBMENU:=$(NF_MENU) TITLE:=IPv6 modules diff --git a/package/network/utils/iptables/Makefile b/package/network/utils/iptables/Makefile index ae9212a552..d70dc11d45 100644 --- a/package/network/utils/iptables/Makefile +++ b/package/network/utils/iptables/Makefile @@ -349,12 +349,20 @@ Other extra iptables extensions. - addrtype - condition - owner - - physdev (if ebtables is enabled) - pkttype - quota endef +define Package/iptables-mod-physdev +$(call Package/iptables/Module, +kmod-ipt-physdev) + TITLE:=physdev iptables extension +endef + +define Package/iptables-mod-physdev/description +The iptables physdev match. +endef + define Package/iptables-mod-led $(call Package/iptables/Module, +kmod-ipt-led) TITLE:=LED trigger iptables extension @@ -609,6 +617,7 @@ $(eval $(call BuildPackage,iptables)) $(eval $(call BuildPlugin,iptables-mod-conntrack-extra,$(IPT_CONNTRACK_EXTRA-m))) $(eval $(call BuildPlugin,iptables-mod-conntrack-label,$(IPT_CONNTRACK_LABEL-m))) $(eval $(call BuildPlugin,iptables-mod-extra,$(IPT_EXTRA-m))) +$(eval $(call BuildPlugin,iptables-mod-physdev,$(IPT_PHYSDEV-m))) $(eval $(call BuildPlugin,iptables-mod-filter,$(IPT_FILTER-m))) $(eval $(call BuildPlugin,iptables-mod-ipopt,$(IPT_IPOPT-m))) $(eval $(call BuildPlugin,iptables-mod-ipsec,$(IPT_IPSEC-m))) |