Switch to tracking upstream master branches

Tweak things to use latest upstream for external repositories, and
switch the AGL repositories to using their "next" branches.

Bug-AGL: SPEC-4578

Change-Id: I445a0d632a909fe63ce8a039b6e888eb714a4e33
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>

2 files changed, 28 insertions, 34 deletions

diff --git a/default-floating.xml b/default-floating.xml
index 2c3d6b64..a4cf5eab 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,23 +30,23 @@
   <!-- YOCTO & OE -->
 
   <!-- Yocto/OpenEmbedded things. -->
-  <project name="poky" path="external/poky" remote="yocto" revision="kirkstone" />
-  <project name="openembedded/meta-openembedded" path="external/meta-openembedded" remote="github" revision="kirkstone" />
+  <project name="poky" path="external/poky" remote="yocto" revision="scarthgap" />
+  <project name="openembedded/meta-openembedded" path="external/meta-openembedded" remote="github" revision="scarthgap" />
 
 
   <!-- UPSTREAM COMPONENTS -->
 
   <!-- meta-virtualization -->
-  <project name="meta-virtualization" path="external/meta-virtualization" remote="yocto" revision="kirkstone"/>
+  <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="kirkstone"/>
+  <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="kirkstone"/>
+  <project name="meta-security" path="external/meta-security" remote="yocto" revision="master"/>
 
   <!-- SELinux layer -->
-  <project name="meta-selinux" path="external/meta-selinux" remote="yocto" revision="kirkstone"/>
+  <project name="meta-selinux" path="external/meta-selinux" remote="yocto" revision="master"/>
 
   <!-- meta-codescanner - support for using CodeScanner during the build -->
   <project name="dl9pf/meta-codechecker" path="external/meta-codechecker" remote="github" revision="master"/>
@@ -55,10 +55,7 @@
   <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="kirkstone"/>
-
-  <!-- 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="kirkstone" />
+  <project name="kraj/meta-clang" path="external/meta-clang" remote="github" revision="master"/>
 
   <!-- meta-flutter -->
   <project name="meta-flutter/meta-flutter" path="external/meta-flutter" remote="github" revision="kirkstone"/>
@@ -71,15 +68,15 @@
   <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="kirkstone"/>
-  <project name="Freescale/meta-freescale-3rdparty" path="bsp/meta-freescale-3rdparty" remote="github" revision="kirkstone"/>
+  <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="kirkstone"/>
-  <project name="meta-ti" path="bsp/meta-ti" remote="yocto" revision="kirkstone"/>
+  <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="kirkstone"/>
+  <project name="meta-raspberrypi" path="bsp/meta-raspberrypi" remote="yocto" revision="master"/>
 
   <!-- Sancloud BSP layers -->
   <project name="SanCloudLtd/meta-sancloud" path="bsp/meta-sancloud" remote="github" revision="kirkstone"/>
diff --git a/default.xml b/default.xml
index 3b8bacb4..419bd16d 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,35 +29,32 @@
   <!-- YOCTO & OE -->
 
   <!-- Yocto/OpenEmbedded things. -->
-  <project name="poky" path="external/poky" remote="yocto" revision="2e79b199114b25d81bfaa029ccfb17676946d20d" upstream="kirkstone" />
-  <project name="openembedded/meta-openembedded" path="external/meta-openembedded" remote="github" revision="50d4a8d2a983a68383ef1ffec2c8e21adf0c1a79" upstream="kirkstone" />
+  <project name="poky" path="external/poky" remote="yocto" revision="78e48090b2c2aa94112b986e0948b0a981d08e7f" upstream="scarthgap" />
+  <project name="openembedded/meta-openembedded" path="external/meta-openembedded" remote="github" revision="30a5a3bb26cf80f97b0f2cc232fe2fdcc663fd11" upstream="scarthgap" />
 
 
   <!-- UPSTREAM COMPONENTS -->
 
   <!-- meta-virtualization -->
-  <project name="meta-virtualization" path="external/meta-virtualization" remote="yocto" revision="9482648daf0bb42ff3475e7892542cf99f3b8d48" upstream="kirkstone"/>
+  <project name="meta-virtualization" path="external/meta-virtualization" remote="yocto" revision="7a3b0b7ae1ac1a721369ee3f7a73b40b73510099" upstream="master"/>
 
   <!-- Qt things -->
-  <project name="meta-qt5/meta-qt5" path="external/meta-qt5" remote="github" revision="5b71df60e523423b9df6793de9387f87a149ac42" upstream="kirkstone"/>
+  <project name="meta-qt5/meta-qt5" path="external/meta-qt5" remote="github" revision="b8e1ae8ce6140f6084388842751280b55d55988b" upstream="master"/>
 
   <!-- Security layer -->
-  <project name="meta-security" path="external/meta-security" remote="yocto" revision="c79262a30bd385f5dbb009ef8704a1a01644528e" upstream="kirkstone"/>
+  <project name="meta-security" path="external/meta-security" remote="yocto" revision="30e755c59204cbd64c3aa12e64ab33041f6f02c0" upstream="master"/>
 
   <!-- SELinux layer -->
-  <project name="meta-selinux" path="external/meta-selinux" remote="yocto" revision="a401f4b2816a0b41ce8d9351542658c721935bcd" upstream="kirkstone"/>
+  <project name="meta-selinux" path="external/meta-selinux" remote="yocto" revision="b1eddc23d6b46a403bd1548a98512b69e5ecbd7e" upstream="master"/>
 
   <!-- meta-codescanner - support for using CodeScanner during the build -->
-  <project name="dl9pf/meta-codechecker" path="external/meta-codechecker" remote="github" revision="f27a46feb2291d333744850a82d5c8af303e3bd5" upstream="master"/>
+  <project name="dl9pf/meta-codechecker" path="external/meta-codechecker" remote="github" revision="38f9a4a68349b6ce32fdaa320f378991e29d09e9" upstream="master"/>
 
   <!-- meta-spdxscanner - support for fossology -->
-  <project name="meta-spdxscanner" path="external/meta-spdxscanner" remote="yocto" revision="25373bc58ece8b6f07680a103b4a1bbbc99e0db1" upstream="master"/>
+  <project name="meta-spdxscanner" path="external/meta-spdxscanner" remote="yocto" revision="8b07df1535fe1203b07fc87f8c6a1e34311e2a1d" upstream="master"/>
 
   <!-- clang support -->
-  <project name="kraj/meta-clang" path="external/meta-clang" remote="github" revision="c728c3f9168c8a4ed05163a51dd48ca1ad8ac21d" upstream="kirkstone"/>
-
-  <!-- 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="f02882e2aa9279ca7becca8d0cedbffe88b5a253" upstream="kirkstone" />
+  <project name="kraj/meta-clang" path="external/meta-clang" remote="github" revision="2c1ac866f5338d7e4b085e5f6c7a2ab353ed3015" upstream="master"/>
 
   <!-- meta-flutter -->
   <project name="meta-flutter/meta-flutter" path="external/meta-flutter" remote="github" revision="7702fabd669ad76e3393f1871bd0805080eb487e" upstream="kirkstone"/>
@@ -70,15 +67,15 @@
   <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="f89933bbebc21506ab75be63fba9ffbaebed94da" upstream="kirkstone"/>
-  <project name="Freescale/meta-freescale-3rdparty" path="bsp/meta-freescale-3rdparty" remote="github" revision="6d8213fc5ec192c33f963b8095d1f01af1574eea" upstream="kirkstone"/>
+  <project name="meta-freescale" path="bsp/meta-freescale" remote="yocto" revision="da46cb6c07ff25a000840b695627a326b0d4085a" upstream="master"/>
+  <project name="Freescale/meta-freescale-3rdparty" path="bsp/meta-freescale-3rdparty" remote="github" revision="ae392bf4c9b9499234cb4a3411624a4177237af2" upstream="master"/>
 
   <!-- TI Vayu / Jacinto 6 / DRA7 -->
-  <project name="meta-arm" path="bsp/meta-arm" remote="yocto" revision="50b34c5cc9496441152ad28bf1022e5fc5ab0a7e" upstream="kirkstone"/>
-  <project name="meta-ti" path="bsp/meta-ti" remote="yocto" revision="2b11afa8aa19814264d1d7b97184ad5cb88ddfa0" upstream="kirkstone"/>
+  <project name="meta-arm" path="bsp/meta-arm" remote="yocto" revision="c93a1459dafa86a0bef346e95f688e7c32bc5eef" upstream="master"/>
+  <project name="meta-ti" path="bsp/meta-ti" remote="yocto" revision="0584bef40f3806613d0d2c3ff0c990705cba3a5b" upstream="master"/>
 
   <!-- Raspberry Pi 4 -->
-  <project name="meta-raspberrypi" path="bsp/meta-raspberrypi" remote="yocto" revision="dacad9302a92b0b7edf8546cdcad1f8ef753e462" upstream="kirkstone"/>
+  <project name="meta-raspberrypi" path="bsp/meta-raspberrypi" remote="yocto" revision="d88e625cf2d12adc3aba03567b7f9f639ba5f129" upstream="master"/>
 
   <!-- Sancloud BSP layers -->
   <project name="SanCloudLtd/meta-sancloud" path="bsp/meta-sancloud" remote="github" revision="7eb9a421f547e347c9da23463734758568e13f95" upstream="kirkstone"/>