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

Mon Feb 20 18:46:04 UTC 2006

Author: tzafrir-guest
Date: 2006-02-20 18:46:03 +0000 (Mon, 20 Feb 2006)
New Revision: 1317

Modified:
   zaptel/trunk/debian/changelog
   zaptel/trunk/debian/modulestest
   zaptel/trunk/debian/patches/Makefile_xpp.dpatch
Log:
* modulestest: options enhanced. Much more usable. For those of you who think 
  a build of zaptel is too fast
* Makefile_xpp.dpatch: now it should work. Waiting for bug reports ;-)


Modified: zaptel/trunk/debian/changelog
===================================================================

--- zaptel/trunk/debian/changelog	2006-02-20 15:05:14 UTC (rev 1316)
+++ zaptel/trunk/debian/changelog	2006-02-20 18:46:03 UTC (rev 1317)
@@ -1,6 +1,5 @@
-zaptel (1:1.2.4-1) UNRELEASED; urgency=low
+zaptel (1:1.2.4-1) unstable; urgency=low
 
-  * NOT RELEASED YET
   * New upstrream release (Closes: #353094)
   * removing xpp.dpatch: merged in upstream
   * removing dot_version: bug fixed upstream
@@ -8,8 +7,10 @@
     upstream
   * Makefile_bristuff.dpatch: really build zaptel modules again
   * Makefile_xpp: fixed. TODO: limit to version >=2.6.12
+  * debian/modulestest: a script for postbuild of zaptel modules from a svn
+    build 
 
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Mon, 20 Feb 2006 12:13:48 +0200
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Mon, 20 Feb 2006 20:41:23 +0200
 
 zaptel (1:1.2.3-2) unstable; urgency=low
 

Modified: zaptel/trunk/debian/modulestest
===================================================================
--- zaptel/trunk/debian/modulestest	2006-02-20 15:05:14 UTC (rev 1316)
+++ zaptel/trunk/debian/modulestest	2006-02-20 18:46:03 UTC (rev 1317)
@@ -3,7 +3,7 @@
 # debian/modulestest: a postbuild script to build zaptel modules
 # example usage:
 #  
-#  svn-buildpackage -rfakeroot --svn-postbuild=debian/modulestest --svn-ignore-new --svn-lintian -uc -us
+#  svn-buildpackage -rfakeroot --svn-postbuild='debian/modulestest -a' --svn-ignore-new --svn-lintian -uc -us
 
 # At least one of the following two must be set to a sensible value:
 # If both are empty, the script does nothing useful)
@@ -11,17 +11,59 @@
 # kernel versions: Comma-separated. Use those if you have their
 # kernel-headers/linux-headers packages installed
 #
-KERNEL_HEADERS=2.4.27-2-386,2.6.8-2-686-smp
 
 # Full pathes to trees:
 # Use this to provide a full path to a custom kernel tree:
-KERNEL_SOURCES=$HOME/Proj/Debs/Kernel/SwSusp/linux-2.6.15-rc5
+#KERNEL_SOURCES=$HOME/Proj/Debs/Kernel/SwSusp/linux-2.6.15-rc5
+KERNEL_HEADERS=
+KERNEL_SOURCES=
 
+while getopts ah:s:tx arg
+do
+  case "$arg" in
+    a) # All of the kernel-headers packages installed:
+        KERNEL_HEADERS=`COLUMNS=160 dpkg -l 'kernel-headers-2.[46].*-*-*' | awk '/^.i/{print $2}' | sed -e 's/^kernel-headers-//'| xargs| tr ' ' ,`
+      ;;
+    h) KERNEL_HEADERS=$OPTARG;;
+    s) KERNEL_SOURCES=$OPTARG;;
+    t) # TODO: make this test per-distro or something 
+      KERNEL_HEADERS=2.4.27-2-386,2.6.8-2-686-smp
+      ;;
+    x)
+      # used internally in xorcom. Don't like it: file a bug report to remove
+      # it (Tzafrir)
+      for conf in 386 686 686-smp k7 k7-smp
+      do
+        for ver in 2.4.27-2 2.6.8
+        do
+          KERNEL_HEADERS=$KERNEL_HEADERS,$ver-$conf
+        done
+      done
+      for conf in 386 686 k7 rapidbox2
+      do
+        for ver in 2.6.12-1
+        do
+          KERNEL_HEADERS=$KERNEL_HEADERS,$ver-$conf
+        done
+      done
+      # remove the leading ',':
+      KERNEL_HEADERS=${KERNEL_HEADERS#,}
+      ;;
+  esac
+done
+shift $(( $OPTIND-1 ))
+
+echo "Building for: Headers: $KERNEL_HEADERS, Sources: $KERNEL_SOURCES"
+
 if [ "$KERNEL_HEADERS" != '' ]; then hdrs_sw="-l $KERNEL_HEADERS"; fi
 if [ "$KERNEL_SOURCES" != '' ]; then srcs_sw="-k $KERNEL_SOURCES"; fi
 
 # must be absolute for m-a ta accept TARBALL:
-TOP_DIR=$PWD/../
+# Also note that $PWD is ugly and is abot to be deleted.
+if [ -x /usr/bin/realpath ]
+then TOP_DIR=`realpath $PWD/../`
+else TOP_DIR=$PWD/../
+fi
 MODS_DIR=$TOP_DIR/modules
 TAR_BALL=$MODS_DIR/usr/src/zaptel.tar.bz2
 DEB=$TOP_DIR/$PACKAGE-source_${TAG_VERSION}_all.deb
@@ -38,5 +80,5 @@
   TARBALL=$TAR_BALL m-a -u $TOP_DIR -t -i -f $srcs_sw build $PACKAGE >>$LOG_FILE
 fi
 
-ls -l $TOP_DIR/$PACKAGE-modules-*$TAG_VERSION*.deb
+ls -l $TOP_DIR/$PACKAGE-modules-*_$TAG_VERSION+*.deb
 

Modified: zaptel/trunk/debian/patches/Makefile_xpp.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_xpp.dpatch	2006-02-20 15:05:14 UTC (rev 1316)
+++ zaptel/trunk/debian/patches/Makefile_xpp.dpatch	2006-02-20 18:46:03 UTC (rev 1317)
@@ -9,12 +9,19 @@
 diff -urNad zaptel-1.2.0/Makefile /tmp/dpep.HPVfs0/zaptel-1.2.0/Makefile
 --- 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_MAJOR_VER:=1
- LIBTONEZONE_SO_MINOR_VER:=0
+@@ -95,10 +95,11 @@
  
-+# Also build xpp in the subdirectory xpp/
+ MOD_DESTDIR:=zaptel
+ 
+-obj-m:=$(MODULESO) ${XPPMOD}
+-
+-ifneq ($(filter xpp,${MAKECMDGOALS}),)
+-XPPMOD=xpp/
++# Also build xpp in the subdirectory xpp/ . But only for >=2.6.12
++# This line is only meaningful when this Makefile is used as kconfig for 
++# 2.6 build
++ifneq (,$(shell [ 0$(SUBLEVEL) -ge 12 ] && echo 1))
 +obj-m += xpp/
- MODULES:=zaptel tor2 torisa wcusb wcfxo wctdm wctdm24xxp \
- 	 ztdynamic ztd-eth wct1xxp wct4xxp wcte11xp pciradio \
-          ztd-loc # ztdummy
+ endif
+ 
+ #ifneq ($(TOPDIR),)


