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>

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 @@
 BBMASK ?= " "
 BBMASK .= "|meta-fsl-arm/qt5-layer/recipes-qt/qt5"
 
+IMAGE_FSTYPES += "ext3 sdcard"
+
 MACHINE_EXTRA_INSTALL_SDK = " \
         ${@base_contains("DISTRO_FEATURES", "wayland", "libwayland-egl-mx6-dev", "", d)} \
         "
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 @@
 ##
 #############################################################################
 
+IMAGE_FSTYPES += "ext3 rpi-sdimg"
+
 BOOTFS_CONTENT = "\
     bcm2835-bootfiles/*: \
     ${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 @@
 ##
 #############################################################################
 
+IMAGE_FSTYPES += "ext3 rpi-sdimg"
+
 BOOTFS_CONTENT = "\
     bcm2835-bootfiles/*: \
     ${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
 RELEASE=5.6
 UPLOADPATH=QT@ci-files02-hki.ci.local:/srv/jenkins_data/enterprise/b2qt/yocto/${RELEASE}/
 
+upload_image() {
+  cp tmp/deploy/images/${MACHINE}/${1} b2qt-embedded-qt5-image-${MACHINE}.img
+  gzip b2qt-embedded-qt5-image-${MACHINE}.img -f
+  scp b2qt-embedded-qt5-image-${MACHINE}.img.gz ${UPLOADPATH}/
+}
+
 if [ ${MACHINE} = "emulator" ]; then
   cp tmp/deploy/images/emulator/b2qt-embedded-image-emulator.hdd .
   gzip b2qt-embedded-image-emulator.hdd -f
@@ -48,9 +54,18 @@ elif [ ${MACHINE} = "imx6qsabresd" ]; then
   scp tmp/deploy/sdk/b2qt-glibc-x86_64-meta-toolchain-b2qt-embedded-sdk-*.sh ${UPLOADPATH}/b2qt-glibc-x86_64-arm-toolchain-${MACHINE}.sh
   scp tmp/deploy/images/${MACHINE}/b2qt-embedded-qt5-image-${MACHINE}.tar.gz ${UPLOADPATH}/
   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
+elif [ ${MACHINE} = "nuc" ]; then
+  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
+  upload_image b2qt-embedded-qt5-image-${MACHINE}.hddimg
 else
   scp tmp/deploy/images/${MACHINE}/b2qt-embedded-image-*${MACHINE}.tar.gz ${UPLOADPATH}/
   scp tmp/deploy/sdk/b2qt-glibc-x86_64-meta-toolchain-b2qt-embedded-sdk-*.sh ${UPLOADPATH}/b2qt-glibc-x86_64-arm-toolchain-${MACHINE}.sh
   scp tmp/deploy/images/${MACHINE}/b2qt-embedded-qt5-image-${MACHINE}.tar.gz ${UPLOADPATH}/
   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
 fi
+
+if [ -e tmp/deploy/images/${MACHINE}/b2qt-embedded-qt5-image-${MACHINE}.sdcard ]; then
+    upload_image b2qt-embedded-qt5-image-${MACHINE}.sdcard
+elif [ -e tmp/deploy/images/${MACHINE}/b2qt-embedded-qt5-image-${MACHINE}.rpi-sdimg ]; then
+    upload_image b2qt-embedded-qt5-image-${MACHINE}.rpi-sdimg
+fi