qbsp: various improvements to qbsp creation

Now using the same component name and installation paths
as are done with components from online installer.
Modify the component description from recipe, so it's different
for boot2qt and automotive qbsps.

Change-Id: Ie43fa00e438b9ec2e219eda052f728e7c0754644
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>

6 files changed, 14 insertions, 11 deletions

diff --git a/classes/qbsp.bbclass b/classes/qbsp.bbclass
index 8beb55f..57aa7ca 100644
--- a/classes/qbsp.bbclass
+++ b/classes/qbsp.bbclass
@@ -78,7 +78,8 @@ patch_installer_files() {
         LICENSE_DEPENDENCY="${QBSP_INSTALLER_COMPONENT}.license"
     fi
 
-    sed -e "s#@NAME@#${DEPLOY_CONF_NAME}#" \
+    sed -e "s#@NAME@#${QBSP_NAME}#" \
+        -e "s#@TARGET@#${DEPLOY_CONF_NAME}#" \
         -e "s#@VERSION@#${QBSP_VERSION}#" \
         -e "s#@RELEASEDATE@#${RELEASEDATE}#" \
         -e "s#@MACHINE@#${MACHINE}#" \
diff --git a/files/qbsp/base_package.xml b/files/qbsp/base_package.xml
index 28261d5..80a02e8 100644
--- a/files/qbsp/base_package.xml
+++ b/files/qbsp/base_package.xml
@@ -3,6 +3,6 @@
   <Version>@VERSION@</Version>
   <ReleaseDate>@RELEASEDATE@</ReleaseDate>
   <DisplayName>@NAME@</DisplayName>
-  <Description>Boot to Qt for @NAME@ with Embedded Linux baselayer</Description>
+  <Description>@NAME@ for @TARGET@</Description>
   <Dependencies>@LICENSEDEPENDENCY@</Dependencies>
 </Package>
diff --git a/files/qbsp/image_package.xml b/files/qbsp/image_package.xml
index 1eaf69c..a3fe0cc 100644
--- a/files/qbsp/image_package.xml
+++ b/files/qbsp/image_package.xml
@@ -2,7 +2,7 @@
 <Package>
   <Version>@VERSION@</Version>
   <ReleaseDate>@RELEASEDATE@</ReleaseDate>
-  <DisplayName>@NAME@ Linux System</DisplayName>
-  <Description>SD-Card image for @NAME@ hardware with Embedded Linux baselayer</Description>
+  <DisplayName>@MACHINE@ Linux System</DisplayName>
+  <Description>System image for @TARGET@ hardware</Description>
   <DownloadableArchives>image.7z</DownloadableArchives>
 </Package>
diff --git a/files/qbsp/toolchain_package.xml b/files/qbsp/toolchain_package.xml
index 85a2c67..b578fc9 100644
--- a/files/qbsp/toolchain_package.xml
+++ b/files/qbsp/toolchain_package.xml
@@ -2,8 +2,8 @@
 <Package>
   <Version>@VERSION@</Version>
   <ReleaseDate>@RELEASEDATE@</ReleaseDate>
-  <DisplayName>@NAME@ Linux Toolchain</DisplayName>
-  <Description>Toolchain and system root for @NAME@ with Embedded Linux baselayer</Description>
+  <DisplayName>@MACHINE@ Linux Toolchain</DisplayName>
+  <Description>Toolchain and system root for @TARGET@</Description>
   <DownloadableArchives>toolchain.7z</DownloadableArchives>
   <Dependencies>qt.tools.qtcreator</Dependencies>
   <Script>installscript.qs</Script>
diff --git a/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb b/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb
index 3f86016..a9da456 100644
--- a/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb
+++ b/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb
@@ -38,11 +38,12 @@ S = "${WORKDIR}"
 
 inherit qbsp
 
-PV = "1.1"
+PV := "${@d.getVar('PV', True)[0:5]}"
 
+QBSP_NAME = "Qt Automotive"
 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_INSTALLER_COMPONENT = "automotive.10.yocto.${QBSP_MACHINE}"
+QBSP_INSTALL_PATH = "/${PV}/Automotive/${MACHINE}"
 
 QBSP_SDK_TASK = "meta-toolchain-b2qt-automotive-qt5-sdk"
 QBSP_IMAGE_TASK = "b2qt-automotive-qt5-image"
diff --git a/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb b/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb
index 6fe8bf1..d6def0f 100644
--- a/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb
+++ b/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb
@@ -40,10 +40,11 @@ inherit qbsp
 
 PV := "${@d.getVar('PV', True)[0:5]}"
 
-VERSION_SHORT = "${@d.getVar('QT_MODULE_BRANCH', True).replace('.','')}"
+VERSION_SHORT = "${@d.getVar('PV', True).replace('.','')}"
+QBSP_NAME = "Boot to Qt"
 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_INSTALL_PATH = "/${PV}/Boot2Qt/${MACHINE}"
 
 QBSP_SDK_TASK = "meta-toolchain-b2qt-embedded-qt5-sdk"
 QBSP_IMAGE_TASK = "b2qt-embedded-qt5-image"