summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@theqtcompany.com>2015-11-11 16:25:21 +0200
committerSamuli Piippo <samuli.piippo@theqtcompany.com>2015-11-17 13:14:37 +0000
commit2d904c40918688065bd040c988241ecf1e1e571d (patch)
tree017a3e58f063990072ed2a71054241afc6e4d519
parent637db7aa05cfc75aa35d43443a1e2879ce3f940f (diff)
downloadmeta-boot2qt-2d904c40918688065bd040c988241ecf1e1e571d.tar.gz
Create and upload binary images
Binary images created for imx6 and RPi devices, upload also for nuc. Change-Id: I4e7533965a6b04a5665ef237acf198b7c867d3f6 Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
-rw-r--r--conf/distro/include/imx6.inc2
-rw-r--r--conf/distro/include/raspberrypi.conf2
-rw-r--r--conf/distro/include/raspberrypi2.conf2
-rwxr-xr-xscripts/upload.sh15
4 files changed, 21 insertions, 0 deletions
diff --git a/conf/distro/include/imx6.inc b/conf/distro/include/imx6.inc
index 4b4f280..0afaa43 100644
--- a/conf/distro/include/imx6.inc
+++ b/conf/distro/include/imx6.inc
@@ -1,6 +1,8 @@
1BBMASK ?= " " 1BBMASK ?= " "
2BBMASK .= "|meta-fsl-arm/qt5-layer/recipes-qt/qt5" 2BBMASK .= "|meta-fsl-arm/qt5-layer/recipes-qt/qt5"
3 3
4IMAGE_FSTYPES += "ext3 sdcard"
5
4MACHINE_EXTRA_INSTALL_SDK = " \ 6MACHINE_EXTRA_INSTALL_SDK = " \
5 ${@base_contains("DISTRO_FEATURES", "wayland", "libwayland-egl-mx6-dev", "", d)} \ 7 ${@base_contains("DISTRO_FEATURES", "wayland", "libwayland-egl-mx6-dev", "", d)} \
6 " 8 "
diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf
index ec57b19..80f88d8 100644
--- a/conf/distro/include/raspberrypi.conf
+++ b/conf/distro/include/raspberrypi.conf
@@ -20,6 +20,8 @@
20## 20##
21############################################################################# 21#############################################################################
22 22
23IMAGE_FSTYPES += "ext3 rpi-sdimg"
24
23BOOTFS_CONTENT = "\ 25BOOTFS_CONTENT = "\
24 bcm2835-bootfiles/*: \ 26 bcm2835-bootfiles/*: \
25 ${KERNEL_IMAGETYPE}:kernel.img \ 27 ${KERNEL_IMAGETYPE}:kernel.img \
diff --git a/conf/distro/include/raspberrypi2.conf b/conf/distro/include/raspberrypi2.conf
index 28989aa..2129ff2 100644
--- a/conf/distro/include/raspberrypi2.conf
+++ b/conf/distro/include/raspberrypi2.conf
@@ -20,6 +20,8 @@
20## 20##
21############################################################################# 21#############################################################################
22 22
23IMAGE_FSTYPES += "ext3 rpi-sdimg"
24
23BOOTFS_CONTENT = "\ 25BOOTFS_CONTENT = "\
24 bcm2835-bootfiles/*: \ 26 bcm2835-bootfiles/*: \
25 ${KERNEL_IMAGETYPE}:kernel.img \ 27 ${KERNEL_IMAGETYPE}:kernel.img \
diff --git a/scripts/upload.sh b/scripts/upload.sh
index 8134cad..c9f97fd 100755
--- a/scripts/upload.sh
+++ b/scripts/upload.sh
@@ -27,6 +27,12 @@ set -e
27RELEASE=5.6 27RELEASE=5.6
28UPLOADPATH=QT@ci-files02-hki.ci.local:/srv/jenkins_data/enterprise/b2qt/yocto/${RELEASE}/ 28UPLOADPATH=QT@ci-files02-hki.ci.local:/srv/jenkins_data/enterprise/b2qt/yocto/${RELEASE}/
29 29
30upload_image() {
31 cp tmp/deploy/images/${MACHINE}/${1} b2qt-embedded-qt5-image-${MACHINE}.img
32 gzip b2qt-embedded-qt5-image-${MACHINE}.img -f
33 scp b2qt-embedded-qt5-image-${MACHINE}.img.gz ${UPLOADPATH}/
34}
35
30if [ ${MACHINE} = "emulator" ]; then 36if [ ${MACHINE} = "emulator" ]; then
31 cp tmp/deploy/images/emulator/b2qt-embedded-image-emulator.hdd . 37 cp tmp/deploy/images/emulator/b2qt-embedded-image-emulator.hdd .
32 gzip b2qt-embedded-image-emulator.hdd -f 38 gzip b2qt-embedded-image-emulator.hdd -f
@@ -48,9 +54,18 @@ elif [ ${MACHINE} = "imx6qsabresd" ]; then
48 scp tmp/deploy/sdk/b2qt-glibc-x86_64-meta-toolchain-b2qt-embedded-sdk-*.sh ${UPLOADPATH}/b2qt-glibc-x86_64-arm-toolchain-${MACHINE}.sh 54 scp tmp/deploy/sdk/b2qt-glibc-x86_64-meta-toolchain-b2qt-embedded-sdk-*.sh ${UPLOADPATH}/b2qt-glibc-x86_64-arm-toolchain-${MACHINE}.sh
49 scp tmp/deploy/images/${MACHINE}/b2qt-embedded-qt5-image-${MACHINE}.tar.gz ${UPLOADPATH}/ 55 scp tmp/deploy/images/${MACHINE}/b2qt-embedded-qt5-image-${MACHINE}.tar.gz ${UPLOADPATH}/
50 scp tmp/deploy/sdk/b2qt-glibc-x86_64-meta-toolchain-b2qt-embedded-qt5-sdk-*.sh ${UPLOADPATH}/b2qt-glibc-x86_64-arm-qt5-toolchain-${MACHINE}.sh 56 scp tmp/deploy/sdk/b2qt-glibc-x86_64-meta-toolchain-b2qt-embedded-qt5-sdk-*.sh ${UPLOADPATH}/b2qt-glibc-x86_64-arm-qt5-toolchain-${MACHINE}.sh
57elif [ ${MACHINE} = "nuc" ]; then
58 scp tmp/deploy/sdk/b2qt-glibc-x86_64-meta-toolchain-b2qt-embedded-qt5-sdk-*.sh ${UPLOADPATH}/b2qt-glibc-x86_64-arm-qt5-toolchain-${MACHINE}.sh
59 upload_image b2qt-embedded-qt5-image-${MACHINE}.hddimg
51else 60else
52 scp tmp/deploy/images/${MACHINE}/b2qt-embedded-image-*${MACHINE}.tar.gz ${UPLOADPATH}/ 61 scp tmp/deploy/images/${MACHINE}/b2qt-embedded-image-*${MACHINE}.tar.gz ${UPLOADPATH}/
53 scp tmp/deploy/sdk/b2qt-glibc-x86_64-meta-toolchain-b2qt-embedded-sdk-*.sh ${UPLOADPATH}/b2qt-glibc-x86_64-arm-toolchain-${MACHINE}.sh 62 scp tmp/deploy/sdk/b2qt-glibc-x86_64-meta-toolchain-b2qt-embedded-sdk-*.sh ${UPLOADPATH}/b2qt-glibc-x86_64-arm-toolchain-${MACHINE}.sh
54 scp tmp/deploy/images/${MACHINE}/b2qt-embedded-qt5-image-${MACHINE}.tar.gz ${UPLOADPATH}/ 63 scp tmp/deploy/images/${MACHINE}/b2qt-embedded-qt5-image-${MACHINE}.tar.gz ${UPLOADPATH}/
55 scp tmp/deploy/sdk/b2qt-glibc-x86_64-meta-toolchain-b2qt-embedded-qt5-sdk-*.sh ${UPLOADPATH}/b2qt-glibc-x86_64-arm-qt5-toolchain-${MACHINE}.sh 64 scp tmp/deploy/sdk/b2qt-glibc-x86_64-meta-toolchain-b2qt-embedded-qt5-sdk-*.sh ${UPLOADPATH}/b2qt-glibc-x86_64-arm-qt5-toolchain-${MACHINE}.sh
56fi 65fi
66
67if [ -e tmp/deploy/images/${MACHINE}/b2qt-embedded-qt5-image-${MACHINE}.sdcard ]; then
68 upload_image b2qt-embedded-qt5-image-${MACHINE}.sdcard
69elif [ -e tmp/deploy/images/${MACHINE}/b2qt-embedded-qt5-image-${MACHINE}.rpi-sdimg ]; then
70 upload_image b2qt-embedded-qt5-image-${MACHINE}.rpi-sdimg
71fi