[Pkg-voip-commits] r8050 - in /dahdi-linux/trunk/debian: README.Debian modulestest

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Sun Feb 14 19:40:21 2010
New Revision: 8050

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8050
Log:
Fix modulestest (build-test script) for Squeeze.

Modified:
    dahdi-linux/trunk/debian/README.Debian
    dahdi-linux/trunk/debian/modulestest

Modified: dahdi-linux/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/README.Debian?rev=8050&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/README.Debian (original)
+++ dahdi-linux/trunk/debian/README.Debian Sun Feb 14 19:40:21 2010
@@ -84,8 +84,6 @@
 
 Build-time Tests
 ----------------
-FIXME: Broken as of Squeeze.
-
 One sanity check to run when making changes in the package is to make
 (besides the usual lintian/linda) is to make sure that the modules
 packages still builds.

Modified: dahdi-linux/trunk/debian/modulestest
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/modulestest?rev=8050&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/modulestest (original)
+++ dahdi-linux/trunk/debian/modulestest Sun Feb 14 19:40:21 2010
@@ -65,19 +65,22 @@
 	TOP_DIR=`dirname $PWD`
 fi
 MODS_DIR=$TOP_DIR/modules
-TAR_BALL=$MODS_DIR/usr/src/$PACKAGE.tar.bz2
-DEB=$TOP_DIR/$PACKAGE-source_${TAG_VERSION}_all.deb
-LOG_FILE=$TOP_DIR/$PACKAGE-modules-build-$TAG_VERSION.log
+SRC_DIR=$MODS_DIR/usr/src
+TAR_BALL=$SRC_DIR/$PACKAGE.tar.bz2
+DEB_VERSION=${TAG_VERSION#*:}
+DEB=$TOP_DIR/$PACKAGE-source_${DEB_VERSION}_all.deb
+LOG_FILE=$TOP_DIR/$PACKAGE-modules-build-$DEB_VERSION.log
 
 rm -f $LOG_FILE
 dpkg -x $DEB $MODS_DIR
 
 if [ "$hdrs_sw" != '' ]; then
-  TARBALL=$TAR_BALL $MODASS -u $TOP_DIR -t -i -f $hdrs_sw build $PACKAGE >>$LOG_FILE
+  MOD_SRCDIR=$SRC_DIR TARBALL=$TAR_BALL $MODASS -u $TOP_DIR -t -i -f $hdrs_sw build $PACKAGE >>$LOG_FILE
 fi
 if [ "$srcs_sw" != '' ]; then
-  TARBALL=$TAR_BALL $MODASS -u $TOP_DIR -t -i -f $srcs_sw build $PACKAGE >>$LOG_FILE
+  MOD_SRCDIR=$SRC_DIR TARBALL=$TAR_BALL $MODASS -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-*_$DEB_VERSION+*.deb
 echo "$me: Log file: $LOG_FILE"
+pwd >&2