* builder now works under dahdi as well.

* ADded test_git_kernel command 'driver_version' Reporting it is of no
  busyniss of the builder script.


git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4474 a0bf4364-ded3-4de4-8d8a-66a801d63aff

2 files changed, 13 insertions, 8 deletions

diff --git a/build_tools/builder b/build_tools/builder
index e85be77..a0311f5 100755
--- a/build_tools/builder
+++ b/build_tools/builder
@@ -127,7 +127,7 @@ case "$1" in
 init)
 	mkdir -p $LOGS_DIR
 	cat <<EOF | $SQLITE $DB
-CREATE TABLE runs(name TEXT PRIMARY KEY, time INTEGER DEFAULT CURRENT_TIMESTAMP, zap_ver TEXT);
+CREATE TABLE runs(name TEXT PRIMARY KEY, time INTEGER DEFAULT CURRENT_TIMESTAMP, driver_ver TEXT);
 CREATE TABLE results(name TEXT, system TEXT, kvers TEXT, result INTEGER, fail_type TEXT, log TEXT);
 EOF
 	mkdir -p $LOGS_DIR
@@ -136,12 +136,12 @@ EOF
 build)
 	cd $BASE_DIR
 	shift
+	
 	if [ "$*" != '' ]; then KERNELS_localhost="$*"; fi
-	#make update
-	make version.h
-	zap_ver=`awk -F'"' '/ZAPTEL_VERSION/{print $2}' version.h`
+	driver_ver=`$BUILD_SCRIPT version_driver`
 	build_name=`date '+%Y%m%d-%H%M%si'`
-	echo "INSERT INTO runs (name, zap_ver) VALUES ('$build_name', '$zap_ver');" | $SQLITE $DB
+
+	echo "INSERT INTO runs (name, driver_ver) VALUES ('$build_name', '$driver_ver');" | $SQLITE $DB
 
 	for host in $HOSTS; do
 		eval kernels="\$KERNELS_$host"
diff --git a/build_tools/test_kernel_git b/build_tools/test_kernel_git
index e6bf083..9ddd7da 100755
--- a/build_tools/test_kernel_git
+++ b/build_tools/test_kernel_git
@@ -7,13 +7,14 @@ CONF_FILE=build_tools/git_test.conf
 
 usage() {
 	me=`basename $0`
-	echo "$me: test building Zaptel vs. kernel from git"
+	echo "$me: test building DAHDI vs. kernel from git"
 	echo "Usage:"
 	echo "  $me checkout <kerneldir>  Pull a kernel version into <kerneldir>"
 	echo "  $me update                Update (pull) the kernel tree."
 	echo "  $me setver <kernel_ver>   Set the kernel version"
 	echo "  $me versions              Print available versions"
 	echo "  $me version               Print current (kernel) version"
+	echo "  $me version_driver        Print the version of DAHDI"
 	echo "  $me build                 Test-build"
 	echo "  $me git <git command>     Run <git command>"
 	echo ""
@@ -70,6 +71,11 @@ case "$command" in
 		echo -n "Actual: "
 		git describe | cut -c2-
 		;;
+	version_driver)
+		version_h=include/dahdi/version.h
+		make $version_h >/dev/null
+		awk -F'"' '/DAHDI_VERSION/{print $2}' $version_h
+		;;
 	setver)
 		kernel_ver="$2"
 		tag="v$kernel_ver"
@@ -77,13 +83,12 @@ case "$command" in
 		git-reset --hard "$tag"
 		make distclean
 		make defconfig modules_prepare
-		#make SUBDIRS=scripts # generate scripts/mod/modpost
 		set_var kernel_ver "$kernel_ver"
 		;;
 	test|build)
 		# you can pass extra parameters to the make command in
 		# two ways:
-		# 1. Set th value of MAKE_PARAMS in git_test.conf .
+		# 1. Set the value of MAKE_PARAMS in git_test.conf .
 		# 2. Any extra command-line parameter.
 		shift
 		make KSRC="$kernel_dir" KVERS=$kernel_ver $MAKE_PARAMS "$@"