From d764068a51993c11248063898c169a049b54a8a7 Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Tue, 25 Feb 2020 15:59:15 -0500
Subject: Update default-floating.xml for zeus

Update default-floating.xml manifest for master/zeus. Some comment
tweaks were made to match default.xml to make diff'ing easier.

Bug-AGL: SPEC-2932

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: If3d3e1478dc901917b4626a09a0370cfb206930b
---
 default-floating.xml | 55 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/default-floating.xml b/default-floating.xml
index 79e1170f..a30cf35f 100644
--- a/default-floating.xml
+++ b/default-floating.xml
@@ -11,7 +11,7 @@
   <remote name="github" fetch="https://github.com/" />
 
   <!-- defaults -->
-  <default remote="agl" sync-j="4" revision="next"/>
+  <default remote="agl" sync-j="4" revision="master"/>
 
 
   <!-- CORE -->
@@ -32,29 +32,31 @@
   <!-- YOCTO & OE -->
 
   <!-- Yocto/OpenEmbedded things. -->
-  <project name="poky" path="external/poky" remote="yocto" revision="thud" />
-  <project name="meta-gplv2" path="external/meta-gplv2" remote="yocto" revision="thud" />
-  <project name="openembedded/meta-openembedded" path="external/meta-openembedded" remote="github" revision="thud" />
+  <project name="poky" path="external/poky" remote="yocto" revision="zeus" />
+  <project name="meta-gplv2" path="external/meta-gplv2" remote="yocto" revision="zeus" />
+  <project name="openembedded/meta-openembedded" path="external/meta-openembedded" remote="github" revision="zeus" />
 
 
   <!-- UPSTREAM COMPONENTS -->
 
   <!-- meta-virtualization -->
-  <project name="meta-virtualization" path="external/meta-virtualization" remote="yocto" revision="thud"/>
+  <project name="meta-virtualization" path="external/meta-virtualization" remote="yocto" revision="zeus"/>
 
   <!-- Qt things -->
-  <project name="meta-qt5/meta-qt5" path="external/meta-qt5" remote="github" revision="thud"/>
+  <project name="meta-qt5/meta-qt5" path="external/meta-qt5" remote="github" revision="zeus"/>
 
   <!-- Updater layers. -->
-  <project name="advancedtelematic/meta-updater" path="external/meta-updater" remote="github" revision="thud"/>
-  <project name="advancedtelematic/meta-updater-qemux86-64" path="external/meta-updater-qemux86-64" remote="github" revision="thud"/>
-  <project name="advancedtelematic/meta-updater-raspberrypi" path="external/meta-updater-raspberrypi" remote="github" revision="thud"/>
+  <project name="advancedtelematic/meta-updater" path="external/meta-updater" remote="github" revision="zeus"/>
+  <project name="advancedtelematic/meta-updater-qemux86-64" path="external/meta-updater-qemux86-64" remote="github" revision="zeus"/>
+  <project name="advancedtelematic/meta-updater-raspberrypi" path="external/meta-updater-raspberrypi" remote="github" revision="zeus"/>
 
   <!-- Security layer -->
-  <project name="meta-security" path="external/meta-security" remote="yocto" revision="thud"/>
+  <project name="meta-security" path="external/meta-security" remote="yocto" revision="zeus"/>
 
   <!-- SmartDeviceLink layer -->
+<!-- no zeus branch. FIXME
   <project name="phongt/meta-sdl" path="external/meta-sdl" remote="github" revision="thud"/>
+-->
 
   <!-- meta-spdxscanner - support for fossology -->
   <project name="dl9pf/meta-spdxscanner" path="external/meta-spdxscanner" remote="github" revision="master"/>
@@ -63,43 +65,48 @@
   <project name="alexa/alexa-auto-sdk" path="external/alexa-auto-sdk" remote="github" revision="2.0"/>
 
   <!-- clang support -->
-  <project name="kraj/meta-clang" path="external/meta-clang" remote="github" revision="thud"/>
+  <project name="kraj/meta-clang" path="external/meta-clang" remote="github" revision="zeus"/>
 
 
   <!-- BSPs -->
 
   <!-- Renesas Gen3 specific things -->
   <project name="AGL/meta-renesas-rcar-gen3" path="external/meta-renesas-rcar-gen3" />
-  <project name="CogentEmbedded/meta-rcar" path="external/meta-rcar" remote="github" revision="thud-v3.21.0"/>
+  <project name="CogentEmbedded/meta-rcar" path="external/meta-rcar" remote="github" revision="zeus-Yocto-v3.21.0"/>
 
-  <!-- MinnowBoard MAX specific things -->
-  <project name="meta-intel" path="bsp/meta-intel" remote="yocto" revision="thud"/>
+  <!-- MinnowBoard MAX / Upsquared specific things -->
+<!-- FIXME: To be merged with qemux86-64 target! -->
+  <project name="meta-intel" path="bsp/meta-intel" remote="yocto" revision="zeus"/>
 
   <!-- consolidate on meta-freescale from git.yoctoproject.org -->
-  <project name="meta-freescale" path="bsp/meta-freescale" remote="yocto" revision="thud"/>
-  <project name="Freescale/meta-freescale-3rdparty" path="bsp/meta-freescale-3rdparty" remote="github" revision="thud"/>
+  <project name="meta-freescale" path="bsp/meta-freescale" remote="yocto" revision="zeus"/>
+  <project name="Freescale/meta-freescale-3rdparty" path="bsp/meta-freescale-3rdparty" remote="github" revision="zeus"/>
 
-  <!-- Boundary devices bsp layer -->
+  <!-- Boundary devices BSP layer -->
+<!-- FIXME zeus 
   <project name="boundarydevices/meta-boundary" path="bsp/meta-boundary" remote="github" revision="master"/>
+-->
 
-  <!-- ti vayu / jacinto 6 / DRA7 -->
-  <project name="meta-ti" path="bsp/meta-ti" remote="yocto" revision="thud"/>
+  <!-- TI Vayu / Jacinto 6 / DRA7 -->
+  <project name="meta-ti" path="bsp/meta-ti" remote="yocto" revision="zeus"/>
 
-  <!-- rpi 2, 3 and 3 B+ -->
-  <project name="meta-raspberrypi" path="bsp/meta-raspberrypi" remote="yocto" revision="thud"/>
+  <!-- Raspberry Pi 3, 3B+, and 4 -->
+  <project name="meta-raspberrypi" path="bsp/meta-raspberrypi" remote="yocto" revision="zeus"/>
 
   <!-- DragonBoard 410c specific things -->
-  <project name="meta-qcom" path="bsp/meta-qcom" remote="yocto" revision="thud"/>
+  <project name="meta-qcom" path="bsp/meta-qcom" remote="yocto" revision="zeus"/>
 
   <!-- Altera SOCFPGA platform -->
   <!-- https://github.com/kraj/meta-altera -->
-  <project name="kraj/meta-altera" path="bsp/meta-altera" remote="github" revision="thud"/>
+  <project name="kraj/meta-altera" path="bsp/meta-altera" remote="github" revision="master"/>
 
   <!-- Sancloud BSP layers -->
-  <project name="SanCloudLtd/meta-sancloud" path="bsp/meta-sancloud" remote="github" revision="thud"/>
+  <project name="SanCloudLtd/meta-sancloud" path="bsp/meta-sancloud" remote="github" revision="zeus"/>
   <project name="EmbeddedAndroid/meta-rtlwifi" path="bsp/meta-rtlwifi" remote="github" revision="master"/>
 
   <!-- meta-synopsys - support for ARC HSDK board -->
+<!-- FIXME zeus - no zeus layer, yet
   <project name="foss-for-synopsys-dwc-arc-processors/meta-synopsys" path="bsp/meta-synopsys" remote="github" revision="thud-agl"/>
+-->
 
 </manifest>
-- 
cgit 1.2.3-korg