12 files changed, 21 insertions, 42 deletions

diff --git a/classes/internal-build.bbclass b/classes/internal-build.bbclass
index 0f12a78..64c07bf 100644
--- a/classes/internal-build.bbclass
+++ b/classes/internal-build.bbclass
@@ -35,8 +35,8 @@ python enable_internal_build () {
         return
 
     e.data.setVar('ENABLE_QTQUICKCOMPILER', "1")
-    e.data.setVar('SSTATE_MIRRORS', "file://.* http://yocto-cache.intra.qt.io/sstate-caches/${DISTRO_CODENAME}/PATH")
-    e.data.setVar('PREMIRRORS', "\
+    e.data.prependVar('SSTATE_MIRRORS', "file://.* http://yocto-cache.intra.qt.io/sstate-caches/${DISTRO_CODENAME}/PATH")
+    e.data.prependVar('PREMIRRORS', "\
         ftp://.*/.*   http://yocto-cache.intra.qt.io/sources/ \n \
         http://.*/.*  http://yocto-cache.intra.qt.io/sources/ \n \
         https://.*/.* http://yocto-cache.intra.qt.io/sources/ \n \
diff --git a/classes/qbsp.bbclass b/classes/qbsp.bbclass
index db70fc9..da790bf 100644
--- a/classes/qbsp.bbclass
+++ b/classes/qbsp.bbclass
@@ -84,7 +84,7 @@ patch_installer_files() {
         -e "s#@RELEASEDATE@#${RELEASEDATE}#" \
         -e "s#@MACHINE@#${MACHINE}#" \
         -e "s#@SYSROOT@#${REAL_MULTIMACH_TARGET_SYS}#" \
-        -e "s#@TARGET@#${TARGET_SYS}#" \
+        -e "s#@TARGET_SYS@#${TARGET_SYS}#" \
         -e "s#@ABI@#${ABI}#" \
         -e "s#@INSTALLPATH@#${QBSP_INSTALL_PATH}#" \
         -e "s#@SDKPATH@#${SDKPATH}#" \
diff --git a/files/qbsp/base_package.xml b/files/qbsp/base_package.xml
index 80a02e8..5f16dfa 100644
--- a/files/qbsp/base_package.xml
+++ b/files/qbsp/base_package.xml
@@ -2,7 +2,7 @@
 <Package>
   <Version>@VERSION@</Version>
   <ReleaseDate>@RELEASEDATE@</ReleaseDate>
-  <DisplayName>@NAME@</DisplayName>
+  <DisplayName>@TARGET@</DisplayName>
   <Description>@NAME@ for @TARGET@</Description>
   <Dependencies>@LICENSEDEPENDENCY@</Dependencies>
 </Package>
diff --git a/files/qbsp/image_package.xml b/files/qbsp/image_package.xml
index a3fe0cc..27e5f2e 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>@MACHINE@ Linux System</DisplayName>
+  <DisplayName>@TARGET@ Linux System</DisplayName>
   <Description>System image for @TARGET@ hardware</Description>
   <DownloadableArchives>image.7z</DownloadableArchives>
 </Package>
diff --git a/files/qbsp/toolchain_installscript.qs b/files/qbsp/toolchain_installscript.qs
index 15e9570..4afab71 100644
--- a/files/qbsp/toolchain_installscript.qs
+++ b/files/qbsp/toolchain_installscript.qs
@@ -38,6 +38,7 @@ Component.prototype.createOperations = function()
     var device = "@MACHINE@"
     var platform = "@NAME@"
     var sysroot = "@SYSROOT@"
+    var target_sys = "@TARGET_SYS@"
     var target = "@TARGET@"
     var abi = "@ABI@"
     var installPath = "@INSTALLPATH@/toolchain"
@@ -71,8 +72,8 @@ Component.prototype.createOperations = function()
     component.addOperation("Execute",
         ["@SDKToolBinary@", "addTC",
         "--id", toolchainId + ".gcc",
-        "--name", "GCC (Boot2Qt " + platform + ")",
-        "--path", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target + "/" + target + "-gcc" + executableExt,
+        "--name", "GCC (" + platform + " " + target + ")",
+        "--path", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target_sys + "/" + target_sys + "-gcc" + executableExt,
         "--abi", abi,
         "--language", "1",
         "UNDOEXECUTE",
@@ -81,8 +82,8 @@ Component.prototype.createOperations = function()
     component.addOperation("Execute",
         ["@SDKToolBinary@", "addTC",
         "--id", toolchainId + ".g++",
-        "--name", "G++ (Boot2Qt " + platform + ")",
-        "--path", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target + "/" + target + "-g++" + executableExt,
+        "--name", "G++ (" + platform + " " + target + ")",
+        "--path", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target_sys + "/" + target_sys + "-g++" + executableExt,
         "--abi", abi,
         "--language", "2",
         "UNDOEXECUTE",
@@ -91,9 +92,9 @@ Component.prototype.createOperations = function()
     component.addOperation("Execute",
         ["@SDKToolBinary@", "addDebugger",
         "--id", debuggerId,
-        "--name", "GDB (Boot2Qt " + platform + ")",
+        "--name", "GDB (" + platform + " " + target + ")",
         "--engine", "1",
-        "--binary", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target + "/" + target + "-gdb" + executableExt,
+        "--binary", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target_sys + "/" + target_sys + "-gdb" + executableExt,
         "--abis", abi,
         "UNDOEXECUTE",
         "@SDKToolBinary@", "rmDebugger", "--id", debuggerId]);
@@ -101,7 +102,7 @@ Component.prototype.createOperations = function()
     component.addOperation("Execute",
         ["@SDKToolBinary@", "addQt",
          "--id", qtId,
-         "--name", "Boot2Qt %{Qt:Version} " + platform,
+         "--name", platform + " " + target,
          "--type", "Qdb.EmbeddedLinuxQt",
          "--qmake", path + "/sysroots/" + hostSysroot + "/usr/bin/qmake" + executableExt,
          "UNDOEXECUTE",
@@ -110,7 +111,7 @@ Component.prototype.createOperations = function()
     component.addOperation("Execute",
         ["@SDKToolBinary@", "addKit",
          "--id", basecomponent,
-         "--name", "Boot2Qt %{Qt:Version} " + platform,
+         "--name", platform + " " + target,
          "--mkspec", "devices/linux-oe-generic-g++",
          "--qt", qtId,
          "--debuggerid", debuggerId,
diff --git a/files/qbsp/toolchain_package.xml b/files/qbsp/toolchain_package.xml
index b578fc9..166e09b 100644
--- a/files/qbsp/toolchain_package.xml
+++ b/files/qbsp/toolchain_package.xml
@@ -2,7 +2,7 @@
 <Package>
   <Version>@VERSION@</Version>
   <ReleaseDate>@RELEASEDATE@</ReleaseDate>
-  <DisplayName>@MACHINE@ Linux Toolchain</DisplayName>
+  <DisplayName>@TARGET@ Linux Toolchain</DisplayName>
   <Description>Toolchain and system root for @TARGET@</Description>
   <DownloadableArchives>toolchain.7z</DownloadableArchives>
   <Dependencies>qt.tools.qtcreator</Dependencies>
diff --git a/recipes/ppp/ppp_2.%.bbappend b/meta-nvidia-extras/recipes/ppp/ppp_2.4.%.bbappend
index d687518..ca8f573 100644
--- a/recipes/ppp/ppp_2.%.bbappend
+++ b/meta-nvidia-extras/recipes/ppp/ppp_2.4.%.bbappend
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,4 +27,4 @@
 ##
 ############################################################################
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+SRC_URI_remove = "file://ppp-fix-building-with-linux-4.8.patch"
diff --git a/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb b/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb
index 9b5c615..5595cc6 100644
--- a/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb
+++ b/recipes-qt/meta/meta-b2qt-automotive-qbsp.bb
@@ -40,7 +40,7 @@ inherit qbsp
 
 PV := "${@d.getVar('PV', True).split('+')[0]}"
 
-QBSP_NAME = "Qt Automotive"
+QBSP_NAME = "Automotive ${PV}"
 QBSP_MACHINE = "${@d.getVar('MACHINE', True).replace('-','')}"
 QBSP_INSTALLER_COMPONENT = "automotive.10.yocto.${QBSP_MACHINE}"
 QBSP_INSTALL_PATH = "/${PV}/Automotive/${MACHINE}"
diff --git a/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb b/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb
index c531633..dc2873f 100644
--- a/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb
+++ b/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb
@@ -41,7 +41,7 @@ inherit qbsp
 PV := "${@d.getVar('PV', True).split('+')[0]}"
 
 VERSION_SHORT = "${@d.getVar('PV', True).replace('.','')}"
-QBSP_NAME = "Boot to Qt"
+QBSP_NAME = "Boot2Qt ${PV}"
 QBSP_MACHINE = "${@d.getVar('MACHINE', True).replace('-','')}"
 QBSP_INSTALLER_COMPONENT = "qt.embedded.b2qt.${VERSION_SHORT}.yocto.${QBSP_MACHINE}"
 QBSP_INSTALL_PATH = "/${PV}/Boot2Qt/${MACHINE}"
diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend
index af38d2c..7685c5a 100644
--- a/recipes-qt/qt5/qtbase_git.bbappend
+++ b/recipes-qt/qt5/qtbase_git.bbappend
@@ -49,6 +49,8 @@ PACKAGECONFIG += " \
     xkbcommon-evdev \
     "
 
+PACKAGECONFIG_remove = "tests"
+
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += " \
diff --git a/recipes/ppp/files/ppp-fix-building-with-linux-4.8.patch b/recipes/ppp/files/ppp-fix-building-with-linux-4.8.patch
deleted file mode 100644
index 17e7975..0000000
--- a/recipes/ppp/files/ppp-fix-building-with-linux-4.8.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h
-index 9ab2eee..96d2794 100644
---- a/pppd/plugins/rp-pppoe/pppoe.h
-+++ b/pppd/plugins/rp-pppoe/pppoe.h
-@@ -47,6 +47,10 @@
- #include <sys/socket.h>
- #endif
- 
-+/* This has to be included before Linux 4.8's linux/in.h
-+ * gets dragged in. */
-+#include <netinet/in.h>
-+
- /* Ugly header files on some Linux boxes... */
- #if defined(HAVE_LINUX_IF_H)
- #include <linux/if.h>
-@@ -84,7 +88,6 @@ typedef unsigned long UINT32_t;
- #include <linux/if_ether.h>
- #endif
- 
--#include <netinet/in.h>
-
- #ifdef HAVE_NETINET_IF_ETHER_H
- #include <sys/types.h>
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 56f083e..1aa053b 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -109,4 +109,3 @@
            path="sources/meta-smx6"
            groups="notdefault,internal"/>
 </manifest>
-