diff options
| author | Fathi Boudra <fathi.boudra@linaro.org> | 2013-03-25 08:38:11 +0100 |
|---|---|---|
| committer | Milo Casagrande <milo@ubuntu.com> | 2013-03-25 08:38:11 +0100 |
| commit | 1fbd345b48d038149979d00456862038935d323a (patch) | |
| tree | 7e2478e7431106c9f08dd9c2aa25a4ef92dcf892 /jenkins_kernel_build_inst | |
| parent | e0e156630e5d79401b8a25c132be9d63780a8b2f (diff) | |
| parent | 7b15894332e5d8f3a5e48334a0d8fc22ea75996f (diff) | |
Various fixes for bug 1092037.
Diffstat (limited to 'jenkins_kernel_build_inst')
| -rwxr-xr-x | jenkins_kernel_build_inst | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/jenkins_kernel_build_inst b/jenkins_kernel_build_inst index 3e71d55..be176c4 100755 --- a/jenkins_kernel_build_inst +++ b/jenkins_kernel_build_inst @@ -94,19 +94,16 @@ export use_config_fragment export gcc_cc_version=`sh $PWD/scripts/gcc-version.sh -p $gcc_compiler` export bundle_stream_name=`echo $JOB_NAME | sed -e 's/_.*//' -e 's/\./_/g'` export TOOLCHAIN_PREFIX=`echo $gcc_compiler | sed -e 's/-gcc$/-/'` -kernel_config_name=`echo ${kernel_config} | sed -e 's/_defconfig//g'` if $git_reset = "true" ; then - git reset --hard $GIT_COMMIT - echo "DEBUG: We have reset the git now to point at $GIT_COMMIT commit id" + git reset --hard fi -export kernel_version=`git describe --match='v*' | sed -e 's/^v//'``echo -${kernel_config_name}-linaro-${kernel_flavour} | sed -e 's/_/-/g'` +export kernel_version=`make kernelversion`-linaro-${kernel_flavour} # Below is the list of values that will be used in the json files -kernel_git=`cat .git/config|grep -i git |cut -d "=" -f2` -export KERNEL_GIT="$kernel_git" -export KERNEL_COMMIT=$GIT_COMMIT +export KERNEL_GIT=`git config remote.origin.url` +export KERNEL_COMMIT=`git log -n1 --pretty=format:%H` if [ -z "${WORKSPACE}" ]; then # Local build |