summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Wesp <n.wesp@phytec.de>2019-10-25 10:54:56 (GMT)
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2019-10-25 11:29:38 (GMT)
commit2976df9bb9fb6b9937f2688e84db3504e87f0144 (patch)
tree4dfa0f0e9157916a37b359021595bf54bd48624d
parentf56ea5a7d41763dfe280a493ff8db92f45f396f9 (diff)
downloadmeta-yogurt-2976df9bb9fb6b9937f2688e84db3504e87f0144.zip
meta-yogurt-2976df9bb9fb6b9937f2688e84db3504e87f0144.tar.bz2
phytec-qt5demo-image: change DISTRO_FEATURE handlingHEADmaster
Removed CONFLICT_DISTRO_FEATURES variable from recipe. Neccessary packages will be installed to the image, if x11 and/or wayland are in DISTRO_FEATURES. (same behavior as in phytec-vision-image) Signed-off-by: Norbert Wesp <n.wesp@phytec.de> Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
-rw-r--r--recipes-images/images/phytec-qt5demo-image.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-images/images/phytec-qt5demo-image.bb b/recipes-images/images/phytec-qt5demo-image.bb
index 2b7c5ac..d8f5a52 100644
--- a/recipes-images/images/phytec-qt5demo-image.bb
+++ b/recipes-images/images/phytec-qt5demo-image.bb
@@ -9,8 +9,6 @@ LICENSE = "MIT"
inherit distro_features_check populate_sdk_qt5
-CONFLICT_DISTRO_FEATURES = "x11"
-
IMAGE_INSTALL += "\
packagegroup-base \
\
@@ -18,6 +16,8 @@ IMAGE_INSTALL += "\
\
qt5-opengles2-test \
phytec-qtdemo \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland qtwayland-plugins weston weston-init', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'weston-xwayland', '', d)} \
"
IMAGE_INSTALL_remove_mx6ul = "\