diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2023-12-19 07:21:55 +0000 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-12-19 13:13:02 +0000 |
| commit | e65042aaef399706ac65830b2a868f412af387de (patch) | |
| tree | 82a34c0a1353e6763bff5663bf264bf3fe0dd992 | |
| parent | db110ad2976499bb15474b0bcf82ef0eff9ce908 (diff) | |
qbsp: don't hardcode sdk deploy dir
Use SDK_DEPLOY to get the correct deploy dir for the sdk package.
Fixes: QTBUG-120246
Change-Id: I2a249829fc68b7328d958bc5df9c561094b931dd
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit ad99132e700100dd3a2c4c9a31abccd356898c86)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | meta-boot2qt/classes/qbsp.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-boot2qt/classes/qbsp.bbclass b/meta-boot2qt/classes/qbsp.bbclass index d2efc89f..cbba4cfc 100644 --- a/meta-boot2qt/classes/qbsp.bbclass +++ b/meta-boot2qt/classes/qbsp.bbclass @@ -108,7 +108,7 @@ patch_installer_files() { prepare_qbsp() { # Toolchain component - if [ -e ${DEPLOY_DIR}/sdk/${SDK_NAME} ]; then + if [ -e ${SDK_DEPLOY}/${SDK_NAME} ]; then COMPONENT_PATH="${B}/pkg/${QBSP_INSTALLER_COMPONENT}.toolchain" mkdir -p ${COMPONENT_PATH}/meta mkdir -p ${COMPONENT_PATH}/data @@ -118,9 +118,9 @@ prepare_qbsp() { patch_installer_files ${COMPONENT_PATH}/meta if [ "${SDK_POSTFIX}" = "${SDK_POSTFIX:sdkmingw32}" ]; then - cp ${DEPLOY_DIR}/sdk/${SDK_NAME} ${COMPONENT_PATH}/data/toolchain.${SDK_POSTFIX} + cp ${SDK_DEPLOY}/${SDK_NAME} ${COMPONENT_PATH}/data/toolchain.${SDK_POSTFIX} else - 7za a -mx=0 ${COMPONENT_PATH}/data/toolchain.7z ${DEPLOY_DIR}/sdk/${SDK_NAME} + 7za a -mx=0 ${COMPONENT_PATH}/data/toolchain.7z ${SDK_DEPLOY}/${SDK_NAME} fi fi |