summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2018-03-07 19:51:40 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2018-03-08 09:53:59 +0200
commitcb9fe99a41d6e0855cb6a7d5febc903b42c52d28 (patch)
tree8e6ca602aeb562ca2e0a2388b6569bbeaf8e4992 /scripts
parent36136bf5bd5fe184c3c87e6283bcd8c3f2549b97 (diff)
parentf5baecf4a633d8a4b4117d9c0f9910118c18256a (diff)
downloadmeta-boot2qt-cb9fe99a41d6e0855cb6a7d5febc903b42c52d28.tar.gz
Merge remote-tracking branch 'origin/morty' into pyro
Not entirely a normal kind of merge. In previous merge from origin/morty into pyro several automotive suite specific commits were left out from the merge due conflicts in automotive component recipes between used platforms (morty 5.9 vs. pyro 5.10). The commits previously left out fo the merge are now included in this merge by a direct copy of origin/morty branch's recipes-qt/automotive folder into pyro. An exception is a single commit in pyro (8513b63 - neptune-ui: bump srcrev, install fonts system-wide) that's left in place and merged with origin/morty content. Also, the toolchain changes under packagegroups folder for automotive are applied, thus making the following included commits list: origin/morty: qtdeviceutilities: update to latest version meta-qt5: update meta layer meta-qt5: update meta layer neptune-ui: fetch sources from code.qt.io instead of github automotive: update neptune-ui automotive: update qtapplicationmanager automotive: update components intel: update mesa to 17.0.2 automotive: update qtapplicationmanager automotive: update qtivi & qtapplicatiomanager Update GammaRay to the 2.9.0 release automotive: update qtivi automotive: update revisions automotive: update revisions automotive: update revisions automotive: update revisions Neptune-UI: Update to use the latest Neptune-UI qtivi: Fix the broken python3 binary inside an yocto SDK Update GammaRay qtquickcontrols2: Fix background regression kontron: update SMARC-sAMX6i BSP to r03.00 origin/morty (previously left out): 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 Conflicts: recipes-qt/automotive/gammaray_git.bb recipes-qt/automotive/multiscreen-demo_git.bb recipes-qt/automotive/neptune-ui_git.bb recipes-qt/automotive/qtapplicationmanager_git.bb recipes-qt/automotive/qtivi_git.bb recipes-qt/b2qt-addons/b2qt-demos.bb recipes-qt/qt5/qtdeviceutilities.bb recipes-qt/qt5/qtsystems_git.bbappend scripts/manifest.xml Change-Id: I95ee06882d88e0dc91be1b9a769e4d88e0b11591
Diffstat (limited to 'scripts')
-rw-r--r--scripts/manifest.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 7f92b19..5e68eb7 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -105,7 +105,7 @@
105 groups="notdefault,internal"/> 105 groups="notdefault,internal"/>
106 <project name="meta-smx6" 106 <project name="meta-smx6"
107 remote="playground" 107 remote="playground"
108 revision="c2f639ef4b2fd5809ab95fb330d28c2716aa290d" 108 revision="ba2b99a9a5895033f081ffce25b0fd45e847c4c2"
109 path="sources/meta-smx6" 109 path="sources/meta-smx6"
110 groups="notdefault,internal"/> 110 groups="notdefault,internal"/>
111</manifest> 111</manifest>