Update master branch to YP 4.0 aka kirkstone

Thanks to the continuous updates from Scott on the next branch,
we can uprev directly when kirkstone is about to be released.

In this step we do uprev the AGL-repo to what is in our 'next' branch.
Then we will update the meta-agl* layers and change the default back to master.

Bug-AGL: SPEC-4343
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Change-Id: I52b87c21be95bafa0813f6388211073ae2b8d35b

2 files changed, 42 insertions, 39 deletions

diff --git a/default-floating.xml b/default-floating.xml
index ee491ba7..0cbab1b8 100644
--- a/default-floating.xml
+++ b/default-floating.xml
@@ -12,7 +12,7 @@
   <remote name="openembedded" fetch="https://git.openembedded.org/" />
 
   <!-- defaults -->
-  <default remote="agl" sync-j="4" revision="master"/>
+  <default remote="agl" sync-j="4" revision="next"/>
 
 
   <!-- CORE -->
@@ -30,33 +30,33 @@
   <!-- YOCTO & OE -->
 
   <!-- Yocto/OpenEmbedded things. -->
-  <project name="poky" path="external/poky" remote="yocto" revision="dunfell" />
-  <project name="meta-gplv2" path="external/meta-gplv2" remote="yocto" revision="dunfell" />
-  <project name="openembedded/meta-openembedded" path="external/meta-openembedded" remote="github" revision="dunfell" />
+  <project name="poky" path="external/poky" remote="yocto" revision="kirkstone" />
+  <project name="meta-gplv2" path="external/meta-gplv2" remote="yocto" revision="kirkstone" />
+  <project name="openembedded/meta-openembedded" path="external/meta-openembedded" remote="github" revision="master" />
 
 
   <!-- UPSTREAM COMPONENTS -->
 
   <!-- meta-virtualization -->
-  <project name="meta-virtualization" path="external/meta-virtualization" remote="yocto" revision="dunfell"/>
+  <project name="meta-virtualization" path="external/meta-virtualization" remote="yocto" revision="master"/>
 
   <!-- Qt things -->
-  <project name="meta-qt5/meta-qt5" path="external/meta-qt5" remote="github" revision="dunfell"/>
+  <project name="meta-qt5/meta-qt5" path="external/meta-qt5" remote="github" revision="master"/>
 
   <!-- Security layer -->
-  <project name="meta-security" path="external/meta-security" remote="yocto" revision="dunfell"/>
+  <project name="meta-security" path="external/meta-security" remote="yocto" revision="kirkstone"/>
 
   <!-- meta-codescanner - support for using CodeScanner during the build -->
   <project name="dl9pf/meta-codechecker" path="external/meta-codechecker" remote="github" revision="master"/>
 
   <!-- meta-spdxscanner - support for fossology -->
-  <project name="meta-spdxscanner" path="external/meta-spdxscanner" remote="yocto" revision="dunfell"/>
+  <project name="meta-spdxscanner" path="external/meta-spdxscanner" remote="yocto" revision="master"/>
 
   <!-- clang support -->
-  <project name="kraj/meta-clang" path="external/meta-clang" remote="github" revision="dunfell"/>
+  <project name="kraj/meta-clang" path="external/meta-clang" remote="github" revision="master"/>
 
   <!-- meta-python2 as stop-gap to allow chromium to build until upstream fixes the dependencies -->
-  <project name="meta-python2" path="external/meta-python2" remote="openembedded" revision="dunfell" />
+  <project name="meta-python2" path="external/meta-python2" remote="openembedded" revision="master" />
 
   <!-- meta-ros layer -->
   <project name="ros/meta-ros" path="external/meta-ros" remote="github" revision="dunfell"/>
@@ -68,25 +68,28 @@
 
   <!-- Renesas Gen3 specific things -->
   <project name="renesas-rcar/meta-renesas" path="bsp/meta-renesas" remote="github" revision="dunfell-dev"/>
-  <project name="CogentEmbedded/meta-rcar" path="bsp/meta-rcar" remote="github" revision="v5.9.0"/>
+  <project name="CogentEmbedded/meta-rcar" path="bsp/meta-rcar" remote="github" revision="dunfell-Yocto-v4.1.0"/>
   <project name="AGL/meta-agl-refhw" path="bsp/meta-agl-refhw" />
 
   <!-- consolidate on meta-freescale from git.yoctoproject.org -->
-  <project name="meta-freescale" path="bsp/meta-freescale" remote="yocto" revision="dunfell"/>
-  <project name="Freescale/meta-freescale-3rdparty" path="bsp/meta-freescale-3rdparty" remote="github" revision="dunfell"/>
+  <project name="meta-freescale" path="bsp/meta-freescale" remote="yocto" revision="master"/>
+  <project name="Freescale/meta-freescale-3rdparty" path="bsp/meta-freescale-3rdparty" remote="github" revision="master"/>
 
   <!-- TI Vayu / Jacinto 6 / DRA7 -->
-  <project name="meta-arm" path="bsp/meta-arm" remote="yocto" revision="dunfell"/>
-  <project name="meta-ti" path="bsp/meta-ti" remote="yocto" revision="dunfell"/>
+  <project name="meta-arm" path="bsp/meta-arm" remote="yocto" revision="master"/>
+  <project name="meta-ti" path="bsp/meta-ti" remote="yocto" revision="master"/>
 
   <!-- Raspberry Pi 3, 3B+, and 4 -->
-  <project name="meta-raspberrypi" path="bsp/meta-raspberrypi" remote="yocto" revision="dunfell"/>
+  <project name="meta-raspberrypi" path="bsp/meta-raspberrypi" remote="yocto" revision="master"/>
 
   <!-- DragonBoard 410c specific things -->
-  <project name="meta-qcom" path="bsp/meta-qcom" remote="yocto" revision="dunfell"/>
+  <project name="meta-qcom" path="bsp/meta-qcom" remote="yocto" revision="master"/>
 
   <!-- Sancloud BSP layers -->
   <project name="SanCloudLtd/meta-sancloud" path="bsp/meta-sancloud" remote="github" revision="dunfell"/>
   <project name="EmbeddedAndroid/meta-rtlwifi" path="bsp/meta-rtlwifi" remote="github" revision="master"/>
 
+  <!-- meta-synopsys - support for ARC HSDK board -->
+  <project name="foss-for-synopsys-dwc-arc-processors/meta-synopsys" path="bsp/meta-synopsys" remote="github" revision="dunfell-agl"/>
+
 </manifest>
diff --git a/default.xml b/default.xml
index f8cce0a2..20930efa 100644
--- a/default.xml
+++ b/default.xml
@@ -12,7 +12,7 @@
   <remote name="openembedded" fetch="https://git.openembedded.org/" />
 
   <!-- defaults -->
-  <default remote="agl" sync-j="4" revision="master"/>
+  <default remote="agl" sync-j="4" revision="next"/>
 
 
   <!-- CORE -->
@@ -29,66 +29,66 @@
   <!-- YOCTO & OE -->
 
   <!-- Yocto/OpenEmbedded things. -->
-  <project name="poky" path="external/poky" remote="yocto" revision="bba323389749ec3e306509f8fb12649f031be152" upstream="dunfell" />
-  <project name="meta-gplv2" path="external/meta-gplv2" remote="yocto" revision="60b251c25ba87e946a0ca4cdc8d17b1cb09292ac" upstream="dunfell" />
-  <project name="openembedded/meta-openembedded" path="external/meta-openembedded" remote="github" revision="ab9fca485e13f6f2f9761e1d2810f87c2e4f060a" upstream="dunfell" />
+  <project name="poky" path="external/poky" remote="yocto" revision="81b4d8bc6bdc47a731a1f7ed741d7336559a1348" upstream="kirkstone" />
+  <project name="meta-gplv2" path="external/meta-gplv2" remote="yocto" revision="d2f8b5cdb285b72a4ed93450f6703ca27aa42e8a" upstream="kirkstone" />
+  <project name="openembedded/meta-openembedded" path="external/meta-openembedded" remote="github" revision="1888971b1fcff1e86be175c2aac724c28d2840ca" upstream="master" />
 
 
   <!-- UPSTREAM COMPONENTS -->
 
   <!-- meta-virtualization -->
-  <project name="meta-virtualization" path="external/meta-virtualization" remote="yocto" revision="c5f61e547b90aa8058cf816f00902afed9c96f72" upstream="dunfell"/>
+  <project name="meta-virtualization" path="external/meta-virtualization" remote="yocto" revision="1f9c37e1a67a269833605a083e26538b130e4d8e" upstream="master"/>
 
   <!-- Qt things -->
-  <project name="meta-qt5/meta-qt5" path="external/meta-qt5" remote="github" revision="b4d24d70aca75791902df5cd59a4f4a54aa4a125" upstream="dunfell"/>
+  <project name="meta-qt5/meta-qt5" path="external/meta-qt5" remote="github" revision="4837db1d965c51e4a2c5971e6a126c896e5b401a" upstream="master"/>
 
   <!-- Security layer -->
-  <project name="meta-security" path="external/meta-security" remote="yocto" revision="b76698c788cb8ca632077a972031899ef15025d6" upstream="dunfell"/>
+  <project name="meta-security" path="external/meta-security" remote="yocto" revision="93f2146211001ee3cf697d8428969cc3069ed6ba" upstream="kirkstone"/>
 
   <!-- meta-codescanner - support for using CodeScanner during the build -->
   <project name="dl9pf/meta-codechecker" path="external/meta-codechecker" remote="github" revision="f27a46feb2291d333744850a82d5c8af303e3bd5" upstream="master"/>
 
   <!-- meta-spdxscanner - support for fossology -->
-  <project name="meta-spdxscanner" path="external/meta-spdxscanner" remote="yocto" revision="23bba6f8dfafc806c187fc58b31fe2466d95772d" upstream="dunfell"/>
+  <project name="meta-spdxscanner" path="external/meta-spdxscanner" remote="yocto" revision="25373bc58ece8b6f07680a103b4a1bbbc99e0db1" upstream="master"/>
 
   <!-- clang support -->
-  <project name="kraj/meta-clang" path="external/meta-clang" remote="github" revision="5ac36e49ab0f4b9bc72a3c747841c1f9e54e640a" upstream="dunfell"/>
+  <project name="kraj/meta-clang" path="external/meta-clang" remote="github" revision="d748f542e27d58fcbcee9d1482d71cd9c38bf06b" upstream="master"/>
 
   <!-- meta-python2 as stop-gap to allow chromium to build until upstream fixes the dependencies -->
-  <project name="meta-python2" path="external/meta-python2" remote="openembedded" revision="b901080cf57d9a7f5476ab4d96e56c30db8170a8" upstream="dunfell" />
+  <project name="meta-python2" path="external/meta-python2" remote="openembedded" revision="f02882e2aa9279ca7becca8d0cedbffe88b5a253" upstream="master" />
 
   <!-- meta-ros layer -->
   <project name="ros/meta-ros" path="external/meta-ros" remote="github" revision="7ded597103e8e54ffa979d042cdbbedb76ff7cb5" upstream="dunfell"/>
 
   <!-- meta-flutter -->
-  <project name="meta-flutter/meta-flutter" path="external/meta-flutter" remote="github" revision="7d59dea18a27b16b0cede7ad5143281b82dd6701" upstream="dunfell"/>
+  <project name="meta-flutter/meta-flutter" path="external/meta-flutter" remote="github" revision="b9e48a0f53cbebf03bf4ad67f7671a78382a47d5" upstream="kirkstone"/>
 
   <!-- BSPs -->
 
   <!-- Renesas Gen3 specific things -->
-  <project name="renesas-rcar/meta-renesas" path="bsp/meta-renesas" remote="github" revision="b28a265e8544ef6bce7fb1b1dd23daa664ec86f5" upstream="dunfell-dev"/>
-  <project name="CogentEmbedded/meta-rcar" path="bsp/meta-rcar" remote="github" revision="fc6201d93336a314c532e063e0abc48969b3b868" upstream="v5.9.0"/>
+  <project name="renesas-rcar/meta-renesas" path="bsp/meta-renesas" remote="github" revision="3184a052ab531b32f59d8385de6d1df9bc0077d9" upstream="kirkstone-dev_3.5_M3_v5.9.0"/>
+  <project name="CogentEmbedded/meta-rcar" path="bsp/meta-rcar" remote="github" revision="f3ecbd1a33e992475d78a58e8ae785a27cfe7c9e" upstream="dunfell-Yocto-v4.1.0"/>
   <project name="AGL/meta-agl-refhw" path="bsp/meta-agl-refhw" />
 
   <!-- consolidate on meta-freescale from git.yoctoproject.org -->
-  <project name="meta-freescale" path="bsp/meta-freescale" remote="yocto" revision="a6199966375875fdfc295e6687c86a83fb53bf04" upstream="dunfell"/>
-  <project name="Freescale/meta-freescale-3rdparty" path="bsp/meta-freescale-3rdparty" remote="github" revision="c52f64973cd4043a5e8be1c7e29bb9690eb4c3e5" upstream="dunfell"/>
+  <project name="meta-freescale" path="bsp/meta-freescale" remote="yocto" revision="ee06b054f0d26ce8e069bfe9b0b8e320d8f2dccf" upstream="master"/>
+  <project name="Freescale/meta-freescale-3rdparty" path="bsp/meta-freescale-3rdparty" remote="github" revision="f244dd4b26f5958e586f2cee3e6854489c2a049f" upstream="master"/>
 
   <!-- TI Vayu / Jacinto 6 / DRA7 -->
-  <project name="meta-arm" path="bsp/meta-arm" remote="yocto" revision="c4f04f3fb66f8f4365b08b553af8206372e90a63" upstream="dunfell"/>
-  <project name="meta-ti" path="bsp/meta-ti" remote="yocto" revision="15613c951051c450fc8726b2576c23c105b79d53" upstream="dunfell"/>
+  <project name="meta-arm" path="bsp/meta-arm" remote="yocto" revision="9c0e0c01cbeb9857efaf22eb975c82cb69d1de81" upstream="master"/>
+  <project name="meta-ti" path="bsp/meta-ti" remote="yocto" revision="d6494c933f7d2098af22a90f39ed652abe564b6d" upstream="master"/>
 
-  <!-- Raspberry Pi 3, 3B+, and 4 -->
-  <project name="meta-raspberrypi" path="bsp/meta-raspberrypi" remote="yocto" revision="934064a01903b2ba9a82be93b3f0efdb4543a0e8" upstream="dunfell"/>
+  <!-- Raspberry Pi 4 -->
+  <project name="meta-raspberrypi" path="bsp/meta-raspberrypi" remote="yocto" revision="83f5577d8d8a5383642cd00a75ec56211596ecd2" upstream="master"/>
 
   <!-- DragonBoard 410c specific things -->
-  <project name="meta-qcom" path="bsp/meta-qcom" remote="yocto" revision="2778e164cd0427277e37fc03c8ed19179da1613b" upstream="dunfell"/>
+  <project name="meta-qcom" path="bsp/meta-qcom" remote="yocto" revision="1d08de2053a3b7dee34cbd37ab22ada14d94f243" upstream="master"/>
 
   <!-- Sancloud BSP layers -->
-  <project name="SanCloudLtd/meta-sancloud" path="bsp/meta-sancloud" remote="github" revision="ef68da514bd7cd4cfed75e69af1eb5c7ac11dbb9" upstream="dunfell"/>
+  <project name="SanCloudLtd/meta-sancloud" path="bsp/meta-sancloud" remote="github" revision="a34ca4c3fedfed1915ec3acc40bc8c0edd70e8a4" upstream="dunfell"/>
   <project name="EmbeddedAndroid/meta-rtlwifi" path="bsp/meta-rtlwifi" remote="github" revision="98b2b2c34f186050e6092bc4f17ecb69aef6148a" upstream="master"/>
 
   <!-- meta-synopsys - support for ARC HSDK board -->
-  <project name="foss-for-synopsys-dwc-arc-processors/meta-synopsys" path="bsp/meta-synopsys" remote="github" revision="80656bf6551b2056c8cb02a74510e595e2553048" upstream="dunfell-agl"/>
+  <project name="foss-for-synopsys-dwc-arc-processors/meta-synopsys" path="bsp/meta-synopsys" remote="github" revision="84ebfa5da3d72bfbd4d592663d0f033616e57857" upstream="dunfell-agl"/>
 
 </manifest>