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

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

Revision: 5545
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5545&view=rev
Author:   abelbeck
Date:     2012-05-22 21:53:12 +0000 (Tue, 22 May 2012)
Log Message:
-----------
DAHDI, version bump dahdi-linux 2.6.1 and dahdi-tools 2.6.1

Modified Paths:
--------------
    branches/1.0/package/dahdi-linux/dahdi-linux.mk
    branches/1.0/package/dahdi-tools/dahdi-tools.mk

Added Paths:
-----------
    branches/1.0/package/dahdi-linux/oslec-2.6.1-echocan_oslec.patch
    branches/1.0/package/dahdi-linux/oslec-pre2.6.1-echocan_oslec.patch

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

Deleted: branches/1.0/package/dahdi-linux/dahdi-linux-2.4.0-echocan_oslec.patch
===================================================================
--- branches/1.0/package/dahdi-linux/dahdi-linux-2.4.0-echocan_oslec.patch	2012-05-21 22:39:36 UTC (rev 5544)
+++ branches/1.0/package/dahdi-linux/dahdi-linux-2.4.0-echocan_oslec.patch	2012-05-22 21:53:12 UTC (rev 5545)
@@ -1,15 +0,0 @@
---- dahdi-linux-2.4.0/drivers/dahdi/Kbuild.orig	2011-02-08 10:50:50.000000000 -0600
-+++ dahdi-linux-2.4.0/drivers/dahdi/Kbuild	2011-02-08 10:52:58.000000000 -0600
-@@ -38,7 +38,11 @@
- # A quick and dirty way to build OSLEC, if you happened to place it
- # yourself in the dahdi source tree. This is experimental. See README
- # regarding OSLEC.
--#obj-m += ../staging/echo/
-+ifneq (,$(wildcard $(src)/../staging/echo/echo.c))
-+obj-$(DAHDI_BUILD_ALL) += ../staging/echo/echo.o
-+obj-m += dahdi_echocan_oslec.o
-+obj-m += ../staging/echo/
-+endif
- 
- CFLAGS_MODULE += -I$(DAHDI_INCLUDE) -I$(src)
- 

Modified: branches/1.0/package/dahdi-linux/dahdi-linux.mk
===================================================================
--- branches/1.0/package/dahdi-linux/dahdi-linux.mk	2012-05-21 22:39:36 UTC (rev 5544)
+++ branches/1.0/package/dahdi-linux/dahdi-linux.mk	2012-05-22 21:53:12 UTC (rev 5545)
@@ -7,9 +7,9 @@
 DAHDI_LINUX_VERSION := 2.5.0.2
 else
  ifeq ($(BR2_PACKAGE_WANPIPE),y)
-DAHDI_LINUX_VERSION := 2.6.0
+DAHDI_LINUX_VERSION := 2.6.1
  else
-DAHDI_LINUX_VERSION := 2.6.0
+DAHDI_LINUX_VERSION := 2.6.1
  endif
 endif
 DAHDI_LINUX_SOURCE := dahdi-linux-$(DAHDI_LINUX_VERSION).tar.gz
@@ -31,6 +31,11 @@
 ifeq ($(strip $(BR2_PACKAGE_DAHDI_OSLEC)),y)
 	mkdir -p $(DAHDI_LINUX_DIR)/drivers/staging/echo
 	cp -a $(BUILD_DIR)/linux-$(LINUX_VERSION)/drivers/staging/echo/* $(DAHDI_LINUX_DIR)/drivers/staging/echo
+ ifeq ($(strip $(DAHDI_LINUX_VERSION)),2.5.0.2)
+	toolchain/patch-kernel.sh $(DAHDI_LINUX_DIR) package/dahdi-linux/ oslec-pre2.6.1\*.patch
+ else
+	toolchain/patch-kernel.sh $(DAHDI_LINUX_DIR) package/dahdi-linux/ oslec-2.6.1\*.patch
+ endif
 endif
 ifeq ($(strip $(BR2_PACKAGE_DAHDI_HFCS)),y)
 	mkdir -p $(DAHDI_LINUX_DIR)/drivers/dahdi/hfcs

Added: branches/1.0/package/dahdi-linux/oslec-2.6.1-echocan_oslec.patch
===================================================================
--- branches/1.0/package/dahdi-linux/oslec-2.6.1-echocan_oslec.patch	                        (rev 0)
+++ branches/1.0/package/dahdi-linux/oslec-2.6.1-echocan_oslec.patch	2012-05-22 21:53:12 UTC (rev 5545)
@@ -0,0 +1,10 @@
+--- dahdi-linux-2.6.1/drivers/dahdi/Kbuild.orig	2012-05-22 16:22:09.000000000 -0500
++++ dahdi-linux-2.6.1/drivers/dahdi/Kbuild	2012-05-22 16:23:11.000000000 -0500
+@@ -37,6 +37,7 @@
+ # drivers/staging/echo . The DAHDI OSLEC echo canceller will be built as
+ # well:
+ ifneq (,$(wildcard $(src)/../staging/echo/echo.c))
++obj-$(DAHDI_BUILD_ALL) += ../staging/echo/echo.o
+ obj-m += dahdi_echocan_oslec.o
+ obj-m += ../staging/echo/
+ endif

Copied: branches/1.0/package/dahdi-linux/oslec-pre2.6.1-echocan_oslec.patch (from rev 5544, branches/1.0/package/dahdi-linux/dahdi-linux-2.4.0-echocan_oslec.patch)
===================================================================
--- branches/1.0/package/dahdi-linux/oslec-pre2.6.1-echocan_oslec.patch	                        (rev 0)
+++ branches/1.0/package/dahdi-linux/oslec-pre2.6.1-echocan_oslec.patch	2012-05-22 21:53:12 UTC (rev 5545)
@@ -0,0 +1,15 @@
+--- dahdi-linux-2.4.0/drivers/dahdi/Kbuild.orig	2011-02-08 10:50:50.000000000 -0600
++++ dahdi-linux-2.4.0/drivers/dahdi/Kbuild	2011-02-08 10:52:58.000000000 -0600
+@@ -38,7 +38,11 @@
+ # A quick and dirty way to build OSLEC, if you happened to place it
+ # yourself in the dahdi source tree. This is experimental. See README
+ # regarding OSLEC.
+-#obj-m += ../staging/echo/
++ifneq (,$(wildcard $(src)/../staging/echo/echo.c))
++obj-$(DAHDI_BUILD_ALL) += ../staging/echo/echo.o
++obj-m += dahdi_echocan_oslec.o
++obj-m += ../staging/echo/
++endif
+ 
+ CFLAGS_MODULE += -I$(DAHDI_INCLUDE) -I$(src)
+ 

Modified: branches/1.0/package/dahdi-tools/dahdi-tools.mk
===================================================================
--- branches/1.0/package/dahdi-tools/dahdi-tools.mk	2012-05-21 22:39:36 UTC (rev 5544)
+++ branches/1.0/package/dahdi-tools/dahdi-tools.mk	2012-05-22 21:53:12 UTC (rev 5545)
@@ -7,9 +7,9 @@
 DAHDI_TOOLS_VERSION := 2.5.0.2
 else
  ifeq ($(BR2_PACKAGE_WANPIPE),y)
-DAHDI_TOOLS_VERSION := 2.6.0
+DAHDI_TOOLS_VERSION := 2.6.1
  else
-DAHDI_TOOLS_VERSION := 2.6.0
+DAHDI_TOOLS_VERSION := 2.6.1
  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.