From 5c36607da64a0e2e3906fa926f36d9514e92c0e8 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 30 Jul 2006 15:27:51 +0000
Subject: port ppp modules to package/kernel and fix ppp package dependencies

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4329 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/kernel/modules.mk | 44 ++++++++++++++++++++++++++++++++++++++++++++
 package/ppp/Makefile      |  5 +++--
 2 files changed, 47 insertions(+), 2 deletions(-)

(limited to 'package')

diff --git a/package/kernel/modules.mk b/package/kernel/modules.mk
index 48741eeb36..51af5d8b61 100644
--- a/package/kernel/modules.mk
+++ b/package/kernel/modules.mk
@@ -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))
+
+
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index e49b610c36..6581ef7e2b 100644
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -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
-- 
cgit v1.2.3