qbsp: move readme to the image packages

Package the README already to the image.7z instead adding it
during the qbsp creation.

Change-Id: I4a751a62c47e1a38f1ffa3b2877d155a7e91ed56
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 59bb152be1a6972c12c125be2b67e89ade67bd61)

8 files changed, 18 insertions, 18 deletions

diff --git a/meta-boot2qt-distro/conf/distro/b2qt.conf b/meta-boot2qt-distro/conf/distro/b2qt.conf
index c5c88e90..77c9519b 100644
--- a/meta-boot2qt-distro/conf/distro/b2qt.conf
+++ b/meta-boot2qt-distro/conf/distro/b2qt.conf
@@ -62,6 +62,10 @@ PREFERRED_PROVIDER_jpeg-native ?= "libjpeg-turbo-native"
 IMAGE_FSTYPES += "conf"
 IMAGE_CLASSES += "image_types_sdcard deploy-conf"
 
+QBSP_README ?= "README"
+QBSP_IMAGE_CONTENT ?= "${QBSP_README}"
+QBSP_IMAGE_DEPENDS ?= "qbsp-readme:do_deploy"
+
 LICENSE_CREATE_PACKAGE = "1"
 COPY_LIC_MANIFEST = "1"
 
diff --git a/meta-boot2qt-distro/conf/distro/include/fsl.inc b/meta-boot2qt-distro/conf/distro/include/fsl.inc
index 450628ed..d0443889 100644
--- a/meta-boot2qt-distro/conf/distro/include/fsl.inc
+++ b/meta-boot2qt-distro/conf/distro/include/fsl.inc
@@ -31,7 +31,7 @@ IMAGE_FSTYPES += "wic"
 
 IMX_DEFAULT_BSP = "nxp"
 
-QBSP_IMAGE_CONTENT ?= "\
+QBSP_IMAGE_CONTENT += "\
     ${IMAGE_LINK_NAME}.img \
     ${IMAGE_LINK_NAME}.conf \
     "
diff --git a/meta-boot2qt-distro/conf/distro/include/intel-corei7-64.conf b/meta-boot2qt-distro/conf/distro/include/intel-corei7-64.conf
index d21cc4f8..a7e73677 100644
--- a/meta-boot2qt-distro/conf/distro/include/intel-corei7-64.conf
+++ b/meta-boot2qt-distro/conf/distro/include/intel-corei7-64.conf
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2018 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.
@@ -31,7 +31,7 @@ DEPLOY_CONF_NAME = "Intel NUC"
 
 DISTRO_FEATURES_remove = "usbgadget"
 
-QBSP_IMAGE_CONTENT ?= "\
+QBSP_IMAGE_CONTENT += "\
     ${IMAGE_LINK_NAME}.img \
     ${IMAGE_LINK_NAME}.conf \
     "
diff --git a/meta-boot2qt-distro/conf/distro/include/jetson.inc b/meta-boot2qt-distro/conf/distro/include/jetson.inc
index 9ea3eeb0..2b95987c 100644
--- a/meta-boot2qt-distro/conf/distro/include/jetson.inc
+++ b/meta-boot2qt-distro/conf/distro/include/jetson.inc
@@ -31,7 +31,7 @@ INITRAMFS_MAXSIZE = "165888"
 IMAGE_ROOTFS_ALIGNMENT = "1024"
 UBOOT_SUFFIX = "bin"
 
-QBSP_IMAGE_CONTENT = "\
+QBSP_IMAGE_CONTENT += "\
     ${IMAGE_LINK_NAME}.img \
     ${IMAGE_LINK_NAME}.conf \
     ${IMAGE_LINK_NAME}.flasher.tar.gz \
diff --git a/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc b/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc
index 860e91a0..e7dc9df5 100644
--- a/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc
+++ b/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc
@@ -29,7 +29,7 @@
 
 IMAGE_FSTYPES += "wic"
 
-QBSP_IMAGE_CONTENT ?= "\
+QBSP_IMAGE_CONTENT += "\
     ${IMAGE_LINK_NAME}.img \
     ${IMAGE_LINK_NAME}.conf \
     "
diff --git a/meta-boot2qt/classes/qbsp-image.bbclass b/meta-boot2qt/classes/qbsp-image.bbclass
index 42551948..2d57923f 100644
--- a/meta-boot2qt/classes/qbsp-image.bbclass
+++ b/meta-boot2qt/classes/qbsp-image.bbclass
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 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.
@@ -28,8 +28,12 @@
 ############################################################################
 
 QBSP_IMAGE_CONTENT ??= ""
+QBSP_IMAGE_DEPENDS ??= ""
 
-do_image_complete[depends] += "p7zip-native:do_populate_sysroot"
+do_image_complete[depends] += "\
+    p7zip-native:do_populate_sysroot \
+    ${QBSP_IMAGE_DEPENDS} \
+"
 
 fakeroot do_qbsp_image () {
     if [ -z "${QBSP_IMAGE_CONTENT}" ]; then
diff --git a/meta-boot2qt/classes/qbsp.bbclass b/meta-boot2qt/classes/qbsp.bbclass
index 9b884602..2b5f0744 100644
--- a/meta-boot2qt/classes/qbsp.bbclass
+++ b/meta-boot2qt/classes/qbsp.bbclass
@@ -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.
@@ -31,8 +31,6 @@ inherit meta nopackages abi-arch siteinfo
 
 FILESEXTRAPATHS_prepend := "${BOOT2QTBASE}/files/qbsp:"
 
-QBSP_README ?= "README"
-
 SRC_URI = "\
     file://base_package.xml \
     file://base_installscript.qs \
@@ -48,7 +46,6 @@ do_qbsp[depends] += "\
     installer-framework-native:do_populate_sysroot \
     ${QBSP_SDK_TASK}:do_populate_sdk \
     ${QBSP_IMAGE_TASK}:do_image_complete \
-    qbsp-readme:do_deploy \
     "
 
 QBSP_VERSION ?= "${PV}${VERSION_AUTO_INCREMENT}"
@@ -130,10 +127,6 @@ prepare_qbsp() {
         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
-
         cd ${B}/images
         7za a ${COMPONENT_PATH}/data/image.7z *
     fi
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/qbsp-readme.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/qbsp-readme.bb
index d492707c..fb2a1596 100644
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/qbsp-readme.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/qbsp-readme.bb
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2019 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.
@@ -34,11 +34,10 @@ LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5
 inherit deploy nopackages
 
 SRC_URI = "file://README"
-QBSP_README ?= "README"
 
 do_deploy() {
     install -d ${DEPLOYDIR}
-    install -m 0644 ${WORKDIR}/${QBSP_README} ${DEPLOYDIR}
+    install -m 0644 ${WORKDIR}/README ${DEPLOYDIR}
 }
 
 addtask do_deploy after do_compile before do_build