[Astlinux-commits] SF.net SVN: astlinux: [492] trunk

[<kr...@us...>]

Revision: 492
          http://svn.sourceforge.net/astlinux/?rev=492&view=rev
Author:   krisk84
Date:     2006-12-20 11:28:32 -0800 (Wed, 20 Dec 2006)

Log Message:
-----------
initial upgrade to support 2.6.19.1 on the net4801

Modified Paths:
--------------
    trunk/package/iptables/iptables.mk
    trunk/package/zaptel/zaptel-makefile0.patch
    trunk/package/zaptel/zaptel.mk
    trunk/target/device/net4801/linux.mk

Added Paths:
-----------
    trunk/package/mqueue-isdn/mqueue-isdn-config.patch

Modified: trunk/package/iptables/iptables.mk
===================================================================
--- trunk/package/iptables/iptables.mk	2006-12-18 18:50:30 UTC (rev 491)
+++ trunk/package/iptables/iptables.mk	2006-12-20 19:28:32 UTC (rev 492)
@@ -3,7 +3,7 @@
 # iptables
 #
 #############################################################
-IPTABLES_VER:=1.3.6
+IPTABLES_VER:=1.3.7
 IPTABLES_SOURCE_URL:=ftp.netfilter.org/pub/iptables/
 IPTABLES_SOURCE:=iptables-$(IPTABLES_VER).tar.bz2
 IPTABLES_BUILD_DIR:=$(BUILD_DIR)/iptables-$(IPTABLES_VER)

Added: trunk/package/mqueue-isdn/mqueue-isdn-config.patch
===================================================================
--- trunk/package/mqueue-isdn/mqueue-isdn-config.patch	                        (rev 0)
+++ trunk/package/mqueue-isdn/mqueue-isdn-config.patch	2006-12-20 19:28:32 UTC (rev 492)
@@ -0,0 +1,251 @@
+diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/avm_fritz.c mISDN/drivers/isdn/hardware/mISDN/avm_fritz.c
+--- mISDN.orig/drivers/isdn/hardware/mISDN/avm_fritz.c	2006-06-28 14:03:52.000000000 -0400
++++ mISDN/drivers/isdn/hardware/mISDN/avm_fritz.c	2006-12-20 14:26:06.000000000 -0500
+@@ -8,7 +8,6 @@
+  * This file is (c) under GNU PUBLIC LICENSE
+  *
+  */
+-#include <linux/config.h>
+ #include <linux/module.h>
+ #include <linux/pci.h>
+ #ifdef NEW_ISAPNP
+diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/core.c mISDN/drivers/isdn/hardware/mISDN/core.c
+--- mISDN.orig/drivers/isdn/hardware/mISDN/core.c	2006-08-07 19:35:59.000000000 -0400
++++ mISDN/drivers/isdn/hardware/mISDN/core.c	2006-12-20 14:26:06.000000000 -0500
+@@ -8,7 +8,6 @@
+ 
+ #include <linux/types.h>
+ #include <linux/stddef.h>
+-#include <linux/config.h>
+ #include <linux/module.h>
+ #include <linux/spinlock.h>
+ #include "core.h"
+diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/dsp_core.c mISDN/drivers/isdn/hardware/mISDN/dsp_core.c
+--- mISDN.orig/drivers/isdn/hardware/mISDN/dsp_core.c	2006-09-06 13:24:22.000000000 -0400
++++ mISDN/drivers/isdn/hardware/mISDN/dsp_core.c	2006-12-20 14:26:06.000000000 -0500
+@@ -172,7 +172,6 @@
+ const char *dsp_revision = "$Revision: 1.24 $";
+ 
+ #include <linux/delay.h>
+-#include <linux/config.h>
+ #include <linux/module.h>
+ #include <linux/vmalloc.h>
+ #include "layer1.h"
+diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/dtmf.c mISDN/drivers/isdn/hardware/mISDN/dtmf.c
+--- mISDN.orig/drivers/isdn/hardware/mISDN/dtmf.c	2006-06-28 14:03:52.000000000 -0400
++++ mISDN/drivers/isdn/hardware/mISDN/dtmf.c	2006-12-20 14:26:06.000000000 -0500
+@@ -15,7 +15,6 @@
+  *
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/module.h>
+ #include "layer1.h"
+ #include "helper.h"
+diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/faxl3.c mISDN/drivers/isdn/hardware/mISDN/faxl3.c
+--- mISDN.orig/drivers/isdn/hardware/mISDN/faxl3.c	2006-03-23 08:11:43.000000000 -0500
++++ mISDN/drivers/isdn/hardware/mISDN/faxl3.c	2006-12-20 14:26:06.000000000 -0500
+@@ -11,7 +11,6 @@
+  *
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/module.h>
+ #include "layer1.h"
+ #include "m_capi.h"
+diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/hfc_multi.c mISDN/drivers/isdn/hardware/mISDN/hfc_multi.c
+--- mISDN.orig/drivers/isdn/hardware/mISDN/hfc_multi.c	2006-09-13 11:53:01.000000000 -0400
++++ mISDN/drivers/isdn/hardware/mISDN/hfc_multi.c	2006-12-20 14:26:06.000000000 -0500
+@@ -93,7 +93,6 @@
+ /* debug using register map (never use this, it will flood your system log) */
+ //#define HFC_REGISTER_MAP
+ 
+-#include <linux/config.h>
+ #include <linux/module.h>
+ #include <linux/pci.h>
+ #include <linux/delay.h>
+diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/hfc_pci.c mISDN/drivers/isdn/hardware/mISDN/hfc_pci.c
+--- mISDN.orig/drivers/isdn/hardware/mISDN/hfc_pci.c	2006-06-29 04:52:39.000000000 -0400
++++ mISDN/drivers/isdn/hardware/mISDN/hfc_pci.c	2006-12-20 14:26:06.000000000 -0500
+@@ -25,7 +25,6 @@
+  *
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/module.h>
+ #include <linux/pci.h>
+ #include <linux/delay.h>
+diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/hfcs_mini.c mISDN/drivers/isdn/hardware/mISDN/hfcs_mini.c
+--- mISDN.orig/drivers/isdn/hardware/mISDN/hfcs_mini.c	2006-06-28 14:03:52.000000000 -0400
++++ mISDN/drivers/isdn/hardware/mISDN/hfcs_mini.c	2006-12-20 14:26:06.000000000 -0500
+@@ -49,7 +49,6 @@
+  *
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/module.h>
+ #include <linux/delay.h>
+ #include <asm/timex.h>
+diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/hfcs_usb.c mISDN/drivers/isdn/hardware/mISDN/hfcs_usb.c
+--- mISDN.orig/drivers/isdn/hardware/mISDN/hfcs_usb.c	2006-08-15 05:38:07.000000000 -0400
++++ mISDN/drivers/isdn/hardware/mISDN/hfcs_usb.c	2006-12-20 14:26:06.000000000 -0500
+@@ -28,7 +28,6 @@
+  *
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/module.h>
+ #include <linux/delay.h>
+ #include <linux/usb.h>
+diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/i4l_mISDN.c mISDN/drivers/isdn/hardware/mISDN/i4l_mISDN.c
+--- mISDN.orig/drivers/isdn/hardware/mISDN/i4l_mISDN.c	2006-03-23 08:11:43.000000000 -0500
++++ mISDN/drivers/isdn/hardware/mISDN/i4l_mISDN.c	2006-12-20 14:26:06.000000000 -0500
+@@ -10,7 +10,6 @@
+  *
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/module.h>
+ #include <linux/isdnif.h>
+ #include <linux/delay.h>
+diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/l1oip.c mISDN/drivers/isdn/hardware/mISDN/l1oip.c
+--- mISDN.orig/drivers/isdn/hardware/mISDN/l1oip.c	2006-03-23 08:11:43.000000000 -0500
++++ mISDN/drivers/isdn/hardware/mISDN/l1oip.c	2006-12-20 14:26:06.000000000 -0500
+@@ -207,7 +207,6 @@
+ */
+ 
+ 
+-#include <linux/config.h>
+ #include <linux/module.h>
+ #include <linux/delay.h>
+ 
+diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/layer1.c mISDN/drivers/isdn/hardware/mISDN/layer1.c
+--- mISDN.orig/drivers/isdn/hardware/mISDN/layer1.c	2006-06-28 14:03:52.000000000 -0400
++++ mISDN/drivers/isdn/hardware/mISDN/layer1.c	2006-12-20 14:26:06.000000000 -0500
+@@ -10,7 +10,6 @@
+ 
+ static char *l1_revision = "$Revision: 1.17 $";
+ 
+-#include <linux/config.h>
+ #include <linux/module.h>
+ #include "layer1.h"
+ #include "helper.h"
+diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/loop.c mISDN/drivers/isdn/hardware/mISDN/loop.c
+--- mISDN.orig/drivers/isdn/hardware/mISDN/loop.c	2006-03-23 08:11:43.000000000 -0500
++++ mISDN/drivers/isdn/hardware/mISDN/loop.c	2006-12-20 14:26:06.000000000 -0500
+@@ -25,7 +25,6 @@
+ 
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/module.h>
+ #include <linux/delay.h>
+ 
+diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/memdbg.c mISDN/drivers/isdn/hardware/mISDN/memdbg.c
+--- mISDN.orig/drivers/isdn/hardware/mISDN/memdbg.c	2006-03-06 07:52:07.000000000 -0500
++++ mISDN/drivers/isdn/hardware/mISDN/memdbg.c	2006-12-20 14:26:06.000000000 -0500
+@@ -1,5 +1,4 @@
+ #include <linux/stddef.h>
+-#include <linux/config.h>
+ #include <linux/module.h>
+ #include <linux/list.h>
+ #include <linux/slab.h>
+diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/netjet.c mISDN/drivers/isdn/hardware/mISDN/netjet.c
+--- mISDN.orig/drivers/isdn/hardware/mISDN/netjet.c	2006-08-07 07:53:02.000000000 -0400
++++ mISDN/drivers/isdn/hardware/mISDN/netjet.c	2006-12-20 14:26:06.000000000 -0500
+@@ -7,7 +7,6 @@
+  * Based on HiSax NETJet driver by Karsten Keil
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/module.h>
+ #include <linux/pci.h>
+ #include <linux/delay.h>
+diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/sedl_fax.c mISDN/drivers/isdn/hardware/mISDN/sedl_fax.c
+--- mISDN.orig/drivers/isdn/hardware/mISDN/sedl_fax.c	2006-06-29 05:11:08.000000000 -0400
++++ mISDN/drivers/isdn/hardware/mISDN/sedl_fax.c	2006-12-20 14:26:06.000000000 -0500
+@@ -26,7 +26,6 @@
+  * the firmware onto the card.
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/module.h>
+ #include <linux/pci.h>
+ #include <linux/delay.h>
+diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/socket.c mISDN/drivers/isdn/hardware/mISDN/socket.c
+--- mISDN.orig/drivers/isdn/hardware/mISDN/socket.c	2006-03-06 07:58:31.000000000 -0500
++++ mISDN/drivers/isdn/hardware/mISDN/socket.c	2006-12-20 14:26:06.000000000 -0500
+@@ -22,7 +22,6 @@
+ 
+ 
+ #include <linux/vmalloc.h>
+-#include <linux/config.h>
+ #include <linux/in.h>
+ #include <net/sock.h>
+ 
+diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/udevice.c mISDN/drivers/isdn/hardware/mISDN/udevice.c
+--- mISDN.orig/drivers/isdn/hardware/mISDN/udevice.c	2006-08-01 07:25:10.000000000 -0400
++++ mISDN/drivers/isdn/hardware/mISDN/udevice.c	2006-12-20 14:26:06.000000000 -0500
+@@ -8,7 +8,6 @@
+ #include <linux/stddef.h>
+ #include <linux/poll.h>
+ #include <linux/vmalloc.h>
+-#include <linux/config.h>
+ #include <linux/timer.h>
+ #ifdef CONFIG_DEVFS_FS
+ #include <linux/devfs_fs_kernel.h>
+diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/w6692.c mISDN/drivers/isdn/hardware/mISDN/w6692.c
+--- mISDN.orig/drivers/isdn/hardware/mISDN/w6692.c	2006-06-28 14:03:52.000000000 -0400
++++ mISDN/drivers/isdn/hardware/mISDN/w6692.c	2006-12-20 14:26:06.000000000 -0500
+@@ -21,7 +21,6 @@
+  *
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/module.h>
+ #include <linux/pci.h>
+ #include <linux/delay.h>
+diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/x25_dte.c mISDN/drivers/isdn/hardware/mISDN/x25_dte.c
+--- mISDN.orig/drivers/isdn/hardware/mISDN/x25_dte.c	2006-06-28 14:03:52.000000000 -0400
++++ mISDN/drivers/isdn/hardware/mISDN/x25_dte.c	2006-12-20 14:26:06.000000000 -0500
+@@ -12,7 +12,6 @@
+  *
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/module.h>
+ #include "x25_l3.h"
+ #include "helper.h"
+diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/x25_l3.c mISDN/drivers/isdn/hardware/mISDN/x25_l3.c
+--- mISDN.orig/drivers/isdn/hardware/mISDN/x25_l3.c	2006-08-07 19:35:59.000000000 -0400
++++ mISDN/drivers/isdn/hardware/mISDN/x25_l3.c	2006-12-20 14:26:06.000000000 -0500
+@@ -12,7 +12,6 @@
+  *
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/module.h>
+ #include "x25_l3.h"
+ #include "helper.h"
+diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/xhfc_pci2pi.c mISDN/drivers/isdn/hardware/mISDN/xhfc_pci2pi.c
+--- mISDN.orig/drivers/isdn/hardware/mISDN/xhfc_pci2pi.c	2006-03-17 02:43:41.000000000 -0500
++++ mISDN/drivers/isdn/hardware/mISDN/xhfc_pci2pi.c	2006-12-20 14:26:06.000000000 -0500
+@@ -21,7 +21,6 @@
+  *
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/module.h>
+ #include <linux/delay.h>
+ #include "xhfc_su.h"
+diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/xhfc_su.c mISDN/drivers/isdn/hardware/mISDN/xhfc_su.c
+--- mISDN.orig/drivers/isdn/hardware/mISDN/xhfc_su.c	2006-09-11 07:44:02.000000000 -0400
++++ mISDN/drivers/isdn/hardware/mISDN/xhfc_su.c	2006-12-20 14:26:06.000000000 -0500
+@@ -51,7 +51,6 @@
+  */
+  
+ #include <linux/mISDNif.h>
+-#include <linux/config.h>
+ #include <linux/module.h>
+ #include <linux/delay.h>
+ #include <linux/pci.h>

Modified: trunk/package/zaptel/zaptel-makefile0.patch
===================================================================
--- trunk/package/zaptel/zaptel-makefile0.patch	2006-12-18 18:50:30 UTC (rev 491)
+++ trunk/package/zaptel/zaptel-makefile0.patch	2006-12-20 19:28:32 UTC (rev 492)
@@ -1,6 +1,6 @@
---- zaptel-1.2.7.orig/Makefile	2006-07-07 14:03:59.000000000 -0400
-+++ zaptel-1.2.7/Makefile	2006-07-18 09:57:52.000000000 -0400
-@@ -45,6 +45,7 @@
+--- zaptel/Makefile.orig	2006-12-06 18:22:11.000000000 -0500
++++ zaptel/Makefile	2006-12-18 22:28:10.000000000 -0500
+@@ -46,6 +46,7 @@
  
  KFLAGS+=-DSTANDALONE_ZAPATA
  CFLAGS+=-DSTANDALONE_ZAPATA
@@ -8,7 +8,7 @@
  KMAKE:= $(MAKE) -C $(KSRC) SUBDIRS=$(PWD)
  KMAKE_INST:= $(KMAKE) INSTALL_MOD_PATH=$(INSTALL_PREFIX) INSTALL_MOD_DIR=misc modules_install
  
-@@ -124,7 +125,7 @@
+@@ -130,7 +131,7 @@
  obj-m+=xpp/
  endif
  
@@ -17,7 +17,7 @@
  ZTTOOL:=zttool
  endif
  BINS=ztcfg torisatool makefw ztmonitor ztspeed $(ZTTOOL) zttest fxotune
-@@ -197,13 +198,13 @@
+@@ -194,13 +195,13 @@
  	$(CC) -o $@ $^
  
  tones.h: gendigits
@@ -34,18 +34,36 @@
  
  gendigits: gendigits.o
  	$(CC) -o $@ $^ -lm
-@@ -336,25 +337,25 @@
+@@ -316,13 +317,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
+ ifeq ($(BUILDVER),linux26)
+ 	for x in $(MODULESKO); do \
+ 		rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/extra/$$x ; \
+@@ -337,25 +338,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)
++	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)
++	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)
++		$(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 restorecon -v $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO); fi
@@ -56,23 +74,16 @@
 -	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) "$(ROOT_PREFIX)" "$(filter-out zaptel,$(MODULES))"
+-	build_tools/genmodconf $(BUILDVER) "$(INSTALL_PREFIX)" "$(filter-out zaptel,$(MODULES))"
 -	@if [ -d /etc/modutils ]; then \
 -		/sbin/update-modules ; \
 -	fi
-+		$(INSTALL_PREFIX)$(INSTALL_BASE)/lib/$(LIBTONEZONE_SO)
-+	if [ -x $(INSTALL_BASE)/sbin/sestatus ] && ($(INSTALL_BASE)/sbin/sestatus | greip "SELinux status:" | grep -q "enabled") ; then restorecon -v $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/$(LIBTONEZONE_SO); fi
-+	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
-+	# [ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
-+	# [ -f $(CONFIG_FILE) ] || install -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
-+	# build_tools/genmodconf $(BUILDVER) "$(ROOT_PREFIX)" "$(filter-out zaptel,$(MODULES))"
-+	#@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
  

Modified: trunk/package/zaptel/zaptel.mk
===================================================================
--- trunk/package/zaptel/zaptel.mk	2006-12-18 18:50:30 UTC (rev 491)
+++ trunk/package/zaptel/zaptel.mk	2006-12-20 19:28:32 UTC (rev 492)
@@ -3,7 +3,7 @@
 # zaptel
 #
 ##############################################################
-ZAPTEL_VERSION := 1.2.10
+ZAPTEL_VERSION := 1.2.12
 ZAPTEL_SOURCE := zaptel-$(ZAPTEL_VERSION).tar.gz
 ZAPTEL_SITE := ftp://ftp.digium.com/pub/zaptel/releases
 ZAPTEL_DIR := $(BUILD_DIR)/zaptel-$(ZAPTEL_VERSION)

Modified: trunk/target/device/net4801/linux.mk
===================================================================
--- trunk/target/device/net4801/linux.mk	2006-12-18 18:50:30 UTC (rev 491)
+++ trunk/target/device/net4801/linux.mk	2006-12-20 19:28:32 UTC (rev 492)
@@ -22,10 +22,10 @@
 ifneq ($(filter $(TARGETS),linux),)
 
 # Version of Linux to download and then apply patches to
-DOWNLOAD_LINUX_VERSION=2.6.18
+DOWNLOAD_LINUX_VERSION=2.6.19.1
 # Version of Linux AFTER patches
 #LINUX_VERSION=$(DOWNLOAD_LINUX_VERSION)-astlinux
-LINUX_VERSION=2.6.18
+LINUX_VERSION=2.6.19.1
 
 DEVICE_DIR=$(BASE_DIR)/target/device/net4801
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.