Merge remote-tracking branch 'origin/pyro' into sumo

* origin/pyro: (29 commits)
  meta-qt5: update layer
  qt5: Enable Link Time Optimization
  toradex: add Qt marketing slides
  toradex: add support for colibri-imx6ull
  rpi: include mcp2515 overlay for CAN support
  qtdeviceutilities: update to latest version
  boot2qt-demos: update revision
  boot2qt-addons: update components
  meta-qt5: update layer
  boot2qt-launcher: update to latest version
  qtdeviceutilities: update to latest version
  Do not use Link Time Optimization
  boot2qt-demo: update demo videos
  qtquicktimeline: fetch from public repository
  boot2qt-demos: no need to patch demos anymore
  Don't use git folder to check if we are using SDK sources
  toradex: include easy installer file in the release 7z
  toradex: Add Boot2Qt material to the Tezi image
  meta-qt5: update layer
  qt5: update submodules
  ...

Change-Id: I23e9b0a018328d7be1441616c07c526e2db61be2

2 files changed, 19 insertions, 1 deletions

diff --git a/meta-boot2qt/classes/image-hdd.bbclass b/meta-boot2qt/classes/image-hdd.bbclass
index d12f3bf..bceb1b1 100644
--- a/meta-boot2qt/classes/image-hdd.bbclass
+++ b/meta-boot2qt/classes/image-hdd.bbclass
@@ -45,4 +45,4 @@ python do_hddimg() {
         bb.build.exec_func('create_hdd_image', d)
 }
 
-addtask hddimg after do_bootdirectdisk before do_build
+addtask hddimg after do_bootdirectdisk before do_image_complete
diff --git a/meta-boot2qt/classes/image_types_sdcard.bbclass b/meta-boot2qt/classes/image_types_sdcard.bbclass
index 7dedf87..970c34b 100644
--- a/meta-boot2qt/classes/image_types_sdcard.bbclass
+++ b/meta-boot2qt/classes/image_types_sdcard.bbclass
@@ -87,3 +87,21 @@ END
     tar czhf ${IMGDEPLOYDIR}/${IMAGE_NAME}.flasher.tar.gz tegraflash
     ln -sf ${IMAGE_NAME}.flasher.tar.gz ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.flasher.tar.gz
 }
+
+IMAGE_DEPENDS_teziimg_append = " qtbase-native:do_populate_sysroot"
+IMAGE_CMD_teziimg_append() {
+    ${IMAGE_CMD_TAR} --transform 's,^,${IMAGE_NAME}-Tezi_${PV}/,' -rhf ${IMGDEPLOYDIR}/${IMAGE_NAME}-Tezi_${PV}${TDX_VERDATE}.tar TEZI_B2QT_EULA.TXT Built_with_Qt.png
+    ln -fs ${IMAGE_NAME}-Tezi_${PV}${TDX_VERDATE}.tar ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.tezi.tar
+}
+python rootfs_tezi_json_append() {
+    import subprocess
+    qtversion = subprocess.check_output(['qmake', '-query', 'QT_VERSION']).decode('utf-8').strip()
+
+    data["license_title"] = "QT DEMO IMAGE END USER LICENSE AGREEMENT"
+    data["license"] = "TEZI_B2QT_EULA.TXT"
+    data["version"] = "Qt " + qtversion
+    data["icon"] = "Built_with_Qt.png"
+
+    with open(os.path.join(deploy_dir, 'image.json'), 'w') as outfile:
+        json.dump(data, outfile, indent=4)
+}