From ba76fc80f03066e6bfb059713cf57f74a941fd5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Wed, 31 Oct 2018 01:09:13 +0100
Subject: [PATCH] Move mesa-deomos to packagegroup-gui-tiny - where glmark2
 lives too
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 recipes-image/allgui/allgui-base-image.bb            | 2 --
 recipes-image/packagegroups/packagegroup-gui-tiny.bb | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/recipes-image/allgui/allgui-base-image.bb b/recipes-image/allgui/allgui-base-image.bb
index c235d06..161ad11 100644
--- a/recipes-image/allgui/allgui-base-image.bb
+++ b/recipes-image/allgui/allgui-base-image.bb
@@ -21,8 +21,6 @@ IMAGE_INSTALL += " \
     lumina \
     \
     weston weston-xwayland \
-    \
-    mesa-demos \
 "
 
 # reenable graphical target
diff --git a/recipes-image/packagegroups/packagegroup-gui-tiny.bb b/recipes-image/packagegroups/packagegroup-gui-tiny.bb
index f47ad56..a90b74a 100644
--- a/recipes-image/packagegroups/packagegroup-gui-tiny.bb
+++ b/recipes-image/packagegroups/packagegroup-gui-tiny.bb
@@ -21,6 +21,6 @@ RDEPENDS_${PN} = " \
     bash-completion \
     dconf-editor \
     \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'glmark2', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'glmark2 mesa-demos', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'eglinfo-x11', '', d)} \
 "