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 /recipes-qt | |
| parent | 570eca3fbe6d8021403d9420b4a74b527e554639 (diff) | |
| download | meta-boot2qt-5.10.0.tar.gz | |
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>
Diffstat (limited to 'recipes-qt')
| -rw-r--r-- | recipes-qt/meta/meta-b2qt-automotive-qbsp.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/meta/meta-b2qt-embedded-qbsp.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb b/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb index a9da456..9b5c615 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}" | |||
| 38 | 38 | ||
| 39 | inherit qbsp | 39 | inherit qbsp |
| 40 | 40 | ||
| 41 | PV := "${@d.getVar('PV', True)[0:5]}" | 41 | PV := "${@d.getVar('PV', True).split('+')[0]}" |
| 42 | 42 | ||
| 43 | QBSP_NAME = "Qt Automotive" | 43 | QBSP_NAME = "Qt Automotive" |
| 44 | QBSP_MACHINE = "${@d.getVar('MACHINE', True).replace('-','')}" | 44 | 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 d6def0f..c531633 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}" | |||
| 38 | 38 | ||
| 39 | inherit qbsp | 39 | inherit qbsp |
| 40 | 40 | ||
| 41 | PV := "${@d.getVar('PV', True)[0:5]}" | 41 | PV := "${@d.getVar('PV', True).split('+')[0]}" |
| 42 | 42 | ||
| 43 | VERSION_SHORT = "${@d.getVar('PV', True).replace('.','')}" | 43 | VERSION_SHORT = "${@d.getVar('PV', True).replace('.','')}" |
| 44 | QBSP_NAME = "Boot to Qt" | 44 | QBSP_NAME = "Boot to Qt" |