summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiku Voipio <riku.voipio@linaro.org>2014-10-22 16:29:09 +0300
committerRiku Voipio <riku.voipio@linaro.org>2014-10-22 16:31:15 +0300
commit1f85cccac1f45523590af3f7c72d288476caf3c7 (patch)
tree42528a5ace312e1acea0a5edbd8f30aa5c5417c6
parent12e3054c4ca236d7121962b97924ab58e5ff8e83 (diff)
fix fix
-rwxr-xr-xjenkins/kernelbuild1
-rwxr-xr-xmakelavaimg18
2 files changed, 8 insertions, 11 deletions
diff --git a/jenkins/kernelbuild b/jenkins/kernelbuild
index 91f35f6..c20ede0 100755
--- a/jenkins/kernelbuild
+++ b/jenkins/kernelbuild
@@ -10,6 +10,7 @@ cd build
git clone https://git.linaro.org/ci/lci-build-tools.git
if [ ! -z ${WORKSPACE} ]
+then
export WORKSPACE=${WORKSPACE}/build
fi
diff --git a/makelavaimg b/makelavaimg
index 90ddb8e..3a78d2a 100755
--- a/makelavaimg
+++ b/makelavaimg
@@ -39,13 +39,8 @@ esac
image="xenlava-${hwpack}.img"
suite="trusty"
-#CI build version
-export HWPACK_BUILD_FILENAME="hwpack*_armhf_supported.tar.gz"
-
-if [ $? -ne 0 ]; then
- echo "hwpack download failed"
- case $hwpack in
- midway)
+case $hwpack in
+ midway)
echo "trying release"
HWPACK_BUILD_FILENAME="hwpack_linaro-midway_20140417-630_armhf_supported.tar.gz"
HWPACK_BUILD_URL="http://releases.linaro.org/14.04/ubuntu/midway/hwpack_linaro-midway_20140417-630_armhf_supported.tar.gz"
@@ -64,10 +59,11 @@ if [ $? -ne 0 ]; then
)
rm -rf tmp
;;
- *)
- exit 1
- esac
-fi
+ arndale)
+ echo "use local build"
+ export HWPACK_BUILD_FILENAME="hwpack*_armhf_supported.tar.gz"
+ ;;
+esac
set -e
#get last rootfs that built OK