From ec4b836f84015936772b1ee1e36a9766993136fc Mon Sep 17 00:00:00 2001
From: Riku Voipio <riku.voipio@linaro.org>
Date: Mon, 25 Nov 2013 15:18:08 +0200
Subject: changes needed for building from cdall's branch

---
 jenkins-vexpress-commands.sh | 45 ++++++--------------------------------------
 1 file changed, 6 insertions(+), 39 deletions(-)

diff --git a/jenkins-vexpress-commands.sh b/jenkins-vexpress-commands.sh
index 75aca7a..3990848 100755
--- a/jenkins-vexpress-commands.sh
+++ b/jenkins-vexpress-commands.sh
@@ -1,52 +1,19 @@
 #!/bin/bash
 
-sudo apt-get install -y qemu-utils
-
 rm -rf lci-build-tools builddir-*
 rm -f *deb *.gz
 
 bzr branch lp:~linaro-infrastructure/linaro-ci/lci-build-tools
-echo "CONFIG_BLK_DEV_NBD=m" >> linaro/configs/kvm-host.conf
 
 # Build KVM kernel for vexpress
-export MAKE_DTBS=true
-export board_type='vexpress'
-export hwpack_type='vexpress'
-export kernel_flavour='vexpress'
-export git_reset='no'
-export use_config_fragment=1
-export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/vexpress.conf linaro/configs/distribution.conf linaro/configs/kvm-host.conf linaro/configs/kvm-guest.conf"
-
-bash ./lci-build-tools/jenkins_kernel_build_inst
-
-export ROOTFS_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/ubuntu-armhf-rootfs/label=precise_hwpack_cloud,rootfs=nano-lava/lastSuccessfulBuild/buildNumber`
-export ROOTFS_BUILD_TIMESTAMP=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/ubuntu-armhf-rootfs/label=precise_hwpack_cloud,rootfs=nano-lava/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd`
-export ROOTFS_BUILD_URL="http://snapshots.linaro.org/raring/images/nano-lava/${ROOTFS_BUILD_NUMBER}/linaro-raring-nano-lava-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.tar.gz"
-wget --progress=dot -e dotbytes=2M ${ROOTFS_BUILD_URL}
-
-# Create pre-built image(s)
-./linaro-image-tools/linaro-media-create --dev vexpress --output-directory upload-dir --image-size 1000M --binary linaro-raring-nano-lava-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.tar.gz --hwpack hwpack_linaro-vexpress_*.tar.gz --hwpack-force
+export kernel_config="kvm_guest_defconfig"
+export make_deb="false"
+export MAKE_DTBS="true"
 
-mv upload-dir/sd.img .
+./lci-build-tools/jenkins_kernel_build_inst
 
-# create the guest fs image as qcow2
-qemu-img convert -f raw -O qcow2 sd.img kvm.qcow2
-
-# Compress image(s)
-gzip -9 kvm.qcow2 &
-gzip -9 sd.img 
-wait
-
-cat <<EOF > post_build_lava_parameters
-HWPACK_JOB_NAME=${JOB_NAME}
-HWPACK_BUILD_NUMBER=${BUILD_NUMBER}
-HWPACK_FILE_NAME=`ls hwpack_linaro-vexpress*.tar.gz`
-DEVICE_TYPE=vexpress-tc2
-IMAGE_URL=https://snapshots.linaro.org/kernel-hwpack/linux-vexpress-kvm/linux-vexpress-kvm/sd.img.gz
-LAVA_TEST_PLAN=kvm
-GIT_REPO=git://git.linaro.org/ci/kvm-ci.git
-BUNDLE_STREAM_NAME=/private/team/linaro/virtualization/
-EOF
+cp ./builddir-*/arch/arm/boot/zImage .
+cp ./builddir-*/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dtb .
 
 cat << EOF > BUILD-INFO.txt
 Format-Version: 0.1
-- 
cgit v1.2.3