aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFathi Boudra <fathi.boudra@linaro.org>2015-03-29 09:02:00 +0300
committerFathi Boudra <fathi.boudra@linaro.org>2015-03-29 09:02:00 +0300
commitdb5d4bd07b76609ed1af11de63c7588afbd94e09 (patch)
tree6b0a2730249d170583c36338470fe82c242c26b0
parentb405a423c77853eb055c4331a3638effbd833518 (diff)
lt-qcom-ubuntu-images-arm64: fix build failures
* hwpack: kernel file is Image * rootfs url has -arm64 appended to the rootfs name Change-Id: I99c60119cceca46461205c838cd864aa2dee235d Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
-rw-r--r--lt-qcom-ubuntu-images-arm64.yaml7
1 files changed, 3 insertions, 4 deletions
diff --git a/lt-qcom-ubuntu-images-arm64.yaml b/lt-qcom-ubuntu-images-arm64.yaml
index 7969b1d..4bc62a4 100644
--- a/lt-qcom-ubuntu-images-arm64.yaml
+++ b/lt-qcom-ubuntu-images-arm64.yaml
@@ -117,7 +117,7 @@
dtb_addr: '0x61000000'
partition_layout: bootfs_rootfs
mmc_id: '0:1'
- kernel_file: boot/vmlinuz-*-qcom
+ kernel_file: boot/Image-*-qcom
initrd_file: boot/initrd.img-*-qcom
dtb_file: lib/firmware/*-qcom/device-tree/msm8916-mtp.dtb
boot_script: boot.scr
@@ -149,7 +149,7 @@
# Get rootfs
export ROOTFS_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/ubuntu-arm64-rootfs/label=build,rootfs=${rootfs}/lastSuccessfulBuild/buildNumber`
export ROOTFS_BUILD_TIMESTAMP=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/ubuntu-arm64-rootfs/label=build,rootfs=${rootfs}/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd`
- export ROOTFS_BUILD_URL="http://snapshots.linaro.org/ubuntu/images/${rootfs}/${ROOTFS_BUILD_NUMBER}/linaro-${UBUNTU_FLAVOUR}-${rootfs}-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.tar.gz"
+ export ROOTFS_BUILD_URL="http://snapshots.linaro.org/ubuntu/images/${rootfs}-arm64/${ROOTFS_BUILD_NUMBER}/linaro-${UBUNTU_FLAVOUR}-${rootfs}-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.tar.gz"
wget --progress=dot -e dotbytes=2M ${ROOTFS_BUILD_URL}
# Create pre-built image(s)
@@ -183,7 +183,7 @@
gzip -9 out/linaro-${UBUNTU_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.img
cat >> out/README.txt << EOF
- Linaro Ubuntu ${rootfs} build: http://snapshots.linaro.org/ubuntu/images/${rootfs}/${ROOTFS_BUILD_NUMBER}
+ Linaro Ubuntu ${rootfs} build: http://snapshots.linaro.org/ubuntu/images/${rootfs}-arm64/${ROOTFS_BUILD_NUMBER}
EOF
done
@@ -218,7 +218,6 @@
# Final preparation for publishing
cp -a linux-*.deb out/
- rm -f out/vmlinuz
# Create MD5SUMS file
(cd out && md5sum * > MD5SUMS.txt)