[zaptel-commits] tzafrir: branch 1.4 r3582 - /branches/1.4/build_tools/test_kernel_git

[SVN commits to the Zaptel project]

Author: tzafrir
Date: Sun Dec 30 03:20:33 2007
New Revision: 3582

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3582
Log:
* git-reset --hard instead of git-checkout (Paolo Ornati).
* "update" command to pull an update from upstream repo.

Modified:
    branches/1.4/build_tools/test_kernel_git

Modified: branches/1.4/build_tools/test_kernel_git
URL: http://svn.digium.com/view/zaptel/branches/1.4/build_tools/test_kernel_git?view=diff&rev=3582&r1=3581&r2=3582
==============================================================================
--- branches/1.4/build_tools/test_kernel_git (original)
+++ branches/1.4/build_tools/test_kernel_git Sun Dec 30 03:20:33 2007
@@ -8,9 +8,10 @@
 usage() {
 	echo "$0: test building Zaptel vs. kernel from git"
 	echo "Usage:"
-	echo "  $0 checkout <kerneldir>        Pull a kernel version into <kerneldir>"
-	echo "  $0 setver <kernel_version>     Set the kernel version"
-	echo "  $0 test                        test-build"
+	echo "  $0 checkout <kerneldir>  Pull a kernel version into <kerneldir>"
+	echo "  $0 update                Update (pull) the kernel tree."
+	echo "  $0 setver <kernel_ver>   Set the kernel version"
+	echo "  $0 test                  Test-build"
 }
 
 # Set a variable in $CONF_FILE
@@ -44,12 +45,16 @@
 		git clone $GIT_URL
 		set_ver kernel_dir "$kernel_dir/linux-2.6"
 		;;
+	update)
+		cd "$kernel_dir"
+		git-pull
+		;;
 	setver)
 		kernel_ver="$2"
 		tag="v$kernel_ver"
 		cd "$kernel_dir"
-		git-checkout $tag .
-		make prepare
+		git-reset --hard "$tag"
+		make defconfig prepare
 		set_var kernel_ver "$kernel_ver"
 		;;
 	test)