freescale, toradex: update meta layersv5.15.0-beta1

* Update meta-freescale to latest revision in zeus branch
* Update meta-toradex-nxp to latest revision in zeus branch
* Update meta-toradex-bsp-common to zeus branch (revision
  before TEZI_DATE introduction)
* Update tezi overrides in image_types_sdcard.bbclass to match
  latest version of image_types_tezi.bbclass

Change-Id: I361476aca17eb8d88b456fc8b8b481dca5473b52
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>

2 files changed, 9 insertions, 9 deletions

diff --git a/meta-boot2qt/classes/image_types_sdcard.bbclass b/meta-boot2qt/classes/image_types_sdcard.bbclass
index 1f81b4c5..b2425fc1 100644
--- a/meta-boot2qt/classes/image_types_sdcard.bbclass
+++ b/meta-boot2qt/classes/image_types_sdcard.bbclass
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -81,8 +81,8 @@ END
 
 do_image[depends] += "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
+    ${IMAGE_CMD_TAR} --transform 's,^,${IMAGE_NAME}-Tezi_${TEZI_VERSION}/,' -rhf ${IMGDEPLOYDIR}/${IMAGE_NAME}-Tezi_${TEZI_VERSION}.tar TEZI_B2QT_EULA.TXT Built_with_Qt.png
+    ln -fs ${TEZI_IMAGE_NAME}-Tezi_${TEZI_VERSION}.tar ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.tezi.tar
 }
 
 def rootfs_tezi_json_b2qt(d, flash_type, flash_data, json_file, uenv_file):
@@ -95,7 +95,7 @@ def rootfs_tezi_json_b2qt(d, flash_type, flash_data, json_file, uenv_file):
     deploydir = d.getVar('DEPLOY_DIR_IMAGE')
     data = OrderedDict({ "config_format": 2, "autoinstall": False })
 
-    # Use image recipes SUMMARY/DESCRIPTION/PV...
+    # Use image recipes SUMMARY/DESCRIPTION...
     data["name"] = d.getVar('SUMMARY')
     data["description"] = d.getVar('DESCRIPTION')
     data["version"] = "Qt " + qtversion
@@ -132,11 +132,11 @@ def rootfs_tezi_json_b2qt(d, flash_type, flash_data, json_file, uenv_file):
     elif flash_type == "emmc":
         data["blockdevs"] = flash_data
 
-    with open(os.path.join(deploydir, json_file), 'w') as outfile:
+    with open(os.path.join(d.getVar('IMGDEPLOYDIR'), json_file), 'w') as outfile:
         json.dump(data, outfile, indent=4)
     bb.note("Toradex Easy Installer metadata file {0} written.".format(json_file))
 
 python rootfs_tezi_run_json_append() {
     # rewrite image.json with our data
-    rootfs_tezi_json_b2qt(d, flash_type, flash_data, "image.json", uenv_file)
+    rootfs_tezi_json_b2qt(d, flash_type, flash_data, "image-%s.json" % d.getVar('IMAGE_BASENAME'), uenv_file)
 }
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index f9a2403d..6429d61f 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -38,7 +38,7 @@
           fetch="git://github.com/Freescale"/>
   <project name="meta-freescale"
            remote="freescale"
-           revision="218e7c48e6d7b95f61a9991c0d3c3bf4b38a34c4"
+           revision="e9d075e2e1084538a8f7e233f7982507213540e7"
            path="sources/meta-freescale"/>
   <project name="meta-freescale-3rdparty"
            remote="freescale"
@@ -80,11 +80,11 @@
           fetch="git://git2.toradex.com"/>
   <project name="meta-toradex-bsp-common"
            remote="toradex"
-           revision="5af9cec247f0cb570b00245dd87f56fe84bc5cf5"
+           revision="fbd77af45f32e88e96d0efe0317d346a55e5580a"
            path="sources/meta-toradex-bsp-common"/>
   <project name="meta-toradex-nxp"
            remote="toradex"
-           revision="13b800c3eebf96640bdd7e6fc781ba71ebf68f3d"
+           revision="e5049a9c1bf8575beec0d7aab06f5d9cc7093283"
            path="sources/meta-toradex-nxp"/>
 
   <!-- BoundaryDevices -->