[package] zaptel-1.4.x: fix build failure, refresh patches move to "Voice over IP"

SVN-Revision: 32936

diff --git a/libs/zaptel-1.4.x/Makefile b/libs/zaptel-1.4.x/Makefile
index 0e246d99aed879d90ec97c91132e3c25d7d16423..7d6ba2e19dc43f13b6bc131eabc37cfb96a4e64e 100644 (file)
--- a/libs/zaptel-1.4.x/Makefile
+++ b/libs/zaptel-1.4.x/Makefile
@@ -27,7 +27,7 @@ endef
 
 define KernelPackage/zaptel14/Default
   TITLE:=Zaptel (kernel module)
-  SUBMENU:=Other modules
+  SUBMENU:=Voice over IP
   DEPENDS:=
 endef
 

diff --git a/libs/zaptel-1.4.x/patches/002-upstream_hrtimer.patch b/libs/zaptel-1.4.x/patches/002-upstream_hrtimer.patch
index 5cc0a6ec0bd48a4c7c296def8571f9a63c6da26b..11430680b738dd8e499c3c4a851e14d2e18005e1 100644 (file)
--- a/libs/zaptel-1.4.x/patches/002-upstream_hrtimer.patch
+++ b/libs/zaptel-1.4.x/patches/002-upstream_hrtimer.patch
@@ -2,8 +2,8 @@
  kernel/ztdummy.c |   18 +++++++++++++++---
  1 file changed, 15 insertions(+), 3 deletions(-)
 
---- zaptel-1.4.12.1.orig/kernel/ztdummy.c
-+++ zaptel-1.4.12.1/kernel/ztdummy.c
+--- a/kernel/ztdummy.c
++++ b/kernel/ztdummy.c
 @@ -54,7 +54,7 @@
   * the #define USE_RTC should be commented out.
   */

diff --git a/libs/zaptel-1.4.x/patches/100-no_hrtimer_on_x86_only.patch b/libs/zaptel-1.4.x/patches/100-no_hrtimer_on_x86_only.patch
index ba4dd76ba286b2ddb91672935bf5064ee644bd9f..cd9666ec941c02c3ac7fc824743ddd49cd41fe38 100644 (file)
--- a/libs/zaptel-1.4.x/patches/100-no_hrtimer_on_x86_only.patch
+++ b/libs/zaptel-1.4.x/patches/100-no_hrtimer_on_x86_only.patch
@@ -2,8 +2,8 @@
  kernel/ztdummy.c |    2 --
  1 file changed, 2 deletions(-)
 
---- zaptel-1.4.12.1.orig/kernel/ztdummy.c
-+++ zaptel-1.4.12.1/kernel/ztdummy.c
+--- a/kernel/ztdummy.c
++++ b/kernel/ztdummy.c
 @@ -53,7 +53,6 @@
   * If using an i386 architecture without a PC real-time clock,
   * the #define USE_RTC should be commented out.

diff --git a/libs/zaptel-1.4.x/patches/200-Makefile-pwd.patch b/libs/zaptel-1.4.x/patches/200-Makefile-pwd.patch
index 03c3c8aea5b424a6f83e4056f347c0c8a364d5ca..fa6aea70d8d360fc7e62a5c124ee494f78f332b8 100644 (file)
--- a/libs/zaptel-1.4.x/patches/200-Makefile-pwd.patch
+++ b/libs/zaptel-1.4.x/patches/200-Makefile-pwd.patch
@@ -2,8 +2,8 @@
  Makefile |    1 +
  1 file changed, 1 insertion(+)
 
---- zaptel-1.4.12.1.orig/Makefile
-+++ zaptel-1.4.12.1/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -18,6 +18,7 @@ ifeq ($(MAKELEVEL),0)
  PWD:=$(shell pwd)
  export PWD

diff --git a/libs/zaptel-1.4.x/patches/330-uname_m.patch b/libs/zaptel-1.4.x/patches/330-uname_m.patch
index 8414debf496f2cd49ab5108d036eb508fabc6df5..7b91ff0985087048b378f9bfa9795d5953c05007 100644 (file)
--- a/libs/zaptel-1.4.x/patches/330-uname_m.patch
+++ b/libs/zaptel-1.4.x/patches/330-uname_m.patch
@@ -2,8 +2,8 @@
  Makefile |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- zaptel-1.4.12.1.orig/Makefile
-+++ zaptel-1.4.12.1/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -25,7 +25,7 @@ ARCH:=$(shell uname -m | sed -e s/i.86/i
  endif
  

diff --git a/libs/zaptel-1.4.x/patches/340-2.6.32.patch b/libs/zaptel-1.4.x/patches/340-2.6.32.patch
index ea9e61387747679f7fb24d5385500b0687caf53c..948cc4864f5063e22330737881de59e04bdb8e7c 100644 (file)
--- a/libs/zaptel-1.4.x/patches/340-2.6.32.patch
+++ b/libs/zaptel-1.4.x/patches/340-2.6.32.patch
@@ -2,8 +2,8 @@
  kernel/zaptel-base.c |    3 +++
  1 file changed, 3 insertions(+)
 
---- zaptel-1.4.12.1.orig/kernel/zaptel-base.c
-+++ zaptel-1.4.12.1/kernel/zaptel-base.c
+--- a/kernel/zaptel-base.c
++++ b/kernel/zaptel-base.c
 @@ -59,6 +59,9 @@
  #include <linux/if_ppp.h>
  #endif

diff --git a/libs/zaptel-1.4.x/patches/350-2.6.34.patch b/libs/zaptel-1.4.x/patches/350-2.6.34.patch
index a60589faac008ff73fa36cc3e5ecce65c4af8b29..d5696e526edf65318a34df9cbbdc2ec5ca965768 100644 (file)
--- a/libs/zaptel-1.4.x/patches/350-2.6.34.patch
+++ b/libs/zaptel-1.4.x/patches/350-2.6.34.patch
@@ -1,7 +1,5 @@
-Index: zaptel-1.4.12.1/kernel/zconfig.h
-===================================================================
---- zaptel-1.4.12.1.orig/kernel/zconfig.h      2010-06-13 08:51:02.000000000 +0200
-+++ zaptel-1.4.12.1/kernel/zconfig.h   2010-06-13 08:53:22.000000000 +0200
+--- a/kernel/zconfig.h
++++ b/kernel/zconfig.h
 @@ -22,6 +22,8 @@
  #include <linux/version.h>
  #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
@@ -11,4 +9,3 @@ Index: zaptel-1.4.12.1/kernel/zconfig.h
  #else
  #include <linux/autoconf.h>
  #endif
-

diff --git a/libs/zaptel-1.4.x/patches/360-slab.patch b/libs/zaptel-1.4.x/patches/360-slab.patch
index f7cd2986e779b26f0c8c41fb03e2132870130837..0221505bdd7f71f5de43ee43be26818c05a13afc 100644 (file)
--- a/libs/zaptel-1.4.x/patches/360-slab.patch
+++ b/libs/zaptel-1.4.x/patches/360-slab.patch
@@ -1,7 +1,5 @@
-Index: zaptel-1.4.12.1/kernel/wctdm.c
-===================================================================
---- zaptel-1.4.12.1.orig/kernel/wctdm.c        2010-06-13 12:11:26.000000000 +0200
-+++ zaptel-1.4.12.1/kernel/wctdm.c     2010-06-13 12:17:47.000000000 +0200
+--- a/kernel/wctdm.c
++++ b/kernel/wctdm.c
 @@ -30,6 +30,8 @@
  #include <linux/errno.h>
  #include <linux/pci.h>
@@ -11,10 +9,8 @@ Index: zaptel-1.4.12.1/kernel/wctdm.c
  #include <asm/io.h>
  #include "proslic.h"
  #include "wctdm.h"
-Index: zaptel-1.4.12.1/kernel/wcusb.c
-===================================================================
---- zaptel-1.4.12.1.orig/kernel/wcusb.c        2010-06-13 12:10:07.000000000 +0200
-+++ zaptel-1.4.12.1/kernel/wcusb.c     2010-06-13 12:10:13.000000000 +0200
+--- a/kernel/wcusb.c
++++ b/kernel/wcusb.c
 @@ -37,6 +37,7 @@
  #include <linux/init.h>
  #include <linux/usb.h>
@@ -23,10 +19,8 @@ Index: zaptel-1.4.12.1/kernel/wcusb.c
  
  #include <linux/version.h>
  #if LINUX_VERSION_CODE > KERNEL_VERSION(2,4,19)
-Index: zaptel-1.4.12.1/kernel/ztdummy.c
-===================================================================
---- zaptel-1.4.12.1.orig/kernel/ztdummy.c      2010-06-13 08:58:02.000000000 +0200
-+++ zaptel-1.4.12.1/kernel/ztdummy.c   2010-06-13 08:58:23.000000000 +0200
+--- a/kernel/ztdummy.c
++++ b/kernel/ztdummy.c
 @@ -38,6 +38,7 @@
   */
  
@@ -35,4 +29,3 @@ Index: zaptel-1.4.12.1/kernel/ztdummy.c
  
  #ifndef VERSION_CODE
  #  define VERSION_CODE(vers,rel,seq) ( ((vers)<<16) | ((rel)<<8) | (seq) )
-

diff --git a/libs/zaptel-1.4.x/patches/370-2.6.36.patch b/libs/zaptel-1.4.x/patches/370-2.6.36.patch
index bff07cae7325bf27fb4e9c074f8eb4368cadf826..b3d29a13bfa8447b88c6e94c8d557323d6cb9513 100644 (file)
--- a/libs/zaptel-1.4.x/patches/370-2.6.36.patch
+++ b/libs/zaptel-1.4.x/patches/370-2.6.36.patch
@@ -2,8 +2,8 @@
  kernel/zaptel-base.c |   18 ++++++++++++++++++
  1 file changed, 18 insertions(+)
 
---- zaptel-1.4.12.1.orig/kernel/zaptel-base.c
-+++ zaptel-1.4.12.1/kernel/zaptel-base.c
+--- a/kernel/zaptel-base.c
++++ b/kernel/zaptel-base.c
 @@ -5181,6 +5181,20 @@ static int zt_ioctl(struct inode *inode,
        return zt_chan_ioctl(inode, file, cmd, data, unit);
  }

diff --git a/libs/zaptel-1.4.x/patches/390-include_spinlock_h.patch b/libs/zaptel-1.4.x/patches/390-include_spinlock_h.patch
new file mode 100644 (file)
index 0000000..ff81638
--- /dev/null
+++ b/libs/zaptel-1.4.x/patches/390-include_spinlock_h.patch
@@ -0,0 +1,19 @@
+--- a/kernel/ztdummy.c
++++ b/kernel/ztdummy.c
+@@ -79,6 +79,7 @@
+ #include <asm/io.h>
+ #endif
+ #ifdef LINUX26
++#include <linux/spinlock.h>
+ #ifdef USE_HIGHRESTIMER
+ #include <linux/hrtimer.h>
+ #endif
+@@ -328,7 +329,7 @@ int init_module(void)
+ #ifdef LINUX26
+       ztd->counter = 0;
+ #ifdef USE_RTC
+-      ztd->rtclock = SPIN_LOCK_UNLOCKED;
++      spin_lock_init(&ztd->rtclock);
+       ztd->rtc_task.func = ztdummy_rtc_interrupt;
+       ztd->rtc_task.private_data = ztd;
+       err = rtc_register(&ztd->rtc_task);