Merge "Merge remote-tracking branch 'origin/morty' into pyro" into refs/staging/pyro

11 files changed, 175 insertions, 64 deletions

diff --git a/files/qbsp/toolchain_installscript.qs b/files/qbsp/toolchain_installscript.qs
index 39a059c..15e9570 100644
--- a/files/qbsp/toolchain_installscript.qs
+++ b/files/qbsp/toolchain_installscript.qs
@@ -67,7 +67,6 @@ Component.prototype.createOperations = function()
         executableExt = ".exe";
         hostSysroot = "i686-pokysdk-mingw32";
     }
-    var deviceType = "Boot2Qt.HwDevice"
 
     component.addOperation("Execute",
         ["@SDKToolBinary@", "addTC",
@@ -103,7 +102,7 @@ Component.prototype.createOperations = function()
         ["@SDKToolBinary@", "addQt",
          "--id", qtId,
          "--name", "Boot2Qt %{Qt:Version} " + platform,
-         "--type", "Boot2Qt.QtVersionType",
+         "--type", "Qdb.EmbeddedLinuxQt",
          "--qmake", path + "/sysroots/" + hostSysroot + "/usr/bin/qmake" + executableExt,
          "UNDOEXECUTE",
          "@SDKToolBinary@", "rmQt", "--id", qtId]);
@@ -116,7 +115,7 @@ Component.prototype.createOperations = function()
          "--qt", qtId,
          "--debuggerid", debuggerId,
          "--sysroot", path + "/sysroots/" + sysroot,
-         "--devicetype", deviceType,
+         "--devicetype", "QdbLinuxOsType",
          "--Ctoolchain", toolchainId + ".gcc",
          "--Cxxtoolchain", toolchainId + ".g++",
          "--icon", icon,
diff --git a/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend b/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend
new file mode 100644
index 0000000..1b8e44e
--- /dev/null
+++ b/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend
@@ -0,0 +1,32 @@
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+do_deploy_append() {
+    echo "dtparam=audio=on" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+}
diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb
index b471a89..3dbf07e 100644
--- a/recipes-qt/automotive/qtivi_git.bb
+++ b/recipes-qt/automotive/qtivi_git.bb
@@ -35,15 +35,48 @@ LIC_FILES_CHKSUM = "file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
                     file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
                     file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02"
 
+DEPENDS = "qtbase qtdeclarative qtmultimedia qtivi-native"
+DEPENDS_class-native = "qtbase"
+DEPENDS_class-nativesdk = "qtbase"
+
 inherit qt5-module
+inherit python3native
 require recipes-qt/qt5/qt5-git.inc
 
-PACKAGECONFIG ?= "taglib"
-PACKAGECONFIG[taglib] = "CONFIG+=config_taglib CONFIG+=done_config_taglib,CONFIG+=done_config_taglib,taglib"
-PACKAGECONFIG[geniviextras-only] = "CONFIG+=geniviextras-only"
+QT_MODULE_BRANCH_QFACE = "upstream/develop"
+
+SRC_URI += " \
+    ${QT_GIT}/qtivi-qface.git;name=qface;branch=${QT_MODULE_BRANCH_QFACE};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/qface \
+"
+
+SRCREV_qtivi = "3205b6e8f57273096ae60d8f6fcdbe597c350393"
+SRCREV_qface = "b1d96d85a7c43ac74335b9a1a99a68507047f5bc"
+SRCREV = "${SRCREV_qtivi}"
+SRCREV_FORMAT = "qtivi_qface"
+
+PACKAGECONFIG ?= "taglib dlt ivigenerator"
+PACKAGECONFIG[taglib] = "QMAKE_EXTRA_ARGS+=-feature-taglib,QMAKE_EXTRA_ARGS+=-no-feature-taglib,taglib"
+PACKAGECONFIG[dlt] = "QMAKE_EXTRA_ARGS+=-feature-dlt,QMAKE_EXTRA_ARGS+=-no-feature-dlt,dlt-daemon"
+PACKAGECONFIG[geniviextras-only] = "QMAKE_EXTRA_ARGS+=--geniviextras-only"
+# For cross-compiling tell qtivi to use the system-ivigenerator, which is installed by the native recipe"
+PACKAGECONFIG[ivigenerator] = "QMAKE_EXTRA_ARGS+=-system-ivigenerator"
+PACKAGECONFIG[ivigenerator-native] = "QMAKE_EXTRA_ARGS+=-qt-ivigenerator,,python3 python3-virtualenv"
+PACKAGECONFIG[host-tools-only] = "QMAKE_EXTRA_ARGS+=-host-tools-only"
+
+PACKAGECONFIG_class-native ??= "host-tools-only ivigenerator-native"
+PACKAGECONFIG_class-nativesdk ??= "${PACKAGECONFIG_class-native}"
+
+EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS} ${@bb.utils.contains_any('PACKAGECONFIG', 'ivigenerator ivigenerator-native', '', 'QMAKE_EXTRA_ARGS+=-no-ivigenerator', d)}"
 
-EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
+do_compile_prepend() {
+    # Otherwise pip might cache or reuse something from our home folder
+    export HOME="${STAGING_DATADIR_NATIVE}"
+    # This is needed as otherwise the virtualenv tries to use the libs from the host
+    export LD_LIBRARY_PATH="${STAGING_LIBDIR_NATIVE}"
+    # Let qtivi use the python3-native binaries
+    export PYTHON3_PATH="${STAGING_BINDIR_NATIVE}/python3-native"
+}
 
-SRCREV = "40e8ba1c8dd89474c4d890a3e050890d0cd9654e"
+BBCLASSEXTEND += "native nativesdk"
 
-DEPENDS = "qtbase qtdeclarative qtmultimedia"
+INSANE_SKIP_${PN}_class-native = "already-stripped"
diff --git a/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch b/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch
index 7ce3a9e..ac4fe40 100644
--- a/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch
+++ b/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch
@@ -1,23 +1,25 @@
-From 5363b4d6d1f3c5683267ec3e190b85eca964eef8 Mon Sep 17 00:00:00 2001
+From 0386cb5f9a46e56a0a94f2a92e87ed52d41cf4ea Mon Sep 17 00:00:00 2001
 From: David Schulz <david.schulz@theqtcompany.com>
 Date: Fri, 3 Jul 2015 16:06:59 +0200
 Subject: [PATCH] Add win32-g++-oe mkspec that uses the OE_ environment.
 
 Upstream-Status: Inappropriate [embedded specific]
                  too OE specific, probably cannot be upstreamed
+
+Change-Id: Ic60b32f88ee6a792b0d8938e40e2d6cb19fb93aa
 ---
- mkspecs/win32-g++-oe/qmake.conf      | 109 +++++++++++++++++++++++++++++++++++
- mkspecs/win32-g++-oe/qplatformdefs.h |  42 ++++++++++++++
- 2 files changed, 151 insertions(+)
+ mkspecs/win32-g++-oe/qmake.conf      | 87 ++++++++++++++++++++++++++++++++++++
+ mkspecs/win32-g++-oe/qplatformdefs.h | 42 +++++++++++++++++
+ 2 files changed, 129 insertions(+)
  create mode 100644 mkspecs/win32-g++-oe/qmake.conf
  create mode 100644 mkspecs/win32-g++-oe/qplatformdefs.h
 
 diff --git a/mkspecs/win32-g++-oe/qmake.conf b/mkspecs/win32-g++-oe/qmake.conf
 new file mode 100644
-index 0000000..1c8879a
+index 0000000..76eefe5
 --- /dev/null
 +++ b/mkspecs/win32-g++-oe/qmake.conf
-@@ -0,0 +1,109 @@
+@@ -0,0 +1,87 @@
 +#
 +# qmake configuration for win32-g++
 +#
@@ -28,6 +30,7 @@ index 0000000..1c8879a
 +#
 +
 +load(device_config)
++include(../common/g++-base.conf)
 +
 +MAKEFILE_GENERATOR      = MINGW
 +QMAKE_PLATFORM          = win32 mingw
@@ -38,45 +41,22 @@ index 0000000..1c8879a
 +QMAKE_EXT_OBJ           = .o
 +QMAKE_EXT_RES           = _res.o
 +
-+QMAKE_COMPILER          = $(OE_QMAKE_COMPILER) gcc
++QMAKE_COMPILER          = $$(OE_QMAKE_COMPILER)
 +
-+QMAKE_CC                = $(OE_QMAKE_CC)
++QMAKE_CC                = $$(OE_QMAKE_CC)
 +QMAKE_LEX               = flex
 +QMAKE_LEXFLAGS          =
-+QMAKE_YACC              = byacc
++QMAKE_YACC              = bison -y
 +QMAKE_YACCFLAGS         = -d
-+QMAKE_CFLAGS            = -pipe $(OE_QMAKE_CFLAGS)
-+QMAKE_CFLAGS_DEPS       = -M
-+QMAKE_CFLAGS_WARN_ON    = -Wall -Wextra
-+QMAKE_CFLAGS_WARN_OFF   = -w
-+QMAKE_CFLAGS_RELEASE    = -O2
-+QMAKE_CFLAGS_DEBUG      = -g
-+QMAKE_CFLAGS_YACC       = -Wno-unused -Wno-parentheses
-+QMAKE_CFLAGS_SPLIT_SECTIONS = -ffunction-sections
-+QMAKE_CFLAGS_SSE2       = -msse2 -mstackrealign
-+QMAKE_CFLAGS_SSE3       = -msse3
-+QMAKE_CFLAGS_SSSE3      = -mssse3
-+QMAKE_CFLAGS_SSE4_1     = -msse4.1
-+QMAKE_CFLAGS_SSE4_2     = -msse4.2
-+QMAKE_CFLAGS_AVX        = -mavx
-+QMAKE_CFLAGS_AVX2       = -mavx2
-+QMAKE_CFLAGS_NEON       = -mfpu=neon
-+
-+QMAKE_CXX               = $(OE_QMAKE_CXX)
-+QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
-+QMAKE_CXXFLAGS_DEPS     = $$QMAKE_CFLAGS_DEPS
-+QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
-+QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
-+QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
-+QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
-+QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
++QMAKE_CFLAGS           += -fno-keep-inline-dllexport $$(OE_QMAKE_CFLAGS)
++QMAKE_CFLAGS_WARN_ON   += -Wextra
++QMAKE_CFLAGS_SSE2      += -mstackrealign
++
++QMAKE_CXX               = $$(OE_QMAKE_CXX)
 +QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
 +QMAKE_CXXFLAGS_RTTI_ON  = -frtti
 +QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti
 +QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads
-+QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions
-+QMAKE_CXXFLAGS_CXX11    = -std=c++0x
-+QMAKE_CXXFLAGS_SPLIT_SECTIONS = $$QMAKE_CFLAGS_SPLIT_SECTIONS
 +
 +QMAKE_INCDIR            =
 +
@@ -85,19 +65,15 @@ index 0000000..1c8879a
 +QMAKE_RUN_CXX           = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
 +QMAKE_RUN_CXX_IMP       = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
 +
-+QMAKE_LINK              = $(OE_QMAKE_LINK)
-+QMAKE_LINK_C            = $(OE_QMAKE_LINK)
-+QMAKE_LFLAGS            = $(OE_QMAKE_LDFLAGS)
++QMAKE_LINK              = $$(OE_QMAKE_LINK)
++QMAKE_LINK_C            = $$(OE_QMAKE_LINK)
++QMAKE_LFLAGS            = $$(OE_QMAKE_LDFLAGS)
 +QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads
-+QMAKE_LFLAGS_EXCEPTIONS_OFF =
 +QMAKE_LFLAGS_RELEASE    = -Wl,-s
-+QMAKE_LFLAGS_DEBUG      =
 +QMAKE_LFLAGS_CONSOLE    = -Wl,-subsystem,console
 +QMAKE_LFLAGS_WINDOWS    = -Wl,-subsystem,windows
 +QMAKE_LFLAGS_DLL        = -shared
-+QMAKE_LFLAGS_CXX11      =
 +QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections
-+QMAKE_LFLAGS_USE_GOLD   = -fuse-ld=gold
 +QMAKE_LINK_OBJECT_MAX   = 10
 +QMAKE_LINK_OBJECT_SCRIPT = object_script
 +QMAKE_PREFIX_SHLIB      =
@@ -111,21 +87,25 @@ index 0000000..1c8879a
 +QMAKE_LIBS_GUI          = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32
 +QMAKE_LIBS_NETWORK      = -lws2_32
 +QMAKE_LIBS_OPENGL       = -lglu32 -lopengl32 -lgdi32 -luser32
-+QMAKE_LIBS_OPENGL_ES2   = -llibEGL -llibGLESv2 -lgdi32 -luser32
-+QMAKE_LIBS_OPENGL_ES2_DEBUG = -llibEGLd -llibGLESv2d -lgdi32 -luser32
++QMAKE_LIBS_OPENGL_ES2   = -lgdi32 -luser32
++QMAKE_LIBS_OPENGL_ES2_DEBUG = -lgdi32 -luser32
 +QMAKE_LIBS_COMPAT       = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
 +QMAKE_LIBS_QT_ENTRY     = -lmingw32 -lqtmain
 +
 +QMAKE_IDL               = midl
-+QMAKE_LIB               = $(OE_QMAKE_AR) -ru
-+QMAKE_RC                = $(RC)
++QMAKE_LIB               = $$(OE_QMAKE_AR) -rc
++QMAKE_RC                = $$(RC)
 +
-+QMAKE_STRIP             = $${OE_QMAKE_STRIP}
++QMAKE_STRIP             = $$(OE_QMAKE_STRIP)
 +QMAKE_STRIPFLAGS_LIB   += --strip-unneeded
 +QMAKE_OBJCOPY           = $${CROSS_COMPILE}objcopy
 +QMAKE_NM                = $${CROSS_COMPILE}nm -P
 +
-+isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
++isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $$(OE_QMAKE_QT_CONFIG)
++
++include(../common/angle.conf)
++include(../common/gcc-base.conf)
++
 +load(qt_config)
 diff --git a/mkspecs/win32-g++-oe/qplatformdefs.h b/mkspecs/win32-g++-oe/qplatformdefs.h
 new file mode 100644
@@ -175,6 +155,3 @@ index 0000000..9d63527
 +****************************************************************************/
 +
 +#include "../win32-g++/qplatformdefs.h"
--- 
-1.9.1
-
diff --git a/recipes/connman-conf/connman-conf.bbappend b/recipes/connman-conf/connman-conf.bbappend
new file mode 100644
index 0000000..06dc61d
--- /dev/null
+++ b/recipes/connman-conf/connman-conf.bbappend
@@ -0,0 +1,42 @@
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+CONNMAN_SETTINGS_DIR := "${localstatedir}/lib/connman"
+
+FILES_${PN} += "${CONNMAN_SETTINGS_DIR}/settings"
+
+SRC_URI += "file://settings \
+          "
+
+do_install_append() {
+    install -d ${D}/${CONNMAN_SETTINGS_DIR}
+    install -m 0644 ${WORKDIR}/settings ${D}/${CONNMAN_SETTINGS_DIR}/settings
+}
diff --git a/recipes/connman-conf/connman-conf/settings b/recipes/connman-conf/connman-conf/settings
new file mode 100644
index 0000000..edfedd4
--- /dev/null
+++ b/recipes/connman-conf/connman-conf/settings
@@ -0,0 +1,5 @@
+[global]
+OfflineMode=false
+
+[Gadget]
+Enable=true
diff --git a/recipes/python/python3-native_%.bbappend b/recipes/python/python3-native_%.bbappend
new file mode 100644
index 0000000..9015f3f
--- /dev/null
+++ b/recipes/python/python3-native_%.bbappend
@@ -0,0 +1 @@
+SRC_URI_remove = "file://python-3.3-multilib.patch"
diff --git a/recipes/python/python3-virtualenv.bb b/recipes/python/python3-virtualenv.bb
new file mode 100644
index 0000000..cc091b8
--- /dev/null
+++ b/recipes/python/python3-virtualenv.bb
@@ -0,0 +1,21 @@
+SUMMARY = "Virtual Python Environment builder"
+HOMEPAGE = "http://github.com/gitpython-developers/GitPython"
+SECTION = "devel/python"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=51910050bd6ad04a50033f3e15d6ce43"
+
+PV="15.1.0"
+SRC_URI = "https://files.pythonhosted.org/packages/source/v/virtualenv/virtualenv-15.1.0.tar.gz"
+
+SRC_URI[md5sum] = "44e19f4134906fe2d75124427dc9b716"
+SRC_URI[sha256sum] = "02f8102c2436bb03b3ee6dede1919d1dac8a427541652e5ec95171ec8adbc93a"
+
+UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/virtualenv/"
+UPSTREAM_CHECK_REGEX = "/virtualenv/(?P<pver>(\d+[\.\-_]*)+)"
+
+S = "${WORKDIR}/virtualenv-${PV}"
+
+BBCLASSEXTEND = "native nativesdk"
+
+inherit setuptools3
+
diff --git a/recipes/python/python3_%.bbappend b/recipes/python/python3_%.bbappend
new file mode 100644
index 0000000..9015f3f
--- /dev/null
+++ b/recipes/python/python3_%.bbappend
@@ -0,0 +1 @@
+SRC_URI_remove = "file://python-3.3-multilib.patch"
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 4ea0f90..e7e6624 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -48,7 +48,7 @@
            groups="notdefault,external,ti"/>
   <project name="meta-raspberrypi"
            remote="yocto"
-           revision="cce6292e41493158c26f5b1b7fded97faacf10d7"
+           revision="380bf2ff445c2049bdea15f3bb36e8cb36540345"
            path="sources/meta-raspberrypi"
            groups="notdefault,external,rpi"/>
   <project name="meta-intel"
diff --git a/scripts/upload.sh b/scripts/upload.sh
index 92256cb..cb94719 100755
--- a/scripts/upload.sh
+++ b/scripts/upload.sh
@@ -31,7 +31,7 @@
 set -x
 set -e
 
-RELEASE=5.10
+RELEASE=$(grep PV ../sources/meta-qt5/recipes-qt/qt5/qt5-git.inc | grep -o [0-9.]*)
 UPLOADPATH=QT@ci-files02-hki.ci.local:/srv/jenkins_data/enterprise/b2qt/yocto/${RELEASE}/
 UPLOADS="\
     tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \