Add support for creating QBSP package

QBSP is a Qt specific Board Support Package that can be installed with
the Qt SDK or MaintenanceTool and contains a system image and a toolchain.
The toolchain is automatically registered to the QtCreator.

The recipes used for creating the system image and the toolchain can be
configured with QBSP_IMAGE_TASK and QBSP_SDK_TASK. The files wanted for
the system image can be further configured with QBSP_IMAGE_CONTENT,
with a list of files located in DEPLOY_DIR_IMAGE folder. By default,
.img and .conf files are used from the selected image recipe.

QBSP_INSTALLER_COMPONENT defines the location in the Qt installer tree
where the QBSP is shown and QBSP_VERSION defines the version for the
components. The QBSP is installed to path defined by QBSP_INSTALL_PATH.

The regular SDK creation can now reuse the same image package .7z, so
update upload script to use it instead of creating new package.

Task-number: QTBUG-57018
Change-Id: Id1e7cc4ab3998a7d450f23ed603b8e676b314d63
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>

3 files changed, 12 insertions, 0 deletions

diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index de7381e..4a8f73b 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -80,6 +80,11 @@ PACKAGE_EXCLUDE_COMPLEMENTARY ?= "qtquickcompiler"
 IMAGE_FSTYPES = "conf"
 IMAGE_CLASSES += "image_types_sdcard deploy-conf"
 
+QBSP_IMAGE_CONTENT ?= "\
+    ${IMAGE_LINK_NAME}.img \
+    ${IMAGE_LINK_NAME}.conf \
+    "
+
 LICENSE_CREATE_PACKAGE = "1"
 COPY_LIC_MANIFEST = "1"
 
diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf
index d7cb2c3..a5b95b5 100644
--- a/conf/distro/include/emulator.conf
+++ b/conf/distro/include/emulator.conf
@@ -32,6 +32,8 @@ IMAGE_ROOTFS_ALIGNMENT = "1048576"
 ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3"
 IMAGE_FSTYPES = "ext3"
 
+QBSP_IMAGE_CONTENT = "${IMAGE_LINK_NAME}.hdd"
+
 MACHINE_EXTRA_RRECOMMENDS += "\
         kernel-module-snd-intel8x0 \
         "
diff --git a/conf/distro/include/tegra-t18x.conf b/conf/distro/include/tegra-t18x.conf
index ebdb63b..80f4d57 100644
--- a/conf/distro/include/tegra-t18x.conf
+++ b/conf/distro/include/tegra-t18x.conf
@@ -33,6 +33,11 @@ TARGET_CFLAGS += " -DWIN_INTERFACE_CUSTOM"
 DISTRO_FEATURES_DEFAULT += "wayland"
 IMAGE_FSTYPES += "tar.gz"
 
+QBSP_IMAGE_CONTENT = "\
+    ${IMAGE_LINK_NAME}.tar.gz \
+    Image \
+    "
+
 KERN_DIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186/kernel")}'
 PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186")}'
 NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer"