diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2023-01-24 11:08:03 +0000 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-01-31 08:32:01 +0000 |
| commit | 9872191d5c290a44d726ebb440a8789f39cf3eef (patch) | |
| tree | 446a82626cbed17d9b3098193744bd73feaa0bd3 | |
| parent | 528e244c3425e65cf5d8e9b301a83d33c23e2c71 (diff) | |
Get Qt version from QT_VERSION variable
Switch to using the global QT_VERSION variable in all bbclasses
that used qmake calls get the Qt version.
Change-Id: I054660e5196ffdc30636f13a76c173bbbe9b3ee2
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit bf3db8a5ac9af1cfd15b346f7f03b60780b1c39b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | meta-boot2qt/classes/deploy-buildinfo.bbclass | 8 | ||||
| -rw-r--r-- | meta-boot2qt/classes/deploy-conf.bbclass | 5 | ||||
| -rw-r--r-- | meta-boot2qt/classes/image_type_tezi_b2qt.bbclass | 4 |
3 files changed, 3 insertions, 14 deletions
diff --git a/meta-boot2qt/classes/deploy-buildinfo.bbclass b/meta-boot2qt/classes/deploy-buildinfo.bbclass index 7c78d3f4..0a7a7500 100644 --- a/meta-boot2qt/classes/deploy-buildinfo.bbclass +++ b/meta-boot2qt/classes/deploy-buildinfo.bbclass @@ -29,18 +29,10 @@ inherit image-buildinfo -do_image[depends] += "qtbase-native:do_populate_sysroot" - IMAGE_BUILDINFO_VARS:append = " QT_VERSION TARGET_SYSROOT" TARGET_SYSROOT = "${REAL_MULTIMACH_TARGET_SYS}" -python buildinfo:prepend () { - import subprocess - qtversion = subprocess.check_output(['qmake', '-query', 'QT_VERSION']).decode('utf-8').strip() - d.setVar('QT_VERSION', qtversion) -} - python buildinfo:append () { import shutil shutil.copyfile( diff --git a/meta-boot2qt/classes/deploy-conf.bbclass b/meta-boot2qt/classes/deploy-conf.bbclass index b04bfab2..2b79d33d 100644 --- a/meta-boot2qt/classes/deploy-conf.bbclass +++ b/meta-boot2qt/classes/deploy-conf.bbclass @@ -29,7 +29,7 @@ inherit image_types -do_image_conf[depends] += "qtbase-native:do_populate_sysroot xz-native:do_populate_sysroot file-native:do_populate_sysroot gawk-native:do_populate_sysroot" +do_image_conf[depends] += "xz-native:do_populate_sysroot file-native:do_populate_sysroot gawk-native:do_populate_sysroot" DEPLOY_CONF_NAME ?= "${MACHINE}" DEPLOY_CONF_TYPE ?= "Boot2Qt" @@ -43,12 +43,11 @@ IMAGE_CMD:conf() { IMAGE_UNCOMPRESSED_SIZE=$(xz --robot --list ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${DEPLOY_CONF_IMAGE_TYPE} | awk -F ' ' '{if (NR==2){ print $5 }}') fi - QT_VERSION=$(qmake -query QT_VERSION) cat > ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.conf <<EOF [${DEPLOY_CONF_NAME}] platform=${MACHINE} product=${DEPLOY_CONF_TYPE} -qt=Qt $QT_VERSION +qt=Qt ${QT_VERSION} os=linux imagefile=${IMAGE_LINK_NAME}.${DEPLOY_CONF_IMAGE_TYPE} imageuncompressedsize=$IMAGE_UNCOMPRESSED_SIZE diff --git a/meta-boot2qt/classes/image_type_tezi_b2qt.bbclass b/meta-boot2qt/classes/image_type_tezi_b2qt.bbclass index c2a1fd5d..ef9edf76 100644 --- a/meta-boot2qt/classes/image_type_tezi_b2qt.bbclass +++ b/meta-boot2qt/classes/image_type_tezi_b2qt.bbclass @@ -27,7 +27,6 @@ ## ############################################################################ -do_image[depends] += "qtbase-native:do_populate_sysroot" IMAGE_CMD:teziimg:append() { ${IMAGE_CMD_TAR} --transform 's,^,${IMAGE_NAME}-Tezi_${TEZI_VERSION}/,' -rhf ${IMGDEPLOYDIR}/${IMAGE_NAME}-Tezi_${TEZI_VERSION}.tar TEZI_B2QT_EULA.TXT Built_with_Qt.png ln -fs ${TEZI_IMAGE_NAME}-Tezi_${TEZI_VERSION}.tar ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.tezi.tar @@ -37,9 +36,8 @@ def rootfs_tezi_json_b2qt(d, flash_type, flash_data, json_file, uenv_file): import json from collections import OrderedDict from datetime import datetime - import subprocess - qtversion = subprocess.check_output(['qmake', '-query', 'QT_VERSION']).decode('utf-8').strip() + qtversion = d.getVar('QT_VERSION') deploydir = d.getVar('DEPLOY_DIR_IMAGE') data = OrderedDict({ "config_format": d.getVar('TEZI_CONFIG_FORMAT'), "autoinstall": False }) |