summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-boot2qt-distro/conf/distro/include/boundary.inc4
-rw-r--r--meta-boot2qt-distro/conf/distro/include/draak.conf5
-rw-r--r--meta-boot2qt-distro/conf/distro/include/imx6qdlsabresd.conf1
-rw-r--r--meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf1
-rw-r--r--meta-boot2qt-distro/recipes-qt/images/b2qt-automation-qt5-image.bb55
-rw-r--r--meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automation-qbsp.bb50
-rw-r--r--meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-automation-qt5-sdk.bb39
-rw-r--r--meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automation-addons.bb41
-rw-r--r--meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automation-qt5-toolchain-target.bb42
-rw-r--r--meta-boot2qt-distro/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch82
-rw-r--r--meta-boot2qt-distro/recipes-qt/qt5/qtbase/0002-Disable-ltcg-for-host_build.patch (renamed from meta-boot2qt-distro/recipes-qt/qt5/qtbase/0015-Disable-ltcg-for-host_build.patch)6
-rw-r--r--meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend3
-rw-r--r--meta-boot2qt-distro/recipes-qt/qt5/qtlocation/0001-location-disable-simulator-content-under-plugins.patch9
-rw-r--r--meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb4
-rw-r--r--meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb2
-rw-r--r--meta-fsl-extras/recipes/linux/linux-boundary/0001-Add-support-for-koe-tx31d200vm0baa-display.patch21
-rw-r--r--meta-fsl-extras/recipes/linux/linux-boundary_4.%.bbappend1
-rw-r--r--meta-fsl-extras/recipes/qt5/qtbase/0001-egl_viv-cast-EGLNative-types-from-vivante-functions.patch57
-rw-r--r--meta-fsl-extras/recipes/qt5/qtbase_git.bbappend (renamed from meta-boot2qt-distro/conf/distro/include/opencv.inc)14
-rw-r--r--meta-renesas-extras/recipes/linux-libc-headers/linux-libc-headers_%.bbappend34
-rw-r--r--scripts/manifest.xml16
21 files changed, 368 insertions, 119 deletions
diff --git a/meta-boot2qt-distro/conf/distro/include/boundary.inc b/meta-boot2qt-distro/conf/distro/include/boundary.inc
index b08e11a..8dcf16b 100644
--- a/meta-boot2qt-distro/conf/distro/include/boundary.inc
+++ b/meta-boot2qt-distro/conf/distro/include/boundary.inc
@@ -30,12 +30,10 @@
30include conf/distro/include/fsl.inc 30include conf/distro/include/fsl.inc
31 31
32BBMASK += " \ 32BBMASK += " \
33 meta-boundary/recipes-browser/chromium \
34 meta-boundary/recipes-core/init-ifupdown \ 33 meta-boundary/recipes-core/init-ifupdown \
35 meta-boundary/recipes-mozilla/firefox \
36 " 34 "
37 35
38MACHINE_EXTRA_INSTALL += "\ 36MACHINE_EXTRA_INSTALL += "\
39 kernel-module-qcacld \ 37 kernel-module-qcacld \
40 linux-firmware-bdsdmac-wlan \ 38 linux-firmware-bdsdmac \
41 " 39 "
diff --git a/meta-boot2qt-distro/conf/distro/include/draak.conf b/meta-boot2qt-distro/conf/distro/include/draak.conf
index 94ca09e..daf68f7 100644
--- a/meta-boot2qt-distro/conf/distro/include/draak.conf
+++ b/meta-boot2qt-distro/conf/distro/include/draak.conf
@@ -40,9 +40,10 @@ WKS_FILE_DEPENDS_remove = "optee-os"
40QBSP_IMAGE_CONTENT_remove = "tee-${MACHINE}.srec" 40QBSP_IMAGE_CONTENT_remove = "tee-${MACHINE}.srec"
41 41
42BBMASK += "\ 42BBMASK += "\
43 meta-rcar-gen3/recipes-multimedia/webp \
44 meta-rcar-gen3/recipes-connectivity/ppp \ 43 meta-rcar-gen3/recipes-connectivity/ppp \
45 meta-rcar-gen3/recipes-graphics/wayland/wayland-protocols \ 44 meta-rcar-gen3/recipes-graphics/wayland/wayland-protocols \
46 meta-renesas/meta-rcar-gen3/recipes-graphics/drm \
47 meta-rcar-gen3/recipes-multimedia/gstreamer \ 45 meta-rcar-gen3/recipes-multimedia/gstreamer \
46 meta-rcar-gen3/recipes-multimedia/webp \
47 meta-renesas/meta-rcar-gen3/recipes-graphics/drm \
48 meta-renesas-extras/recipes/arm-trusted-firmware \
48 " 49 "
diff --git a/meta-boot2qt-distro/conf/distro/include/imx6qdlsabresd.conf b/meta-boot2qt-distro/conf/distro/include/imx6qdlsabresd.conf
index 5f3ddb3..644dac0 100644
--- a/meta-boot2qt-distro/conf/distro/include/imx6qdlsabresd.conf
+++ b/meta-boot2qt-distro/conf/distro/include/imx6qdlsabresd.conf
@@ -28,7 +28,6 @@
28############################################################################ 28############################################################################
29 29
30include conf/distro/include/fsl.inc 30include conf/distro/include/fsl.inc
31include conf/distro/include/opencv.inc
32 31
33DEPLOY_CONF_NAME = "NXP i.MX6QP/Q/DL SABRE Smart Device" 32DEPLOY_CONF_NAME = "NXP i.MX6QP/Q/DL SABRE Smart Device"
34 33
diff --git a/meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf b/meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf
index f6871be..7883ab5 100644
--- a/meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf
+++ b/meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf
@@ -28,7 +28,6 @@
28############################################################################ 28############################################################################
29 29
30include conf/distro/include/boundary.inc 30include conf/distro/include/boundary.inc
31include conf/distro/include/opencv.inc
32 31
33DEPLOY_CONF_NAME = "Boundary Devices i.MX6" 32DEPLOY_CONF_NAME = "Boundary Devices i.MX6"
34 33
diff --git a/meta-boot2qt-distro/recipes-qt/images/b2qt-automation-qt5-image.bb b/meta-boot2qt-distro/recipes-qt/images/b2qt-automation-qt5-image.bb
new file mode 100644
index 0000000..25bfb4d
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-qt/images/b2qt-automation-qt5-image.bb
@@ -0,0 +1,55 @@
1############################################################################
2##
3## Copyright (C) 2018 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/
5##
6## This file is part of the Boot to Qt meta layer.
7##
8## $QT_BEGIN_LICENSE:GPL$
9## Commercial License Usage
10## Licensees holding valid commercial Qt licenses may use this file in
11## accordance with the commercial license agreement provided with the
12## Software or, alternatively, in accordance with the terms contained in
13## a written agreement between you and The Qt Company. For licensing terms
14## and conditions see https://www.qt.io/terms-conditions. For further
15## information use the contact form at https://www.qt.io/contact-us.
16##
17## GNU General Public License Usage
18## Alternatively, this file may be used under the terms of the GNU
19## General Public License version 3 or (at your option) any later version
20## approved by the KDE Free Qt Foundation. The licenses are as published by
21## the Free Software Foundation and appearing in the file LICENSE.GPL3
22## included in the packaging of this file. Please review the following
23## information to ensure the GNU General Public License requirements will
24## be met: https://www.gnu.org/licenses/gpl-3.0.html.
25##
26## $QT_END_LICENSE$
27##
28############################################################################
29
30DESCRIPTION = "B2Qt Automation Qt5 image"
31LICENSE = "The-Qt-Company-Commercial"
32LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625"
33
34DEPLOY_CONF_TYPE = "Qt for Automation ($QT_VERSION)"
35
36IMAGE_FEATURES += "\
37 package-management \
38 ssh-server-dropbear \
39 tools-debug \
40 debug-tweaks \
41 hwcodecs \
42 "
43
44inherit core-image qbsp-image
45inherit consistent_timestamps
46
47IMAGE_INSTALL += "\
48 packagegroup-b2qt-embedded-base \
49 packagegroup-b2qt-embedded-tools \
50 ${@bb.utils.contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \
51 ${@bb.utils.contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \
52 packagegroup-b2qt-qt5-modules \
53 packagegroup-b2qt-embedded-addons \
54 packagegroup-b2qt-automation-addons \
55 "
diff --git a/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automation-qbsp.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automation-qbsp.bb
new file mode 100644
index 0000000..16a1530
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automation-qbsp.bb
@@ -0,0 +1,50 @@
1############################################################################
2##
3## Copyright (C) 2018 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/
5##
6## This file is part of the Boot to Qt meta layer.
7##
8## $QT_BEGIN_LICENSE:GPL$
9## Commercial License Usage
10## Licensees holding valid commercial Qt licenses may use this file in
11## accordance with the commercial license agreement provided with the
12## Software or, alternatively, in accordance with the terms contained in
13## a written agreement between you and The Qt Company. For licensing terms
14## and conditions see https://www.qt.io/terms-conditions. For further
15## information use the contact form at https://www.qt.io/contact-us.
16##
17## GNU General Public License Usage
18## Alternatively, this file may be used under the terms of the GNU
19## General Public License version 3 or (at your option) any later version
20## approved by the KDE Free Qt Foundation. The licenses are as published by
21## the Free Software Foundation and appearing in the file LICENSE.GPL3
22## included in the packaging of this file. Please review the following
23## information to ensure the GNU General Public License requirements will
24## be met: https://www.gnu.org/licenses/gpl-3.0.html.
25##
26## $QT_END_LICENSE$
27##
28############################################################################
29
30DESCRIPTION = "Meta task for QBSP creation"
31
32LICENSE = "The-Qt-Company-Commercial"
33LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625"
34
35# get Qt version number
36require recipes-qt/qt5/qt5-git.inc
37S = "${WORKDIR}"
38
39inherit qbsp
40
41PV := "${@d.getVar('PV').split('+')[0]}"
42
43VERSION_SHORT = "${@d.getVar('PV').replace('.','')}"
44QBSP_NAME = "Automation ${PV}"
45QBSP_MACHINE = "${@d.getVar('MACHINE').replace('-','')}"
46QBSP_INSTALLER_COMPONENT = "automation.${VERSION_SHORT}.yocto.${QBSP_MACHINE}"
47QBSP_INSTALL_PATH = "/${PV}/Automation/${MACHINE}"
48
49QBSP_SDK_TASK = "meta-toolchain-b2qt-automation-qt5-sdk"
50QBSP_IMAGE_TASK = "b2qt-automation-qt5-image"
diff --git a/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-automation-qt5-sdk.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-automation-qt5-sdk.bb
new file mode 100644
index 0000000..8cd0d04
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-automation-qt5-sdk.bb
@@ -0,0 +1,39 @@
1############################################################################
2##
3## Copyright (C) 2018 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/
5##
6## This file is part of the Boot to Qt meta layer.
7##
8## $QT_BEGIN_LICENSE:GPL$
9## Commercial License Usage
10## Licensees holding valid commercial Qt licenses may use this file in
11## accordance with the commercial license agreement provided with the
12## Software or, alternatively, in accordance with the terms contained in
13## a written agreement between you and The Qt Company. For licensing terms
14## and conditions see https://www.qt.io/terms-conditions. For further
15## information use the contact form at https://www.qt.io/contact-us.
16##
17## GNU General Public License Usage
18## Alternatively, this file may be used under the terms of the GNU
19## General Public License version 3 or (at your option) any later version
20## approved by the KDE Free Qt Foundation. The licenses are as published by
21## the Free Software Foundation and appearing in the file LICENSE.GPL3
22## included in the packaging of this file. Please review the following
23## information to ensure the GNU General Public License requirements will
24## be met: https://www.gnu.org/licenses/gpl-3.0.html.
25##
26## $QT_END_LICENSE$
27##
28############################################################################
29
30DESCRIPTION = "B2Qt embedded Qt5 SDK toolchain"
31
32LICENSE = "The-Qt-Company-Commercial"
33LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625"
34
35inherit populate_b2qt_qt5_sdk
36
37TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host"
38TOOLCHAIN_TARGET_TASK += "packagegroup-b2qt-embedded-qt5-toolchain-target \
39 packagegroup-b2qt-automation-qt5-toolchain-target"
diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automation-addons.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automation-addons.bb
new file mode 100644
index 0000000..d90e1b9
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automation-addons.bb
@@ -0,0 +1,41 @@
1############################################################################
2##
3## Copyright (C) 2018 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/
5##
6## This file is part of the Boot to Qt meta layer.
7##
8## $QT_BEGIN_LICENSE:GPL$
9## Commercial License Usage
10## Licensees holding valid commercial Qt licenses may use this file in
11## accordance with the commercial license agreement provided with the
12## Software or, alternatively, in accordance with the terms contained in
13## a written agreement between you and The Qt Company. For licensing terms
14## and conditions see https://www.qt.io/terms-conditions. For further
15## information use the contact form at https://www.qt.io/contact-us.
16##
17## GNU General Public License Usage
18## Alternatively, this file may be used under the terms of the GNU
19## General Public License version 3 or (at your option) any later version
20## approved by the KDE Free Qt Foundation. The licenses are as published by
21## the Free Software Foundation and appearing in the file LICENSE.GPL3
22## included in the packaging of this file. Please review the following
23## information to ensure the GNU General Public License requirements will
24## be met: https://www.gnu.org/licenses/gpl-3.0.html.
25##
26## $QT_END_LICENSE$
27##
28############################################################################
29
30DESCRIPTION = "Automation specific Qt packages"
31LICENSE = "The-Qt-Company-Commercial"
32
33inherit packagegroup
34
35PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
36
37RDEPENDS_${PN} += " \
38 qtmqtt \
39 qtknx \
40 qtopcua \
41 "
diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automation-qt5-toolchain-target.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automation-qt5-toolchain-target.bb
new file mode 100644
index 0000000..257ef0f
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automation-qt5-toolchain-target.bb
@@ -0,0 +1,42 @@
1############################################################################
2##
3## Copyright (C) 2018 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/
5##
6## This file is part of the Boot to Qt meta layer.
7##
8## $QT_BEGIN_LICENSE:GPL$
9## Commercial License Usage
10## Licensees holding valid commercial Qt licenses may use this file in
11## accordance with the commercial license agreement provided with the
12## Software or, alternatively, in accordance with the terms contained in
13## a written agreement between you and The Qt Company. For licensing terms
14## and conditions see https://www.qt.io/terms-conditions. For further
15## information use the contact form at https://www.qt.io/contact-us.
16##
17## GNU General Public License Usage
18## Alternatively, this file may be used under the terms of the GNU
19## General Public License version 3 or (at your option) any later version
20## approved by the KDE Free Qt Foundation. The licenses are as published by
21## the Free Software Foundation and appearing in the file LICENSE.GPL3
22## included in the packaging of this file. Please review the following
23## information to ensure the GNU General Public License requirements will
24## be met: https://www.gnu.org/licenses/gpl-3.0.html.
25##
26## $QT_END_LICENSE$
27##
28############################################################################
29
30DESCRIPTION = "Target packages for B2Qt Automation Qt5 SDK"
31LICENSE = "The-Qt-Company-Commercial"
32PR = "r0"
33
34inherit packagegroup
35
36PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
37
38RDEPENDS_${PN} += " \
39 qtmqtt-dev \
40 qtknx-dev \
41 qtopcua-dev \
42 "
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch
index ac4fe40..7b13555 100644
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch
@@ -1,4 +1,4 @@
1From 0386cb5f9a46e56a0a94f2a92e87ed52d41cf4ea Mon Sep 17 00:00:00 2001 1From 8d720921ddda76fcf77c0f7ebc5ac0b873ab1595 Mon Sep 17 00:00:00 2001
2From: David Schulz <david.schulz@theqtcompany.com> 2From: David Schulz <david.schulz@theqtcompany.com>
3Date: Fri, 3 Jul 2015 16:06:59 +0200 3Date: Fri, 3 Jul 2015 16:06:59 +0200
4Subject: [PATCH] Add win32-g++-oe mkspec that uses the OE_ environment. 4Subject: [PATCH] Add win32-g++-oe mkspec that uses the OE_ environment.
@@ -8,108 +8,52 @@ Upstream-Status: Inappropriate [embedded specific]
8 8
9Change-Id: Ic60b32f88ee6a792b0d8938e40e2d6cb19fb93aa 9Change-Id: Ic60b32f88ee6a792b0d8938e40e2d6cb19fb93aa
10--- 10---
11 mkspecs/win32-g++-oe/qmake.conf | 87 ++++++++++++++++++++++++++++++++++++ 11 mkspecs/win32-g++-oe/qmake.conf | 31 ++++++++++++++++++++
12 mkspecs/win32-g++-oe/qplatformdefs.h | 42 +++++++++++++++++ 12 mkspecs/win32-g++-oe/qplatformdefs.h | 42 ++++++++++++++++++++++++++++
13 2 files changed, 129 insertions(+) 13 2 files changed, 73 insertions(+)
14 create mode 100644 mkspecs/win32-g++-oe/qmake.conf 14 create mode 100644 mkspecs/win32-g++-oe/qmake.conf
15 create mode 100644 mkspecs/win32-g++-oe/qplatformdefs.h 15 create mode 100644 mkspecs/win32-g++-oe/qplatformdefs.h
16 16
17diff --git a/mkspecs/win32-g++-oe/qmake.conf b/mkspecs/win32-g++-oe/qmake.conf 17diff --git a/mkspecs/win32-g++-oe/qmake.conf b/mkspecs/win32-g++-oe/qmake.conf
18new file mode 100644 18new file mode 100644
19index 0000000..76eefe5 19index 0000000000..ab759e2093
20--- /dev/null 20--- /dev/null
21+++ b/mkspecs/win32-g++-oe/qmake.conf 21+++ b/mkspecs/win32-g++-oe/qmake.conf
22@@ -0,0 +1,87 @@ 22@@ -0,0 +1,31 @@
23+# 23+#
24+# qmake configuration for win32-g++ 24+# qmake configuration for win32-g++
25+# 25+#
26+# Written for MinGW / gcc 4.6 or higher 26+# Written for MinGW-w64 / gcc 5.3 or higher
27+# 27+#
28+# Cross compile example for i686-w64-mingw32-g++: 28+# Cross compile example for i686-w64-mingw32-g++:
29+# configure -xplatform win32-g++ -device-option CROSS_COMPILE=i686-w64-mingw32- 29+# configure -xplatform win32-g++ -device-option CROSS_COMPILE=i686-w64-mingw32-
30+# 30+#
31+ 31+
32+load(device_config) 32+include(../common/g++-win32.conf)
33+include(../common/g++-base.conf)
34+ 33+
35+MAKEFILE_GENERATOR = MINGW 34+# modifications to g++-win32.conf
36+QMAKE_PLATFORM = win32 mingw
37+CONFIG += debug_and_release debug_and_release_target precompile_header
38+DEFINES += UNICODE
39+QMAKE_COMPILER_DEFINES += __GNUC__ WIN32
40+
41+QMAKE_EXT_OBJ = .o
42+QMAKE_EXT_RES = _res.o
43+
44+QMAKE_COMPILER = $$(OE_QMAKE_COMPILER)
45+ 35+
46+QMAKE_CC = $$(OE_QMAKE_CC) 36+QMAKE_CC = $$(OE_QMAKE_CC)
47+QMAKE_LEX = flex
48+QMAKE_LEXFLAGS =
49+QMAKE_YACC = bison -y
50+QMAKE_YACCFLAGS = -d
51+QMAKE_CFLAGS += -fno-keep-inline-dllexport $$(OE_QMAKE_CFLAGS) 37+QMAKE_CFLAGS += -fno-keep-inline-dllexport $$(OE_QMAKE_CFLAGS)
52+QMAKE_CFLAGS_WARN_ON += -Wextra 38+QMAKE_CFLAGS_WARN_ON += -Wextra
53+QMAKE_CFLAGS_SSE2 += -mstackrealign
54+ 39+
55+QMAKE_CXX = $$(OE_QMAKE_CXX) 40+QMAKE_CXX = $$(OE_QMAKE_CXX)
56+QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD 41+QMAKE_CXXFLAGS += -fno-keep-inline-dllexport
57+QMAKE_CXXFLAGS_RTTI_ON = -frtti 42+QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
58+QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti
59+QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads
60+
61+QMAKE_INCDIR =
62+
63+QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src
64+QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
65+QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
66+QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
67+ 43+
68+QMAKE_LINK = $$(OE_QMAKE_LINK) 44+QMAKE_LINK = $$(OE_QMAKE_LINK)
69+QMAKE_LINK_C = $$(OE_QMAKE_LINK) 45+QMAKE_LINK_C = $$(OE_QMAKE_CC)
70+QMAKE_LFLAGS = $$(OE_QMAKE_LDFLAGS) 46+QMAKE_LFLAGS = $$(OE_QMAKE_LDFLAGS)
71+QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads
72+QMAKE_LFLAGS_RELEASE = -Wl,-s
73+QMAKE_LFLAGS_CONSOLE = -Wl,-subsystem,console
74+QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows
75+QMAKE_LFLAGS_DLL = -shared
76+QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections
77+QMAKE_LINK_OBJECT_MAX = 10
78+QMAKE_LINK_OBJECT_SCRIPT = object_script
79+QMAKE_PREFIX_SHLIB =
80+QMAKE_EXTENSION_SHLIB = dll
81+QMAKE_PREFIX_STATICLIB = lib
82+QMAKE_EXTENSION_STATICLIB = a
83+QMAKE_LIB_EXTENSIONS = a dll.a
84+ 47+
85+QMAKE_LIBS =
86+QMAKE_LIBS_CORE = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32
87+QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32
88+QMAKE_LIBS_NETWORK = -lws2_32
89+QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32
90+QMAKE_LIBS_OPENGL_ES2 = -lgdi32 -luser32
91+QMAKE_LIBS_OPENGL_ES2_DEBUG = -lgdi32 -luser32
92+QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
93+QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain
94+
95+QMAKE_IDL = midl
96+QMAKE_LIB = $$(OE_QMAKE_AR) -rc 48+QMAKE_LIB = $$(OE_QMAKE_AR) -rc
97+QMAKE_RC = $$(RC) 49+QMAKE_RC = $$(RC)
98+ 50+
99+QMAKE_STRIP = $$(OE_QMAKE_STRIP) 51+QMAKE_STRIP = $$(OE_QMAKE_STRIP)
100+QMAKE_STRIPFLAGS_LIB += --strip-unneeded
101+QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy
102+QMAKE_NM = $${CROSS_COMPILE}nm -P
103+
104+isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $$(OE_QMAKE_QT_CONFIG)
105+
106+include(../common/angle.conf)
107+include(../common/gcc-base.conf)
108+ 52+
109+load(qt_config) 53+load(qt_config)
110diff --git a/mkspecs/win32-g++-oe/qplatformdefs.h b/mkspecs/win32-g++-oe/qplatformdefs.h 54diff --git a/mkspecs/win32-g++-oe/qplatformdefs.h b/mkspecs/win32-g++-oe/qplatformdefs.h
111new file mode 100644 55new file mode 100644
112index 0000000..9d63527 56index 0000000000..9d63527955
113--- /dev/null 57--- /dev/null
114+++ b/mkspecs/win32-g++-oe/qplatformdefs.h 58+++ b/mkspecs/win32-g++-oe/qplatformdefs.h
115@@ -0,0 +1,42 @@ 59@@ -0,0 +1,42 @@
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0015-Disable-ltcg-for-host_build.patch b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0002-Disable-ltcg-for-host_build.patch
index a7ee953..b1a755f 100644
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0015-Disable-ltcg-for-host_build.patch
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0002-Disable-ltcg-for-host_build.patch
@@ -1,4 +1,4 @@
1From 9b541f4f6272c4ed4bb5bf6591e9a65cded6fdfa Mon Sep 17 00:00:00 2001 1From 4de366eeb48038da4140c3dcb3e96070e7d56429 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Tue, 23 Oct 2018 09:54:57 +0300 3Date: Tue, 23 Oct 2018 09:54:57 +0300
4Subject: [PATCH] Disable ltcg for host_build 4Subject: [PATCH] Disable ltcg for host_build
@@ -22,11 +22,11 @@ Upstream-Status: Inappropriate [embedded specific]
22 1 file changed, 1 insertion(+), 1 deletion(-) 22 1 file changed, 1 insertion(+), 1 deletion(-)
23 23
24diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf 24diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf
25index ccf0226272..00118be872 100644 25index 482e5b5..de00842 100644
26--- a/mkspecs/features/ltcg.prf 26--- a/mkspecs/features/ltcg.prf
27+++ b/mkspecs/features/ltcg.prf 27+++ b/mkspecs/features/ltcg.prf
28@@ -1,4 +1,4 @@ 28@@ -1,4 +1,4 @@
29-CONFIG(release, debug|release) { 29-CONFIG(release, debug|release):!host_build {
30+CONFIG(release, debug|release):!host_build:!equals(QMAKE_HOST.os, Windows):!staticlib { 30+CONFIG(release, debug|release):!host_build:!equals(QMAKE_HOST.os, Windows):!staticlib {
31 # We need fat object files when creating static libraries on some platforms 31 # We need fat object files when creating static libraries on some platforms
32 # so the linker will know to load a particular object from the library 32 # so the linker will know to load a particular object from the library
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend
index 5684832..95ca956 100644
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend
@@ -47,7 +47,7 @@ PACKAGECONFIG += " \
47 ltcg \ 47 ltcg \
48 sql-sqlite \ 48 sql-sqlite \
49 tslib \ 49 tslib \
50 xkbcommon-evdev \ 50 xkbcommon \
51 " 51 "
52 52
53PACKAGECONFIG_remove = "tests" 53PACKAGECONFIG_remove = "tests"
@@ -60,6 +60,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
60SRC_URI += " \ 60SRC_URI += " \
61 file://oe-device-extra.pri \ 61 file://oe-device-extra.pri \
62 file://0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch \ 62 file://0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch \
63 file://0002-Disable-ltcg-for-host_build.patch \
63 " 64 "
64do_configure_prepend() { 65do_configure_prepend() {
65 install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs 66 install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtlocation/0001-location-disable-simulator-content-under-plugins.patch b/meta-boot2qt-distro/recipes-qt/qt5/qtlocation/0001-location-disable-simulator-content-under-plugins.patch
index b90d2f8..c5e9fbf 100644
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtlocation/0001-location-disable-simulator-content-under-plugins.patch
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtlocation/0001-location-disable-simulator-content-under-plugins.patch
@@ -1,20 +1,19 @@
1From 5a68ac7a0121eff661a448e2fcbe5c02981c50a1 Mon Sep 17 00:00:00 2001 1From 1362ec91854e9d56be56dc3556a9991eb3b17a5c Mon Sep 17 00:00:00 2001
2From: Mikko Gronoff <mikko.gronoff@qt.io> 2From: Mikko Gronoff <mikko.gronoff@qt.io>
3Date: Wed, 25 Oct 2017 13:22:16 +0300 3Date: Wed, 25 Oct 2017 13:22:16 +0300
4Subject: [PATCH] location: disable simulator content under plugins 4Subject: [PATCH] location: disable simulator content under plugins
5 5
6Does not build against more recent simulator 6Does not build against more recent simulator
7
8--- 7---
9 src/plugins/position/position.pro | 2 +- 8 src/plugins/position/position.pro | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-) 9 1 file changed, 1 insertion(+), 1 deletion(-)
11 10
12diff --git a/src/plugins/position/position.pro b/src/plugins/position/position.pro 11diff --git a/src/plugins/position/position.pro b/src/plugins/position/position.pro
13index 4453b8a3..c36a1b58 100644 12index 6800d5a3..a6d3edba 100644
14--- a/src/plugins/position/position.pro 13--- a/src/plugins/position/position.pro
15+++ b/src/plugins/position/position.pro 14+++ b/src/plugins/position/position.pro
16@@ -6,7 +6,7 @@ qtHaveModule(dbus):SUBDIRS += geoclue 15@@ -6,7 +6,7 @@ linux:qtHaveModule(dbus):SUBDIRS += geoclue
17 qtHaveModule(dbus):SUBDIRS += geoclue2 16 linux:qtHaveModule(dbus):SUBDIRS += geoclue2
18 qtConfig(gypsy):SUBDIRS += gypsy 17 qtConfig(gypsy):SUBDIRS += gypsy
19 qtConfig(winrt_geolocation):SUBDIRS += winrt 18 qtConfig(winrt_geolocation):SUBDIRS += winrt
20-qtHaveModule(simulator):SUBDIRS += simulator 19-qtHaveModule(simulator):SUBDIRS += simulator
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb
index 6e1d324..c1960ec 100644
--- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb
+++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demos_git.bb
@@ -42,11 +42,11 @@ SRC_URI = " \
42 https://qt-files.s3.amazonaws.com/examples/Videos/The+Future+is+Written+with+Qt.mp4;name=video3 \ 42 https://qt-files.s3.amazonaws.com/examples/Videos/The+Future+is+Written+with+Qt.mp4;name=video3 \
43 " 43 "
44 44
45PV = "5.12.0+git${SRCPV}" 45PV = "5.12.1+git${SRCPV}"
46 46
47BRANCH = "5.12" 47BRANCH = "5.12"
48 48
49SRCREV = "0fad7db4b7d34972b5b11fe31ceede43b3e6d0ea" 49SRCREV = "76322dd776d99367c8425f1bd116ad3dec66e52a"
50 50
51SRC_URI[video1.md5sum] = "25d9e963a02675a4f3ba83abeebb32da" 51SRC_URI[video1.md5sum] = "25d9e963a02675a4f3ba83abeebb32da"
52SRC_URI[video1.sha256sum] = "33125518c2eb7848f378ddb6bebaf39f3327c92f1e33daa7fc09e4260e54d54a" 52SRC_URI[video1.sha256sum] = "33125518c2eb7848f378ddb6bebaf39f3327c92f1e33daa7fc09e4260e54d54a"
diff --git a/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb b/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb
index a669f5e..cba3881 100644
--- a/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb
+++ b/meta-boot2qt/recipes-qt/qt5/qtdeviceutilities_git.bb
@@ -39,7 +39,7 @@ PACKAGECONFIG[wpasupplicant] = "CONFIG+=wpasupplicant,,wpa-supplicant"
39 39
40EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 40EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
41 41
42SRCREV = "4b4ed3262fafc93fe510f27f09fa45393eb14852" 42SRCREV = "9cd5fe081ff15d46802a90b5d19471091799f3e3"
43 43
44DEPENDS = "\ 44DEPENDS = "\
45 qtbase qtdeclarative qtconnectivity qtdeclarative-native \ 45 qtbase qtdeclarative qtconnectivity qtdeclarative-native \
diff --git a/meta-fsl-extras/recipes/linux/linux-boundary/0001-Add-support-for-koe-tx31d200vm0baa-display.patch b/meta-fsl-extras/recipes/linux/linux-boundary/0001-Add-support-for-koe-tx31d200vm0baa-display.patch
index e8ac286..7851ca4 100644
--- a/meta-fsl-extras/recipes/linux/linux-boundary/0001-Add-support-for-koe-tx31d200vm0baa-display.patch
+++ b/meta-fsl-extras/recipes/linux/linux-boundary/0001-Add-support-for-koe-tx31d200vm0baa-display.patch
@@ -1,4 +1,4 @@
1From 524e178f97a72e9dbc81486b1af44c5749bc698b Mon Sep 17 00:00:00 2001 1From c1099dfa376de7bf16763dee364698078f015848 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@theqtcompany.com> 2From: Samuli Piippo <samuli.piippo@theqtcompany.com>
3Date: Wed, 27 Jan 2016 13:07:39 +0200 3Date: Wed, 27 Jan 2016 13:07:39 +0200
4Subject: [PATCH] Add support for koe tx31d200vm0baa display 4Subject: [PATCH] Add support for koe tx31d200vm0baa display
@@ -8,20 +8,20 @@ Subject: [PATCH] Add support for koe tx31d200vm0baa display
8 1 file changed, 12 insertions(+) 8 1 file changed, 12 insertions(+)
9 9
10diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi 10diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
11index 1a2a358..de01d23 100644 11index efbe51d..3704e14 100644
12--- a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi 12--- a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
13+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi 13+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
14@@ -393,6 +393,7 @@ 14@@ -498,6 +498,7 @@
15 mxcfb1 = &fb_lvds; 15 pwm_lvds = &pwm4;
16 mxcfb2 = &fb_lcd; 16 rtc1 = &snvs_rtc;
17 t_lvds = &t_lvds; 17 t_lvds = &t_lvds;
18+ koe = &koe; 18+ koe = &koe;
19 }; 19 };
20 20
21 clocks { 21 backlight_lcd: backlight_lcd {
22@@ -955,6 +956,17 @@ 22@@ -1075,6 +1076,17 @@
23 hsync-len = <96>; 23 hsync-len = <32>;
24 vsync-len = <2>; 24 vsync-len = <6>;
25 }; 25 };
26+ koe: tx31d200vm0baa { 26+ koe: tx31d200vm0baa {
27+ clock-frequency = <28000000>; 27+ clock-frequency = <28000000>;
@@ -37,6 +37,3 @@ index 1a2a358..de01d23 100644
37 }; 37 };
38 }; 38 };
39 }; 39 };
40--
411.9.1
42
diff --git a/meta-fsl-extras/recipes/linux/linux-boundary_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-boundary_4.%.bbappend
index 9bf3498..ff0a0d2 100644
--- a/meta-fsl-extras/recipes/linux/linux-boundary_4.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-boundary_4.%.bbappend
@@ -36,6 +36,5 @@ SRC_URI += " \
36RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" 36RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
37 37
38do_preconfigure_prepend() { 38do_preconfigure_prepend() {
39 echo "CONFIG_HID_MULTITOUCH=m" >> ${WORKDIR}/defconfig
40 echo "CONFIG_UPROBE_EVENT=y" >> ${WORKDIR}/defconfig 39 echo "CONFIG_UPROBE_EVENT=y" >> ${WORKDIR}/defconfig
41} 40}
diff --git a/meta-fsl-extras/recipes/qt5/qtbase/0001-egl_viv-cast-EGLNative-types-from-vivante-functions.patch b/meta-fsl-extras/recipes/qt5/qtbase/0001-egl_viv-cast-EGLNative-types-from-vivante-functions.patch
new file mode 100644
index 0000000..dc56cfc
--- /dev/null
+++ b/meta-fsl-extras/recipes/qt5/qtbase/0001-egl_viv-cast-EGLNative-types-from-vivante-functions.patch
@@ -0,0 +1,57 @@
1From 40e76307c1ee1ebe4e0142d623071d0f768f2450 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 9 Jan 2019 13:01:01 +0000
4Subject: [PATCH] egl_viv: cast EGLNative types from vivante functions
5
6All vivante functions return void* even when the actual native type
7(EGLNativeDisplayType, EGLNativeWindowType, etc.) might be typedef'ed
8as something else, as they do when the CFLAGS from egl.pc are now used.
9---
10 .../deviceintegration/eglfs_viv/qeglfsvivintegration.cpp | 4 ++--
11 .../deviceintegration/eglfs_viv_wl/qeglfsvivwlintegration.cpp | 4 ++--
12 2 files changed, 4 insertions(+), 4 deletions(-)
13
14diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/qeglfsvivintegration.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/qeglfsvivintegration.cpp
15index 763a4a462b..2fc076ad0c 100644
16--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/qeglfsvivintegration.cpp
17+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/qeglfsvivintegration.cpp
18@@ -65,7 +65,7 @@ void QEglFSVivIntegration::platformInit()
19 VivanteInit();
20 mNativeDisplay = fbGetDisplay();
21 #else
22- mNativeDisplay = fbGetDisplayByIndex(framebufferIndex());
23+ mNativeDisplay = static_cast<EGLNativeDisplayType>(fbGetDisplayByIndex(framebufferIndex()));
24 #endif
25
26 fbGetDisplayGeometry(mNativeDisplay, &width, &height);
27@@ -88,7 +88,7 @@ EGLNativeWindowType QEglFSVivIntegration::createNativeWindow(QPlatformWindow *wi
28 Q_UNUSED(window)
29 Q_UNUSED(format)
30
31- EGLNativeWindowType eglWindow = fbCreateWindow(mNativeDisplay, 0, 0, size.width(), size.height());
32+ EGLNativeWindowType eglWindow = static_cast<EGLNativeWindowType>(fbCreateWindow(mNativeDisplay, 0, 0, size.width(), size.height()));
33 return eglWindow;
34 }
35
36diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/qeglfsvivwlintegration.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/qeglfsvivwlintegration.cpp
37index 61e2f17766..3bdae239cd 100644
38--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/qeglfsvivwlintegration.cpp
39+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/qeglfsvivwlintegration.cpp
40@@ -60,7 +60,7 @@ void QEglFSVivWaylandIntegration::platformInit()
41 }
42
43 mWaylandDisplay = wl_display_create();
44- mNativeDisplay = fbGetDisplay(mWaylandDisplay);
45+ mNativeDisplay = static_cast<EGLNativeDisplayType>(fbGetDisplay(mWaylandDisplay));
46 fbGetDisplayGeometry(mNativeDisplay, &width, &height);
47 mScreenSize.setHeight(height);
48 mScreenSize.setWidth(width);
49@@ -81,7 +81,7 @@ EGLNativeWindowType QEglFSVivWaylandIntegration::createNativeWindow(QPlatformWin
50 Q_UNUSED(window)
51 Q_UNUSED(format)
52
53- EGLNativeWindowType eglWindow = fbCreateWindow(mNativeDisplay, 0, 0, size.width(), size.height());
54+ EGLNativeWindowType eglWindow = static_cast<EGLNativeWindowType>(fbCreateWindow(mNativeDisplay, 0, 0, size.width(), size.height()));
55 return eglWindow;
56 }
57
diff --git a/meta-boot2qt-distro/conf/distro/include/opencv.inc b/meta-fsl-extras/recipes/qt5/qtbase_git.bbappend
index a1d37df..373e614 100644
--- a/meta-boot2qt-distro/conf/distro/include/opencv.inc
+++ b/meta-fsl-extras/recipes/qt5/qtbase_git.bbappend
@@ -1,6 +1,6 @@
1############################################################################ 1############################################################################
2## 2##
3## Copyright (C) 2016 The Qt Company Ltd. 3## Copyright (C) 2018 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/ 4## Contact: https://www.qt.io/licensing/
5## 5##
6## This file is part of the Boot to Qt meta layer. 6## This file is part of the Boot to Qt meta layer.
@@ -27,13 +27,7 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30MACHINE_EXTRA_INSTALL += "\ 30FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
31 libopencv-core \ 31SRC_URI += " \
32 libopencv-imgproc \ 32 file://0001-egl_viv-cast-EGLNative-types-from-vivante-functions.patch \
33 libopencv-objdetect \
34 " 33 "
35
36MACHINE_EXTRA_INSTALL_SDK += " \
37 opencv-dev \
38 "
39
diff --git a/meta-renesas-extras/recipes/linux-libc-headers/linux-libc-headers_%.bbappend b/meta-renesas-extras/recipes/linux-libc-headers/linux-libc-headers_%.bbappend
new file mode 100644
index 0000000..e1022d8
--- /dev/null
+++ b/meta-renesas-extras/recipes/linux-libc-headers/linux-libc-headers_%.bbappend
@@ -0,0 +1,34 @@
1############################################################################
2##
3## Copyright (C) 2018 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/
5##
6## This file is part of the Boot to Qt meta layer.
7##
8## $QT_BEGIN_LICENSE:GPL$
9## Commercial License Usage
10## Licensees holding valid commercial Qt licenses may use this file in
11## accordance with the commercial license agreement provided with the
12## Software or, alternatively, in accordance with the terms contained in
13## a written agreement between you and The Qt Company. For licensing terms
14## and conditions see https://www.qt.io/terms-conditions. For further
15## information use the contact form at https://www.qt.io/contact-us.
16##
17## GNU General Public License Usage
18## Alternatively, this file may be used under the terms of the GNU
19## General Public License version 3 or (at your option) any later version
20## approved by the KDE Free Qt Foundation. The licenses are as published by
21## the Free Software Foundation and appearing in the file LICENSE.GPL3
22## included in the packaging of this file. Please review the following
23## information to ensure the GNU General Public License requirements will
24## be met: https://www.gnu.org/licenses/gpl-3.0.html.
25##
26## $QT_END_LICENSE$
27##
28############################################################################
29
30# override to remove asm/bpf_perf_event.h
31do_install_armmultilib_draak () {
32 oe_multilib_header asm/auxvec.h asm/bitsperlong.h asm/byteorder.h asm/fcntl.h asm/hwcap.h asm/ioctls.h asm/kvm.h asm/kvm_para.h asm/mman.h asm/param.h asm/perf_regs.h
33 oe_multilib_header asm/posix_types.h asm/ptrace.h asm/setup.h asm/sigcontext.h asm/siginfo.h asm/signal.h asm/stat.h asm/statfs.h asm/swab.h asm/types.h asm/unistd.h
34}
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 1e42086..46f6eb6 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -18,29 +18,29 @@
18 18
19 <project name="poky" 19 <project name="poky"
20 remote="yocto" 20 remote="yocto"
21 revision="36d5cee56bd389ecbe66dbfad9e5d57c13b56b95" 21 revision="623b77885051174d0e05198843e739110977bd18"
22 path="sources/poky"/> 22 path="sources/poky"/>
23 <project name="meta-openembedded" 23 <project name="meta-openembedded"
24 remote="oe-mirror" 24 remote="oe-mirror"
25 revision="2bb21ef27c4b0c9d52d30b3b2c5a0160fd02b966" 25 revision="8760facba1bceb299b3613b8955621ddaa3d4c3f"
26 path="sources/meta-openembedded"/> 26 path="sources/meta-openembedded"/>
27 <project name="meta-qt5" 27 <project name="meta-qt5"
28 remote="qtyocto" 28 remote="qtyocto"
29 revision="475da47667f65fc83023f2f4553e47cdf41f352c" 29 revision="f705a8a47e542a5819380f024c92e43eebf08f5e"
30 path="sources/meta-qt5"/> 30 path="sources/meta-qt5"/>
31 <project name="meta-mingw" 31 <project name="meta-mingw"
32 remote="qtyocto" 32 remote="qtyocto"
33 revision="fde300483f2133489c1f16b5b03a22050613787b" 33 revision="628dcfed62ce8dcc408e5b4a5e5c0aaa921b20ad"
34 path="sources/meta-mingw"/> 34 path="sources/meta-mingw"/>
35 35
36 <project name="meta-freescale" 36 <project name="meta-freescale"
37 remote="freescale" 37 remote="freescale"
38 revision="2813c0c59a81498afab26a2b1f90db07728df2ed" 38 revision="407c6cf408969445031a492e2d25e0e2749582ea"
39 path="sources/meta-freescale" 39 path="sources/meta-freescale"
40 groups="notdefault,external,fsl,toradex,smx6,boundary,fsl-imx8"/> 40 groups="notdefault,external,fsl,toradex,smx6,boundary,fsl-imx8"/>
41 <project name="meta-freescale-3rdparty" 41 <project name="meta-freescale-3rdparty"
42 remote="freescale" 42 remote="freescale"
43 revision="ba684412e6983eeda0ef7158a724305f0f1a2f0a" 43 revision="88a29631809d1af0df618245430db29f2a7012b5"
44 path="sources/meta-freescale-3rdparty" 44 path="sources/meta-freescale-3rdparty"
45 groups="notdefault,external,fsl,toradex,smx6,boundary,fsl-imx8"/> 45 groups="notdefault,external,fsl,toradex,smx6,boundary,fsl-imx8"/>
46 <project name="meta-raspberrypi" 46 <project name="meta-raspberrypi"
@@ -50,7 +50,7 @@
50 groups="notdefault,external,rpi"/> 50 groups="notdefault,external,rpi"/>
51 <project name="meta-intel" 51 <project name="meta-intel"
52 remote="intel" 52 remote="intel"
53 revision="b736eed4746899e76a84545471bf06da09a8b64a" 53 revision="90af97d23fb2a56187c2fe2a3f4f4190d7cc2605"
54 path="sources/meta-intel" 54 path="sources/meta-intel"
55 groups="notdefault,external,intel"/> 55 groups="notdefault,external,intel"/>
56 <project name="meta-tegra" 56 <project name="meta-tegra"
@@ -85,7 +85,7 @@
85 groups="notdefault,external,toradex"/> 85 groups="notdefault,external,toradex"/>
86 <project name="meta-boundary" 86 <project name="meta-boundary"
87 remote="boundary" 87 remote="boundary"
88 revision="107a7ceba84b87e1e2a463fea27ae5c53c4e452f" 88 revision="412ef0b92df0575808c2292cc4983e118c1a19f8"
89 path="sources/meta-boundary" 89 path="sources/meta-boundary"
90 groups="notdefault,external,boundary"/> 90 groups="notdefault,external,boundary"/>
91 <project name="meta-fsl-bsp-release" 91 <project name="meta-fsl-bsp-release"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-04 02:21:01 +0000