9 files changed, 29 insertions, 17 deletions

diff --git a/classes/qbsp-image.bbclass b/classes/qbsp-image.bbclass
index b8da767..71d1d45 100644
--- a/classes/qbsp-image.bbclass
+++ b/classes/qbsp-image.bbclass
@@ -42,7 +42,14 @@ fakeroot do_qbsp_image () {
         src=`echo $item | awk -F':' '{ print $1 }'`
         dst=`echo $item | awk -F':' '{ print $2 }'`
 
-        install -D -m 0755 ${IMGDEPLOYDIR}/$src ${S}/qbsp/$dst
+        if [ -e "${IMGDEPLOYDIR}/$src" ]; then
+            install -D -m 0755 ${IMGDEPLOYDIR}/$src ${S}/qbsp/$dst
+        elif [ -e "${DEPLOY_DIR_IMAGE}/$src" ]; then
+            install -D -m 0755 ${DEPLOY_DIR_IMAGE}/$src ${S}/qbsp/$dst
+        else
+            echo "Could not copy file $src"
+            exit 1
+        fi
     done
 
     cd ${S}/qbsp
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/automotive/neptune-ui/neptune.service b/recipes-qt/automotive/neptune-ui/neptune.service
index f27ac10..ef73324 100644
--- a/recipes-qt/automotive/neptune-ui/neptune.service
+++ b/recipes-qt/automotive/neptune-ui/neptune.service
@@ -5,7 +5,7 @@ After=dbus.service dbus-session.service systemd-user-sessions.service
 [Service]
 ExecStart=/usr/bin/appcontroller /usr/bin/appman -r --dbus session -c am-config.yaml
 Restart=on-failure
-WorkingDirectory=/opt/neptune
+WorkingDirectory=/opt/neptune-ui
 
 [Install]
 WantedBy=multi-user.target
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"
diff --git a/recipes-qt/qt5-addons/installer-framework_2.0.3.bb b/recipes-qt/qt5-addons/installer-framework_3.0.1.bb
index 0ea0ec4..5bc09c0 100644
--- a/recipes-qt/qt5-addons/installer-framework_2.0.3.bb
+++ b/recipes-qt/qt5-addons/installer-framework_3.0.1.bb
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -33,10 +33,12 @@ LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
 
 inherit bin_package native
 
-SRC_URI = "http://ci-files02-hki.intra.qt.io/packages/jenkins/opensource/ifw/installer-framework/installer-framework-build-stripped-linux-x64.7z"
+do_unpack[depends] += "p7zip-native:do_populate_sysroot"
 
-SRC_URI[md5sum] = "08beb5450c3938fcfd1b380f6aaec75d"
-SRC_URI[sha256sum] = "91bfef896db58f28e4c2c6db437b958101a59e87aa880c38b6ddc40ebe6c38e6"
+SRC_URI = "http://download.qt.io/development_releases/installer-framework/${PV}/installer-framework-build-stripped-${PV}-linux-x64.7z"
+
+SRC_URI[md5sum] = "68b7c1f761ca0dba18f1d165d66005d6"
+SRC_URI[sha256sum] = "c2eb769351025e0c7df2882116390fffaf958368f873a2abab99e37caee0a498"
 
 S = "${WORKDIR}/ifw-pkg"