[Pkg-voip-commits] r6110 - in /zaptel/trunk/debian: README.Debian modulestest

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Thu Aug 28 14:04:54 2008
New Revision: 6110

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6110
Log:
* Support test-building from vs. a custom version of a git kernel repo.
* Remove note of obsolete warning from README.

Modified:
    zaptel/trunk/debian/README.Debian
    zaptel/trunk/debian/modulestest

Modified: zaptel/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/README.Debian?rev=6110&op=diff
==============================================================================
--- zaptel/trunk/debian/README.Debian (original)
+++ zaptel/trunk/debian/README.Debian Thu Aug 28 14:04:54 2008
@@ -150,12 +150,18 @@
 chack that all packages were indeed built and that their size looks sane
 (no driver was left unbuilt).
 
+To test-build the package with a custom kernel from a git repository:
 
-If you get the "error":
-  
-  zconfig.h:91:41: error: missing binary operator before token "(" 
+  svn-buildpackage --svn-ignore-new -uc -us \
+   --svn-postbuild='debian/modulestest -g v2.6.25-rc4 -s /path/to/linux-2.6'
 
-It is probably harmless. See http://bugs.digium.com/12426 .
+This uses 'm-a -k /path/to/linux-2.6' (as supported before) to build
+the package with a custom kernel directory at /home/tzafrir/linux-2.6 .
+However before doing so, it checkouts the tag 'v2.6.25-rc4' from there
+and prepares that directory for building modules. 
 
+Note that the next time you'll use '-s /path/to/linux-2.6' it should 
+already be set to tag v2.6.25-rc4, and you won't need to use the switch 
+-g again.
 
--- Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>  16 June 2007
+-- Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>  Thu, 28 Aug 2008 17:03:16 +0300

Modified: zaptel/trunk/debian/modulestest
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/modulestest?rev=6110&op=diff
==============================================================================
--- zaptel/trunk/debian/modulestest (original)
+++ zaptel/trunk/debian/modulestest Thu Aug 28 14:04:54 2008
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -x
 
 # debian/modulestest: a postbuild script to build zaptel modules
 # example usage:
@@ -17,6 +17,10 @@
 #KERNEL_SOURCES=$HOME/Proj/Debs/Kernel/SwSusp/linux-2.6.15-rc5
 KERNEL_HEADERS=
 KERNEL_SOURCES=
+
+# Assume that the kernel directory is a git kernel repository.
+# Set it to tag <version> and configure it before building.
+GIT_KERNEL_VER=
 # run module-asustant with environment params that will generate
 # .changes files even without signing
 MODASS="env SIGNCHANGES=1 DEBSIGNCOMMAND=not_an_executable m-a"
@@ -27,13 +31,14 @@
   set -- $MODULESTEST_ARGS
 fi
 
-while getopts ah:rs:t arg
+while getopts ag:h:rs:t 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;;
+    g) GIT_KERNEL_VER=$OPTARG;;
     s) KERNEL_SOURCES=$OPTARG;;
     r) KERNEL_HEADERS=`uname -r`;;
     t) # TODO: make this test per-distro or something 
@@ -60,6 +65,15 @@
 rm -f $LOG_FILE
 dpkg -x $DEB $MODS_DIR
 
+if [ "$GIT_KERNEL_VER" != '' ] && [ -d "$KERNEL_SOURCES/.git" ]; then
+	(
+		cd "$KERNEL_SOURCES"
+		git checkout "$GIT_KERNEL_VER"
+		make distclean
+		make defconfig modules_prepare
+	)
+fi
+
 if [ "$hdrs_sw" != '' ]; then
   TARBALL=$TAR_BALL $MODASS -u $TOP_DIR -t -i -f $hdrs_sw build $PACKAGE >>$LOG_FILE
 fi