qbsp: fix replace tags

@TARGET@ was used twice for different things and other tags were used
with wrong content. Installer content now follows closer to the online
content.

Task-number: QTBUG-66010
Change-Id: I6a10f765fa582da2025134f268c6ee35b74ac8c6
Reviewed-by: Ilari Ängeslevä <ilari.angesleva@qt.io>

7 files changed, 16 insertions, 15 deletions

diff --git a/classes/qbsp.bbclass b/classes/qbsp.bbclass
index 57aa7ca..8b8aa7f 100644
--- a/classes/qbsp.bbclass
+++ b/classes/qbsp.bbclass
@@ -57,7 +57,7 @@ QBSP_LICENSE_NAME ?= ""
 QBSP_LICENSE_FILE_imx = "NXP-EULA"
 QBSP_LICENSE_NAME_imx = "NXP Semiconductors Software License Agreement"
 
-VERSION_AUTO_INCREMENT = "-0-${DATETIME}"
+VERSION_AUTO_INCREMENT = "-${DATETIME}"
 VERSION_AUTO_INCREMENT[vardepsexclude] = "DATETIME"
 
 DEPLOY_CONF_NAME ?= "${MACHINE}"
@@ -84,7 +84,7 @@ patch_installer_files() {
         -e "s#@RELEASEDATE@#${RELEASEDATE}#" \
         -e "s#@MACHINE@#${MACHINE}#" \
         -e "s#@SYSROOT@#${REAL_MULTIMACH_TARGET_SYS}#" \
-        -e "s#@TARGET@#${TARGET_SYS}#" \
+        -e "s#@TARGET_SYS@#${TARGET_SYS}#" \
         -e "s#@ABI@#${ABI}#" \
         -e "s#@INSTALLPATH@#${QBSP_INSTALL_PATH}#" \
         -e "s#@SDKPATH@#${SDKPATH}#" \
diff --git a/files/qbsp/base_package.xml b/files/qbsp/base_package.xml
index 80a02e8..5f16dfa 100644
--- a/files/qbsp/base_package.xml
+++ b/files/qbsp/base_package.xml
@@ -2,7 +2,7 @@
 <Package>
   <Version>@VERSION@</Version>
   <ReleaseDate>@RELEASEDATE@</ReleaseDate>
-  <DisplayName>@NAME@</DisplayName>
+  <DisplayName>@TARGET@</DisplayName>
   <Description>@NAME@ for @TARGET@</Description>
   <Dependencies>@LICENSEDEPENDENCY@</Dependencies>
 </Package>
diff --git a/files/qbsp/image_package.xml b/files/qbsp/image_package.xml
index a3fe0cc..27e5f2e 100644
--- a/files/qbsp/image_package.xml
+++ b/files/qbsp/image_package.xml
@@ -2,7 +2,7 @@
 <Package>
   <Version>@VERSION@</Version>
   <ReleaseDate>@RELEASEDATE@</ReleaseDate>
-  <DisplayName>@MACHINE@ Linux System</DisplayName>
+  <DisplayName>@TARGET@ Linux System</DisplayName>
   <Description>System image for @TARGET@ hardware</Description>
   <DownloadableArchives>image.7z</DownloadableArchives>
 </Package>
diff --git a/files/qbsp/toolchain_installscript.qs b/files/qbsp/toolchain_installscript.qs
index 15e9570..4afab71 100644
--- a/files/qbsp/toolchain_installscript.qs
+++ b/files/qbsp/toolchain_installscript.qs
@@ -38,6 +38,7 @@ Component.prototype.createOperations = function()
     var device = "@MACHINE@"
     var platform = "@NAME@"
     var sysroot = "@SYSROOT@"
+    var target_sys = "@TARGET_SYS@"
     var target = "@TARGET@"
     var abi = "@ABI@"
     var installPath = "@INSTALLPATH@/toolchain"
@@ -71,8 +72,8 @@ Component.prototype.createOperations = function()
     component.addOperation("Execute",
         ["@SDKToolBinary@", "addTC",
         "--id", toolchainId + ".gcc",
-        "--name", "GCC (Boot2Qt " + platform + ")",
-        "--path", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target + "/" + target + "-gcc" + executableExt,
+        "--name", "GCC (" + platform + " " + target + ")",
+        "--path", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target_sys + "/" + target_sys + "-gcc" + executableExt,
         "--abi", abi,
         "--language", "1",
         "UNDOEXECUTE",
@@ -81,8 +82,8 @@ Component.prototype.createOperations = function()
     component.addOperation("Execute",
         ["@SDKToolBinary@", "addTC",
         "--id", toolchainId + ".g++",
-        "--name", "G++ (Boot2Qt " + platform + ")",
-        "--path", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target + "/" + target + "-g++" + executableExt,
+        "--name", "G++ (" + platform + " " + target + ")",
+        "--path", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target_sys + "/" + target_sys + "-g++" + executableExt,
         "--abi", abi,
         "--language", "2",
         "UNDOEXECUTE",
@@ -91,9 +92,9 @@ Component.prototype.createOperations = function()
     component.addOperation("Execute",
         ["@SDKToolBinary@", "addDebugger",
         "--id", debuggerId,
-        "--name", "GDB (Boot2Qt " + platform + ")",
+        "--name", "GDB (" + platform + " " + target + ")",
         "--engine", "1",
-        "--binary", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target + "/" + target + "-gdb" + executableExt,
+        "--binary", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target_sys + "/" + target_sys + "-gdb" + executableExt,
         "--abis", abi,
         "UNDOEXECUTE",
         "@SDKToolBinary@", "rmDebugger", "--id", debuggerId]);
@@ -101,7 +102,7 @@ Component.prototype.createOperations = function()
     component.addOperation("Execute",
         ["@SDKToolBinary@", "addQt",
          "--id", qtId,
-         "--name", "Boot2Qt %{Qt:Version} " + platform,
+         "--name", platform + " " + target,
          "--type", "Qdb.EmbeddedLinuxQt",
          "--qmake", path + "/sysroots/" + hostSysroot + "/usr/bin/qmake" + executableExt,
          "UNDOEXECUTE",
@@ -110,7 +111,7 @@ Component.prototype.createOperations = function()
     component.addOperation("Execute",
         ["@SDKToolBinary@", "addKit",
          "--id", basecomponent,
-         "--name", "Boot2Qt %{Qt:Version} " + platform,
+         "--name", platform + " " + target,
          "--mkspec", "devices/linux-oe-generic-g++",
          "--qt", qtId,
          "--debuggerid", debuggerId,
diff --git a/files/qbsp/toolchain_package.xml b/files/qbsp/toolchain_package.xml
index b578fc9..166e09b 100644
--- a/files/qbsp/toolchain_package.xml
+++ b/files/qbsp/toolchain_package.xml
@@ -2,7 +2,7 @@
 <Package>
   <Version>@VERSION@</Version>
   <ReleaseDate>@RELEASEDATE@</ReleaseDate>
-  <DisplayName>@MACHINE@ Linux Toolchain</DisplayName>
+  <DisplayName>@TARGET@ Linux Toolchain</DisplayName>
   <Description>Toolchain and system root for @TARGET@</Description>
   <DownloadableArchives>toolchain.7z</DownloadableArchives>
   <Dependencies>qt.tools.qtcreator</Dependencies>
diff --git a/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb b/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb
index a9da456..3752fc0 100644
--- a/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb
+++ b/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb
@@ -40,7 +40,7 @@ inherit qbsp
 
 PV := "${@d.getVar('PV', True)[0:5]}"
 
-QBSP_NAME = "Qt Automotive"
+QBSP_NAME = "Automotive ${PV}"
 QBSP_MACHINE = "${@d.getVar('MACHINE', True).replace('-','')}"
 QBSP_INSTALLER_COMPONENT = "automotive.10.yocto.${QBSP_MACHINE}"
 QBSP_INSTALL_PATH = "/${PV}/Automotive/${MACHINE}"
diff --git a/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb b/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb
index d6def0f..1d0b018 100644
--- a/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb
+++ b/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb
@@ -41,7 +41,7 @@ inherit qbsp
 PV := "${@d.getVar('PV', True)[0:5]}"
 
 VERSION_SHORT = "${@d.getVar('PV', True).replace('.','')}"
-QBSP_NAME = "Boot to Qt"
+QBSP_NAME = "Boot2Qt ${PV}"
 QBSP_MACHINE = "${@d.getVar('MACHINE', True).replace('-','')}"
 QBSP_INSTALLER_COMPONENT = "qt.embedded.b2qt.${VERSION_SHORT}.yocto.${QBSP_MACHINE}"
 QBSP_INSTALL_PATH = "/${PV}/Boot2Qt/${MACHINE}"