summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2022-05-24 11:38:30 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2022-06-20 11:50:23 +0000
commit9593b2415769ecbe2ad3a946209f034ddff27f8e (patch)
tree5893f8cca1f931d7340cc0bc71a6d6cf0fa540fb
parentd1aa23dd210e7c257fdd4845023f138d29fa071e (diff)
Update to kirkstone
dev, 6.4 and lts-6.2 are now all using kirkstone. Change-Id: Iaabcadf96547d48ddf68cd32935777a2703a4e3d Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
-rw-r--r--6.4.xml60
-rw-r--r--dev.xml16
-rw-r--r--lts-6.2.xml21
3 files changed, 76 insertions, 21 deletions
diff --git a/6.4.xml b/6.4.xml
new file mode 100644
index 0000000..4be42a2
--- /dev/null
+++ b/6.4.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+ <!-- Yocto -->
+ <remote name="yocto"
+ fetch="git://git.yoctoproject.org"/>
+ <project name="poky"
+ remote="yocto"
+ revision="refs/tags/yocto-4.0.1"
+ upstream="kirkstone"
+ path="sources/poky"/>
+ <project name="meta-mingw"
+ remote="yocto"
+ revision="refs/tags/yocto-4.0.1"
+ upstream="kirkstone"
+ path="sources/meta-mingw"/>
+
+ <!-- OpenEmbedded -->
+ <remote name="oe"
+ fetch="git://git.openembedded.org"/>
+ <project name="meta-openembedded"
+ remote="oe"
+ revision="0b78362654262145415df8211052442823b9ec9b"
+ upstream="kirkstone"
+ path="sources/meta-openembedded"/>
+
+ <!-- Qt -->
+ <remote name="qt"
+ fetch="git://code.qt.io/yocto"
+ pushurl="ssh://codereview.qt-project.org/yocto"/>
+ <remote name="gerrit"
+ fetch="ssh://codereview.qt-project.org/yocto"/>
+ <project name="meta-boot2qt"
+ remote="qt"
+ revision="6.4"
+ upstream="6.4"
+ path="sources/meta-boot2qt">
+ <linkfile dest="setup-environment.sh" src="scripts/setup-environment.sh"/>
+ </project>
+ <project name="meta-boot2qt-st"
+ remote="qt"
+ revision="dev"
+ upstream="dev"
+ path="sources/meta-boot2qt-st">
+ <linkfile dest="sources/templates" src="conf"/>
+ </project>
+ <project name="meta-qt6"
+ remote="qt"
+ revision="6.4"
+ upstream="6.4"
+ path="sources/meta-qt6"/>
+
+ <!-- ST -->
+ <remote name="stm"
+ fetch="https://github.com/STMicroelectronics/"/>
+ <project name="meta-st-stm32mp"
+ remote="stm"
+ revision="kirkstone"
+ upstream="kirkstone"
+ path="sources/meta-st-stm32mp"/>
+</manifest>
diff --git a/dev.xml b/dev.xml
index 43f2b3e..0276e35 100644
--- a/dev.xml
+++ b/dev.xml
@@ -5,13 +5,13 @@
fetch="git://git.yoctoproject.org"/>
<project name="poky"
remote="yocto"
- revision="0447aace57d46c4de4d120b430384e99fc3a5e0c"
- upstream="master"
+ revision="refs/tags/yocto-4.0.1"
+ upstream="kirkstone"
path="sources/poky"/>
<project name="meta-mingw"
remote="yocto"
- revision="d49e803e4b8b62dc148c182af499e582e7684de4"
- upstream="master"
+ revision="refs/tags/yocto-4.0.1"
+ upstream="kirkstone"
path="sources/meta-mingw"/>
<!-- OpenEmbedded -->
@@ -19,8 +19,8 @@
fetch="git://git.openembedded.org"/>
<project name="meta-openembedded"
remote="oe"
- revision="d6dcffc75445fafa93ed4e55f549b149fc9161eb"
- upstream="master"
+ revision="0b78362654262145415df8211052442823b9ec9b"
+ upstream="kirkstone"
path="sources/meta-openembedded"/>
<!-- Qt -->
@@ -54,7 +54,7 @@
fetch="https://github.com/STMicroelectronics/"/>
<project name="meta-st-stm32mp"
remote="stm"
- revision="honister"
- upstream="honister"
+ revision="kirkstone"
+ upstream="kirkstone"
path="sources/meta-st-stm32mp"/>
</manifest>
diff --git a/lts-6.2.xml b/lts-6.2.xml
index 2fa609d..46fa7e1 100644
--- a/lts-6.2.xml
+++ b/lts-6.2.xml
@@ -5,13 +5,13 @@
fetch="git://git.yoctoproject.org"/>
<project name="poky"
remote="yocto"
- revision="refs/tags/hardknott-3.3.6"
- upstream="hardknott"
+ revision="refs/tags/yocto-4.0.1"
+ upstream="kirkstone"
path="sources/poky"/>
<project name="meta-mingw"
remote="yocto"
- revision="refs/tags/hardknott-3.3.6"
- upstream="hardknott"
+ revision="refs/tags/yocto-4.0.1"
+ upstream="kirkstone"
path="sources/meta-mingw"/>
<!-- OpenEmbedded -->
@@ -19,14 +19,9 @@
fetch="git://git.openembedded.org"/>
<project name="meta-openembedded"
remote="oe"
- revision="786d3aa313e31a718acc9611ba3adb60573ec458"
- upstream="hardknott"
+ revision="0b78362654262145415df8211052442823b9ec9b"
+ upstream="kirkstone"
path="sources/meta-openembedded"/>
- <project name="meta-python2"
- remote="oe"
- revision="8db9e4f6ceae33d7a4f55453d31e69f9858af4eb"
- upstream="hardknott"
- path="sources/meta-python2"/>
<!-- Qt -->
<remote name="qt"
@@ -59,8 +54,8 @@
fetch="https://github.com/STMicroelectronics/"/>
<project name="meta-st-stm32mp"
remote="stm"
- revision="hardknott"
- upstream="hardknott"
+ revision="kirkstone"
+ upstream="kirkstone"
path="sources/meta-st-stm32mp"/>
</manifest>