From 7eae1c5c3d7d2d925afcc52a934613d2de4d6d8a Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 9 Jun 2017 15:17:37 +0300 Subject: meta-qt5: update to Qt 5.9.1 Change-Id: I66c0770780da9d04b4fe2a9dfd50067e34d9dbeb Reviewed-by: Mikko Gronoff --- recipes-qt/qt5/qtquickcompiler_git.bb | 2 +- scripts/manifest.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb index 23fbaf8..e684364 100644 --- a/recipes-qt/qt5/qtquickcompiler_git.bb +++ b/recipes-qt/qt5/qtquickcompiler_git.bb @@ -37,7 +37,7 @@ SRC_URI = " \ git://codereview.qt-project.org/qt/tqtc-qmlcompiler;nobranch=1;protocol=ssh \ " -SRCREV = "86d362f4ed6baeab0dfc6d892f18458a65ec7361" +SRCREV = "d450627682ddacb21712b869e43502addafad891" S = "${WORKDIR}/git" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index a91147b..87d6c4c 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/> Date: Thu, 15 Jun 2017 11:07:28 +0300 Subject: qbsp: use correct creator type names for qdb plugin Change-Id: I5dba58fbdaf5512710ed79973ab0e4809484d805 Reviewed-by: Mikko Gronoff --- files/qbsp/toolchain_installscript.qs | 5 ++--- 1 file changed, 2 insertions(+), 3 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, -- cgit v1.2.3-54-g00ecf From 90717dbcb0c2431dc0b4e7da58b3abfecbbae16b Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 15 Jun 2017 13:46:42 +0300 Subject: Use actual Qt version for upload location Change-Id: I7629bcba7aadf9acb417d2c0b3567e1a0e9e69eb Reviewed-by: Mikko Gronoff --- scripts/upload.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upload.sh b/scripts/upload.sh index 23b3b16..cb94719 100755 --- a/scripts/upload.sh +++ b/scripts/upload.sh @@ -31,7 +31,7 @@ set -x set -e -RELEASE=5.9 +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 \ -- cgit v1.2.3-54-g00ecf From f2415efd12512eb771d4554a5a8f835bef6f5d2d Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Fri, 16 Jun 2017 13:22:37 +0300 Subject: rpi: update meta-raspberrypi layer to latest morty branch Includes kernel updates among others, but most importantly fix for broken wlan in raspberrypi3. Task-number: QTBUG-61105 Change-Id: Ia81332c844c8999f69bfa79a40f237b5e9fb57f7 Reviewed-by: Samuli Piippo --- scripts/manifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 87d6c4c..e645613 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -48,7 +48,7 @@ groups="notdefault,external,ti"/> Date: Wed, 21 Jun 2017 13:38:39 +0300 Subject: meta-qt5: update to Qt 5.9.1 RC Update mingw mkspec to fix Qt build Change-Id: I1f9ff8f09a7b2cac3b26426a44139b351e39abad Reviewed-by: Mikko Gronoff --- ...g-oe-mkspec-that-uses-the-OE_-environment.patch | 83 ++++++++-------------- scripts/manifest.xml | 2 +- 2 files changed, 31 insertions(+), 54 deletions(-) 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 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/scripts/manifest.xml b/scripts/manifest.xml index e645613..2a10f3c 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/> Date: Fri, 23 Jun 2017 13:39:13 +0200 Subject: Enable sound on raspberrypi Currently there is no sound when playing videos. Change-Id: I8240b4ecdcc4966869751f97cde6168515d7c4d9 Reviewed-by: Samuli Piippo --- .../recipes/bootfiles/rpi-config_git.bbappend | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend 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 +} -- cgit v1.2.3-54-g00ecf From 545cfb313238fccdbe799a8006601d3ba50d7f6e Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 26 Jun 2017 12:28:21 +0300 Subject: meta-qt5: update to Qt 5.9.1 RC2 Change-Id: I26e1f03e490f52c0f3b30245c5bff4ff015d29a0 Reviewed-by: Samuli Piippo --- scripts/manifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 2a10f3c..f1bcb00 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/> Date: Tue, 27 Jun 2017 19:22:42 +0300 Subject: meta-qt5: update to Qt 5.9.1 RC3 Change-Id: I3e3a584d6aeebf0ec62b05735ffdb755377cd7c5 Reviewed-by: Samuli Piippo --- scripts/manifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/manifest.xml b/scripts/manifest.xml index f1bcb00..6ac1fbc 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/> Date: Fri, 7 Jul 2017 10:25:10 +0300 Subject: Fix qdb connection Connman has gadget networks disabled by default. Service qdbd creates usb0 gadget connection. This results in race condition where usb0 disappears if connman is started late enough after qdbd. Fix is to enable gadget networks for connman so it doesn't force it off. Task-number: QTBUG-61718 Change-Id: I896b537bcfb03a1b92960166f0579a58ba6a2d6f Reviewed-by: Kari Oikarinen --- recipes/connman-conf/connman-conf.bbappend | 42 ++++++++++++++++++++++++++++++ recipes/connman-conf/connman-conf/settings | 5 ++++ 2 files changed, 47 insertions(+) create mode 100644 recipes/connman-conf/connman-conf.bbappend create mode 100644 recipes/connman-conf/connman-conf/settings 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 -- cgit v1.2.3-54-g00ecf From a4fe4a8df79e91d724de690c0039e4da7b999f9b Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Thu, 6 Jul 2017 10:46:00 +0200 Subject: qtivi: Restructure the recipe according to the OE style guide Change-Id: Ibb455bdf95c75d4d6d4f5c8c4758cd201e75c765 Reviewed-by: Gordan Markus --- recipes-qt/automotive/qtivi_git.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb index b471a89..3da3dde 100644 --- a/recipes-qt/automotive/qtivi_git.bb +++ b/recipes-qt/automotive/qtivi_git.bb @@ -35,6 +35,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02" +DEPENDS = "qtbase qtdeclarative qtmultimedia" + +SRCREV = "40e8ba1c8dd89474c4d890a3e050890d0cd9654e" + inherit qt5-module require recipes-qt/qt5/qt5-git.inc @@ -44,6 +48,4 @@ PACKAGECONFIG[geniviextras-only] = "CONFIG+=geniviextras-only" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "40e8ba1c8dd89474c4d890a3e050890d0cd9654e" -DEPENDS = "qtbase qtdeclarative qtmultimedia" -- cgit v1.2.3-54-g00ecf From 7a3c1ab7e16362bdad29dfdd370c01f3926b8560 Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Thu, 6 Jul 2017 10:54:27 +0200 Subject: qtivi: Use the option of the new configure system This also fixes the geniviextras-only PACKAGECONFIG, which wouldn't work otherwise Change-Id: I07c748742d755734e1004ee73391a396f8b78510 Reviewed-by: Gordan Markus --- recipes-qt/automotive/qtivi_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb index 3da3dde..8a01c29 100644 --- a/recipes-qt/automotive/qtivi_git.bb +++ b/recipes-qt/automotive/qtivi_git.bb @@ -43,8 +43,8 @@ inherit qt5-module 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" +PACKAGECONFIG[taglib] = "QMAKE_EXTRA_ARGS+=-feature-taglib,QMAKE_EXTRA_ARGS+=-no-feature-taglib,taglib" +PACKAGECONFIG[geniviextras-only] = "QMAKE_EXTRA_ARGS+=--geniviextras-only" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -- cgit v1.2.3-54-g00ecf From 4471c546cfff6a0b50f71a1fafabc64a2cc87818 Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Thu, 6 Jul 2017 11:00:22 +0200 Subject: qtivi: Add a PACKAGECONFIG option for dlt This makes sure the QtGeniviExtras module is build if 'dlt' is set in PACKAGECONFIG. In this case the build and runtime dependencies are setup correctly. Change-Id: Icf6650144692b39ddafeea9d51fc3ccf75b747c5 Reviewed-by: Gordan Markus --- recipes-qt/automotive/qtivi_git.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb index 8a01c29..103933f 100644 --- a/recipes-qt/automotive/qtivi_git.bb +++ b/recipes-qt/automotive/qtivi_git.bb @@ -42,8 +42,9 @@ SRCREV = "40e8ba1c8dd89474c4d890a3e050890d0cd9654e" inherit qt5-module require recipes-qt/qt5/qt5-git.inc -PACKAGECONFIG ?= "taglib" +PACKAGECONFIG ?= "taglib dlt" 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" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -- cgit v1.2.3-54-g00ecf From e9a9002eac0e6d667826c18cb6f0d96e536eacd0 Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Fri, 14 Jul 2017 11:19:58 +0200 Subject: python3: Remove the multilib patch This is needed to make the python3 binary work and find its modules Change-Id: Ief417b4217a11b721990f560b44221f1ad0f8f9d Reviewed-by: Gordan Markus --- recipes/python/python3-native_%.bbappend | 1 + recipes/python/python3_%.bbappend | 1 + 2 files changed, 2 insertions(+) create mode 100644 recipes/python/python3-native_%.bbappend create mode 100644 recipes/python/python3_%.bbappend 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_%.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" -- cgit v1.2.3-54-g00ecf From ab097355d593244bf0b5ea5a62ee7b04d1a0a5a3 Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Fri, 14 Jul 2017 11:21:59 +0200 Subject: python3-virtualenv: Add a recipe for python3-virtualenv The recipe also supports native and nativsdk builds Change-Id: Iab2b66b7969a1ca7f444eece2f7a74ed3760364b Reviewed-by: Gordan Markus --- recipes/python/python3-virtualenv.bb | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 recipes/python/python3-virtualenv.bb 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(\d+[\.\-_]*)+)" + +S = "${WORKDIR}/virtualenv-${PV}" + +BBCLASSEXTEND = "native nativesdk" + +inherit setuptools3 + -- cgit v1.2.3-54-g00ecf From 8c13aef478448114a8fe0ac112e26b59d7ad03d4 Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Thu, 6 Jul 2017 10:30:41 +0200 Subject: qtivi: Use the latest version from 'dev' This also introduces fetching the qface submodule and the new default PACKAGECONFIG for the ivigenerator. For the ivigenerator new native and nativesdk packages are needed, which have a dependency towards python3 and python3-virtualenv Task-number: QTAUTO-472 Change-Id: I4e86168f4249c53c521c60cc2e1d44e91e968f4d Reviewed-by: Gordan Markus --- recipes-qt/automotive/qtivi_git.bb | 40 +++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb index 103933f..3dbf07e 100644 --- a/recipes-qt/automotive/qtivi_git.bb +++ b/recipes-qt/automotive/qtivi_git.bb @@ -35,18 +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" - -SRCREV = "40e8ba1c8dd89474c4d890a3e050890d0cd9654e" +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 dlt" +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" +} +BBCLASSEXTEND += "native nativesdk" +INSANE_SKIP_${PN}_class-native = "already-stripped" -- cgit v1.2.3-54-g00ecf