summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-11-11 10:38:18 +0000
committerGerrit Code Review <gerrit@automotivelinux.org>2017-11-11 10:38:18 +0000
commitc3ec51de4f611d0c841cbae34611bfdf4cf8628f (patch)
tree836baa2d431d038844fecddb6eb7107cb25039d8
parent27155d650036a972f3f54fc3a6ffcfa9fda2279d (diff)
parent10e8985c5bd4e57cc1e2361ea5560dbb5215c67c (diff)
Merge "Set PREFERRED_PROVIDER_virtual/libhomescreen in config fragment"
-rw-r--r--meta-hmi-framework/recipes-demo-hmi/homescreen-2017/homescreen-2017_git.bb2
-rw-r--r--meta-hmi-framework/recipes-platform/packagegroups/packagegroup-hmi-framework.bb2
-rw-r--r--templates/feature/agl-hmi-framework/50_local.conf.inc3
3 files changed, 4 insertions, 3 deletions
diff --git a/meta-hmi-framework/recipes-demo-hmi/homescreen-2017/homescreen-2017_git.bb b/meta-hmi-framework/recipes-demo-hmi/homescreen-2017/homescreen-2017_git.bb
index c29956ae..b6528b19 100644
--- a/meta-hmi-framework/recipes-demo-hmi/homescreen-2017/homescreen-2017_git.bb
+++ b/meta-hmi-framework/recipes-demo-hmi/homescreen-2017/homescreen-2017_git.bb
@@ -12,8 +12,8 @@ DEPENDS = "\
pulseaudio \
agl-service-homescreen-2017 \
agl-service-windowmanager-2017 \
- libhomescreen \
libwindowmanager \
+ virtual/libhomescreen \
"
inherit qmake5 systemd pkgconfig aglwgt
diff --git a/meta-hmi-framework/recipes-platform/packagegroups/packagegroup-hmi-framework.bb b/meta-hmi-framework/recipes-platform/packagegroups/packagegroup-hmi-framework.bb
index d93baec4..b11cb349 100644
--- a/meta-hmi-framework/recipes-platform/packagegroups/packagegroup-hmi-framework.bb
+++ b/meta-hmi-framework/recipes-platform/packagegroups/packagegroup-hmi-framework.bb
@@ -13,5 +13,5 @@ RDEPENDS_${PN} += " \
libwindowmanager \
qlibwindowmanager \
libsoundmanager \
- libhomescreen \
+ libhomescreen-2017 \
"
diff --git a/templates/feature/agl-hmi-framework/50_local.conf.inc b/templates/feature/agl-hmi-framework/50_local.conf.inc
index 2b72a8e2..942cc06f 100644
--- a/templates/feature/agl-hmi-framework/50_local.conf.inc
+++ b/templates/feature/agl-hmi-framework/50_local.conf.inc
@@ -1,4 +1,5 @@
# In order to enable the hmi-framework features ,
# enables the following line:
#
-DISTRO_FEATURES_append = " agl-hmi-framework "
+DISTRO_FEATURES_append = "agl-hmi-framework"
+PREFERRED_PROVIDER_virtual/libhomescreen = "libhomescreen-2017"