qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-30 20:50:38 +02:00
Code

kernel: split off act_connmark into a separate package to avoid cluttering kmod-sched with a netfilter dependency (fixes #11483)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31791 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2012-05-18 18:36:36 +00:00
parent 5ce0dd5cbe
commit 435a2cf2ad
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
package/kernel/modules/netsupport.mk
View File

@ -624,8 +624,8 @@ $(eval $(call KernelPackage,mppe))
SCHED_MODULES = $(patsubst $(LINUX_DIR)/net/sched/%.ko,%,$(wildcard $(LINUX_DIR)/net/sched/*.ko)) SCHED_MODULES = $(patsubst $(LINUX_DIR)/net/sched/%.ko,%,$(wildcard $(LINUX_DIR)/net/sched/*.ko))
SCHED_MODULES_CORE = sch_ingress sch_codel sch_fq_codel sch_hfsc cls_fw cls_route cls_flow cls_tcindex cls_u32 em_u32 act_mirred act_connmark act_skbedit SCHED_MODULES_CORE = sch_ingress sch_codel sch_fq_codel sch_hfsc cls_fw cls_route cls_flow cls_tcindex cls_u32 em_u32 act_mirred act_skbedit
SCHED_MODULES_EXTRA = $(filter-out $(SCHED_MODULES_CORE),$(SCHED_MODULES)) SCHED_MODULES_EXTRA = $(filter-out $(SCHED_MODULES_CORE) act_connmark,$(SCHED_MODULES))
SCHED_FILES = $(patsubst %,$(LINUX_DIR)/net/sched/%.ko,$(SCHED_MODULES_CORE)) SCHED_FILES = $(patsubst %,$(LINUX_DIR)/net/sched/%.ko,$(SCHED_MODULES_CORE))
SCHED_FILES_EXTRA = $(patsubst %,$(LINUX_DIR)/net/sched/%.ko,$(SCHED_MODULES_EXTRA)) SCHED_FILES_EXTRA = $(patsubst %,$(LINUX_DIR)/net/sched/%.ko,$(SCHED_MODULES_EXTRA))
@ -646,7 +646,6 @@ define KernelPackage/sched-core
CONFIG_NET_CLS_TCINDEX \ CONFIG_NET_CLS_TCINDEX \
CONFIG_NET_CLS_U32 \ CONFIG_NET_CLS_U32 \
CONFIG_NET_ACT_MIRRED \ CONFIG_NET_ACT_MIRRED \
CONFIG_NET_ACT_CONNMARK \
CONFIG_NET_ACT_SKBEDIT \ CONFIG_NET_ACT_SKBEDIT \
CONFIG_NET_EMATCH=y \ CONFIG_NET_EMATCH=y \
CONFIG_NET_EMATCH_U32 CONFIG_NET_EMATCH_U32
@ -660,9 +659,17 @@ endef
$(eval $(call KernelPackage,sched-core)) $(eval $(call KernelPackage,sched-core))
define KernelPackage/sched-connmark
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=Traffic shaper conntrack mark support
DEPENDS:=+kmod-sched-core +kmod-ipt-core +kmod-ipt-conntrack-extra
KCONFIG:=CONFIG_NET_ACT_CONNMARK
endef
$(eval $(call KernelPackage,sched-connmark))
define KernelPackage/sched define KernelPackage/sched
SUBMENU:=$(NETWORK_SUPPORT_MENU) SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=Traffic schedulers TITLE:=Extra traffic schedulers
DEPENDS:=+kmod-sched-core DEPENDS:=+kmod-sched-core
KCONFIG:= \ KCONFIG:= \
CONFIG_NET_SCH_DSMARK \ CONFIG_NET_SCH_DSMARK \

2
package/qos-scripts/Makefile
View File

@ -18,7 +18,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/qos-scripts define Package/qos-scripts
SECTION:=utils SECTION:=utils
CATEGORY:=Base system CATEGORY:=Base system
DEPENDS:=+tc +kmod-sched-core +kmod-ifb +iptables +iptables-mod-filter +iptables-mod-ipopt +iptables-mod-conntrack-extra DEPENDS:=+tc +kmod-sched-core +kmod-sched-connmark +kmod-ifb +iptables +iptables-mod-filter +iptables-mod-ipopt +iptables-mod-conntrack-extra
TITLE:=QoS scripts TITLE:=QoS scripts
PKGARCH:=all PKGARCH:=all
endef endef