diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2020-09-04 12:40:03 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2020-09-07 16:26:26 +0300 |
| commit | 7e0564fafec7a1d8d05a2a2ffd313690a9ee914e (patch) | |
| tree | 2cd6ca4c8ca54ebb72ba131b7b8f59c7e2a0e2d4 /meta-boot2qt | |
| parent | 0522cf1636a44c71ab908c0928659f1fecbde7d9 (diff) | |
qbsp: allow build without image
Change-Id: I88c3045d772ba9ed2b838db60a4628706c8441da
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'meta-boot2qt')
| -rw-r--r-- | meta-boot2qt/classes/qbsp.bbclass | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/meta-boot2qt/classes/qbsp.bbclass b/meta-boot2qt/classes/qbsp.bbclass index afce4fe8..7611508f 100644 --- a/meta-boot2qt/classes/qbsp.bbclass +++ b/meta-boot2qt/classes/qbsp.bbclass @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -121,23 +121,25 @@ prepare_qbsp() { cd ${B}/toolchain 7za a ${COMPONENT_PATH}/data/toolchain.7z * - # Image component - COMPONENT_PATH="${B}/pkg/${QBSP_INSTALLER_COMPONENT}.system" - mkdir -p ${COMPONENT_PATH}/meta - mkdir -p ${COMPONENT_PATH}/data + # Image component, only if we have the qbsp-image + if [ -e ${DEPLOY_DIR_IMAGE}/${IMAGE_PACKAGE} ]; then + COMPONENT_PATH="${B}/pkg/${QBSP_INSTALLER_COMPONENT}.system" + mkdir -p ${COMPONENT_PATH}/meta + mkdir -p ${COMPONENT_PATH}/data - cp ${WORKDIR}/image_package.xml ${COMPONENT_PATH}/meta/package.xml - patch_installer_files ${COMPONENT_PATH}/meta + cp ${WORKDIR}/image_package.xml ${COMPONENT_PATH}/meta/package.xml + patch_installer_files ${COMPONENT_PATH}/meta - mkdir -p ${B}/images/${QBSP_INSTALL_PATH}/images - 7za x ${DEPLOY_DIR_IMAGE}/${IMAGE_PACKAGE} -o${B}/images/${QBSP_INSTALL_PATH}/images/ + mkdir -p ${B}/images/${QBSP_INSTALL_PATH}/images + 7za x ${DEPLOY_DIR_IMAGE}/${IMAGE_PACKAGE} -o${B}/images/${QBSP_INSTALL_PATH}/images/ - if [ -n "${QBSP_README}" ]; then - cp ${DEPLOY_DIR_IMAGE}/${QBSP_README} ${B}/images/${QBSP_INSTALL_PATH}/images/ - fi + if [ -n "${QBSP_README}" ]; then + cp ${DEPLOY_DIR_IMAGE}/${QBSP_README} ${B}/images/${QBSP_INSTALL_PATH}/images/ + fi - cd ${B}/images - 7za a ${COMPONENT_PATH}/data/image.7z * + cd ${B}/images + 7za a ${COMPONENT_PATH}/data/image.7z * + fi # License component if [ -n "${QBSP_LICENSE_FILE}" ]; then |