From 7f56f11cefe2fd258e2ba53d0bae098613457d66 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 27 Dec 2016 16:11:52 +0200
Subject: 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>
---
 classes/populate_b2qt_sdk.bbclass |  2 +-
 classes/qbsp-image.bbclass        |  2 +-
 classes/qbsp.bbclass              | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'classes')

diff --git a/classes/populate_b2qt_sdk.bbclass b/classes/populate_b2qt_sdk.bbclass
index 2902f96..5bd0902 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 c80aa23..13fb365 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 3216edb..a13db65 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() {
-- 
cgit v1.2.3-54-g00ecf