Modify

Opened 7 years ago

Closed 7 years ago

Last modified 2 years ago

#6258 closed enhancement (worksforme)

some kmod-ppp rework?

Reported by: system___f Owned by: developers
Priority: low Milestone: Barrier Breaker 14.07
Component: packages Version: Trunk
Keywords: Cc:

Description

pppol2tp actually doesn't depends on pppoe, but only on pppox:

Path: .
URL: svn://svn.openwrt.org/openwrt/trunk
Repository Root: svn://svn.openwrt.org/openwrt
Repository UUID: 3c298f89-4303-0410-b956-a3cf2f4a3e73
Revision: 18614
Node Kind: directory
Schedule: normal
Last Changed Author: juhosg
Last Changed Rev: 18614
Last Changed Date: 2009-11-30 16:53:39 +0300 (Mon, 30 Nov 2009)

Index: package/kernel/modules/netsupport.mk
===================================================================
--- package/kernel/modules/netsupport.mk	(revision 18614)
+++ package/kernel/modules/netsupport.mk	(working copy)
@@ -402,16 +402,13 @@
 define KernelPackage/ppp
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=PPP modules
-  DEPENDS:=+LINUX_2_6:kmod-crc-ccitt
   KCONFIG:= \
 	CONFIG_PPP \
-	CONFIG_PPP_ASYNC \
 	CONFIG_SLHC
   FILES:= \
-	$(LINUX_DIR)/drivers/net/ppp_async.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/net/ppp_generic.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/net/slhc.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,slhc ppp_generic ppp_async)
+  AUTOLOAD:=$(call AutoLoad,30,slhc ppp_generic)
 endef
 
 define KernelPackage/ppp/description
@@ -421,6 +418,22 @@
 $(eval $(call KernelPackage,ppp))
 
 
+define KernelPackage/ppp-async
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=PPP support for async serial ports
+  DEPENDS:=kmod-ppp +LINUX_2_6:kmod-crc-ccitt
+  KCONFIG:=CONFIG_PPP_ASYNC
+  FILES:=$(LINUX_DIR)/drivers/net/ppp_async.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,ppp_async)
+endef
+
+define KernelPackage/ppp-async/description
+ Kernel modules for PPP async serial ports
+endef
+
+$(eval $(call KernelPackage,ppp-async))
+
+
 define KernelPackage/ppp-synctty
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=PPP sync tty support
@@ -473,10 +486,12 @@
 define KernelPackage/pppol2tp
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=PPPoL2TP support
-  DEPENDS:=kmod-ppp +kmod-pppoe @!LINUX_2_6_21||!LINUX_2_6_25
+  DEPENDS:=kmod-ppp @!LINUX_2_6_21||!LINUX_2_6_25
   KCONFIG:=CONFIG_PPPOL2TP
-  FILES:=$(LINUX_DIR)/drivers/net/pppol2tp.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,40,pppol2tp)
+  FILES:= \
+		$(LINUX_DIR)/drivers/net/pppol2tp.$(LINUX_KMOD_SUFFIX) \
+		$(LINUX_DIR)/drivers/net/pppox.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,40,pppox pppol2tp)
 endef
 
 define KernelPackage/pppol2tp/description

Attachments (0)

Change History (2)

comment:1 Changed 7 years ago by florian

  • Resolution set to worksforme
  • Status changed from new to closed

Agreed, it depends on pppox, but we package pppox within the pppoe package, thus the dependency.

comment:2 Changed 2 years ago by jow

  • Milestone changed from Attitude Adjustment 12.09 to Barrier Breaker 14.07

Milestone Attitude Adjustment 12.09 deleted

Add Comment

Modify Ticket

Action
as closed .
The resolution will be deleted. Next status will be 'reopened'.
Author


E-mail address and user name can be saved in the Preferences.

 
Note: See TracTickets for help on using tickets.