Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Javier Viguera 2014-09-25 16:22:37 +02:00
parent 5e3c8b3e13
commit 794f9f58dc
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meta-digi-dey/conf/distro/dey-gui.conf
View File

@ -1,3 +0,0 @@
include dey.conf
DISTRO_FEATURES += "x11"

3
meta-digi-dey/conf/distro/dey.conf
View File

@ -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)

4
meta-digi-dey/recipes-core/images/dey-image-minimal.bb
View File

@ -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}"