diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-12-27 16:11:52 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-01-02 06:41:43 +0000 |
| commit | 7f56f11cefe2fd258e2ba53d0bae098613457d66 (patch) | |
| tree | dd64ce73243405ce48f404ce40497cc5075f7713 /classes | |
| parent | 0303ce3b821d1402c856fd637ef51d8bc3af04bf (diff) | |
Use 7zr instead of the full 7z binary
7zr is already available is some distros without need to install
additional utils.
Change-Id: Iabcbf98b3db66d04ab7c16b3316d6ff309ec90cc
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/populate_b2qt_sdk.bbclass | 2 | ||||
| -rw-r--r-- | classes/qbsp-image.bbclass | 2 | ||||
| -rw-r--r-- | classes/qbsp.bbclass | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/classes/populate_b2qt_sdk.bbclass b/classes/populate_b2qt_sdk.bbclass index 2902f968..5bd09027 100644 --- a/classes/populate_b2qt_sdk.bbclass +++ b/classes/populate_b2qt_sdk.bbclass @@ -55,6 +55,6 @@ fakeroot tar_sdk_sdkmingw32() { if [ -e ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z ]; then rm ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z fi - 7z a ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z sysroots + 7zr a ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z sysroots } diff --git a/classes/qbsp-image.bbclass b/classes/qbsp-image.bbclass index c80aa233..13fb3657 100644 --- a/classes/qbsp-image.bbclass +++ b/classes/qbsp-image.bbclass @@ -44,7 +44,7 @@ fakeroot do_qbsp_image () { done cd ${S}/qbsp - 7z a ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.7z . + 7zr a ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.7z . rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.7z ln -s ${IMAGE_NAME}.7z ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.7z diff --git a/classes/qbsp.bbclass b/classes/qbsp.bbclass index 3216edb8..a13db659 100644 --- a/classes/qbsp.bbclass +++ b/classes/qbsp.bbclass @@ -105,13 +105,13 @@ prepare_qbsp() { mkdir -p ${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain if [ "${SDK_POSTFIX}" = "7z" ]; then - 7z x ${DEPLOY_DIR}/sdk/${SDK_NAME} -o${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain/ + 7zr x ${DEPLOY_DIR}/sdk/${SDK_NAME} -o${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain/ else cp ${DEPLOY_DIR}/sdk/${SDK_NAME} ${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain/ fi cd ${B}/toolchain - 7z a ${COMPONENT_PATH}/data/toolchain.7z * + 7zr a ${COMPONENT_PATH}/data/toolchain.7z * # Image component COMPONENT_PATH="${B}/pkg/${QBSP_INSTALLER_COMPONENT}.system" @@ -122,10 +122,10 @@ prepare_qbsp() { patch_installer_files ${COMPONENT_PATH}/meta mkdir -p ${B}/images/${QBSP_INSTALL_PATH}/images - 7z x ${DEPLOY_DIR_IMAGE}/${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 - 7z a ${COMPONENT_PATH}/data/image.7z * + 7zr a ${COMPONENT_PATH}/data/image.7z * # License component if [ -n "${QBSP_LICENSE_FILE}" ]; then @@ -155,7 +155,7 @@ create_qbsp() { rm -f ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}.qbsp cd ${B}/repository - 7z a ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}.qbsp * + 7zr a ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}.qbsp * } python do_qbsp() { |