From e9e548d24c8a640cde741f3f5bba48ee941d62c5 Mon Sep 17 00:00:00 2001
From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Wed, 6 Jul 2022 09:11:17 +0200
Subject: manifest: set ext layers to kirkstone

In preparation of BSP 6 set all layers not provided from Toradex to the
latest of their kirkstone branches. (meta-updater didn't fork yet so it
is kept on master)

Related-to: ELB-4476
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
 base/integration.xml        | 8 ++++----
 base/pinned.xml             | 8 ++++----
 bsp/integration-nxp.xml     | 6 +++---
 bsp/pinned-nxp.xml          | 6 +++---
 tdxref/default.xml          | 2 +-
 tdxref/integration.xml      | 2 +-
 tdxref/next.xml             | 2 +-
 torizoncore/default.xml     | 8 ++++----
 torizoncore/integration.xml | 4 ++--
 torizoncore/next.xml        | 4 ++--
 10 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/base/integration.xml b/base/integration.xml
index be3c9c5..a0b2883 100644
--- a/base/integration.xml
+++ b/base/integration.xml
@@ -5,8 +5,8 @@
 
   <default sync-j="4"/>
 
-  <project name="bitbake.git" path="layers/openembedded-core/bitbake" remote="oe" revision="master"/>
-  <project name="meta-openembedded.git" path="layers/meta-openembedded" remote="oe" revision="master"/>
-  <project name="meta-yocto" path="layers/meta-yocto" remote="yocto" revision="master"/>
-  <project name="openembedded-core.git" path="layers/openembedded-core" remote="oe" revision="master"/>
+  <project name="bitbake.git" path="layers/openembedded-core/bitbake" remote="oe" revision="2.0"/>
+  <project name="meta-openembedded.git" path="layers/meta-openembedded" remote="oe" revision="kirkstone"/>
+  <project name="meta-yocto" path="layers/meta-yocto" remote="yocto" revision="kirkstone"/>
+  <project name="openembedded-core.git" path="layers/openembedded-core" remote="oe" revision="kirkstone"/>
 </manifest>
diff --git a/base/pinned.xml b/base/pinned.xml
index 03a8833..d9571f8 100644
--- a/base/pinned.xml
+++ b/base/pinned.xml
@@ -5,8 +5,8 @@
 
   <default sync-j="4"/>
 
-  <project name="bitbake.git" path="layers/openembedded-core/bitbake" remote="oe" revision="712da71b24445c814d79a206ce26188def8fce0a" upstream="master"/>
-  <project name="meta-openembedded.git" path="layers/meta-openembedded" remote="oe" revision="02c7c9adab24196417529085a2fef9ec60f4c89c" upstream="master"/>
-  <project name="meta-yocto" path="layers/meta-yocto" remote="yocto" revision="bfd62a1b09c46919ec4e3bc804d6f5634773cdda" upstream="master"/>
-  <project name="openembedded-core.git" path="layers/openembedded-core" remote="oe" revision="dce3c772efab4e51a82fb9c8fb74bc614ee3a82e" upstream="master"/>
+  <project name="bitbake.git" path="layers/openembedded-core/bitbake" remote="oe" revision="b8fd6f5d9959d27176ea016c249cf6d35ac8ba03" upstream="2.0"/>
+  <project name="meta-openembedded.git" path="layers/meta-openembedded" remote="oe" revision="fcc7d7eae82be4c180f2e8fa3db90a8ab3be07b7" upstream="kirkstone"/>
+  <project name="meta-yocto" path="layers/meta-yocto" remote="yocto" revision="7e21de293e2a36d7f931201fe5fa54954a09e6ee" upstream="kirkstone"/>
+  <project name="openembedded-core.git" path="layers/openembedded-core" remote="oe" revision="eea52e0c3d24c79464f4afdbc3c397e1cb982231" upstream="kirkstone"/>
 </manifest>
\ No newline at end of file
diff --git a/bsp/integration-nxp.xml b/bsp/integration-nxp.xml
index da1ccda..31b25ba 100644
--- a/bsp/integration-nxp.xml
+++ b/bsp/integration-nxp.xml
@@ -2,7 +2,7 @@
 <manifest>
   <remote alias="repo" fetch="https://github.com/Freescale" name="githf"/>
 
-  <project name="meta-freescale-3rdparty.git" path="layers/meta-freescale-3rdparty" remote="githf" revision="master"/>
-  <project name="meta-freescale-distro.git" path="layers/meta-freescale-distro" remote="githf" revision="master"/>
-  <project name="meta-freescale.git" path="layers/meta-freescale" remote="githf" revision="master"/>
+  <project name="meta-freescale-3rdparty.git" path="layers/meta-freescale-3rdparty" remote="githf" revision="kirkstone"/>
+  <project name="meta-freescale-distro.git" path="layers/meta-freescale-distro" remote="githf" revision="kirkstone"/>
+  <project name="meta-freescale.git" path="layers/meta-freescale" remote="githf" revision="kirkstone"/>
 </manifest>
diff --git a/bsp/pinned-nxp.xml b/bsp/pinned-nxp.xml
index 515536b..fe8da56 100644
--- a/bsp/pinned-nxp.xml
+++ b/bsp/pinned-nxp.xml
@@ -2,7 +2,7 @@
 <manifest>
   <remote alias="repo" fetch="https://github.com/Freescale" name="githf"/>
 
-  <project name="meta-freescale-3rdparty.git" path="layers/meta-freescale-3rdparty" remote="githf" revision="dfae23f66e8e49e0c82f563b4bd1cad73c0e2f2a" upstream="master"/>
-  <project name="meta-freescale-distro.git" path="layers/meta-freescale-distro" remote="githf" revision="eb5cb63abafcd9c9fab16506b89f41532e3de261" upstream="master"/>
-  <project name="meta-freescale.git" path="layers/meta-freescale" remote="githf" revision="0a83f1f6385ba6ba6079606c3b4de86e1cdcba9f" upstream="master"/>
+  <project name="meta-freescale-3rdparty.git" path="layers/meta-freescale-3rdparty" remote="githf" revision="3a3bc0ef50031f6254f7b5f9c7b799051ec74e09" upstream="kirkstone"/>
+  <project name="meta-freescale-distro.git" path="layers/meta-freescale-distro" remote="githf" revision="fc15f5003043da23212596be7366ae2547c308ad" upstream="kirkstone"/>
+  <project name="meta-freescale.git" path="layers/meta-freescale" remote="githf" revision="85fd00674bfe74d0c0272f2547dc1c63c4f46b0a" upstream="kirkstone"/>
 </manifest>
\ No newline at end of file
diff --git a/tdxref/default.xml b/tdxref/default.xml
index 6ca6ef7..179b7f6 100644
--- a/tdxref/default.xml
+++ b/tdxref/default.xml
@@ -6,7 +6,7 @@
   <include name="bsp/pinned-nxp.xml" />
   <include name="bsp/pinned-tdx.xml" />
 
-  <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="387784b0d7387545ef1d99e39063a109d880082e" upstream="master"/>
+  <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="5b71df60e523423b9df6793de9387f87a149ac42" upstream="kirkstone"/>
   <project name="meta-toradex-demos.git" path="layers/meta-toradex-demos" remote="tdx" revision="86a1a443fd424ebde3405934e01a238936b7c84c" upstream="master"/>
   <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="bf27aa8e615476a525f07605bdd027faf8a76e02" upstream="master">
     <copyfile dest="export" src="buildconf/export"/>
diff --git a/tdxref/integration.xml b/tdxref/integration.xml
index 56827b0..d692e11 100644
--- a/tdxref/integration.xml
+++ b/tdxref/integration.xml
@@ -6,7 +6,7 @@
   <include name="bsp/pinned-nxp.xml"/>
   <include name="bsp/integration-tdx.xml"/>
 
-  <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="387784b0d7387545ef1d99e39063a109d880082e" upstream="master"/>
+  <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="5b71df60e523423b9df6793de9387f87a149ac42" upstream="kirkstone"/>
   <project name="meta-toradex-demos.git" path="layers/meta-toradex-demos" remote="tdx" revision="master"/>
   <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="master">
     <copyfile dest="export" src="buildconf/export"/>
diff --git a/tdxref/next.xml b/tdxref/next.xml
index eff1cd8..ec00062 100644
--- a/tdxref/next.xml
+++ b/tdxref/next.xml
@@ -6,7 +6,7 @@
   <include name="bsp/integration-nxp.xml" />
   <include name="bsp/integration-tdx.xml" />
 
-  <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="master"/>
+  <project name="meta-qt5.git" path="layers/meta-qt5" remote="githq" revision="kirkstone"/>
   <project name="meta-toradex-demos.git" path="layers/meta-toradex-demos" remote="tdx" revision="master"/>
   <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="master">
     <copyfile dest="export" src="buildconf/export"/>
diff --git a/torizoncore/default.xml b/torizoncore/default.xml
index 6ced946..4948b0d 100644
--- a/torizoncore/default.xml
+++ b/torizoncore/default.xml
@@ -7,11 +7,11 @@
   <remote alias="repo" fetch="https://github.com/uptane" name="uptane"/>
   <remote alias="repo" fetch="https://github.com/toradex" name="toradex-torizon"/>
 
-  <project name="meta-security" path="layers/meta-security" remote="yocto" revision="fcceba2208fa7cf63d5841a6a1a3ff743b4cb35d"/>
+  <project name="meta-security" path="layers/meta-security" remote="yocto" revision="d3d8e62bf1caa3870a504c0addcfd200b33c189f"/>
   <project name="meta-updater" path="layers/meta-updater" remote="uptane" revision="d3d04674cca2b56f97870b0b68bf6e409ebb10fa"/>
-  <project name="meta-virtualization" path="layers/meta-virtualization" remote="yocto" revision="0db3901a48426ee403a045e0b626416c5fa93c6f"/>
-  <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="49af4af336c6600f8a97837ce7fd2581c5c027f7"/>
-  <project name="meta-toradex-torizon" path="layers/meta-toradex-torizon" remote="toradex-torizon" revision="6054c5e5df22c7e3c9b25ac865417695ebe1eca3">
+  <project name="meta-virtualization" path="layers/meta-virtualization" remote="yocto" revision="d577f45ac664c43cfff5cef01065b85980e5b7ee"/>
+  <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="bf27aa8e615476a525f07605bdd027faf8a76e02"/>
+  <project name="meta-toradex-torizon" path="layers/meta-toradex-torizon" remote="toradex-torizon" revision="574d84b9fbe40db6e22cb8d18753960fc018380f">
     <linkfile dest="setup-environment" src="scripts/setup-environment"/>
   </project>
 </manifest>
diff --git a/torizoncore/integration.xml b/torizoncore/integration.xml
index dc1999a..272600a 100644
--- a/torizoncore/integration.xml
+++ b/torizoncore/integration.xml
@@ -7,9 +7,9 @@
   <remote alias="repo" fetch="https://github.com/uptane" name="uptane"/>
   <remote alias="repo" fetch="https://github.com/toradex" name="toradex-torizon"/>
 
-  <project name="meta-security" path="layers/meta-security" remote="yocto" revision="93f2146211001ee3cf697d8428969cc3069ed6ba"/>
+  <project name="meta-security" path="layers/meta-security" remote="yocto" revision="d3d8e62bf1caa3870a504c0addcfd200b33c189f"/>
   <project name="meta-updater" path="layers/meta-updater" remote="uptane" revision="d3d04674cca2b56f97870b0b68bf6e409ebb10fa"/>
-  <project name="meta-virtualization" path="layers/meta-virtualization" remote="yocto" revision="21a5c29a10f033859f6e44aa035161befa439128"/>
+  <project name="meta-virtualization" path="layers/meta-virtualization" remote="yocto" revision="d577f45ac664c43cfff5cef01065b85980e5b7ee"/>
   <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="master"/>
   <project name="meta-toradex-torizon" path="layers/meta-toradex-torizon" remote="toradex-torizon" revision="master">
     <linkfile dest="setup-environment" src="scripts/setup-environment"/>
diff --git a/torizoncore/next.xml b/torizoncore/next.xml
index 71b0f6c..c474e28 100644
--- a/torizoncore/next.xml
+++ b/torizoncore/next.xml
@@ -7,9 +7,9 @@
   <remote alias="repo" fetch="https://github.com/uptane" name="uptane"/>
   <remote alias="repo" fetch="https://github.com/toradex" name="toradex-torizon"/>
 
-  <project name="meta-security" path="layers/meta-security" remote="yocto" revision="master"/>
+  <project name="meta-security" path="layers/meta-security" remote="yocto" revision="kirkstone"/>
   <project name="meta-updater" path="layers/meta-updater" remote="uptane" revision="master"/>
-  <project name="meta-virtualization" path="layers/meta-virtualization" remote="yocto" revision="master"/>
+  <project name="meta-virtualization" path="layers/meta-virtualization" remote="yocto" revision="kirkstone"/>
   <project name="meta-toradex-distro.git" path="layers/meta-toradex-distro" remote="tdx" revision="master"/>
   <project name="meta-toradex-torizon" path="layers/meta-toradex-torizon" remote="toradex-torizon" revision="master">
     <linkfile dest="setup-environment" src="scripts/setup-environment"/>
-- 
cgit v1.2.3