[Astlinux-commits] SF.net SVN: astlinux:[5525] branches/1.0

[<abe...@us...>]

Revision: 5525
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5525&view=rev
Author:   abelbeck
Date:     2012-05-02 15:25:41 +0000 (Wed, 02 May 2012)
Log Message:
-----------
remove old DAHDI_ZAPHFC support

Modified Paths:
--------------
    branches/1.0/astlinux.config
    branches/1.0/astlinux18.config
    branches/1.0/package/dahdi-linux/Config.in
    branches/1.0/package/dahdi-linux/dahdi-linux.mk
    branches/1.0/package/dahdi-tools/dahdi-tools.mk

Removed Paths:
-------------
    branches/1.0/package/dahdi-linux/zaphfc/
    branches/1.0/package/dahdi-linux/zaphfc-dahdi-2.4.0-Kbuild.patch

Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config	2012-04-30 22:20:28 UTC (rev 5524)
+++ branches/1.0/astlinux.config	2012-05-02 15:25:41 UTC (rev 5525)
@@ -179,7 +179,6 @@
 BR2_PACKAGE_ASTERISK_GUI=y
 BR2_PACKAGE_DAHDI_LINUX=y
 BR2_PACKAGE_DAHDI_OSLEC=y
-# BR2_PACKAGE_DAHDI_ZAPHFC is not set
 # BR2_PACKAGE_DAHDI_HFCS is not set
 BR2_PACKAGE_DAHDI_TOOLS=y
 # BR2_PACKAGE_FREESWITCH is not set

Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config	2012-04-30 22:20:28 UTC (rev 5524)
+++ branches/1.0/astlinux18.config	2012-05-02 15:25:41 UTC (rev 5525)
@@ -173,7 +173,6 @@
 BR2_PACKAGE_ASTERISK_GUI=y
 BR2_PACKAGE_DAHDI_LINUX=y
 BR2_PACKAGE_DAHDI_OSLEC=y
-# BR2_PACKAGE_DAHDI_ZAPHFC is not set
 # BR2_PACKAGE_DAHDI_HFCS is not set
 BR2_PACKAGE_DAHDI_TOOLS=y
 # BR2_PACKAGE_FREESWITCH is not set

Modified: branches/1.0/package/dahdi-linux/Config.in
===================================================================
--- branches/1.0/package/dahdi-linux/Config.in	2012-04-30 22:20:28 UTC (rev 5524)
+++ branches/1.0/package/dahdi-linux/Config.in	2012-05-02 15:25:41 UTC (rev 5525)
@@ -19,17 +19,6 @@
 
 		http://www.rowetel.com/blog/?page_id=454
 
-config BR2_PACKAGE_DAHDI_ZAPHFC
-	bool "dahdi_zaphfc"
-	default n
-	depends on BR2_PACKAGE_DAHDI_LINUX
-	help
-		Adds zaphfc driver (single port HFC BRI cards)
-		Note: Requires chan_dahdi in asterisk 1.6 and newer.
-		Note: Requires DAHDI 2.4.x
-
-		http://code.google.com/p/zaphfc/
-
 config BR2_PACKAGE_DAHDI_HFCS
 	bool "dahdi_hfcs"
 	default n

Modified: branches/1.0/package/dahdi-linux/dahdi-linux.mk
===================================================================
--- branches/1.0/package/dahdi-linux/dahdi-linux.mk	2012-04-30 22:20:28 UTC (rev 5524)
+++ branches/1.0/package/dahdi-linux/dahdi-linux.mk	2012-05-02 15:25:41 UTC (rev 5525)
@@ -3,17 +3,13 @@
 # dahdi-linux
 #
 ##############################################################
-ifeq ($(BR2_PACKAGE_DAHDI_ZAPHFC),y)
-DAHDI_LINUX_VERSION := 2.4.1.1
-else
- ifeq ($(BR2_PACKAGE_RHINO),y)
+ifeq ($(BR2_PACKAGE_RHINO),y)
 DAHDI_LINUX_VERSION := 2.5.0.2
+else
+ ifeq ($(BR2_PACKAGE_WANPIPE),y)
+DAHDI_LINUX_VERSION := 2.6.0
  else
-  ifeq ($(BR2_PACKAGE_WANPIPE),y)
 DAHDI_LINUX_VERSION := 2.6.0
-  else
-DAHDI_LINUX_VERSION := 2.6.0
-  endif
  endif
 endif
 DAHDI_LINUX_SOURCE := dahdi-linux-$(DAHDI_LINUX_VERSION).tar.gz
@@ -36,11 +32,6 @@
 	mkdir -p $(DAHDI_LINUX_DIR)/drivers/staging/echo
 	cp -a $(BUILD_DIR)/linux-$(LINUX_VERSION)/drivers/staging/echo/* $(DAHDI_LINUX_DIR)/drivers/staging/echo
 endif
-ifeq ($(strip $(BR2_PACKAGE_DAHDI_ZAPHFC)),y)
-	mkdir -p $(DAHDI_LINUX_DIR)/drivers/dahdi/zaphfc
-	cp -a package/dahdi-linux/zaphfc/* $(DAHDI_LINUX_DIR)/drivers/dahdi/zaphfc
-	toolchain/patch-kernel.sh $(DAHDI_LINUX_DIR) package/dahdi-linux/ zaphfc\*.patch
-endif
 ifeq ($(strip $(BR2_PACKAGE_DAHDI_HFCS)),y)
 	mkdir -p $(DAHDI_LINUX_DIR)/drivers/dahdi/hfcs
 	cp -a package/dahdi-linux/hfcs/* $(DAHDI_LINUX_DIR)/drivers/dahdi/hfcs

Deleted: branches/1.0/package/dahdi-linux/zaphfc-dahdi-2.4.0-Kbuild.patch
===================================================================
--- branches/1.0/package/dahdi-linux/zaphfc-dahdi-2.4.0-Kbuild.patch	2012-04-30 22:20:28 UTC (rev 5524)
+++ branches/1.0/package/dahdi-linux/zaphfc-dahdi-2.4.0-Kbuild.patch	2012-05-02 15:25:41 UTC (rev 5525)
@@ -1,11 +0,0 @@
---- dahdi-linux-2.4.0/drivers/dahdi/Kbuild.orig	2011-02-08 16:34:39.000000000 -0600
-+++ dahdi-linux-2.4.0/drivers/dahdi/Kbuild	2011-02-08 16:37:17.000000000 -0600
-@@ -17,6 +17,8 @@
- obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCT1XXP)		+= wct1xxp.o
- obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTE11XP)		+= wcte11xp.o
- 
-+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ZAPHFC)		+= zaphfc/
-+
- obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCFXO)		+= wcfxo.o
- obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_TOR2)		+= tor2.o
- obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_PCIRADIO)		+= pciradio.o

Modified: branches/1.0/package/dahdi-tools/dahdi-tools.mk
===================================================================
--- branches/1.0/package/dahdi-tools/dahdi-tools.mk	2012-04-30 22:20:28 UTC (rev 5524)
+++ branches/1.0/package/dahdi-tools/dahdi-tools.mk	2012-05-02 15:25:41 UTC (rev 5525)
@@ -3,17 +3,13 @@
 # dahdi-tools
 #
 ##############################################################
-ifeq ($(BR2_PACKAGE_DAHDI_ZAPHFC),y)
-DAHDI_TOOLS_VERSION := 2.4.1
-else
- ifeq ($(BR2_PACKAGE_RHINO),y)
+ifeq ($(BR2_PACKAGE_RHINO),y)
 DAHDI_TOOLS_VERSION := 2.5.0.2
+else
+ ifeq ($(BR2_PACKAGE_WANPIPE),y)
+DAHDI_TOOLS_VERSION := 2.6.0
  else
-  ifeq ($(BR2_PACKAGE_WANPIPE),y)
 DAHDI_TOOLS_VERSION := 2.6.0
-  else
-DAHDI_TOOLS_VERSION := 2.6.0
-  endif
  endif
 endif
 DAHDI_TOOLS_SOURCE := dahdi-tools-$(DAHDI_TOOLS_VERSION).tar.gz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.