From e65565d9810935ebaed6fea586a42d754fc905d6 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Wed, 5 Aug 2020 09:30:17 +0300
Subject: Sync meta layers

Use the meta layer sha1s from master branch.
Make zeus the default manifest to be used.

Change-Id: I9cdb4b06bdd6d0ff129a0782dea4a5e24b583146
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
---
 default.xml |  2 +-
 warrior.xml |  4 ++--
 zeus.xml    | 12 +++---------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/default.xml b/default.xml
index 0635d57..b79df96 120000
--- a/default.xml
+++ b/default.xml
@@ -1 +1 @@
-warrior.xml
\ No newline at end of file
+zeus.xml
\ No newline at end of file
diff --git a/warrior.xml b/warrior.xml
index ed2a93f..4584982 100644
--- a/warrior.xml
+++ b/warrior.xml
@@ -5,7 +5,7 @@
           fetch="git://git.yoctoproject.org"/>
   <project name="poky"
            remote="yocto"
-           revision="d0f73121551dc98f6924cd77952bf9ebf5ef3dd7"
+           revision="f475afc5df0837532dcd0f3a831ddc3aec8941f1"
            path="sources/poky"/>
   <project name="meta-mingw"
            remote="yocto"
@@ -23,7 +23,7 @@
            path="sources/meta-openembedded"/>
   <project name="meta-python2"
            remote="oe"
-           revision="6740870aac9627c99f03a20fd49ffc9ae8acc1e3"
+           revision="4400f9155ec193d028208cf0c66aeed2ba2b00ab"
            path="sources/meta-python2"/>
 
   <!-- Qt -->
diff --git a/zeus.xml b/zeus.xml
index 3247786..f1ee1fb 100644
--- a/zeus.xml
+++ b/zeus.xml
@@ -5,7 +5,7 @@
           fetch="git://git.yoctoproject.org"/>
   <project name="poky"
            remote="yocto"
-           revision="5e1f52edb7a9f790fb6cb5d96502f3690267c1b1"
+           revision="eac84e73e8d94610173c3bb3b6c6d74b58e44f60"
            path="sources/poky"/>
   <project name="meta-mingw"
            remote="yocto"
@@ -19,7 +19,7 @@
           fetch="git://github.com/openembedded"/>
   <project name="meta-openembedded"
            remote="oe"
-           revision="bb65c27a772723dfe2c15b5e1b27bcc1a1ed884c"
+           revision="9e60d30669a2ad0598e9abf0cd15ee06b523986b"
            path="sources/meta-openembedded"/>
   <project name="meta-python2"
            remote="oe"
@@ -54,14 +54,8 @@
           fetch="git://github.com/renesas-rcar"/>
   <project name="meta-renesas"
            remote="renesas"
-           revision="e1a44724144e599f538b2573949ac08ad68e9d6f"
+           revision="9a58b78a5c2960332b6ed4b02a6d8d5c606fa3e5"
            path="sources/meta-renesas"/>
-  <remote name="linaro"
-          fetch="git://git.linaro.org/openembedded"/>
-  <project name="meta-linaro"
-           remote="linaro"
-           revision="674ce19e685233994052c8f6e4c133377076ea40"
-           path="sources/meta-linaro"/>
 
   <!-- internal layer for the proprietary device drivers -->
   <remote name="playground"
-- 
cgit v1.2.3