diff options
author | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2020-06-24 17:53:33 +0200 |
---|---|---|
committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2020-06-24 17:54:18 +0200 |
commit | 79473c2e7789d4887a449abad46732ed2b17f33d (patch) | |
tree | 96fb8ad57a15c96347da141d5bdaa9ee21f6ebb5 /recipes-platform | |
parent | cb5b0b199ec113591b17ca7b6bcb8dbd941b0876 (diff) | |
parent | c38d4a7ae95dd28cf2984787f703d4cc9f1b83b1 (diff) |
Merge the agl-compositor sandbox into master
The changes prepared by Marius for agl-compositor
have been reviewed in the sandbox/mvlad/agl-compositor.
This is the merge to master.
Notes:
- weston+ivi-shell+windowmanager are replaced using agl-compositor
- applications have been adapted accordingly
- CI will likely fail as we need to merge all related patches
* gerrit/sandbox/mvlad/agl-compositor:
Make the agl-compositor the default compositor
recipes-demo-hmi: Remove qtaglextras and *-windowmanager depends
packagegroup-agl-demo-platform: Remove qtaglextras dependency
packagegroup-hmi-framework: Remove *-windowmanager dependency
recipes-demo-hmi/alexa-viewer/alexa-viewer_git.bb | 6 ++++--
recipes-demo-hmi/dashboard/dashboard_git.bb | 2 +-
recipes-demo-hmi/homescreen/homescreen_git.bb | 6 ++++--
recipes-demo-hmi/hvac/hvac_git.bb | 5 +++--
recipes-demo-hmi/launcher/launcher_git.bb | 5 ++++-
recipes-demo-hmi/mediaplayer/mediaplayer_git.bb | 1 -
recipes-demo-hmi/messaging/messaging_git.bb | 1 -
recipes-demo-hmi/mixer/mixer_git.bb | 1 -
recipes-demo-hmi/navigation/navigation-demo_git.bb | 1 -
recipes-demo-hmi/navigation/ondemandnavi_git.bb | 2 --
recipes-demo-hmi/navigation/poiapp_git.bb | 2 +-
recipes-demo-hmi/navigation/tbtnavi_git.bb | 1 -
recipes-demo-hmi/onscreenapp/onscreenapp_git.bb | 2 +-
recipes-demo-hmi/phone/phone_git.bb | 1 -
recipes-demo-hmi/radio/radio_git.bb | 2 +-
recipes-demo-hmi/settings/settings_git.bb | 2 +-
recipes-demo-hmi/taskmanager/taskmanager_git.bb | 1 -
recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb | 4 +---
recipes-platform/packagegroups/packagegroup-hmi-framework.bb | 6 ------
19 files changed, 21 insertions(+), 30 deletions(-)
Change-Id: I2942a82beee36f283817ae566ec44b5f3219411f
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'recipes-platform')
-rw-r--r-- | recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb | 4 | ||||
-rw-r--r-- | recipes-platform/packagegroups/packagegroup-hmi-framework.bb | 6 |
2 files changed, 1 insertions, 9 deletions
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb index fc0bbfa6e..812139b2e 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb @@ -37,9 +37,7 @@ AGL_APPS = " \ virtual/mixer \ " -QTAGLEXTRAS = "${@bb.utils.contains("DISTRO_FEATURES", "agl-hmi-framework", " qtaglextras", "",d)}" -#NOTE: removed libqtappfw from QTAGLEXTRAS as it is no longer -# necessary due to replacement by individual recipe RDEPENDS. +QTAGLEXTRAS = " libqtappfw" # add support for websocket in Qt and QML QTAGLEXTRAS_append = " qtwebsockets qtwebsockets-qmlplugins" diff --git a/recipes-platform/packagegroups/packagegroup-hmi-framework.bb b/recipes-platform/packagegroups/packagegroup-hmi-framework.bb index f7de02c90..6e0749309 100644 --- a/recipes-platform/packagegroups/packagegroup-hmi-framework.bb +++ b/recipes-platform/packagegroups/packagegroup-hmi-framework.bb @@ -16,22 +16,16 @@ PACKAGES = "\ " RDEPENDS_${PN} = " \ - agl-service-windowmanager \ agl-service-homescreen \ homescreen \ - libwindowmanager \ - qlibwindowmanager \ libhomescreen \ qlibhomescreen \ - runxdg \ hmi-debug \ launcher \ " - # NOTE: Currently no coverage versions of these widgets, they should # be added here when available. RDEPENDS_${PN}-devel = " \ - agl-service-windowmanager-dbg \ agl-service-homescreen-dbg \ homescreen-dbg \ launcher-dbg \ |