diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2017-12-01 16:37:23 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-12-01 18:17:28 +0000 |
| commit | 33cf00b428968820ac1520d36b557ca1d1d0a2e1 (patch) | |
| tree | e7c19aaedd393d2e0cdce09d766e06896843d869 | |
| parent | 570eca3fbe6d8021403d9420b4a74b527e554639 (diff) | |
qbsp: fix version number parsingv5.10.0
Don't trust the length of Qt's version number, split it at '+git${SRCPV}'.
Also remove extra bits from auto increment version string.
Change-Id: I18a7fea3c5f6927be6730ebceac63bb61c2ec8ef
Reviewed-by: Kari Hormi <kari.hormi@qt.io>
| -rw-r--r-- | classes/qbsp.bbclass | 2 | ||||
| -rw-r--r-- | recipes-qt/meta/meta-b2qt-automotive-qbsp.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/meta/meta-b2qt-embedded-qbsp.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/classes/qbsp.bbclass b/classes/qbsp.bbclass index b3f4521d..db70fc97 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}" diff --git a/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb b/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb index a9da4568..9b5c6150 100644 --- a/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb +++ b/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb @@ -38,7 +38,7 @@ S = "${WORKDIR}" inherit qbsp -PV := "${@d.getVar('PV', True)[0:5]}" +PV := "${@d.getVar('PV', True).split('+')[0]}" QBSP_NAME = "Qt Automotive" QBSP_MACHINE = "${@d.getVar('MACHINE', True).replace('-','')}" diff --git a/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb b/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb index d6def0fa..c531633d 100644 --- a/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb +++ b/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb @@ -38,7 +38,7 @@ S = "${WORKDIR}" inherit qbsp -PV := "${@d.getVar('PV', True)[0:5]}" +PV := "${@d.getVar('PV', True).split('+')[0]}" VERSION_SHORT = "${@d.getVar('PV', True).replace('.','')}" QBSP_NAME = "Boot to Qt" |