qbsp: don't repackage image and toolchain

Update installer framework tools and use its new Extract operation to
include the image and toolchain 7z as-is without repackaging them.

Task-number: QTBUG-92540
Change-Id: Icd3db7a9fb755b9664c5c9b6badf5d104a6fc27c
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 9a91dc4962eb6351457629f83226c58f19ca3250)

5 files changed, 19 insertions, 17 deletions

diff --git a/meta-boot2qt/classes/qbsp.bbclass b/meta-boot2qt/classes/qbsp.bbclass
index 2b5f0744..bcb4422f 100644
--- a/meta-boot2qt/classes/qbsp.bbclass
+++ b/meta-boot2qt/classes/qbsp.bbclass
@@ -105,16 +105,12 @@ prepare_qbsp() {
     cp ${WORKDIR}/toolchain_installscript.qs ${COMPONENT_PATH}/meta/installscript.qs
     patch_installer_files ${COMPONENT_PATH}/meta
 
-    mkdir -p ${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain
     if [ "${SDK_POSTFIX}" = "7z" ]; then
-        7za x ${DEPLOY_DIR}/sdk/${SDK_NAME} -o${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain/
+        cp ${DEPLOY_DIR}/sdk/${SDK_NAME} ${COMPONENT_PATH}/data/toolchain.7z
     else
-        cp ${DEPLOY_DIR}/sdk/${SDK_NAME} ${B}/toolchain/${QBSP_INSTALL_PATH}/toolchain/
+        7za a -mx=0 ${COMPONENT_PATH}/data/toolchain.7z ${DEPLOY_DIR}/sdk/${SDK_NAME}
     fi
 
-    cd ${B}/toolchain
-    7za a ${COMPONENT_PATH}/data/toolchain.7z *
-
     # 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"
@@ -124,11 +120,7 @@ prepare_qbsp() {
         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/
-
-        cd ${B}/images
-        7za a ${COMPONENT_PATH}/data/image.7z *
+        cp ${DEPLOY_DIR_IMAGE}/${IMAGE_PACKAGE} ${COMPONENT_PATH}/data/image.7z
     fi
 
     # License component
diff --git a/meta-boot2qt/files/qbsp/image_package.xml b/meta-boot2qt/files/qbsp/image_package.xml
index 326b443a..e7d25cbb 100644
--- a/meta-boot2qt/files/qbsp/image_package.xml
+++ b/meta-boot2qt/files/qbsp/image_package.xml
@@ -6,4 +6,9 @@
   <Description>System image for @TARGET@ hardware</Description>
   <DownloadableArchives>image.7z</DownloadableArchives>
   <Default>true</Default>
+  <Operations>
+    <Operation name="Extract">
+      <Argument>@TargetDir@@INSTALLPATH@/images</Argument>
+    </Operation>
+  </Operations>
 </Package>
diff --git a/meta-boot2qt/files/qbsp/toolchain_installscript.qs b/meta-boot2qt/files/qbsp/toolchain_installscript.qs
index 56aa2ac8..a89e9e0b 100644
--- a/meta-boot2qt/files/qbsp/toolchain_installscript.qs
+++ b/meta-boot2qt/files/qbsp/toolchain_installscript.qs
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Boot to Qt meta layer.
diff --git a/meta-boot2qt/files/qbsp/toolchain_package.xml b/meta-boot2qt/files/qbsp/toolchain_package.xml
index 89a73b7a..ad6d0bb4 100644
--- a/meta-boot2qt/files/qbsp/toolchain_package.xml
+++ b/meta-boot2qt/files/qbsp/toolchain_package.xml
@@ -8,4 +8,9 @@
   <Dependencies>qt.tools.qtcreator</Dependencies>
   <Script>installscript.qs</Script>
   <Default>true</Default>
+  <Operations>
+    <Operation name="Extract">
+      <Argument>@TargetDir@@INSTALLPATH@/toolchain</Argument>
+    </Operation>
+  </Operations>
 </Package>
diff --git a/meta-boot2qt/recipes-qt/qt6/installer-framework-native_3.0.1.bb b/meta-boot2qt/recipes-qt/qt6/installer-framework-native_4.1.0.bb
index 844e43de..2527e600 100644
--- a/meta-boot2qt/recipes-qt/qt6/installer-framework-native_3.0.1.bb
+++ b/meta-boot2qt/recipes-qt/qt6/installer-framework-native_4.1.0.bb
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2021 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -35,12 +35,12 @@ inherit bin_package native
 
 do_unpack[depends] += "p7zip-native:do_populate_sysroot"
 
-SRC_URI = "http://download.qt.io/development_releases/installer-framework/${PV}/installer-framework-build-stripped-${PV}-linux-x64.7z"
+SRC_URI = "https://download.qt.io/development_releases/installer-framework/${PV}/installer-framework-Linux-RHEL_7_4-GCC-Linux-RHEL_7_4-X86_64.7z"
 
-SRC_URI[md5sum] = "68b7c1f761ca0dba18f1d165d66005d6"
-SRC_URI[sha256sum] = "c2eb769351025e0c7df2882116390fffaf958368f873a2abab99e37caee0a498"
+SRC_URI[md5sum] = "8b87aef981dc7205d8574c486401a7c2"
+SRC_URI[sha256sum] = "212094b446bad04629045c08cb274eb7e9a4cc5c1ddd5c7c8fcbfe10af783e1b"
 
-S = "${WORKDIR}/ifw-pkg"
+S = "${WORKDIR}"
 
 do_install() {
     install -d ${D}${bindir}