diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2018-01-25 15:20:23 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-01-26 14:27:15 +0000 |
| commit | 6aca07601e166ab0654e4179c4d80b8e17b6cc0a (patch) | |
| tree | 9392ff20f8444304df00ea9e660aaf185687b42a /classes | |
| parent | d98bd0735bbf4969154ed219d2827fd6e34c8c30 (diff) | |
| download | meta-boot2qt-6aca07601e166ab0654e4179c4d80b8e17b6cc0a.tar.gz | |
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>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/qbsp.bbclass | 4 |
1 files changed, 2 insertions, 2 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 ?= "" | |||
| 57 | QBSP_LICENSE_FILE_imx = "NXP-EULA" | 57 | QBSP_LICENSE_FILE_imx = "NXP-EULA" |
| 58 | QBSP_LICENSE_NAME_imx = "NXP Semiconductors Software License Agreement" | 58 | QBSP_LICENSE_NAME_imx = "NXP Semiconductors Software License Agreement" |
| 59 | 59 | ||
| 60 | VERSION_AUTO_INCREMENT = "-0-${DATETIME}" | 60 | VERSION_AUTO_INCREMENT = "-${DATETIME}" |
| 61 | VERSION_AUTO_INCREMENT[vardepsexclude] = "DATETIME" | 61 | VERSION_AUTO_INCREMENT[vardepsexclude] = "DATETIME" |
| 62 | 62 | ||
| 63 | DEPLOY_CONF_NAME ?= "${MACHINE}" | 63 | DEPLOY_CONF_NAME ?= "${MACHINE}" |
| @@ -84,7 +84,7 @@ patch_installer_files() { | |||
| 84 | -e "s#@RELEASEDATE@#${RELEASEDATE}#" \ | 84 | -e "s#@RELEASEDATE@#${RELEASEDATE}#" \ |
| 85 | -e "s#@MACHINE@#${MACHINE}#" \ | 85 | -e "s#@MACHINE@#${MACHINE}#" \ |
| 86 | -e "s#@SYSROOT@#${REAL_MULTIMACH_TARGET_SYS}#" \ | 86 | -e "s#@SYSROOT@#${REAL_MULTIMACH_TARGET_SYS}#" \ |
| 87 | -e "s#@TARGET@#${TARGET_SYS}#" \ | 87 | -e "s#@TARGET_SYS@#${TARGET_SYS}#" \ |
| 88 | -e "s#@ABI@#${ABI}#" \ | 88 | -e "s#@ABI@#${ABI}#" \ |
| 89 | -e "s#@INSTALLPATH@#${QBSP_INSTALL_PATH}#" \ | 89 | -e "s#@INSTALLPATH@#${QBSP_INSTALL_PATH}#" \ |
| 90 | -e "s#@SDKPATH@#${SDKPATH}#" \ | 90 | -e "s#@SDKPATH@#${SDKPATH}#" \ |