summaryrefslogtreecommitdiffstats
path: root/meta-nvidia-extras
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2018-02-01 10:47:02 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2018-02-05 10:17:31 +0200
commite91280bbcb99d7f4e3f79c2efe9c1fbc40b144fc (patch)
tree36b11f486cb876af80339d6b5d25e329a66127e3 /meta-nvidia-extras
parent1d3c81ea336f57add641e0fa3144de81af429f7e (diff)
parent07b4960e438f4eb772dde4d1ccac153785cf151e (diff)
downloadmeta-boot2qt-e91280bbcb99d7f4e3f79c2efe9c1fbc40b144fc.tar.gz
Merge remote-tracking branch 'origin/morty' into pyro
Automotive related changes left intact for pyro, as they require further work than just a basic merge due component branching differences etc. * origin/morty [MERGED]: qt5: don't build tests by default qbsp: fix replace tags quickcompiler: update to 5.9.4 release revision meta-qt5: update to Qt 5.9.4 RC meta-qt5: update to Qt 5.9.4 snapshot meta-qt5: update meta layer poky: update revision ppp: remove obsolete patch meta-qt5: update meta layer internal-build: prepend mirror variables qtdeviceutilities: update revision meta-qt5: update meta layer poky: update revision * origin/morty [NOT MERGED]: Fix license checksum due to incremented year number Update GammaRay revision multiscreen-demo: update revision and fix startup automotive: update revisions sdk: add qtapplicationmanger staticdev package qtivi: enable ivigenerator for toolchain appman: add dependency to nativesdk-qtdeclarative qtivi: Update to the latest version and add PACKAGECONFIG options for qtsimulator Changes not staged for commit: recipes-qt/automotive/gammaray_git.bb recipes-qt/automotive/multiscreen-demo_git.bb recipes-qt/automotive/qtapplicationmanager_git.bb recipes-qt/automotive/qtivi_git.bb recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb recipes-qt/packagegroups/packagegroup-b2qt-automotive-qt5-toolchain-target.bb Conflicts: recipes-qt/automotive/gammaray_git.bb recipes-qt/automotive/neptune-ui_git.bb recipes-qt/automotive/qtapplicationmanager_git.bb recipes-qt/automotive/qtivi_git.bb recipes-qt/qt5/qtdeviceutilities.bb recipes-qt/qt5/qtquickcompiler_git.bb scripts/manifest.xml Task-number: QTBUG-65164 Change-Id: I98fe358aaaf55a609dc34f7b8cc65525d493ff26
Diffstat (limited to 'meta-nvidia-extras')
-rw-r--r--meta-nvidia-extras/recipes/ppp/ppp_2.4.%.bbappend30
1 files changed, 30 insertions, 0 deletions
diff --git a/meta-nvidia-extras/recipes/ppp/ppp_2.4.%.bbappend b/meta-nvidia-extras/recipes/ppp/ppp_2.4.%.bbappend
new file mode 100644
index 0000000..ca8f573
--- /dev/null
+++ b/meta-nvidia-extras/recipes/ppp/ppp_2.4.%.bbappend
@@ -0,0 +1,30 @@
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
30SRC_URI_remove = "file://ppp-fix-building-with-linux-4.8.patch"