diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2017-05-02 10:18:27 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-05-02 09:29:52 +0000 |
| commit | 126c788b1a9d5b71ee876fb12b41ba594a75321b (patch) | |
| tree | 0ff21e5f39bf78a454e516b719219855e9c9fc71 /classes | |
| parent | 1037ce1006ad2111c07e9a319aaf2525fb9dea92 (diff) | |
qbsp: use correct image path
.. and make sure that component name does not contain a dash,
since that's not supported by IFW.
Change-Id: Ie611b4557c18b22ff56b9f1407376e59d7c71b0d
Reviewed-by: Mikko Gronoff <mikko.gronoff@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 2dd42d0b..fd6d14cd 100644 --- a/classes/qbsp.bbclass +++ b/classes/qbsp.bbclass @@ -48,7 +48,7 @@ do_qbsp[depends] += "\ " QBSP_VERSION ?= "${PV}${VERSION_AUTO_INCREMENT}" -QBSP_INSTALLER_COMPONENT ?= "${MACHINE}" +QBSP_INSTALLER_COMPONENT ?= "${@d.getVar('MACHINE', True).replace('-','')}" QBSP_INSTALL_PATH ?= "/Extras/${MACHINE}" QBSP_LICENSE_FILE ?= "" @@ -122,7 +122,7 @@ prepare_qbsp() { patch_installer_files ${COMPONENT_PATH}/meta mkdir -p ${B}/images/${QBSP_INSTALL_PATH}/images - 7zr x ${IMGDEPLOYDIR}/${IMAGE_PACKAGE} -o${B}/images/${QBSP_INSTALL_PATH}/images/ + 7zr x ${DEPLOY_DIR_IMAGE}/${IMAGE_PACKAGE} -o${B}/images/${QBSP_INSTALL_PATH}/images/ cd ${B}/images 7zr a ${COMPONENT_PATH}/data/image.7z * |