From 126c788b1a9d5b71ee876fb12b41ba594a75321b Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 2 May 2017 10:18:27 +0300
Subject: qbsp: use correct image path

.. and make sure that component name does not contain a dash,
since that's not supported by IFW.

Change-Id: Ie611b4557c18b22ff56b9f1407376e59d7c71b0d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
---
 classes/qbsp.bbclass                         | 4 ++--
 recipes-qt/meta/meta-b2qt-automotive-qbsp.bb | 3 ++-
 recipes-qt/meta/meta-b2qt-embedded-qbsp.bb   | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/classes/qbsp.bbclass b/classes/qbsp.bbclass
index 2dd42d0..fd6d14c 100644
--- a/classes/qbsp.bbclass
+++ b/classes/qbsp.bbclass
@@ -48,7 +48,7 @@ do_qbsp[depends] += "\
     "
 
 QBSP_VERSION ?= "${PV}${VERSION_AUTO_INCREMENT}"
-QBSP_INSTALLER_COMPONENT ?= "${MACHINE}"
+QBSP_INSTALLER_COMPONENT ?= "${@d.getVar('MACHINE', True).replace('-','')}"
 QBSP_INSTALL_PATH ?= "/Extras/${MACHINE}"
 
 QBSP_LICENSE_FILE ?= ""
@@ -122,7 +122,7 @@ prepare_qbsp() {
     patch_installer_files ${COMPONENT_PATH}/meta
 
     mkdir -p ${B}/images/${QBSP_INSTALL_PATH}/images
-    7zr x ${IMGDEPLOYDIR}/${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
     7zr a ${COMPONENT_PATH}/data/image.7z *
diff --git a/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb b/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb
index ebd12c5..3f86016 100644
--- a/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb
+++ b/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb
@@ -40,7 +40,8 @@ inherit qbsp
 
 PV = "1.1"
 
-QBSP_INSTALLER_COMPONENT = "qt.automotive.10.yocto.${MACHINE}"
+QBSP_MACHINE = "${@d.getVar('MACHINE', True).replace('-','')}"
+QBSP_INSTALLER_COMPONENT = "qt.automotive.10.yocto.${QBSP_MACHINE}"
 QBSP_INSTALL_PATH = "/${QT_MODULE_BRANCH}/Automotive/${MACHINE}"
 
 QBSP_SDK_TASK = "meta-toolchain-b2qt-automotive-qt5-sdk"
diff --git a/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb b/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb
index 56da506..6fe8bf1 100644
--- a/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb
+++ b/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb
@@ -41,7 +41,8 @@ inherit qbsp
 PV := "${@d.getVar('PV', True)[0:5]}"
 
 VERSION_SHORT = "${@d.getVar('QT_MODULE_BRANCH', True).replace('.','')}"
-QBSP_INSTALLER_COMPONENT = "qt.embedded.b2qt.${VERSION_SHORT}.yocto.${MACHINE}"
+QBSP_MACHINE = "${@d.getVar('MACHINE', True).replace('-','')}"
+QBSP_INSTALLER_COMPONENT = "qt.embedded.b2qt.${VERSION_SHORT}.yocto.${QBSP_MACHINE}"
 QBSP_INSTALL_PATH = "/${QT_MODULE_BRANCH}/Boot2Qt/${MACHINE}"
 
 QBSP_SDK_TASK = "meta-toolchain-b2qt-embedded-qt5-sdk"
-- 
cgit v1.2.3-54-g00ecf