From 99616d29ceb75e8f8c1027d2381e1312edb99055 Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Wed, 22 May 2024 12:42:09 -0400
Subject: [PATCH] Switch to tracking next/master branches

Changes:
- Switch branch for AGL repositories to next.
- Switch branch to upstream repos to master, except for a few BSP
  repositories that do not have useful master branches.
- Remove meta-lts-mixins checkout with scarthgap/u-boot branch, as
  it is no longer required.

Bug-AGL: SPEC-5147

Change-Id: I121d4beef91e3571311ae700982254f2f244519b
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
---
 default-floating.xml | 23 +++++++++++------------
 default.xml          | 37 ++++++++++++++++++-------------------
 2 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/default-floating.xml b/default-floating.xml
index bd455da8..dacb76ba 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="scarthgap" />
-  <project name="openembedded/meta-openembedded" path="external/meta-openembedded" remote="github" revision="scarthgap" />
+  <project name="poky" path="external/poky" remote="yocto" revision="master" />
+  <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="scarthgap"/>
+  <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="master"/>
 
   <!-- Security layer -->
-  <project name="meta-security" path="external/meta-security" remote="yocto" revision="scarthgap"/>
+  <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="scarthgap"/>
+  <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,7 +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="scarthgap"/>
+  <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="master"/>
@@ -76,23 +76,22 @@
   <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="scarthgap"/>
-  <project name="Freescale/meta-freescale-3rdparty" path="bsp/meta-freescale-3rdparty" remote="github" revision="scarthgap"/>
+  <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="master"/>
-  <project name="meta-ti" path="bsp/meta-ti" remote="yocto" revision="scarthgap"/>
+  <project name="meta-ti" path="bsp/meta-ti" remote="yocto" revision="master"/>
 
   <!-- Raspberry Pi -->
   <project name="meta-raspberrypi" path="bsp/meta-raspberrypi" remote="yocto" revision="master"/>
-  <project name="meta-lts-mixins" path="bsp/meta-lts-mixins_u-boot" remote="yocto" revision="scarthgap/u-boot"/>
 
   <!-- Sancloud BSP layers -->
   <project name="SanCloudLtd/meta-sancloud" path="bsp/meta-sancloud" remote="github" revision="kirkstone"/>
   <project name="EmbeddedAndroid/meta-rtlwifi" path="bsp/meta-rtlwifi" remote="github" revision="master"/>
 
   <!-- meta-sifive -->
-  <project name="sifive/meta-sifive" path="bsp/meta-sifive" remote="github" revision="scarthgap"/>
+  <project name="sifive/meta-sifive" path="bsp/meta-sifive" remote="github" revision="master"/>
 
   <!-- meta-riscv for several risc boards -->
   <project name="riscv/meta-riscv" path="bsp/meta-riscv" remote="github" revision="master"/>
diff --git a/default.xml b/default.xml
index 8e6f6995..d3542639 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,35 @@
   <!-- YOCTO & OE -->
 
   <!-- Yocto/OpenEmbedded things. -->
-  <project name="poky" path="external/poky" remote="yocto" revision="eb723d4a1082b10d14554f799c6c31cee620152d" upstream="scarthgap" />
-  <project name="openembedded/meta-openembedded" path="external/meta-openembedded" remote="github" revision="6819f825caf750b4deac5d8dda1b81f3380615be" upstream="scarthgap" />
+  <project name="poky" path="external/poky" remote="yocto" revision="f66f8fa9f605d5dc39acb10226198b3ab40dcaa3" upstream="master" />
+  <project name="openembedded/meta-openembedded" path="external/meta-openembedded" remote="github" revision="907b9c0ae697ff169470157c0dc5e2ae11e5452d" upstream="master" />
 
 
   <!-- UPSTREAM COMPONENTS -->
 
   <!-- meta-virtualization -->
-  <project name="meta-virtualization" path="external/meta-virtualization" remote="yocto" revision="3ff80e14e243a2bbdbf20a61aff4115d11c2da06" upstream="scarthgap"/>
+  <project name="meta-virtualization" path="external/meta-virtualization" remote="yocto" revision="89e2b594dcfd0643b84830dce5e7a5e2cbb046cd" upstream="master"/>
 
   <!-- Qt things -->
-  <project name="meta-qt5/meta-qt5" path="external/meta-qt5" remote="github" revision="fe008b6174862a05de14aa350efec271631697e7" upstream="master"/>
+  <project name="meta-qt5/meta-qt5" path="external/meta-qt5" remote="github" revision="ddb498a726d904eeabaed8908e17b06a68511a1c" upstream="master"/>
 
   <!-- Security layer -->
-  <project name="meta-security" path="external/meta-security" remote="yocto" revision="11ea91192d43d7c2b0b95a93aa63ca7e73e38034" upstream="scarthgap"/>
+  <project name="meta-security" path="external/meta-security" remote="yocto" revision="11ea91192d43d7c2b0b95a93aa63ca7e73e38034" upstream="master"/>
 
   <!-- SELinux layer -->
-  <project name="meta-selinux" path="external/meta-selinux" remote="yocto" revision="07f3233374f013412d691732adfa2c20167a0ea0" upstream="scarthgap"/>
+  <project name="meta-selinux" path="external/meta-selinux" remote="yocto" revision="769274a8ca624b8da314ffad249262559d9315b1" upstream="master"/>
 
   <!-- meta-codescanner - support for using CodeScanner during the build -->
-  <project name="dl9pf/meta-codechecker" path="external/meta-codechecker" remote="github" revision="38f9a4a68349b6ce32fdaa320f378991e29d09e9" upstream="master"/>
+  <project name="dl9pf/meta-codechecker" path="external/meta-codechecker" remote="github" revision="f0bd1ac046116695dc44ca327019519ae716c12d" upstream="master"/>
 
   <!-- meta-spdxscanner - support for fossology -->
-  <project name="meta-spdxscanner" path="external/meta-spdxscanner" remote="yocto" revision="8b07df1535fe1203b07fc87f8c6a1e34311e2a1d" upstream="master"/>
+  <project name="meta-spdxscanner" path="external/meta-spdxscanner" remote="yocto" revision="2c376d72a1aed6b335aebd3bb28663f973a11fa9" upstream="master"/>
 
   <!-- clang support -->
-  <project name="kraj/meta-clang" path="external/meta-clang" remote="github" revision="66414c17ae60e489bef9a97031323e92c247fbe1" upstream="scarthgap"/>
+  <project name="kraj/meta-clang" path="external/meta-clang" remote="github" revision="49b031747859cc20238c07628f1b550fcf759de9" upstream="master"/>
 
   <!-- meta-flutter -->
-  <project name="meta-flutter/meta-flutter" path="external/meta-flutter" remote="github" revision="6f431e743a878c738d35383c5cbabda71ba6538f" upstream="master"/>
+  <project name="meta-flutter/meta-flutter" path="external/meta-flutter" remote="github" revision="5435e4c8b3fa6997a87d9eba0a253d077edcb80e" upstream="master"/>
   <project name="meta-flutter/workspace-automation" path="external/workspace-automation" remote="github" revision="418058a45eab3e1b50dd125c901f0ae4253bd472" upstream="main"/>
 
   <!-- meta-tensorflow -->
@@ -67,7 +67,7 @@
   <!-- BSPs -->
 
   <!-- meta-aws -->
-  <project name="aws4embeddedlinux/meta-aws" path="bsp/meta-aws" remote="github" revision="b7df61417aaf741260044e4f246844608ee33900" upstream="master"/>
+  <project name="aws4embeddedlinux/meta-aws" path="bsp/meta-aws" remote="github" revision="db6c4f6ded2e0c59cda547afca72271b11fbb37a" upstream="master"/>
 
   <!-- Renesas Gen3 specific things -->
   <project name="renesas-rcar/meta-renesas" path="bsp/meta-renesas" remote="github" revision="0605dac7d8972740e58d08a9cf1e2040617fe1fc" upstream="scarthgap-dev"/>
@@ -75,25 +75,24 @@
   <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="19ffbd1a6bf1caadbc23b09415985d73c1827828" upstream="scarthgap"/>
-  <project name="Freescale/meta-freescale-3rdparty" path="bsp/meta-freescale-3rdparty" remote="github" revision="8b61684f0b1ba8bacdf3a69d993445e9791d4932" upstream="scarthgap"/>
+  <project name="meta-freescale" path="bsp/meta-freescale" remote="yocto" revision="23ceaa0ecd56b41e3edb44ed0c7216829f7613ad" upstream="master"/>
+  <project name="Freescale/meta-freescale-3rdparty" path="bsp/meta-freescale-3rdparty" remote="github" revision="f2e8d77e55acd3af90548640e93c2d26a2c7cf82" upstream="master"/>
 
   <!-- TI Vayu / Jacinto 6 / DRA7 -->
-  <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="5c049dcb30d7a644333762198771d7fd3795b686" upstream="scarthgap"/>
+  <project name="meta-arm" path="bsp/meta-arm" remote="yocto" revision="b8965bb95ba4e3f80b99ac0d67c7f7a326fbb5de" upstream="master"/>
+  <project name="meta-ti" path="bsp/meta-ti" remote="yocto" revision="67b556502b1c44fb55ddd02af1fa0b07a753b075" upstream="master"/>
 
   <!-- Raspberry Pi -->
   <project name="meta-raspberrypi" path="bsp/meta-raspberrypi" remote="yocto" revision="1879cb831f4ea3e532cb5ce9fa0f32be917e8fa3" upstream="master"/>
-  <project name="meta-lts-mixins" path="bsp/meta-lts-mixins_u-boot" remote="yocto" revision="66ceeebd047d7fdfc8668b300319a76da8ae257d" upstream="scarthgap/u-boot"/>
 
   <!-- Sancloud BSP layers -->
   <project name="SanCloudLtd/meta-sancloud" path="bsp/meta-sancloud" remote="github" revision="7eb9a421f547e347c9da23463734758568e13f95" upstream="kirkstone"/>
   <project name="EmbeddedAndroid/meta-rtlwifi" path="bsp/meta-rtlwifi" remote="github" revision="032a394e7569d1254cd17a0358475b986e64a5a4" upstream="master"/>
 
   <!-- meta-sifive -->
-  <project name="sifive/meta-sifive" path="bsp/meta-sifive" remote="github" revision="b2678e67b079b4fb233bed4eb9b70a46b5bb06a7" upstream="scarthgap"/>
+  <project name="sifive/meta-sifive" path="bsp/meta-sifive" remote="github" revision="b2678e67b079b4fb233bed4eb9b70a46b5bb06a7" upstream="master"/>
 
   <!-- meta-riscv for several risc boards -->
-  <project name="riscv/meta-riscv" path="bsp/meta-riscv" remote="github" revision="c1c671a97025941f7ec4d98e586f357f126e9379" upstream="master"/>
+  <project name="riscv/meta-riscv" path="bsp/meta-riscv" remote="github" revision="d330dfe4011a873d379cdf6228fa1f243cf5a6db" upstream="master"/>
 
 </manifest>
-- 
2.16.6