183130227/tn3399_openwrt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

port ppp modules to package/kernel and fix ppp package dependencies

Browse Source 
SVN-Revision: 4329
This commit is contained in:
Felix Fietkau 2006-07-30 15:27:51 +00:00
parent d4af14883e
commit 526445bae2
5 changed files with 47 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
openwrt/include/modules-2.4.mk
View File

@ -25,25 +25,6 @@ $(eval $(call KMOD_template,IPV6,ipv6,\
$(MODULES_DIR)/kernel/net/ipv6/ipv6.o \
,CONFIG_IPV6,,20,ipv6))
$(eval $(call KMOD_template,PPP,ppp,\
$(MODULES_DIR)/kernel/drivers/net/ppp_async.o \
$(MODULES_DIR)/kernel/drivers/net/ppp_generic.o \
$(MODULES_DIR)/kernel/drivers/net/slhc.o \
$(MODULES_DIR)/kernel/drivers/net/pppox.o \
,CONFIG_PPP))
$(eval $(call KMOD_template,MPPE,mppe,\
$(MODULES_DIR)/kernel/drivers/net/ppp_mppe_mppc.o \
,CONFIG_PPP_MPPE_MPPC))
$(eval $(call KMOD_template,PPPOATM,pppoatm,\
$(MODULES_DIR)/kernel/net/atm/pppoatm.o \
,CONFIG_PPPOATM))
$(eval $(call KMOD_template,PPPOE,pppoe,\
$(MODULES_DIR)/kernel/drivers/net/pppoe.o \
,CONFIG_PPPOE))
$(eval $(call KMOD_template,SCHED,sched,\
$(MODULES_DIR)/kernel/net/sched/*.o \
))

20
openwrt/include/modules-2.6.mk
View File

@ -27,26 +27,6 @@ $(eval $(call KMOD_template,IPV6,ipv6,\
$(MODULES_DIR)/kernel/net/ipv6/ipv6.ko \
,CONFIG_IPV6,,20,ipv6))
$(eval $(call KMOD_template,PPP,ppp,\
$(MODULES_DIR)/kernel/drivers/net/ppp_async.ko \
$(MODULES_DIR)/kernel/drivers/net/ppp_generic.ko \
$(MODULES_DIR)/kernel/drivers/net/slhc.ko \
$(MODULES_DIR)/kernel/lib/crc-ccitt.ko \
,CONFIG_PPP))
#$(eval $(call KMOD_template,MPPE,mppe,\
# $(MODULES_DIR)/kernel/drivers/net/ppp_mppe_mppc.ko \
#,CONFIG_PPP_MPPE_MPPC))
$(eval $(call KMOD_template,PPPOATM,pppoatm,\
$(MODULES_DIR)/kernel/net/atm/pppoatm.ko \
,CONFIG_PPPOATM))
$(eval $(call KMOD_template,PPPOE,pppoe,\
$(MODULES_DIR)/kernel/drivers/net/pppoe.ko \
$(MODULES_DIR)/kernel/drivers/net/pppox.ko \
,CONFIG_PPPOE))
$(eval $(call KMOD_template,SCHED,sched,\
$(MODULES_DIR)/kernel/net/sched/*.ko \
,CONFIG_NET_SCHED))

44
openwrt/package/kernel/modules.mk
View File

@ -223,3 +223,47 @@ endef
$(eval $(call KernelPackage,ebtables))
define KernelPackage/ppp
TITLE:=PPP modules
DESCRIPTION:=Kernel modules for PPP support
KCONFIG:=$(CONFIG_PPP)
endef
define KernelPackage/ppp/2.6
FILES:=$(MODULES_DIR)/kernel/drivers/net/ppp_async.ko $(MODULES_DIR)/kernel/drivers/net/ppp_generic.ko $(MODULES_DIR)/kernel/drivers/net/slhc.ko $(MODULES_DIR)/kernel/lib/crc-ccitt.ko
AUTOLOAD:=$(call AutoLoad,30,crc-ccitt)
endef
define KernelPackage/ppp/2.4
FILES:=$(MODULES_DIR)/kernel/drivers/net/ppp_async.o $(MODULES_DIR)/kernel/drivers/net/ppp_generic.o $(MODULES_DIR)/kernel/drivers/net/slhc.o
endef
$(eval $(call KernelPackage,ppp))
define KernelPackage/pppoe
TITLE:=PPPoE modules
DESCRIPTION:=Kernel modules for PPP over Ethernet support
DEPENDS:=kmod-ppp
KCONFIG:=$(CONFIG_PPPOE)
FILES:=$(MODULES_DIR)/kernel/drivers/net/pppoe.$(LINUX_KMOD_SUFFIX) $(MODULES_DIR)/kernel/drivers/net/pppox.$(LINUX_KMOD_SUFFIX)
endef
$(eval $(call KernelPackage,pppoe))
define KernelPackage/pppoa
TITLE:=PPPoA modules
DESCRIPTION:=Kernel modules for PPP over ATM support
DEPENDS:=kmod-ppp
KCONFIG:=$(CONFIG_PPPOATM)
FILES:=$(MODULES_DIR)/kernel/drivers/net/pppoatm.$(LINUX_KMOD_SUFFIX)
endef
$(eval $(call KernelPackage,pppoa))
define KernelPackage/mppe
TITLE:=Microsoft PPP compression/encryption
DESCRIPTION:=Kernel modules for Microsoft PPP compression/encryption
DEPENDS:=@LINUX_2_4 kmod-ppp
KCONFIG:=$(CONFIG_PPPOE)
FILES:=$(MODULES_DIR)/kernel/drivers/net/ppp_mppe_mppc.$(LINUX_KMOD_SUFFIX)
endef
$(eval $(call KernelPackage,mppe))

5
openwrt/package/ppp/Makefile
View File

@ -28,6 +28,7 @@ SECTION:=net
CATEGORY:=Network
MENU:=1
DEFAULT:=y
DEPENDS:=+kmod-ppp
TITLE:=PPP daemon
DESCRIPTION:=PPP (Point-to-Point Protocol) daemon
URL:=http://ppp.samba.org/
@ -36,7 +37,7 @@ endef
define Package/ppp-mod-pppoa
SECTION:=net
CATEGORY:=Network
DEPENDS:=ppp +linux-atm
DEPENDS:=ppp +linux-atm +kmod-pppoa
TITLE:=PPPoA plugin
DESCRIPTION:=PPPoA (PPP over ATM) plugin for ppp
endef
@ -45,7 +46,7 @@ define Package/ppp-mod-pppoe
SECTION:=net
CATEGORY:=Network
DEFAULT:=y
DEPENDS:=ppp
DEPENDS:=ppp +kmod-pppoe
TITLE:=PPPoE plugin
DESCRIPTION:=PPPoE (PPP over Ethernet) plugin for ppp
endef

34
openwrt/target/linux/Config.in
View File

@ -37,40 +37,6 @@ config PACKAGE_KMOD_IPV6
help
Kernel modules for IPv6 protocol support
config PACKAGE_KMOD_PPP
prompt "kmod-ppp.......................... PPP support"
tristate
default m
help
Kernel support for PPP
config PACKAGE_KMOD_MPPE
prompt "kmod-mppe....................... PPP MPPE/MPPC module"
tristate
default m
depends PACKAGE_KMOD_PPP
select PACKAGE_kmod-crypto
help
Support for Microsoft PPP Encryption/Compression
config PACKAGE_KMOD_PPPOATM
prompt "kmod-pppoatm.................... PPPoA (PPP over ATM) kernel support"
tristate
default y if LINUX_2_4_AR7
default m
depends PACKAGE_KMOD_PPP
select PACKAGE_KMOD_ATM
help
Support for PPP over ATM
config PACKAGE_KMOD_PPPOE
prompt "kmod-pppoe...................... PPPoE (PPP over Ethernet) kernel support"
tristate
default m
depends PACKAGE_KMOD_PPP
help
Support for PPP over Ethernet
config PACKAGE_KMOD_RING
prompt "kmod-ring......................... PF Ring"
tristate