From: Florian Fainelli Date: Wed, 1 Aug 2012 18:40:32 +0000 (+0000) Subject: [package] zaptel-1.4.x: fix build failure, refresh patches move to "Voice over IP" X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1256a573d53bc2c2fe7bc9f7d50e0ceb6670ebdb;p=openwrt%2Fsvn-archive%2Farchive.git [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 0e246d99ae..7d6ba2e19d 100644 --- 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 5cc0a6ec0b..11430680b7 100644 --- 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 ba4dd76ba2..cd9666ec94 100644 --- 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 03c3c8aea5..fa6aea70d8 100644 --- 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 8414debf49..7b91ff0985 100644 --- 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 ea9e613877..948cc4864f 100644 --- 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 #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 a60589faac..d5696e526e 100644 --- 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 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) @@ -11,4 +9,3 @@ Index: zaptel-1.4.12.1/kernel/zconfig.h #else #include #endif - diff --git a/libs/zaptel-1.4.x/patches/360-slab.patch b/libs/zaptel-1.4.x/patches/360-slab.patch index f7cd2986e7..0221505bdd 100644 --- 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 #include @@ -11,10 +9,8 @@ Index: zaptel-1.4.12.1/kernel/wctdm.c #include #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 #include @@ -23,10 +19,8 @@ Index: zaptel-1.4.12.1/kernel/wcusb.c #include #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 bff07cae73..b3d29a13bf 100644 --- 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 index 0000000000..ff816387a2 --- /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 + #endif + #ifdef LINUX26 ++#include + #ifdef USE_HIGHRESTIMER + #include + #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);