20 files changed, 75 insertions, 2 deletions

diff --git a/classes/deploy-conf.bbclass b/classes/deploy-conf.bbclass
new file mode 100644
index 0000000..c49c375
--- /dev/null
+++ b/classes/deploy-conf.bbclass
@@ -0,0 +1,37 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+inherit image_types
+
+DEPLOY_CONF_NAME ?= "${MACHINE}"
+DEPLOY_CONF_TYPE ?= "Boot2Qt"
+
+IMAGE_CMD_conf() {
+    cat > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.conf <<EOF
+[${DEPLOY_CONF_TYPE} | ${DEPLOY_CONF_NAME}]
+platform=${MACHINE}
+os=linux
+board=
+imagefile=${IMAGE_LINK_NAME}.img
+asroot=true
+EOF
+}
diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index 66d3045..33a335a 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -57,8 +57,8 @@ MACHINE_EXTRA_INSTALL ?= ""
 MACHINE_EXTRA_INSTALL_SDK ?= ""
 MACHINE_EXTRA_INSTALL_SDK_HOST ?= ""
 
-IMAGE_FSTYPES = "tar.gz"
-IMAGE_CLASSES += "image_types_sdcard"
+IMAGE_FSTYPES = "tar.gz conf"
+IMAGE_CLASSES += "image_types_sdcard deploy-conf"
 
 LICENSE_CREATE_PACKAGE = "1"
 COPY_LIC_MANIFEST = "1"
diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf
index e44e99a..a2300cf 100644
--- a/conf/distro/include/am335x-evm.conf
+++ b/conf/distro/include/am335x-evm.conf
@@ -22,6 +22,8 @@
 
 include conf/distro/include/ti.inc
 
+DEPLOY_CONF_NAME = "Sitara AM335x Starter Kit"
+
 BOOTFS_CONTENT = "\
     u-boot-${MACHINE}.img:u-boot.img \
     MLO-${MACHINE}:MLO \
diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf
index 119161e..0764a81 100644
--- a/conf/distro/include/apalis-imx6.conf
+++ b/conf/distro/include/apalis-imx6.conf
@@ -23,6 +23,8 @@
 include conf/distro/include/toradex.inc
 include conf/distro/include/imx6.inc
 
+DEPLOY_CONF_NAME = "Toradex Apalis iMX6"
+
 KERNEL_IMAGETYPE = "uImage"
 
 BOOTFS_CONTENT = "\
diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf
index eaba0c2..ab47646 100644
--- a/conf/distro/include/beagleboard.conf
+++ b/conf/distro/include/beagleboard.conf
@@ -22,6 +22,8 @@
 
 include conf/distro/include/ti.inc
 
+DEPLOY_CONF_NAME = "BeagleBoard"
+
 BOOTFS_CONTENT = "\
     u-boot-${MACHINE}.img:u-boot.img \
     MLO-${MACHINE}:MLO \
diff --git a/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf
index 73b1c87..5e795c6 100644
--- a/conf/distro/include/beaglebone.conf
+++ b/conf/distro/include/beaglebone.conf
@@ -18,6 +18,8 @@
 
 include conf/distro/include/ti.inc
 
+DEPLOY_CONF_NAME = "BeagleBone Black"
+
 BOOTFS_CONTENT = "\
     u-boot-${MACHINE}.img:u-boot.img \
     MLO-${MACHINE}:MLO \
diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf
index 6b8399a..0d3037b 100644
--- a/conf/distro/include/colibri-imx6.conf
+++ b/conf/distro/include/colibri-imx6.conf
@@ -23,6 +23,8 @@
 include conf/distro/include/toradex.inc
 include conf/distro/include/imx6.inc
 
+DEPLOY_CONF_NAME = "Toradex Colibri iMX6"
+
 KERNEL_IMAGETYPE = "uImage"
 
 BOOTFS_CONTENT = "\
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf
index 303e676..2911e96 100644
--- a/conf/distro/include/colibri-vf.conf
+++ b/conf/distro/include/colibri-vf.conf
@@ -22,6 +22,8 @@
 
 include conf/distro/include/toradex.inc
 
+DEPLOY_CONF_NAME = "Toradex Colibri VF"
+
 IMAGE_FSTYPES += "ext3 sdcard"
 
 BOOTFS_CONTENT = "\
diff --git a/conf/distro/include/imx53qsb.conf b/conf/distro/include/imx53qsb.conf
index 13eb70e..fb90045 100644
--- a/conf/distro/include/imx53qsb.conf
+++ b/conf/distro/include/imx53qsb.conf
@@ -22,6 +22,8 @@
 
 include conf/distro/include/imx6.inc
 
+DEPLOY_CONF_NAME = "Freescale iMX53 Quick Start Board"
+
 BOOTFS_CONTENT = "\
     u-boot-${MACHINE}.${UBOOT_SUFFIX}:u-boot.${UBOOT_SUFFIX} \
     ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
diff --git a/conf/distro/include/imx6dlsabresd.conf b/conf/distro/include/imx6dlsabresd.conf
index 7a209ed..0c25c4b 100644
--- a/conf/distro/include/imx6dlsabresd.conf
+++ b/conf/distro/include/imx6dlsabresd.conf
@@ -21,3 +21,5 @@
 #############################################################################
 
 require imx6qsabresd.conf
+
+DEPLOY_CONF_NAME = "Freescale SABRE SD i.MX6Dual"
diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf
index 82c98a4..dae5927 100644
--- a/conf/distro/include/imx6qsabresd.conf
+++ b/conf/distro/include/imx6qsabresd.conf
@@ -22,6 +22,8 @@
 
 include conf/distro/include/imx6.inc
 
+DEPLOY_CONF_NAME = "Freescale SABRE SD i.MX6Quad"
+
 BOOTFS_CONTENT = "\
     ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
     ${KERNEL_IMAGETYPE}-imx6q-sabresd.dtb:imx6q-sabresd.dtb \
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index 0abf640..1000676 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -22,6 +22,8 @@
 
 include conf/distro/include/imx6.inc
 
+DEPLOY_CONF_NAME = "Boundary Devices i.MX6"
+
 BOOTFS_CONTENT = "\
     ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
     ${KERNEL_IMAGETYPE}-imx6q-${MACHINE}.dtb:imx6q-${MACHINE}.dtb \
diff --git a/conf/distro/include/nuc.conf b/conf/distro/include/nuc.conf
index 1f3e4e5..941c3a2 100644
--- a/conf/distro/include/nuc.conf
+++ b/conf/distro/include/nuc.conf
@@ -20,6 +20,8 @@
 ##
 #############################################################################
 
+DEPLOY_CONF_NAME = "Intel NUC"
+
 DISTRO_FEATURES_DEFAULT += "wayland weston"
 
 DISTRO_FEATURES_remove = "usbgadget"
diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf
index 80f88d8..78730cc 100644
--- a/conf/distro/include/raspberrypi.conf
+++ b/conf/distro/include/raspberrypi.conf
@@ -20,6 +20,8 @@
 ##
 #############################################################################
 
+DEPLOY_CONF_NAME = "Raspberry Pi"
+
 IMAGE_FSTYPES += "ext3 rpi-sdimg"
 
 BOOTFS_CONTENT = "\
diff --git a/conf/distro/include/raspberrypi2.conf b/conf/distro/include/raspberrypi2.conf
index 2129ff2..497d733 100644
--- a/conf/distro/include/raspberrypi2.conf
+++ b/conf/distro/include/raspberrypi2.conf
@@ -20,6 +20,8 @@
 ##
 #############################################################################
 
+DEPLOY_CONF_NAME = "Raspberry Pi 2"
+
 IMAGE_FSTYPES += "ext3 rpi-sdimg"
 
 BOOTFS_CONTENT = "\
diff --git a/conf/distro/include/smarc-samx6i.conf b/conf/distro/include/smarc-samx6i.conf
index ff8bdd5..2f931b7 100644
--- a/conf/distro/include/smarc-samx6i.conf
+++ b/conf/distro/include/smarc-samx6i.conf
@@ -22,6 +22,8 @@
 
 include conf/distro/include/imx6.inc
 
+DEPLOY_CONF_NAME = "Kontron SMARC-sAMX6i"
+
 KERNEL_IMAGETYPE = "uImage"
 
 BOOTFS_CONTENT = " "
diff --git a/conf/distro/include/tibidabo.conf b/conf/distro/include/tibidabo.conf
index b50338d..f26efc9 100644
--- a/conf/distro/include/tibidabo.conf
+++ b/conf/distro/include/tibidabo.conf
@@ -22,6 +22,8 @@
 
 include conf/distro/include/imx6.inc
 
+DEPLOY_CONF_NAME = "ArchiTech Tibidabo"
+
 KERNEL_IMAGETYPE = "uImage"
 
 BOOTFS_CONTENT = "\
diff --git a/recipes-qt/images/b2qt-automotive-qt5-image.bb b/recipes-qt/images/b2qt-automotive-qt5-image.bb
index 6aafc77..7c3cd0c 100644
--- a/recipes-qt/images/b2qt-automotive-qt5-image.bb
+++ b/recipes-qt/images/b2qt-automotive-qt5-image.bb
@@ -25,6 +25,8 @@ LICENSE = "QtEnterprise"
 LIC_FILES_CHKSUM = "file://${QT_LICENCE};md5=7bc9c54e450006250a60e96604c186c9"
 PR = "r0"
 
+DEPLOY_CONF_TYPE = "Automotive"
+
 IMAGE_FEATURES += "\
         package-management \
         ssh-server-dropbear \
diff --git a/recipes-qt/images/b2qt-embedded-qt5-image.bb b/recipes-qt/images/b2qt-embedded-qt5-image.bb
index 8c986ac..bc130fb 100644
--- a/recipes-qt/images/b2qt-embedded-qt5-image.bb
+++ b/recipes-qt/images/b2qt-embedded-qt5-image.bb
@@ -25,6 +25,8 @@ LICENSE = "QtEnterprise"
 LIC_FILES_CHKSUM = "file://${QT_LICENCE};md5=7bc9c54e450006250a60e96604c186c9"
 PR = "r0"
 
+DEPLOY_CONF_TYPE = "Boot2Qt"
+
 IMAGE_FEATURES += "\
         package-management \
         ssh-server-dropbear \
diff --git a/scripts/upload.sh b/scripts/upload.sh
index 3df3b3e..f74da52 100755
--- a/scripts/upload.sh
+++ b/scripts/upload.sh
@@ -33,6 +33,7 @@ if [ ${AUTOMOTIVE} = "true" ]; then
     scp tmp/deploy/images/${MACHINE}/b2qt-automotive-qt5-image-${MACHINE}.hdd ${UPLOADPATH}/
   elif [ -e tmp/deploy/images/${MACHINE}/b2qt-automotive-qt5-image-${MACHINE}.img ]; then
     scp tmp/deploy/images/${MACHINE}/b2qt-automotive-qt5-image-${MACHINE}.img ${UPLOADPATH}/
+    scp tmp/deploy/images/${MACHINE}/b2qt-automotive-qt5-image-${MACHINE}.conf ${UPLOADPATH}/
   fi
   exit 0
 fi
@@ -63,4 +64,5 @@ if [ -e tmp/deploy/images/${MACHINE}/b2qt-embedded-qt5-image-${MACHINE}.hdd ]; t
   scp tmp/deploy/images/${MACHINE}/b2qt-embedded-qt5-image-${MACHINE}.hdd ${UPLOADPATH}/
 elif [ -e tmp/deploy/images/${MACHINE}/b2qt-embedded-qt5-image-${MACHINE}.img ]; then
   scp tmp/deploy/images/${MACHINE}/b2qt-embedded-qt5-image-${MACHINE}.img ${UPLOADPATH}/
+  scp tmp/deploy/images/${MACHINE}/b2qt-embedded-qt5-image-${MACHINE}.conf ${UPLOADPATH}/
 fi