forked from ports/contrib
dahdi: Updated version 2.2.1 -> 2.3.0
Added patch to fix compilation with kernel 2.6.34
This commit is contained in:
parent
fee5943bd8
commit
8f84b5d947
@ -1,5 +1,6 @@
|
||||
drwxr-xr-x root/root lib/
|
||||
drwxr-xr-x root/root lib/firmware/
|
||||
-rw-r--r-- root/root lib/firmware/dahdi-fw-hx8.bin
|
||||
-rw-r--r-- root/root lib/firmware/dahdi-fw-oct6114-064.bin
|
||||
-rw-r--r-- root/root lib/firmware/dahdi-fw-oct6114-128.bin
|
||||
-rw-r--r-- root/root lib/firmware/dahdi-fw-tc400m.bin
|
||||
@ -7,9 +8,9 @@ drwxr-xr-x root/root lib/modules/
|
||||
drwxr-xr-x root/root lib/modules/<kernel-version>/
|
||||
drwxr-xr-x root/root lib/modules/<kernel-version>/dahdi/
|
||||
-rw-r--r-- root/root lib/modules/<kernel-version>/dahdi/dahdi.ko
|
||||
-rw-r--r-- root/root lib/modules/<kernel-version>/dahdi/dahdi_dummy.ko
|
||||
-rw-r--r-- root/root lib/modules/<kernel-version>/dahdi/dahdi_dynamic.ko
|
||||
-rw-r--r-- root/root lib/modules/<kernel-version>/dahdi/dahdi_dynamic_eth.ko
|
||||
-rw-r--r-- root/root lib/modules/<kernel-version>/dahdi/dahdi_dynamic_ethmf.ko
|
||||
-rw-r--r-- root/root lib/modules/<kernel-version>/dahdi/dahdi_dynamic_loc.ko
|
||||
-rw-r--r-- root/root lib/modules/<kernel-version>/dahdi/dahdi_echocan_jpah.ko
|
||||
-rw-r--r-- root/root lib/modules/<kernel-version>/dahdi/dahdi_echocan_kb1.ko
|
||||
|
@ -1,6 +1,7 @@
|
||||
a7f3886942bb3e9fed349a41b3390c9f dahdi-fw-hx8-2.06.tar.gz
|
||||
88db9b7a07d8392736171b1b3e6bcc66 dahdi-fw-oct6114-064-1.05.01.tar.gz
|
||||
c1f1a18d3e20d283f42c71e580a64b5a dahdi-fw-oct6114-128-1.05.01.tar.gz
|
||||
2ea860bb8a9d8ede2858b9557b74ee3c dahdi-fw-tc400m-MR6.12.tar.gz
|
||||
3178234ed1219de555f88d75fa7248ff dahdi-fwload-vpmadt032-1.20.0.tar.gz
|
||||
46e4abbe743830045364fc716d293e88 dahdi-linux-2.2.1.tar.gz
|
||||
71e3924dec8621d6ef5ac0c91c327ee4 dahdi-linux-2.6.33.patch
|
||||
2c26fc3ad3db731f1793a0fc638f1985 dahdi-linux-2.3.0.tar.gz
|
||||
847adb2d815b01e5620b27434a67db88 dahdi-linux-2.6.34.patch
|
||||
|
@ -4,22 +4,23 @@
|
||||
# Depends on:
|
||||
|
||||
name=dahdi
|
||||
version=2.2.1
|
||||
release=2
|
||||
version=2.3.0
|
||||
release=1
|
||||
source=(
|
||||
http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-$version.tar.gz
|
||||
http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
|
||||
http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
|
||||
http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
|
||||
http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.20.0.tar.gz
|
||||
dahdi-linux-2.6.33.patch
|
||||
http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
|
||||
dahdi-linux-2.6.34.patch
|
||||
)
|
||||
|
||||
build () {
|
||||
cd $name-linux-$version
|
||||
|
||||
# this fixes includes in kernel 2.6.33
|
||||
patch -p1 -i $SRC/dahdi-linux-2.6.33.patch
|
||||
# fix compilation in linux 2.6.34
|
||||
patch -p1 -i $SRC/dahdi-linux-2.6.34.patch
|
||||
|
||||
# prevent downloading sources for second time
|
||||
# why, oh why did the developer do this?
|
||||
|
@ -1,48 +0,0 @@
|
||||
--- dahdi-linux-2.2.1/include/dahdi/dahdi_config.h.orig 2009-07-22 03:11:53.000000000 +0900
|
||||
+++ dahdi-linux-2.2.1/include/dahdi/dahdi_config.h 2010-03-18 11:01:36.881380169 +0900
|
||||
@@ -24,7 +24,11 @@
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
|
||||
#include <linux/config.h>
|
||||
#else
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
|
||||
#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
--- dahdi-linux-2.2.1/drivers/dahdi/wcb4xxp/base.c.orig 2009-11-10 04:32:45.000000000 +0900
|
||||
+++ dahdi-linux-2.2.1/drivers/dahdi/wcb4xxp/base.c 2010-03-18 11:05:53.013854479 +0900
|
||||
@@ -20,7 +20,17 @@
|
||||
* this program for more details.
|
||||
*/
|
||||
|
||||
+#include <linux/version.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
|
||||
+#include <linux/config.h>
|
||||
+#else
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
|
||||
#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
+#endif
|
||||
+
|
||||
#include <linux/init.h>
|
||||
|
||||
#include <linux/kernel.h> /* printk() */
|
||||
--- dahdi-linux-2.2.1/drivers/dahdi/wct4xxp/vpm450m.c.orig 2008-08-07 06:07:48.000000000 +0900
|
||||
+++ dahdi-linux-2.2.1/drivers/dahdi/wct4xxp/vpm450m.c 2010-03-18 11:01:36.881380169 +0900
|
||||
@@ -31,7 +31,11 @@
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
|
||||
#include <linux/config.h>
|
||||
#else
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
|
||||
#include <linux/autoconf.h>
|
||||
+#else
|
||||
+#include <generated/autoconf.h>
|
||||
+#endif
|
||||
#endif
|
||||
|
||||
/* API for Octasic access */
|
10
dahdi/dahdi-linux-2.6.34.patch
Normal file
10
dahdi/dahdi-linux-2.6.34.patch
Normal file
@ -0,0 +1,10 @@
|
||||
--- dahdi-linux-2.3.0/include/dahdi/kernel.h.orig 2010-05-20 12:00:40.441781672 +0900
|
||||
+++ dahdi-linux-2.3.0/include/dahdi/kernel.h 2010-05-20 12:00:58.822611827 +0900
|
||||
@@ -43,6 +43,7 @@
|
||||
#endif
|
||||
#include <linux/fs.h>
|
||||
#include <linux/ioctl.h>
|
||||
+#include <linux/slab.h>
|
||||
|
||||
#ifdef CONFIG_DAHDI_NET
|
||||
#include <linux/hdlc.h>
|
Loading…
x
Reference in New Issue
Block a user