diff options
| author |   Ronan <ronan.lemartret@iot.bzh> | 2016-11-01 15:52:09 +0100 |
|---|---|---|
| committer | Ronan <ronan.lemartret@iot.bzh> | 2016-11-02 10:16:18 +0100 |
| commit | ce583cd627a0c75033739f6efcb59f6aadb21a7a (patch) | |
| tree | 007fee87acec2c99cc936447b9880578fb995130 | |
| parent | 7530b316c94361fc8419cd8450e5d624576b704a (diff) | |
Allow build without meta-agl-demo
Change-Id: Ic78464d6e9c07e205b222b3f0f3d49ed1b928ed6
Signed-off-by: Ronan <ronan.lemartret@iot.bzh>
| -rw-r--r-- | meta-app-framework/recipes-core/packagegroups/packagegroup-agl-app-framework.bb | 2 | ||||
| -rw-r--r-- | templates/feature/agl-demo/50_local.conf.inc | 2 |
2 files changed, 3 insertions, 1 deletions
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" |