From 794f9f58dcee2e4191c2cf8ad98372a833b17489 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Thu, 25 Sep 2014 16:22:37 +0200
Subject: [PATCH] meta-digi-dey: remove dey-gui distro

We used to have two distros:

  DEY: without X11 support
  DEY-GUI: with X11 support

After the change, we have just one DEY distro with X11 support. At the
same time add a CONFLICT_DISTRO_FEATURE to dey-image-minimal so it
cannot be built with X11 distro feature enabled. So now in order to
build 'dey-image-minimal':

DISTRO_FEATURES_remove = "x11"

needs to be added to your project's local.conf file.

https://jira.digi.com/browse/DEL-858

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 meta-digi-dey/conf/distro/dey-gui.conf                 | 3 ---
 meta-digi-dey/conf/distro/dey.conf                     | 3 +--
 meta-digi-dey/recipes-core/images/dey-image-minimal.bb | 4 ++++
 3 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 meta-digi-dey/conf/distro/dey-gui.conf

diff --git a/meta-digi-dey/conf/distro/dey-gui.conf b/meta-digi-dey/conf/distro/dey-gui.conf
deleted file mode 100644
index 4ad19d5ee..000000000
--- a/meta-digi-dey/conf/distro/dey-gui.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-include dey.conf
-
-DISTRO_FEATURES += "x11"
diff --git a/meta-digi-dey/conf/distro/dey.conf b/meta-digi-dey/conf/distro/dey.conf
index 6f27e335a..15c4df8b7 100644
--- a/meta-digi-dey/conf/distro/dey.conf
+++ b/meta-digi-dey/conf/distro/dey.conf
@@ -20,8 +20,7 @@ POKY_DEFAULT_EXTRA_RRECOMMENDS = ""
 
 DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} ${POKY_DEFAULT_DISTRO_FEATURES}"
 
-# Remove X-related features for DEY distro
-DISTRO_FEATURES_DEFAULT_remove = "x11"
+# Remove 'wayland' feature from DEY distro
 POKY_DEFAULT_DISTRO_FEATURES_remove = "wayland"
 
 # DEY image features (alphabetical order)
diff --git a/meta-digi-dey/recipes-core/images/dey-image-minimal.bb b/meta-digi-dey/recipes-core/images/dey-image-minimal.bb
index 26d7f6af8..84303bb02 100644
--- a/meta-digi-dey/recipes-core/images/dey-image-minimal.bb
+++ b/meta-digi-dey/recipes-core/images/dey-image-minimal.bb
@@ -21,6 +21,10 @@ inherit distro_features_check
 
 CONFLICT_DISTRO_FEATURES = "directfb wayland"
 
+# Add 'x11' to CONFLICT_DISTRO_FEATURES for 'dey-image-minimal' family of recipes but
+# not for 'dey-image-graphical' (NOTICE: dey-image-graphical recipe includes this one)
+CONFLICT_DISTRO_FEATURES += "${@base_ifelse(d.getVar('PN', True).startswith('dey-image-minimal'), "x11", "")}"
+
 # Only common features to remain here.
 VIRTUAL_RUNTIME_ssh_server ?= "ssh-server-dropbear"
 IMAGE_FEATURES += "${VIRTUAL_RUNTIME_ssh_server}"