From e2e0faabe64b922df8865ca1df23768ebc3b1fcf Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 29 Jan 2019 09:41:15 +0200
Subject: Use 7za instead of 7zr in bbclasses

7zr is no longer built by default, so use 7za instead.

Change-Id: I413017a38f0d18c29316442a2414cfeff9609d2c
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
---
 meta-boot2qt/classes/populate_b2qt_sdk.bbclass |  2 +-
 meta-boot2qt/classes/qbsp-image.bbclass        |  2 +-
 meta-boot2qt/classes/qbsp.bbclass              | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/meta-boot2qt/classes/populate_b2qt_sdk.bbclass b/meta-boot2qt/classes/populate_b2qt_sdk.bbclass
index ad863da..ff4b677 100644
--- a/meta-boot2qt/classes/populate_b2qt_sdk.bbclass
+++ b/meta-boot2qt/classes/populate_b2qt_sdk.bbclass
@@ -57,6 +57,6 @@ fakeroot tar_sdk_sdkmingw32() {
         if [ -e ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z ]; then
                 rm ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z
         fi
-        7zr a ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z *
+        7za a ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.7z *
 }
 
diff --git a/meta-boot2qt/classes/qbsp-image.bbclass b/meta-boot2qt/classes/qbsp-image.bbclass
index 71d1d45..4255194 100644
--- a/meta-boot2qt/classes/qbsp-image.bbclass
+++ b/meta-boot2qt/classes/qbsp-image.bbclass
@@ -53,7 +53,7 @@ fakeroot do_qbsp_image () {
     done
 
     cd ${S}/qbsp
-    7zr a ${IMGDEPLOYDIR}/${IMAGE_NAME}.7z .
+    7za a ${IMGDEPLOYDIR}/${IMAGE_NAME}.7z .
 
     rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.7z
     ln -s ${IMAGE_NAME}.7z ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.7z
diff --git a/meta-boot2qt/classes/qbsp.bbclass b/meta-boot2qt/classes/qbsp.bbclass
index d61e12b..c5916ce 100644
--- a/meta-boot2qt/classes/qbsp.bbclass
+++ b/meta-boot2qt/classes/qbsp.bbclass
@@ -109,13 +109,13 @@ prepare_qbsp() {
 
     mkdir -p ${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain
     if [ "${SDK_POSTFIX}" = "7z" ]; then
-        7zr x ${DEPLOY_DIR}/sdk/${SDK_NAME} -o${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain/
+        7za 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
-    7zr a ${COMPONENT_PATH}/data/toolchain.7z *
+    7za a ${COMPONENT_PATH}/data/toolchain.7z *
 
     # Image component
     COMPONENT_PATH="${B}/pkg/${QBSP_INSTALLER_COMPONENT}.system"
@@ -126,10 +126,10 @@ prepare_qbsp() {
     patch_installer_files ${COMPONENT_PATH}/meta
 
     mkdir -p ${B}/images/${QBSP_INSTALL_PATH}/images
-    7zr x ${DEPLOY_DIR_IMAGE}/${IMAGE_PACKAGE} -o${B}/images/${QBSP_INSTALL_PATH}/images/
+    7za x ${DEPLOY_DIR_IMAGE}/${IMAGE_PACKAGE} -o${B}/images/${QBSP_INSTALL_PATH}/images/
 
     cd ${B}/images
-    7zr a ${COMPONENT_PATH}/data/image.7z *
+    7za a ${COMPONENT_PATH}/data/image.7z *
 
     # License component
     if [ -n "${QBSP_LICENSE_FILE}" ]; then
@@ -160,7 +160,7 @@ create_qbsp() {
     rm -f ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}-${PV}.qbsp
 
     cd ${B}/repository
-    7zr a ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}-${PV}.qbsp *
+    7za a ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}-${PV}.qbsp *
 }
 
 python do_qbsp() {
-- 
cgit v1.2.3-54-g00ecf