[Pkg-voip-commits] r1316 - in zaptel/trunk/debian: . patches

[Tzafrir Cohen]

Author: tzafrir-guest
Date: 2006-02-20 15:05:14 +0000 (Mon, 20 Feb 2006)
New Revision: 1316

Added:
   zaptel/trunk/debian/patches/Makefile_bristuff.dpatch
Modified:
   zaptel/trunk/debian/changelog
   zaptel/trunk/debian/patches/00list
   zaptel/trunk/debian/patches/Makefile_kbuild.dpatch
   zaptel/trunk/debian/patches/Makefile_xpp.dpatch
Log:
* Makefile_bristuff.dpatch: really build zaptel modules again
* Makefile_xpp: fixed. TODO: limit to version >=2.6.12


Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog	2006-02-19 21:23:44 UTC (rev 1315)
+++ zaptel/trunk/debian/changelog	2006-02-20 15:05:14 UTC (rev 1316)
@@ -6,8 +6,10 @@
   * removing dot_version: bug fixed upstream
   * Makefile_kbuild.dpatch: modified, as it was not properly merged in
     upstream
+  * Makefile_bristuff.dpatch: really build zaptel modules again
+  * Makefile_xpp: fixed. TODO: limit to version >=2.6.12
 
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Thu, 16 Feb 2006 06:10:04 +0200
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Mon, 20 Feb 2006 12:13:48 +0200
 
 zaptel (1:1.2.3-2) unstable; urgency=low
 

Modified: zaptel/trunk/debian/patches/00list
===================================================================
--- zaptel/trunk/debian/patches/00list	2006-02-19 21:23:44 UTC (rev 1315)
+++ zaptel/trunk/debian/patches/00list	2006-02-20 15:05:14 UTC (rev 1316)
@@ -3,8 +3,10 @@
 Makefile_uname
 #Makefile_pscmd
 Makefile_targets
-#Makefile_kbuild
-#Makefile_xpp
+Makefile_kbuild
+Makefile_xpp
+# probably depends on previus Makefile_* patches (specifically: Makefile_targets)
+Makefile_bristuff
 # touches the Makefile as well:
 echocan_env
 ukcid

Added: zaptel/trunk/debian/patches/Makefile_bristuff.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_bristuff.dpatch	2006-02-19 21:23:44 UTC (rev 1315)
+++ zaptel/trunk/debian/patches/Makefile_bristuff.dpatch	2006-02-20 15:05:14 UTC (rev 1316)
@@ -0,0 +1,47 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Makefile_bristuff.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: A bit of extra Makefile changes to build bristuff
+
+ at DPATCH@
+diff -urNad zaptel-1.2.4/Makefile /tmp/dpep.sFEWj1/zaptel-1.2.4/Makefile
+--- zaptel-1.2.4/Makefile	2006-02-19 00:34:22.000000000 +0200
++++ /tmp/dpep.sFEWj1/zaptel-1.2.4/Makefile	2006-02-19 00:43:02.000000000 +0200
+@@ -140,6 +140,9 @@
+ MODULES:=zaptel tor2 torisa wcusb wcfxo wctdm wctdm24xxp \
+ 	 ztdynamic ztd-eth wct1xxp wct4xxp wcte11xp pciradio \
+          ztd-loc # ztdummy
++
++BRIMODS=cwain qozap zaphfc
++MODULES+=$(BRIMODS)
+ #MODULES+=wcfxsusb
+ # build ztdummy by default for 2.6 kernels
+ ifeq (${BUILDVER},linux26)
+@@ -228,6 +231,26 @@
+ 
+ ztdummy.o: ztdummy.h
+ 
++$(BRIMODS:%=%.o): %.o: %.h
++ifneq (,$(wildcard /usr/src/modules/rtai/base/include/rtai.h))
++zaphfc.o: KFLAGS+=-DRTAITIMING \
++  -I/usr/src/modules/rtai/base/include -I/usr/src/modules/rtai
++endif
++# copy the zaptel modules to current directory before building modules:
++prereq: $(BRIMODS:%=%.c) $(BRIMODS:%=%.h)
++
++# copy bristuff files from subdirectories
++# provide zaphfc.[ch] from zaphfc/zaphfc.[ch] etc. Any better way?
++zaphfc.%: zaphfc/zaphfc.%
++	cp $^ $@
++
++qozap.%: qozap/qozap.%
++	cp $^ $@
++
++cwain.%: cwain/cwain.%
++	cp $^ $@
++
++
+ $(MODULESO): %.o: %.c zaptel.h
+ 	$(HOSTCC) $(KFLAGS) -o $@ -c $<
+ 


Property changes on: zaptel/trunk/debian/patches/Makefile_bristuff.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: zaptel/trunk/debian/patches/Makefile_kbuild.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_kbuild.dpatch	2006-02-19 21:23:44 UTC (rev 1315)
+++ zaptel/trunk/debian/patches/Makefile_kbuild.dpatch	2006-02-20 15:05:14 UTC (rev 1316)
@@ -9,13 +9,14 @@
 diff -urNad zaptel-1.2.0/Makefile /tmp/dpep.UEJtoR/zaptel-1.2.0/Makefile
 --- zaptel-1.2.0/Makefile	2005-11-18 03:55:06.922498053 +0200
 +++ /tmp/dpep.UEJtoR/zaptel-1.2.0/Makefile	2005-11-18 03:59:07.152581731 +0200
-@@ -58,6 +58,9 @@
+@@ -58,6 +58,10 @@
  
  KFLAGS+=-DSTANDALONE_ZAPATA
  CFLAGS+=-DSTANDALONE_ZAPATA
 +KMAKE  = $(MAKE) -C $(KSRC) SUBDIRS=$(PWD)
 +KMAKE_INST = $(KMAKE) \
 +  INSTALL_MOD_PATH=$(INSTALL_PREFIX) INSTALL_MOD_DIR=misc modules_install
++EXTRA_CFLAGS=-I$(src)
  
  ROOT_PREFIX=
  INSTALL_PREFIX=$(DESTDIR)

Modified: zaptel/trunk/debian/patches/Makefile_xpp.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_xpp.dpatch	2006-02-19 21:23:44 UTC (rev 1315)
+++ zaptel/trunk/debian/patches/Makefile_xpp.dpatch	2006-02-20 15:05:14 UTC (rev 1316)
@@ -10,9 +10,9 @@
 --- zaptel-1.2.0/Makefile	2005-11-16 20:09:29.000000000 +0200
 +++ /tmp/dpep.HPVfs0/zaptel-1.2.0/Makefile	2005-11-18 02:43:44.385305666 +0200
 @@ -95,6 +95,8 @@
- LIBTONEZONE_SO:=libtonezone.so
  LIBTONEZONE_SO_MAJOR_VER:=1
  LIBTONEZONE_SO_MINOR_VER:=0
+ 
 +# Also build xpp in the subdirectory xpp/
 +obj-m += xpp/
  MODULES:=zaptel tor2 torisa wcusb wcfxo wctdm wctdm24xxp \