From 6aca07601e166ab0654e4179c4d80b8e17b6cc0a Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 25 Jan 2018 15:20:23 +0200 Subject: qbsp: fix replace tags MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @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ä --- classes/qbsp.bbclass | 4 ++-- files/qbsp/base_package.xml | 2 +- files/qbsp/image_package.xml | 2 +- files/qbsp/toolchain_installscript.qs | 17 +++++++++-------- files/qbsp/toolchain_package.xml | 2 +- recipes-qt/meta/meta-b2qt-automotive-qbsp.bb | 2 +- recipes-qt/meta/meta-b2qt-embedded-qbsp.bb | 2 +- 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 @@ @VERSION@ @RELEASEDATE@ - @NAME@ + @TARGET@ @NAME@ for @TARGET@ @LICENSEDEPENDENCY@ 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 @@ @VERSION@ @RELEASEDATE@ - @MACHINE@ Linux System + @TARGET@ Linux System System image for @TARGET@ hardware image.7z 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 @@ @VERSION@ @RELEASEDATE@ - @MACHINE@ Linux Toolchain + @TARGET@ Linux Toolchain Toolchain and system root for @TARGET@ toolchain.7z qt.tools.qtcreator 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}" -- cgit v1.2.3-54-g00ecf