diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2020-12-07 10:42:24 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2020-12-07 11:18:33 +0200 |
| commit | eb535e5bd15cb66f2f5e74a99bbb5e477b3fd7aa (patch) | |
| tree | a6c5943e326ee2969b48ec10a3731484c63a10b8 | |
| parent | 48da103d33c3369824a77f7df802515fb6d2a73d (diff) | |
manifest: add upstream branchesv6.0.0
Since we are using Qt branching now, add upstream branches
to the manifest to make it clear what version we are currently
using.
Pick-to: dev
Change-Id: I91e2666411df5e0f75e0a265e41801d5f8e686f3
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
| -rw-r--r-- | scripts/manifest.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 69b8186c..dabcd300 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -6,10 +6,12 @@ <project name="poky" remote="yocto" revision="012ad10a89a889c21e67c27dc37d22520212548f" + upstream="dunfell" path="sources/poky"/> <project name="meta-mingw" remote="yocto" revision="524de686205b5d6736661d4532f5f98fee8589b7" + upstream="dunfell" path="sources/meta-mingw"/> <!-- OpenEmbedded --> @@ -20,6 +22,7 @@ <project name="meta-openembedded" remote="oe" revision="2a5c534d2b9f01e9c0f39701fccd7fc874945b1c" + upstream="dunfell" path="sources/meta-openembedded"/> <!-- Qt --> @@ -31,6 +34,7 @@ <project name="meta-qt6" remote="qt" revision="aaa3b77573f448c14a9526e85813b2e8c8ca6956" + upstream="6.0" path="sources/meta-qt6"/> <!-- NXP --> @@ -39,16 +43,19 @@ <project name="meta-freescale" remote="freescale" revision="4da095837c93b84d52c7029d5c83796602c6834e" + upstream="dunfell" path="sources/meta-freescale"/> <project name="meta-freescale-3rdparty" remote="freescale" revision="ac7476ea5aef52eb5fda4ce00756e7e0ddfe1174" + upstream="dunfell" path="sources/meta-freescale-3rdparty"/> <!-- Raspberry Pi --> <project name="meta-raspberrypi" remote="yocto" revision="987993209716302eb8f314f69a2a3340555f94d8" + upstream="dunfell" path="sources/meta-raspberrypi"/> <!-- Intel --> @@ -57,6 +64,7 @@ <project name="meta-intel" remote="intel" revision="81cfa07db0ca5f756179af2af5799a2fce5ee7ee" + upstream="dunfell" path="sources/meta-intel"/> <!-- NVIDIA --> @@ -65,6 +73,7 @@ <project name="meta-tegra" remote="madisongh" revision="ee17b63336727658c543d9a6c93545d755bdc6b3" + upstream="dunfell-l4t-r32.4.3" path="sources/meta-tegra"/> <!-- internal layer for the nvidia devnet downloads --> <remote name="playground" @@ -81,10 +90,12 @@ <project name="meta-toradex-bsp-common" remote="toradex" revision="51927b354280c398b11b7b6bd64c1617825f17d1" + upstream="dunfell-5.x.y" path="sources/meta-toradex-bsp-common"/> <project name="meta-toradex-nxp" remote="toradex" revision="fddb6cc10a1df717cc77b6958ce5e233cef9a80a" + upstream="dunfell-5.x.y" path="sources/meta-toradex-nxp"/> </manifest> |