Changeset 31791


Ignore:
Timestamp:
2012-05-18T20:36:36+02:00 (6 years ago)
Author:
nbd
Message:

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

Location:
trunk/package
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/package/kernel/modules/netsupport.mk

    r31775 r31791  
    625625 
    626626SCHED_MODULES = $(patsubst $(LINUX_DIR)/net/sched/%.ko,%,$(wildcard $(LINUX_DIR)/net/sched/*.ko)) 
    627 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 
    628 SCHED_MODULES_EXTRA = $(filter-out $(SCHED_MODULES_CORE),$(SCHED_MODULES)) 
     627SCHED_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 
     628SCHED_MODULES_EXTRA = $(filter-out $(SCHED_MODULES_CORE) act_connmark,$(SCHED_MODULES)) 
    629629SCHED_FILES = $(patsubst %,$(LINUX_DIR)/net/sched/%.ko,$(SCHED_MODULES_CORE)) 
    630630SCHED_FILES_EXTRA = $(patsubst %,$(LINUX_DIR)/net/sched/%.ko,$(SCHED_MODULES_EXTRA)) 
    … …  
    647647        CONFIG_NET_CLS_U32 \ 
    648648        CONFIG_NET_ACT_MIRRED \ 
    649         CONFIG_NET_ACT_CONNMARK \ 
    650649        CONFIG_NET_ACT_SKBEDIT \ 
    651650        CONFIG_NET_EMATCH=y \ 
    … …  
    661660 
    662661 
     662define KernelPackage/sched-connmark 
     663  SUBMENU:=$(NETWORK_SUPPORT_MENU) 
     664  TITLE:=Traffic shaper conntrack mark support 
     665  DEPENDS:=+kmod-sched-core +kmod-ipt-core +kmod-ipt-conntrack-extra 
     666  KCONFIG:=CONFIG_NET_ACT_CONNMARK 
     667endef 
     668$(eval $(call KernelPackage,sched-connmark)) 
     669 
    663670define KernelPackage/sched 
    664671  SUBMENU:=$(NETWORK_SUPPORT_MENU) 
    665   TITLE:=Traffic schedulers 
     672  TITLE:=Extra traffic schedulers 
    666673  DEPENDS:=+kmod-sched-core 
    667674  KCONFIG:= \ 

  • trunk/package/qos-scripts/Makefile

    r31761 r31791  
    1919  SECTION:=utils 
    2020  CATEGORY:=Base system 
    21   DEPENDS:=+tc +kmod-sched-core +kmod-ifb +iptables +iptables-mod-filter +iptables-mod-ipopt +iptables-mod-conntrack-extra 
     21  DEPENDS:=+tc +kmod-sched-core +kmod-sched-connmark +kmod-ifb +iptables +iptables-mod-filter +iptables-mod-ipopt +iptables-mod-conntrack-extra 
    2222  TITLE:=QoS scripts 
    2323  PKGARCH:=all 
Note: See TracChangeset for help on using the changeset viewer.