diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-09-09 20:37:50 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-09-09 20:37:50 +0000 |
| commit | c31bf097337128e0799e39ba4028db9d56795c38 (patch) | |
| tree | dab2823c341fe2341cc381d8e2500702730c694f /package/kernel/modules/network.mk | |
| parent | ab6c861ac767930b3d14cae66f07022735a2efd7 (diff) | |
fix KCONFIG in packages: move back all KCONFIG from package variants to the main package since we don't know the kernel version at dump time.
keep old KCONFIG lines commented out, so we can switch back easily later.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8721 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/modules/network.mk')
| -rw-r--r-- | package/kernel/modules/network.mk | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk index 5dc520db8..503c2e05c 100644 --- a/package/kernel/modules/network.mk +++ b/package/kernel/modules/network.mk @@ -62,13 +62,15 @@ $(eval $(call KernelPackage,bonding)) define KernelPackage/ipip SUBMENU:=$(NSMENU) TITLE:=IP in IP encapsulation support - KCONFIG:=CONFIG_NET_IPIP + KCONFIG:= \ + CONFIG_NET_IPIP \ + CONFIG_INET_TUNNEL FILES:=$(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,ipip) endef define KernelPackage/ipip/2.6 - KCONFIG+=CONFIG_INET_TUNNEL +# KCONFIG+=CONFIG_INET_TUNNEL FILES+=$(LINUX_DIR)/net/ipv4/tunnel4.$(LINUX_KMOD_SUFFIX) AUTOLOAD+=$(call AutoLoad,31,tunnel4) endef @@ -159,13 +161,15 @@ $(eval $(call KernelPackage,ipsec6)) define KernelPackage/ipv6 SUBMENU:=$(NSMENU) TITLE:=IPv6 support - KCONFIG:=CONFIG_IPV6 + KCONFIG:= \ + CONFIG_IPV6 \ + CONFIG_IPV6_SIT FILES:=$(LINUX_DIR)/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,20,ipv6) endef define KernelPackage/ipv6/2.6 - KCONFIG+=CONFIG_IPV6_SIT +# KCONFIG+=CONFIG_IPV6_SIT FILES+=$(LINUX_DIR)/net/ipv6/sit.$(LINUX_KMOD_SUFFIX) AUTOLOAD+=$(call AutoLoad,21,sit) endef @@ -211,7 +215,9 @@ define KernelPackage/ppp TITLE:=PPP modules KCONFIG:= \ CONFIG_PPP \ - CONFIG_PPP_ASYNC + CONFIG_PPP_ASYNC \ + CONFIG_SLHC \ + CONFIG_CRC_CCITT FILES:= \ $(LINUX_DIR)/drivers/net/ppp_async.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/net/ppp_generic.$(LINUX_KMOD_SUFFIX) \ @@ -223,9 +229,9 @@ define KernelPackage/ppp/2.4 endef define KernelPackage/ppp/2.6 - KCONFIG+= \ - CONFIG_SLHC \ - CONFIG_CRC_CCITT +# KCONFIG+= \ +# CONFIG_SLHC \ +# CONFIG_CRC_CCITT FILES+= \ $(LINUX_DIR)/lib/crc-ccitt.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,crc-ccitt slhc ppp_generic ppp_async) @@ -291,16 +297,19 @@ define KernelPackage/mppe SUBMENU:=$(NSMENU) TITLE:=Microsoft PPP compression/encryption DEPENDS:=kmod-ppp + KCONFIG:= \ + CONFIG_PPP_MPPE_MPPC \ + CONFIG_PPP_MPPE endef define KernelPackage/mppe/2.4 - KCONFIG:=CONFIG_PPP_MPPE_MPPC +# KCONFIG:=CONFIG_PPP_MPPE_MPPC FILES:=$(LINUX_DIR)/drivers/net/ppp_mppe_mppc.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,31,ppp_mppe_mppc) endef define KernelPackage/mppe/2.6 - KCONFIG:=CONFIG_PPP_MPPE +# KCONFIG:=CONFIG_PPP_MPPE FILES:=$(LINUX_DIR)/drivers/net/ppp_mppe.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,31,ppp_mppe) endef |