From e7b84ba82a208008b2f9c83377c7c69a2c856ae2 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Thu, 7 Nov 2019 10:56:47 +0200
Subject: Update to zeus

Use zeus-M2-Yocto-v3.21.0 tag from meta-renesas, and update proprietary
driver repo to v3.21.0.

Change-Id: I951bf1f73bfe3521619d306c2b1a0fcb6badccef
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
---
 conf/distro/include/b2qt.inc | 6 ------
 conf/layer.conf              | 5 ++++-
 conf/manifest.xml            | 8 ++++----
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/conf/distro/include/b2qt.inc b/conf/distro/include/b2qt.inc
index d94f389..9e103b7 100644
--- a/conf/distro/include/b2qt.inc
+++ b/conf/distro/include/b2qt.inc
@@ -79,11 +79,5 @@ FILESEXTRAPATHS_append = "${BSPDIR}/sources/renesas-rcar3/${PN}:"
 BBMASK += "\
     meta-linaro/meta-optee/recipes-security/optee \
     meta-rcar-gen3/recipes-core/packagegroups \
-    meta-rcar-gen3/recipes-devtools/perl \
     meta-rcar-gen3/recipes-graphics/wayland/weston \
-    meta-rcar-gen3/recipes-graphics/xorg-xserver \
-    meta-rcar-gen3/recipes-multimedia/alsa \
-    meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12.4.bbappend \
-    meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.4.bbappend \
-    meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.12.4.bbappend \
     "
diff --git a/conf/layer.conf b/conf/layer.conf
index 359308d..b96c01b 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -39,4 +39,7 @@ BBFILE_COLLECTIONS += "b2qt_renesas"
 BBFILE_PATTERN_b2qt_renesas := "^${LAYERDIR}/"
 BBFILE_PRIORITY_b2qt_renesas = "20"
 
-LAYERSERIES_COMPAT_b2qt_renesas = "warrior"
+LAYERSERIES_COMPAT_b2qt_renesas = "zeus"
+
+# override meta-renesas layer COMPATs
+LAYERSERIES_COMPAT_rcar-gen3 = "zeus"
diff --git a/conf/manifest.xml b/conf/manifest.xml
index 6044f8e..27e9354 100644
--- a/conf/manifest.xml
+++ b/conf/manifest.xml
@@ -8,7 +8,7 @@
           fetch="ssh://codereview.qt-project.org/yocto"/>
   <project name="meta-boot2qt"
            remote="qt"
-           revision="warrior"
+           revision="zeus"
            path="sources/meta-boot2qt">
     <!-- link init script to the build dir -->
     <linkfile dest="b2qt-init-build-env" src="b2qt-init-build-env"/>
@@ -21,13 +21,13 @@
           fetch="git://github.com/renesas-rcar"/>
   <project name="meta-renesas"
            remote="renesas"
-           revision="1b33df50c1f0c3848deb65b636d5134ed0d0d328"
+           revision="e1a44724144e599f538b2573949ac08ad68e9d6f"
            path="sources/meta-renesas"/>
   <remote name="linaro"
           fetch="git://git.linaro.org/openembedded"/>
   <project name="meta-linaro"
            remote="linaro"
-           revision="853e8e05e55e1bce7cef94ad7515e37e9485f745"
+           revision="674ce19e685233994052c8f6e4c133377076ea40"
            path="sources/meta-linaro"/>
 
   <!-- internal layer for the proprietary device drivers -->
@@ -35,7 +35,7 @@
           fetch="ssh://git@git.qt.io/boot2qt"/>
   <project name="renesas-rcar3"
            remote="playground"
-           revision="abc38c02585edd300e842f4e649a9f491e40187a"
+           revision="9018f7478a0a6646a61e8ee5cad8811fbc3ea927"
            path="sources/renesas-rcar3"
            groups="notdefault"/>
 </manifest>
-- 
cgit v1.2.3