diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2018-09-09 14:40:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@automotivelinux.org> | 2018-09-09 14:40:31 +0000 |
| commit | cf6e5ce3afd1745af74fbf4ae7681aad2a412420 (patch) | |
| tree | 28f4675a03673b1ad7258a4238940d2592cb1525 | |
| parent | 71645b64bc5699854f888e34a0a37f799b4ec73b (diff) | |
| parent | ccd9735f854443ea81750421212b77cd5cd17d7d (diff) | |
Merge "Change libhomescreen-2017 to libhomescreen"flounder_5.99.6flounder/5.99.65.99.6
5 files changed, 5 insertions, 6 deletions
diff --git a/meta-audio-4a-framework/meta-agl-demo/recipes-multimedia/4a-mixer/4a-mixer_git.bb b/meta-audio-4a-framework/meta-agl-demo/recipes-multimedia/4a-mixer/4a-mixer_git.bb index fbeb2a77..fc424b3d 100644 --- a/meta-audio-4a-framework/meta-agl-demo/recipes-multimedia/4a-mixer/4a-mixer_git.bb +++ b/meta-audio-4a-framework/meta-agl-demo/recipes-multimedia/4a-mixer/4a-mixer_git.bb @@ -15,7 +15,7 @@ S = "${WORKDIR}/git" # build-time dependencies DEPENDS += "qtquickcontrols2 \ qtwebsockets \ - virtual/libhomescreen \ + libhomescreen \ qlibwindowmanager \ " diff --git a/meta-hmi-framework/recipes-demo-hmi/qlibhomescreen/qlibhomescreen_git.bb b/meta-hmi-framework/recipes-demo-hmi/qlibhomescreen/qlibhomescreen_git.bb index e5b21bf5..21640013 100644 --- a/meta-hmi-framework/recipes-demo-hmi/qlibhomescreen/qlibhomescreen_git.bb +++ b/meta-hmi-framework/recipes-demo-hmi/qlibhomescreen/qlibhomescreen_git.bb @@ -3,8 +3,8 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" -DEPENDS = "qtbase libhomescreen-2017" -RDEPENDS_${PN} = "libhomescreen-2017" +DEPENDS = "qtbase libhomescreen" +RDEPENDS_${PN} = "libhomescreen" inherit qmake5 diff --git a/meta-hmi-framework/recipes-demo-hmi/runxdg/runxdg_git.bb b/meta-hmi-framework/recipes-demo-hmi/runxdg/runxdg_git.bb index 4bd0b28a..d5bd568b 100644 --- a/meta-hmi-framework/recipes-demo-hmi/runxdg/runxdg_git.bb +++ b/meta-hmi-framework/recipes-demo-hmi/runxdg/runxdg_git.bb @@ -5,7 +5,7 @@ HOMEPAGE = "https://git.automotivelinux.org/staging/xdg-launcher" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -DEPENDS = "json-c wayland wayland-ivi-extension virtual/libhomescreen libwindowmanager" +DEPENDS = "json-c wayland wayland-ivi-extension libhomescreen libwindowmanager" inherit cmake 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 e80b3608..2f0fe080 100644 --- a/meta-hmi-framework/recipes-platform/packagegroups/packagegroup-hmi-framework.bb +++ b/meta-hmi-framework/recipes-platform/packagegroups/packagegroup-hmi-framework.bb @@ -15,7 +15,7 @@ RDEPENDS_${PN} += " \ homescreen \ libwindowmanager \ qlibwindowmanager \ - libhomescreen-2017 \ + libhomescreen \ qlibhomescreen \ runxdg \ hmi-debug \ diff --git a/templates/feature/agl-hmi-framework/50_local.conf.inc b/templates/feature/agl-hmi-framework/50_local.conf.inc index a9e32fff..845a5270 100644 --- a/templates/feature/agl-hmi-framework/50_local.conf.inc +++ b/templates/feature/agl-hmi-framework/50_local.conf.inc @@ -2,5 +2,4 @@ # enables the following line: # DISTRO_FEATURES_append = " agl-hmi-framework" -PREFERRED_PROVIDER_virtual/libhomescreen = "libhomescreen-2017" PREFERRED_RPROVIDER_virtual/navigation = "navigation" |