From ce583cd627a0c75033739f6efcb59f6aadb21a7a Mon Sep 17 00:00:00 2001 From: Ronan Date: Tue, 1 Nov 2016 15:52:09 +0100 Subject: Allow build without meta-agl-demo Change-Id: Ic78464d6e9c07e205b222b3f0f3d49ed1b928ed6 Signed-off-by: Ronan --- .../recipes-core/packagegroups/packagegroup-agl-app-framework.bb | 2 +- templates/feature/agl-demo/50_local.conf.inc | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-app-framework/recipes-core/packagegroups/packagegroup-agl-app-framework.bb b/meta-app-framework/recipes-core/packagegroups/packagegroup-agl-app-framework.bb index 231d9c9..9eaf2fc 100644 --- a/meta-app-framework/recipes-core/packagegroups/packagegroup-agl-app-framework.bb +++ b/meta-app-framework/recipes-core/packagegroups/packagegroup-agl-app-framework.bb @@ -16,5 +16,5 @@ RDEPENDS_${PN} += "\ af-binder-binding-authlogin \ libafbwsc \ af-main \ - web-runtime \ + ${@bb.utils.contains('DISTRO_FEATURES', 'AGL_WEBRUNTIME', 'web-runtime', '', d)} \ " diff --git a/templates/feature/agl-demo/50_local.conf.inc b/templates/feature/agl-demo/50_local.conf.inc index 77e5d95..6d1ce9f 100644 --- a/templates/feature/agl-demo/50_local.conf.inc +++ b/templates/feature/agl-demo/50_local.conf.inc @@ -1,5 +1,7 @@ EXTRA_IMAGE_FEATURES =+ "debug-tweaks" +DISTRO_FEATURES_append = " AGL_WEBRUNTIME " + # Add webkit as workaround as webengine is broken right now IMAGE_INSTALL_append = " qtwebkit qtwebkit-examples-examples" #IMAGE_INSTALL_append = " qtsmarthome cinematicexperience qt5everywheredemo qt5-demo-extrafiles" -- cgit 1.2.3-korg