summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2017-02-13 22:30:03 +0100
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2017-02-13 22:30:03 +0100
commit6df4bf66a7f5520d3ece74bf979057951c2083d4 (patch)
treeae091302e89c55b50a90eb8af51e67057dcb0406
parent7fc1b398f6cc039368e5f1ddbc625c0ced75f034 (diff)
Migrate meta-qt5 to 5.8 branch provided by qt.io
This changeset changes the upstream and the branch of meta-qt5 to branch 5.8 and upstream to qt.io . This was decided during the AMM F2F meeting in Tokyo last week. Change-Id: Ia4289c4f920f10e12aa32076981528a521afadbb Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
-rw-r--r--default.xml11
1 files changed, 8 insertions, 3 deletions
diff --git a/default.xml b/default.xml
index 43ba16e4..7dffd230 100644
--- a/default.xml
+++ b/default.xml
@@ -13,9 +13,11 @@
fetch="git://git.openembedded.org/" />
<!-- meta-rust --> <!-- freescale bsp -->
- <!-- meta-qt5 -->
<remote name="github" fetch="https://github.com/" />
+ <!-- meta-qt5 -->
+ <remote name="qt.io" fetch="git://code.qt.io/" />
+
<!-- 01.org (Intel) -->
<remote name="01org" fetch="https://github.com/01org/" />
@@ -28,7 +30,7 @@
<!-- AGL things. -->
<project name="AGL/meta-agl" path="meta-agl" />
<project name="AGL/meta-agl-extra" path="meta-agl-extra" />
- <project name="AGL/meta-agl-demo" path="meta-agl-demo" />
+ <project name="AGL/meta-agl-demo" path="meta-agl-demo" revision="sandbox/jsmoeller/meta-qt5-58" />
<project name="AGL/meta-agl-devel" path="meta-agl-devel" />
<!-- Yocto/OpenEmbedded things. -->
@@ -36,7 +38,10 @@
<project name="meta-openembedded" path="meta-openembedded" remote="openembedded" revision="morty" />
<!-- Qt things --> <!-- meta-qt5 has qt5.7.x in branch morty -->
- <project name="meta-qt5/meta-qt5" path="meta-qt5" remote="github" revision="morty" />
+ <!-- <project name="meta-qt5/meta-qt5" path="meta-qt5" remote="github" revision="morty" /> -->
+ <!-- switch from opensource project meta-qt5 to vendor-maintained repo -->
+ <!-- QT uses vendor branch 5.8 -->
+ <project name="yocto/meta-qt5" path="meta-qt5" remote="qt.io" revision="5.8" />
<!-- Porter specific things. -->
<project name="AGL/meta-renesas" path="meta-renesas" />