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

meta-digi-dey: remove support for wayland 

Also make DEY image recipes more robust to misconfigurations, by setting
explicitly the required and conflict distro features.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2014-01-16 15:32:16 +01:00
parent 1466a3ff79
commit 9a681704d4
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
meta-digi-dey/recipes-core/images/dey-image-graphical.bb
View File

@ -11,6 +11,8 @@ LICENSE = "MIT"
include dey-image-minimal.bb include dey-image-minimal.bb
REQUIRED_DISTRO_FEATURES = "x11"
WEB = "web-webkit" WEB = "web-webkit"
SOC_IMAGE_INSTALL = "" SOC_IMAGE_INSTALL = ""

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

@ -17,6 +17,9 @@ LICENSE = "MIT"
inherit core-image inherit core-image
inherit dey-image inherit dey-image
inherit distro_features_check
CONFLICT_DISTRO_FEATURES = "directfb wayland"
# Only common features to remain here. # Only common features to remain here.
VIRTUAL_RUNTIME_ssh_server ?= "ssh-server-dropbear" VIRTUAL_RUNTIME_ssh_server ?= "ssh-server-dropbear"