Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux: [1427] trunk/package/zaptel
|
From: <dha...@us...> - 2007-12-04 18:41:54
|
Revision: 1427
http://astlinux.svn.sourceforge.net/astlinux/?rev=1427&view=rev
Author: dhartman
Date: 2007-12-04 10:41:33 -0800 (Tue, 04 Dec 2007)
Log Message:
-----------
zaptel 1.4 is backwards compatible with Asterisk 1.2
Modified Paths:
--------------
trunk/package/zaptel/zaptel.mk
Removed Paths:
-------------
trunk/package/zaptel/zaptel-hires.patch
trunk/package/zaptel/zaptel-makefile0.patch
trunk/package/zaptel/zaptel-no64.patch
trunk/package/zaptel/zaptel-tdmoe.patch
Deleted: trunk/package/zaptel/zaptel-hires.patch
===================================================================
--- trunk/package/zaptel/zaptel-hires.patch 2007-12-04 18:12:16 UTC (rev 1426)
+++ trunk/package/zaptel/zaptel-hires.patch 2007-12-04 18:41:33 UTC (rev 1427)
@@ -1,132 +0,0 @@
-diff -ur zaptel-1.2.19.orig/ztdummy.c zaptel-1.2.19/ztdummy.c
---- zaptel-1.2.19.orig/ztdummy.c 2007-01-31 14:01:33.000000000 -0500
-+++ zaptel-1.2.19/ztdummy.c 2007-08-27 15:02:08.000000000 -0400
-@@ -8,6 +8,12 @@
- * Unified by Mark Spencer <mar...@di...>
- * Converted to use RTC on i386 by Tony Mountifield <to...@so...>
- *
-+ * Converted to use HighResTimers on i386 by Jeffery Palmer <je...@tr...>
-+ * To use the newer high resolution timers, in your kernel CONFIG_HIGH_RES_TIMERS
-+ * needs to be enabled (Processor type and features -> High Resolution Timer Support),
-+ * and optionally, (Processor type and features -> HPET Timer Support) provides
-+ * a better clock source.
-+ *
- * Copyright (C) 2002, Hermes Softlab
- * Copyright (C) 2004, Digium, Inc.
- *
-@@ -46,7 +52,11 @@
- */
- #if defined(__i386__) || defined(__x86_64__)
- #if LINUX_VERSION_CODE >= VERSION_CODE(2,6,13)
-+#ifdef CONFIG_HIGH_RES_TIMERS
-+#define USE_HIGHRESTIMER
-+#else
- #define USE_RTC
-+#endif
- #else
- #if 0
- #define USE_RTC
-@@ -70,6 +80,9 @@
- #include <asm/io.h>
- #endif
- #ifdef LINUX26
-+#ifdef USE_HIGHRESTIMER
-+#include <linux/hrtimer.h>
-+#endif
- #ifdef USE_RTC
- #include <linux/rtc.h>
- #endif
-@@ -96,7 +109,14 @@
- static int debug = 0;
-
- #ifdef LINUX26
--#ifndef USE_RTC
-+#if defined(LINUX26) && defined(USE_HIGHRESTIMER)
-+struct hrtimer zaptimer;
-+static int count = 0;
-+#endif
-+
-+#define ZAPTEL_RATE 1000
-+
-+#if !defined(USE_RTC) && !defined(USE_HIGHRESTIMER)
- /* New 2.6 kernel timer stuff */
- static struct timer_list timer;
- #if HZ != 1000
-@@ -147,6 +167,34 @@
- zt_transmit(&ztd->span);
- }
- }
-+#elif defined(USE_HIGHRESTIMER)
-+static enum hrtimer_restart ztdummy_hr_int(struct hrtimer *htmr)
-+{
-+ unsigned long overrun;
-+
-+ /* Trigger Zaptel */
-+ zt_receive(&ztd->span);
-+ zt_transmit(&ztd->span);
-+
-+ /* Overrun should always return 1, since we are in the timer that expired.
-+ * We should worry if overrun is 2 or more; then we really missed a tick */
-+ overrun = hrtimer_forward(&zaptimer, htmr->expires, ktime_set(0,ZAPTEL_RATE*1000));
-+ if(overrun > 1) {
-+ if(printk_ratelimit())
-+ printk(KERN_NOTICE "ztdummy: HRTimer missed %lu ticks\n", overrun - 1);
-+ }
-+
-+ if(debug) {
-+ /* Printk every 5 seconds, good test to see if timer is running properly */
-+ count++;
-+ if(count == 5000)
-+ printk(KERN_DEBUG "ztdummy: 5000 ticks from hrtimer\n");
-+ count = count % 5000;
-+ }
-+
-+ /* Always restart the timer */
-+ return HRTIMER_RESTART;
-+}
- #else
- /* use kernel system tick timer if PC architecture RTC is not available */
- static void ztdummy_timer(unsigned long param)
-@@ -220,12 +268,12 @@
- }
- #endif
-
--#if defined(LINUX26) && !defined(USE_RTC)
-+#if defined(LINUX26) && !defined(USE_RTC) && !defined(USE_HIGHRESTIMER)
- if (HZ != 1000) {
- printk("ztdummy: This module requires the kernel HZ setting to be 1000 ticks per second\n");
- return -ENODEV;
- }
--#endif /* defined(LINUX26) && !defined(USE_RTC) */
-+#endif /* defined(LINUX26) && !defined(USE_RTC) && !defined(USE_HIGHRESTIMER) */
-
- ztd = kmalloc(sizeof(struct ztdummy), GFP_KERNEL);
- if (ztd == NULL) {
-@@ -255,6 +303,17 @@
- }
- rtc_control(&ztd->rtc_task, RTC_IRQP_SET, 1024); /* 1024 Hz */
- rtc_control(&ztd->rtc_task, RTC_PIE_ON, 0);
-+#elif defined(USE_HIGHRESTIMER)
-+ printk("ztdummy: Trying to load High Resolution Timer\n");
-+ hrtimer_init(&zaptimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
-+ printk("ztdummy: Initialized High Resolution Timer\n");
-+
-+ /* Set timer callback function */
-+ zaptimer.function = ztdummy_hr_int;
-+
-+ printk("ztdummy: Starting High Resolution Timer\n");
-+ hrtimer_start(&zaptimer, ktime_set(0,ZAPTEL_RATE*1000), HRTIMER_MODE_REL);
-+ printk("ztdummy: High Resolution Timer started, good to go\n");
- #else
- init_timer(&timer);
- timer.function = ztdummy_timer;
-@@ -294,6 +353,9 @@
- #ifdef USE_RTC
- rtc_control(&ztd->rtc_task, RTC_PIE_OFF, 0);
- rtc_unregister(&ztd->rtc_task);
-+#elif defined(USE_HIGHRESTIMER)
-+ /* Stop high resolution timer */
-+ hrtimer_cancel(&zaptimer);
- #else
- del_timer(&timer);
- #endif
Deleted: trunk/package/zaptel/zaptel-makefile0.patch
===================================================================
--- trunk/package/zaptel/zaptel-makefile0.patch 2007-12-04 18:12:16 UTC (rev 1426)
+++ trunk/package/zaptel/zaptel-makefile0.patch 2007-12-04 18:41:33 UTC (rev 1427)
@@ -1,98 +0,0 @@
-Common subdirectories: zaptel-1.2.18.orig/build_tools and zaptel-1.2.18/build_tools
-Common subdirectories: zaptel-1.2.18.orig/doc and zaptel-1.2.18/doc
-Common subdirectories: zaptel-1.2.18.orig/hpec and zaptel-1.2.18/hpec
-diff -u zaptel-1.2.18.orig/Makefile zaptel-1.2.18/Makefile
---- zaptel-1.2.18.orig/Makefile 2007-06-08 11:19:15.000000000 -0400
-+++ zaptel-1.2.18/Makefile 2007-06-29 15:11:21.000000000 -0400
-@@ -6,6 +6,7 @@
- #
-
- CFLAGS+=-DSTANDALONE_ZAPATA -DBUILDING_TONEZONE
-+INSTALL_BASE=/usr
-
- ifeq ($(MAKELEVEL),0)
- PWD:=$(shell pwd)
-@@ -145,7 +146,7 @@
- MANDIR = /usr/share/man/man8
- MAN_PAGES_BASE = ztcfg
- BINS=ztcfg torisatool makefw ztmonitor ztspeed zttest fxotune
--ifneq (,$(wildcard /usr/include/newt.h))
-+ifneq (,$(wildcard ./newt.h))
- BINS+=zttool
- MAN_PAGES_BASE += zttool
- endif
-@@ -230,13 +231,13 @@
- $(CC) -o $@ $^
-
- tones.h: gendigits
-- ./gendigits > $@
-+ gendigits > $@
-
- tor2fw.h: makefw tormenta2.rbt
-- ./makefw tormenta2.rbt tor2fw > tor2fw.h
-+ makefw tormenta2.rbt tor2fw > tor2fw.h
-
- radfw.h: makefw pciradio.rbt
-- ./makefw pciradio.rbt radfw > radfw.h
-+ makefw pciradio.rbt radfw > radfw.h
-
- gendigits: gendigits.o
- $(CC) -o $@ $^ -lm
-@@ -351,13 +352,13 @@
- $(MAKE) -C mISDNuser install
-
- install: all devices firmware
-- install -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg
-+ install -D -m 755 ztcfg $(INSTALL_PREFIX)/$(INSTALL_BASE)/sbin/ztcfg
- if [ -f sethdlc-new ]; then \
-- install -D -m 755 sethdlc-new $(INSTALL_PREFIX)/sbin/sethdlc; \
-+ install -D -m 755 sethdlc-new $(INSTALL_PREFIX)/$(INSTALL_BASE)/sbin/sethdlc; \
- elif [ -f sethdlc ]; then \
-- install -D -m 755 sethdlc $(INSTALL_PREFIX)/sbin/sethdlc ; \
-+ install -D -m 755 sethdlc $(INSTALL_PREFIX)/$(INSTALL_BASE)/sbin/sethdlc ; \
- fi
-- if [ -f zttool ]; then install -D -m 755 zttool $(INSTALL_PREFIX)/sbin/zttool; fi
-+ if [ -f zttool ]; then install -D -m 755 zttool $(INSTALL_PREFIX)/$(INSTALL_BASE)/sbin/zttool; fi
- install -d $(INSTALL_PREFIX)$(MANDIR)
- install -m 644 $(MAN_PAGES) $(INSTALL_PREFIX)$(MANDIR)
- ifeq ($(BUILDVER),linux26)
-@@ -375,25 +376,18 @@
- rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxsusb.o; \
- fi; \
- rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxs.o
-- install -D -m 755 $(LIBTONEZONE_SO) $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
-+ install -D -m 755 $(LIBTONEZONE_SO) $(INSTALL_PREFIX)/$(INSTALL_BASE)/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
- [ `id -u` = 0 ] && /sbin/ldconfig || :
-- rm -f $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
-+ rm -f $(INSTALL_PREFIX)/$(INSTALL_BASE)/lib/$(LIBTONEZONE_SO)
- ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
-- $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER)
-+ $(INSTALL_PREFIX)/$(INSTALL_BASE)/lib/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER)
- ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
-- $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
-- if [ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then /sbin/restorecon -v $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO); fi
-- install -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/linux/zaptel.h
-- install -D -m 644 torisa.h $(INSTALL_PREFIX)/usr/include/linux/torisa.h
-- install -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
-- install -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
-- install -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
-- [ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
-- [ -f $(CONFIG_FILE) ] || install -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
-- build_tools/genmodconf $(BUILDVER) "$(INSTALL_PREFIX)" "$(filter-out zaptel ztdummy zttranscode wctc4xxp ztdynamic xpp_usb,$(MODULES)) $(MODULE_ALIASES)"
-- @if [ -d /etc/modutils ]; then \
-- /sbin/update-modules ; \
-- fi
-+ $(INSTALL_PREFIX)/$(INSTALL_BASE)/lib/$(LIBTONEZONE_SO)
-+ install -D -m 644 zaptel.h $(INSTALL_PREFIX)/$(INSTALL_BASE)/include/linux/zaptel.h
-+ install -D -m 644 torisa.h $(INSTALL_PREFIX)/$(INSTALL_BASE)/include/linux/torisa.h
-+ install -D -m 644 tonezone.h $(INSTALL_PREFIX)/$(INSTALL_BASE)/include/tonezone.h
-+ install -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/$(INSTALL_BASE)/share/man/man8
-+ install -m 644 doc/zttool.8 $(INSTALL_PREFIX)/$(INSTALL_BASE)/share/man/man8
-
- install-udev: devices
-
-Only in zaptel-1.2.18: Makefile.orig
-Common subdirectories: zaptel-1.2.18.orig/oct612x and zaptel-1.2.18/oct612x
-Common subdirectories: zaptel-1.2.18.orig/wct4xxp and zaptel-1.2.18/wct4xxp
-Common subdirectories: zaptel-1.2.18.orig/wctc4xxp and zaptel-1.2.18/wctc4xxp
-Common subdirectories: zaptel-1.2.18.orig/xpp and zaptel-1.2.18/xpp
Deleted: trunk/package/zaptel/zaptel-no64.patch
===================================================================
--- trunk/package/zaptel/zaptel-no64.patch 2007-12-04 18:12:16 UTC (rev 1426)
+++ trunk/package/zaptel/zaptel-no64.patch 2007-12-04 18:41:33 UTC (rev 1427)
@@ -1,14 +0,0 @@
-diff -ur zaptel-1.2.19.orig/Makefile zaptel-1.2.19/Makefile
---- zaptel-1.2.19.orig/Makefile 2007-07-12 12:01:12.000000000 -0400
-+++ zaptel-1.2.19/Makefile 2007-09-13 12:13:50.000000000 -0400
-@@ -94,8 +94,8 @@
- INSTALL_PREFIX:=$(DESTDIR)
-
- CFLAGS+=-I. -O4 -g -Wall
--CFLAGS_PPC:=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
--CFLAGS_X86-64:=$(shell if uname -m | grep -q x86_64; then echo "-m64"; fi)
-+CFLAGS_PPC:=
-+CFLAGS_X86-64:=
- CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_X86-64)
- LCFLAGS:=-fPIC $(CFLAGS) -DBUILDING_TONEZONE
- KFLAGS:=-I$(KINCLUDES) -O6
Deleted: trunk/package/zaptel/zaptel-tdmoe.patch
===================================================================
--- trunk/package/zaptel/zaptel-tdmoe.patch 2007-12-04 18:12:16 UTC (rev 1426)
+++ trunk/package/zaptel/zaptel-tdmoe.patch 2007-12-04 18:41:33 UTC (rev 1427)
@@ -1,228 +0,0 @@
-diff -ur zaptel-1.2.9.orig/zaptel.h zaptel-1.2.9/zaptel.h
---- zaptel-1.2.9.orig/zaptel.h 2005-12-16 21:04:05.000000000 -0500
-+++ zaptel-1.2.9/zaptel.h 2006-09-11 11:26:38.000000000 -0400
-@@ -1359,6 +1359,9 @@
- /* Transmit a given message */
- int (*transmit)(void *tpipe, unsigned char *msg, int msglen);
-
-+ /* Flush any pending messages */
-+ int (*flush)(void);
-+
- struct zt_dynamic_driver *next;
- };
-
-Only in zaptel-1.2.9: zaptel.h.orig
-diff -ur zaptel-1.2.9.orig/ztd-eth.c zaptel-1.2.9/ztd-eth.c
---- zaptel-1.2.9.orig/ztd-eth.c 2005-11-29 13:42:08.000000000 -0500
-+++ zaptel-1.2.9/ztd-eth.c 2006-09-11 11:26:38.000000000 -0400
-@@ -56,6 +56,8 @@
- static spinlock_t zlock = SPIN_LOCK_UNLOCKED;
- #endif
-
-+static struct sk_buff_head skbs;
-+
- static struct ztdeth {
- unsigned char addr[ETH_ALEN];
- unsigned short subaddr; /* Network byte order */
-@@ -171,7 +173,7 @@
- skb->dev = dev;
- if (dev->hard_header)
- dev->hard_header(skb, dev, ETH_P_ZTDETH, addr, dev->dev_addr, skb->len);
-- dev_queue_xmit(skb);
-+ skb_queue_tail(&skbs, skb);
- }
- }
- else
-@@ -179,6 +181,18 @@
- return 0;
- }
-
-+
-+static int ztdeth_flush(void)
-+{
-+ struct sk_buff *skb;
-+
-+ /* Handle all transmissions now */
-+ while ((skb = skb_dequeue(&skbs))) {
-+ dev_queue_xmit(skb);
-+ }
-+ return 0;
-+}
-+
- static struct packet_type ztdeth_ptype = {
- type: __constant_htons(ETH_P_ZTDETH), /* Protocol */
- dev: NULL, /* Device (NULL = wildcard) */
-@@ -376,7 +390,8 @@
- "Ethernet",
- ztdeth_create,
- ztdeth_destroy,
-- ztdeth_transmit
-+ ztdeth_transmit,
-+ ztdeth_flush
- };
-
- static struct notifier_block ztdeth_nblock = {
-@@ -388,6 +403,9 @@
- dev_add_pack(&ztdeth_ptype);
- register_netdevice_notifier(&ztdeth_nblock);
- zt_dynamic_register(&ztd_eth);
-+
-+ skb_queue_head_init(&skbs);
-+
- return 0;
- }
-
-diff -ur zaptel-1.2.9.orig/ztd-loc.c zaptel-1.2.9/ztd-loc.c
---- zaptel-1.2.9.orig/ztd-loc.c 2005-11-29 13:42:08.000000000 -0500
-+++ zaptel-1.2.9/ztd-loc.c 2006-09-11 11:26:38.000000000 -0400
-@@ -255,7 +255,8 @@
- "Local",
- ztdlocal_create,
- ztdlocal_destroy,
-- ztdlocal_transmit
-+ ztdlocal_transmit,
-+ NULL /* flush */
- };
-
- /*static*/ int __init ztdlocal_init(void)
-diff -ur zaptel-1.2.9.orig/ztdynamic.c zaptel-1.2.9/ztdynamic.c
---- zaptel-1.2.9.orig/ztdynamic.c 2005-11-29 13:42:08.000000000 -0500
-+++ zaptel-1.2.9/ztdynamic.c 2006-09-11 11:26:38.000000000 -0400
-@@ -132,6 +132,12 @@
- static spinlock_t dlock = SPIN_LOCK_UNLOCKED;
- #endif
-
-+#ifdef DEFINE_RWLOCK
-+static DEFINE_RWLOCK(drvlock);
-+#else
-+static rwlock_t drvlock = RW_LOCK_UNLOCKED;
-+#endif
-+
- static void checkmaster(void)
- {
- unsigned long flags;
-@@ -142,15 +148,13 @@
- z = dspans;
- while(z) {
- if (z->timing) {
-- if (z->timing) {
-- z->master = 0;
-- newhasmaster = 1;
-- if (!z->alarm && (z->timing < best) && !z->dead) {
-- /* If not in alarm and they're
-- a better timing source, use them */
-- master = z;
-- best = z->timing;
-- }
-+ z->master = 0;
-+ newhasmaster = 1;
-+ if (!z->alarm && (z->timing < best) && !z->dead) {
-+ /* If not in alarm and they're
-+ a better timing source, use them */
-+ master = z;
-+ best = z->timing;
- }
- }
- z = z->next;
-@@ -230,6 +234,7 @@
- {
- unsigned long flags;
- struct zt_dynamic *z;
-+ struct zt_dynamic_driver *drv;
- int y;
- spin_lock_irqsave(&dlock, flags);
- z = dspans;
-@@ -248,6 +253,17 @@
- z = z->next;
- }
- spin_unlock_irqrestore(&dlock, flags);
-+
-+ read_lock(&drvlock);
-+ drv = drivers;
-+ while(drv) {
-+ /* Flush any traffic still pending in the driver */
-+ if (drv->flush) {
-+ drv->flush();
-+ }
-+ drv = drv->next;
-+ }
-+ read_unlock(&drvlock);
- }
-
- #ifdef ENABLE_TASKLETS
-@@ -275,7 +291,7 @@
- int x, bits, sig;
- int nchans, master;
- int newalarm;
-- unsigned short rxpos;
-+ unsigned short rxpos, rxcnt;
-
-
- spin_lock_irqsave(&dlock, flags);
-@@ -373,6 +389,9 @@
-
- master = ztd->master;
-
-+ rxcnt = ztd->rxcnt;
-+ ztd->rxcnt = rxpos+1;
-+
- spin_unlock_irqrestore(&dlock, flags);
-
- /* Check for Yellow alarm */
-@@ -388,6 +407,10 @@
- /* Keep track of last received packet */
- ztd->rxjif = jiffies;
-
-+ /* note if we had a missing packet */
-+ // if (rxpos != rxcnt)
-+ // printk("Span %s: Expected seq no %d, but received %d instead\n", span->name, rxcnt, rxpos);
-+
- /* If this is our master span, then run everything */
- if (master)
- ztdynamic_run();
-@@ -710,14 +733,14 @@
- {
- unsigned long flags;
- int res = 0;
-- spin_lock_irqsave(&dlock, flags);
-+ write_lock_irqsave(&drvlock, flags);
- if (find_driver(dri->name))
- res = -1;
- else {
- dri->next = drivers;
- drivers = dri;
- }
-- spin_unlock_irqrestore(&dlock, flags);
-+ write_unlock_irqrestore(&drvlock, flags);
- return res;
- }
-
-@@ -726,7 +749,7 @@
- struct zt_dynamic_driver *cur, *prev=NULL;
- struct zt_dynamic *z, *zp, *zn;
- unsigned long flags;
-- spin_lock_irqsave(&dlock, flags);
-+ write_lock_irqsave(&drvlock, flags);
- cur = drivers;
- while(cur) {
- if (cur == dri) {
-@@ -739,6 +762,8 @@
- prev = cur;
- cur = cur->next;
- }
-+ write_unlock_irqrestore(&drvlock, flags);
-+ spin_lock_irqsave(&dlock, flags);
- z = dspans;
- zp = NULL;
- while(z) {
-@@ -773,8 +798,8 @@
- z = dspans;
- while(z) {
- newalarm = z->span.alarms & ~ZT_ALARM_RED;
-- /* If nothing received for a minute, consider that RED ALARM */
-- if ((jiffies - z->rxjif) > 1000 / HZ) {
-+ /* If nothing received for a second, consider that RED ALARM */
-+ if ((jiffies - z->rxjif) > 1 * HZ) {
- newalarm |= ZT_ALARM_RED;
- if (z->span.alarms != newalarm) {
- z->span.alarms = newalarm;
Modified: trunk/package/zaptel/zaptel.mk
===================================================================
--- trunk/package/zaptel/zaptel.mk 2007-12-04 18:12:16 UTC (rev 1426)
+++ trunk/package/zaptel/zaptel.mk 2007-12-04 18:41:33 UTC (rev 1427)
@@ -3,12 +3,13 @@
# zaptel
#
##############################################################
-ZAPTEL_VERSION := 1.2.19
+ZAPTEL_VERSION := 1.4.7
ZAPTEL_SOURCE := zaptel-$(ZAPTEL_VERSION).tar.gz
ZAPTEL_SITE := http://downloads.digium.com/pub/zaptel/releases
ZAPTEL_DIR := $(BUILD_DIR)/zaptel-$(ZAPTEL_VERSION)
ZAPTEL_BINARY := ztcfg
ZAPTEL_TARGET_BINARY := sbin/ztcfg
+PERLLIBDIR := $(shell eval `perl -V:sitelib`; echo "$$sitelib")
LINUX_VER=$(LINUX_VERSION)
@@ -16,13 +17,6 @@
ZAPWAN=wanpipe
endif
-ifeq ($(strip $(BR2_PACKAGE_UDEV)),y)
-ZAPUDEV=udev
-ZAPHOTPLUG=yes
-else
-ZAPHOTPLUG=no
-endif
-
ZAPTEL_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
-e 's/i.86/i386/' \
-e 's/sparc.*/sparc/' \
@@ -50,55 +44,43 @@
touch $(ZAPTEL_DIR)/.source
$(ZAPTEL_DIR)/.configured: $(ZAPTEL_DIR)/.source
- touch $(ZAPTEL_DIR)/.configured
+ (cd $(ZAPTEL_DIR); rm -rf config.cache; \
+ $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD=$(HOSTCC) \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ ./configure \
+ --target=$(GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) \
+ --prefix=/ \
+ --exec-prefix=/usr \
+ --libdir=/usr/lib \
+ --includedir=/usr/include \
+ --datadir=/usr/share \
+ --sysconfdir=/etc \
+ );
+ touch $(ZAPTEL_DIR)/.configured;
$(ZAPTEL_DIR)/$(ZAPTEL_BINARY): $(ZAPTEL_DIR)/.configured
- $(MAKE) -C $(ZAPTEL_DIR) CC=gcc PATH="$(ZAPTEL_DIR):$(PATH)" \
- makefw gendigits tor2fw.h radfw.h #hack
- $(MAKE) -C $(ZAPTEL_DIR) CC=$(TARGET_CC) ARCH=$(ZAPTEL_TARGET_ARCH) \
- PROC=$(OPTIMIZE_FOR_CPU) KSRC=$(BUILD_DIR)/linux KVERS=$(LINUX_VER) \
- $(TARGET_CONFIGURE_OPTS) PATH="$(ZAPTEL_DIR):$(PATH)" ZTTOOL=zttool \
- HOTPLUG_FIRMWARE=$(ZAPHOTPLUG) INSTALL_BASE=/ PWD=$(ZAPTEL_DIR)
+ $(MAKE) -C $(ZAPTEL_DIR) HOSTCC=gcc CC=$(TARGET_CC) DEB_HOST_GNU_TYPE=$(ZAPTEL_TARGET_ARCH) \
+ KVERS=$(LINUX_VER) KSRC=$(LINUX_DIR) PWD=$(ZAPTEL_DIR) modules programs
$(TARGET_DIR)/$(ZAPTEL_TARGET_BINARY): $(ZAPTEL_DIR)/$(ZAPTEL_BINARY)
- mkdir -p $(STAGING_DIR)/etc/udev/rules.d #hack to get install to work...
- mkdir -p $(STAGING_DIR)/share/man/man8 #yet another hack...
- cp $(STAGING_DIR)/include/newt.h $(ZAPTEL_DIR)/. #hack to get zttool to compile
- mkdir -p $(STAGING_DIR)/lib/modules/$(LINUX_VER)/misc
- $(MAKE) -C $(ZAPTEL_DIR) CC=$(TARGET_CC) PROC=$(OPTIMIZE_FOR_CPU) ARCH=$(ZAPTEL_TARGET_ARCH) \
- KSRC=$(BUILD_DIR)/linux KVERS=$(LINUX_VER) $(TARGET_CONFIGURE_OPTS) PATH="$(ZAPTEL_DIR):$(PATH)" \
- INSTALL_PREFIX=$(STAGING_DIR) INSTALL_BASE=/ ZTTOOL=zttool PWD=$(ZAPTEL_DIR) HOTPLUG_FIRMWARE=$(ZAPHOTPLUG) \
- install
- mkdir -p $(STAGING_DIR)/usr/include/linux
- cp -a $(STAGING_DIR)/include/linux/zaptel.h $(STAGING_DIR)/usr/include/linux/zaptel.h #Hack for Asterisk to find us
- cp -a $(STAGING_DIR)/lib/modules/$(LINUX_VER)/misc $(TARGET_DIR)/lib/modules/$(LINUX_VER)/
- cp -a $(STAGING_DIR)/lib/libtone*so* $(TARGET_DIR)/lib/
- cp -a $(STAGING_DIR)/$(ZAPTEL_TARGET_BINARY) $(TARGET_DIR)/$(ZAPTEL_TARGET_BINARY)
- cp -a $(STAGING_DIR)/sbin/zttool $(TARGET_DIR)/sbin/zttool
-ifeq ($(strip $(BR2_PACKAGE_UDEV)),y)
- $(INSTALL) -D -m 0644 $(STAGING_DIR)/etc/udev/rules.d/zaptel.rules $(TARGET_DIR)/etc/udev/rules.d/zaptel.rules
-endif
- $(INSTALL) -D -m 0755 $(ZAPTEL_DIR)/ztmonitor $(TARGET_DIR)/sbin/ztmonitor
- $(INSTALL) -D -m 0755 $(ZAPTEL_DIR)/zttool $(TARGET_DIR)/sbin/zttool
- $(INSTALL) -D -m 0755 $(ZAPTEL_DIR)/zttest $(TARGET_DIR)/sbin/zttest
- $(INSTALL) -D -m 0755 $(ZAPTEL_DIR)/ztspeed $(TARGET_DIR)/sbin/ztspeed
- $(INSTALL) -D -m 0755 $(ZAPTEL_DIR)/fxotune $(TARGET_DIR)/sbin/fxotune
- $(INSTALL) -D -m 0755 $(ZAPTEL_DIR)/torisatool $(TARGET_DIR)/sbin/torisatool
- $(INSTALL) -D -m 0644 $(ZAPTEL_DIR)/zaptel.conf.sample $(TARGET_DIR)/stat/etc/zaptel.conf.sample
- -$(STRIP) -g $(TARGET_DIR)/lib/modules/$(LINUX_VER)/misc/*.ko
- -$(STRIP) -g $(TARGET_DIR)/lib/libtone*
- -$(STRIP) -g $(TARGET_DIR)/$(ZAPTEL_TARGET_BINARY)
- -$(STRIP) -g $(TARGET_DIR)/sbin/zttool
- -$(STRIP) -g $(TARGET_DIR)/sbin/ztmonitor
- -$(STRIP) -g $(TARGET_DIR)/sbin/zttest
- -$(STRIP) -g $(TARGET_DIR)/sbin/ztspeed
- -$(STRIP) -g $(TARGET_DIR)/sbin/fxotune
- -$(STRIP) -g $(TARGET_DIR)/sbin/torisatool
- $(DEPMOD) -ae -F $(BUILD_DIR)/linux/System.map -b $(BUILD_DIR)/root -r $(LINUX_VER)
+ mkdir -p $(TARGET_DIR)/$(PERLLIBDIR)
+ $(MAKE1) -C $(ZAPTEL_DIR) HOSTCC=gcc CC=$(TARGET_CC) DEB_HOST_GNU_TYPE=$(ZAPTEL_TARGET_ARCH) \
+ DESTDIR=$(STAGING_DIR) KVERS=$(LINUX_VER) KSRC=$(LINUX_DIR) PWD=$(ZAPTEL_DIR) \
+ install-libs install-include
+ $(MAKE1) -C $(ZAPTEL_DIR) HOSTCC=gcc CC=$(TARGET_CC) DEB_HOST_GNU_TYPE=$(ZAPTEL_TARGET_ARCH) \
+ DESTDIR=$(TARGET_DIR) KVERS=$(LINUX_VER) KSRC=$(LINUX_DIR) PWD=$(ZAPTEL_DIR) \
+ install-programs install-libs install-modules
+ -rm -rf $(TARGET_DIR)/usr/include
+ -rm -f $(TARGET_DIR)/usr/lib/*.a
+ -rm -rf $(TARGET_DIR)/$(PERLLIBDIR)
+ -$(STRIP) $(TARGET_DIR)/sbin/zt* $(TARGET_DIR)/usr/lib/libtone*
+ $(DEPMOD) -ae -F $(LINUX_DIR)/System.map -b $(TARGET_DIR) -r $(LINUX_VER)
$(INSTALL) -D -m 755 package/zaptel/zaptel.init $(TARGET_DIR)/etc/init.d/zaptel
ln -sf /tmp/etc/zaptel.conf $(TARGET_DIR)/etc/zaptel.conf
-zaptel: uclibc linux newt $(ZAPUDEV) $(ZAPWAN) $(TARGET_DIR)/$(ZAPTEL_TARGET_BINARY)
+zaptel: uclibc newt $(TARGET_DIR)/$(ZAPTEL_TARGET_BINARY)
zaptel-source: $(DL_DIR)/$(ZAPTEL_SOURCE)
@@ -109,12 +91,10 @@
rm -Rf $(STAGING_DIR)/usr/include/zaptel.h
rm -Rf $(TARGET_DIR)/lib/libtone*
rm -Rf $(STAGING_DIR)/lib/modules/$(LINUX_VER)/misc
- $(DEPMOD) -ae -F $(BUILD_DIR)/linux/System.map -b $(BUILD_DIR)/root -r $(LINUX_VER)
- rm -Rf $(BUILD_DIR)/zaptel
- -$(MAKE) -C $(ZAPTEL_DIR) CC=$(TARGET_CC) ARCH=$(ZAPTEL_TARGET_ARCH) \
- PROC=$(OPTIMIZE_FOR_CPU) KSRC=$(BUILD_DIR)/linux KVERS=$(LINUX_VER) \
- $(TARGET_CONFIGURE_OPTS) PATH="$(ZAPTEL_DIR):$(PATH)" ZTTOOL=zttool INSTALL_BASE=/ \
- PWD=$(ZAPTEL_DIR) clean
+ $(DEPMOD) -ae -F $(LINUX_DIR)/System.map -b $(BUILD_DIR)/root -r $(LINUX_VER)
+ rm $(BUILD_DIR)/zaptel
+ -$(MAKE) -C $(ZAPTEL_DIR) -C $(ZAPTEL_DIR) HOSTCC=gcc CC=$(TARGET_CC) DEB_HOST_GNU_TYPE=$(ZAPTEL_TARGET_ARCH) \
+ INSTALL_PREFIX=$(STAGING_DIR) KVERS=$(LINUX_VER) KSRC=$(LINUX_DIR) clean
zaptel-dirclean:
rm -rf $(ZAPTEL_DIR)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
