diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2016-11-03 09:07:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@automotivelinux.org> | 2016-11-03 09:07:12 +0000 |
| commit | 77c89adf2f5a6480440d269317c46168dbda24f8 (patch) | |
| tree | 54933f9b9b7be230659c98edd53b7898deccbd2a | |
| parent | fff431bf7097955e45c6111e404edb268ba680a1 (diff) | |
| parent | ce583cd627a0c75033739f6efcb59f6aadb21a7a (diff) | |
Merge "Allow build without meta-agl-demo"
| -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" |