diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-02-01 10:47:02 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-02-05 10:17:31 +0200 |
| commit | e91280bbcb99d7f4e3f79c2efe9c1fbc40b144fc (patch) | |
| tree | 36b11f486cb876af80339d6b5d25e329a66127e3 /recipes | |
| parent | 1d3c81ea336f57add641e0fa3144de81af429f7e (diff) | |
| parent | 07b4960e438f4eb772dde4d1ccac153785cf151e (diff) | |
| download | meta-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 'recipes')
| -rw-r--r-- | recipes/ppp/files/ppp-fix-building-with-linux-4.8.patch | 23 | ||||
| -rw-r--r-- | recipes/ppp/ppp_2.%.bbappend | 30 |
2 files changed, 0 insertions, 53 deletions
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 @@ | |||
| 1 | diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h | ||
| 2 | index 9ab2eee..96d2794 100644 | ||
| 3 | --- a/pppd/plugins/rp-pppoe/pppoe.h | ||
| 4 | +++ b/pppd/plugins/rp-pppoe/pppoe.h | ||
| 5 | @@ -47,6 +47,10 @@ | ||
| 6 | #include <sys/socket.h> | ||
| 7 | #endif | ||
| 8 | |||
| 9 | +/* This has to be included before Linux 4.8's linux/in.h | ||
| 10 | + * gets dragged in. */ | ||
| 11 | +#include <netinet/in.h> | ||
| 12 | + | ||
| 13 | /* Ugly header files on some Linux boxes... */ | ||
| 14 | #if defined(HAVE_LINUX_IF_H) | ||
| 15 | #include <linux/if.h> | ||
| 16 | @@ -84,7 +88,6 @@ typedef unsigned long UINT32_t; | ||
| 17 | #include <linux/if_ether.h> | ||
| 18 | #endif | ||
| 19 | |||
| 20 | -#include <netinet/in.h> | ||
| 21 | |||
| 22 | #ifdef HAVE_NETINET_IF_ETHER_H | ||
| 23 | #include <sys/types.h> | ||
diff --git a/recipes/ppp/ppp_2.%.bbappend b/recipes/ppp/ppp_2.%.bbappend deleted file mode 100644 index d687518..0000000 --- a/recipes/ppp/ppp_2.%.bbappend +++ /dev/null | |||
| @@ -1,30 +0,0 @@ | |||
| 1 | ############################################################################ | ||
| 2 | ## | ||
| 3 | ## Copyright (C) 2017 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 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | ||
