From fa03be185938b8a4c0b4d6c5c88f2a0bcf494a36 Mon Sep 17 00:00:00 2001 From: tzafrir Date: Sun, 30 Dec 2007 09:20:33 +0000 Subject: * git-reset --hard instead of git-checkout (Paolo Ornati). * "update" command to pull an update from upstream repo. git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@3582 5390a7c7-147a-4af0-8ec9-7488f05a26cb --- build_tools/test_kernel_git | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'build_tools/test_kernel_git') diff --git a/build_tools/test_kernel_git b/build_tools/test_kernel_git index 329ae11..1d6e514 100755 --- a/build_tools/test_kernel_git +++ b/build_tools/test_kernel_git @@ -8,9 +8,10 @@ CONF_FILE=build_tools/git_test.conf usage() { echo "$0: test building Zaptel vs. kernel from git" echo "Usage:" - echo " $0 checkout Pull a kernel version into " - echo " $0 setver Set the kernel version" - echo " $0 test test-build" + echo " $0 checkout Pull a kernel version into " + echo " $0 update Update (pull) the kernel tree." + echo " $0 setver Set the kernel version" + echo " $0 test Test-build" } # Set a variable in $CONF_FILE @@ -44,12 +45,16 @@ case "$command" in 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) -- cgit v1.2.3