summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFathi Boudra <fathi.boudra@linaro.org>2014-06-12 09:33:43 +0300
committerFathi Boudra <fathi.boudra@linaro.org>2014-06-12 09:33:43 +0300
commitdd10cf87dbafb73dbf7cdcc5588241c4af992319 (patch)
tree32bfd2141fe2b5b099e48313bc8f8a8117c9b748
parent75e7b60871d5489469c708801632cf7a1f082123 (diff)
downloadlci-build-tools-dd10cf87dbafb73dbf7cdcc5588241c4af992319.tar.gz
Minor code re-ordering to keep linaro-image-tools operations together
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
-rwxr-xr-xjenkins_common_lib4
1 files changed, 2 insertions, 2 deletions
diff --git a/jenkins_common_lib b/jenkins_common_lib
index 1cd53fb..4f2d457 100755
--- a/jenkins_common_lib
+++ b/jenkins_common_lib
@@ -172,13 +172,13 @@ build_instructions()
if [ "$submit_job" -eq 1 ]; then
hwpack_url=`python lci-build-tools/get_latest_slo_hwpack`
python lci-build-tools/download_file ${hwpack_url}
- rm -rf linaro-image-tools
- git clone http://git.linaro.org/git/ci/linaro-image-tools.git
latest_hwpack_name=`basename $hwpack_url`
hwpack_prefix=`echo ${latest_hwpack_name} | cut -d'_' -f-2`
hwpack_version=`date +%Y%m%d`-${BUILD_NUMBER}
hwpack_name=${hwpack_prefix}_${hwpack_version}_${kernel_debarch}_supported.tar.gz
mv ${latest_hwpack_name} ${hwpack_name}
+ rm -rf linaro-image-tools
+ git clone http://git.linaro.org/git/ci/linaro-image-tools.git
python linaro-image-tools/linaro-hwpack-replace -t ${hwpack_name} -p linux-image-${kernel_release}_*.deb -r linux-image -i
python linaro-image-tools/linaro-hwpack-replace -t ${hwpack_name} -p linux-headers-${kernel_release}_*.deb -r linux-headers -i
echo HWPACK_NAME=${hwpack_name} >> hwpack_info