summaryrefslogtreecommitdiffstats
path: root/meta-agl-bsp
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2020-06-24 17:47:43 +0200
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2020-06-24 17:48:35 +0200
commit54c2fda805fd7fda591008693cd6843413cee9f8 (patch)
tree16ab8f0ac5ba32e6741849eede7610bcfe844925 /meta-agl-bsp
parent8e93c36104e8cd3f319170d70b60c705fd7fa402 (diff)
parent95b8edd4aab48f4cb66f3119e91e59ab74f907e9 (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 Updating 8e93c361..95b8edd4 Fast-forward meta-agl-bsp/conf/include/agl_rcar.inc | 11 ++++++++++ meta-agl-profile-graphical-qt5/recipes-qt/qt5/qtwayland_%.bbappend | 4 ++-- meta-agl-profile-graphical/recipes-graphics/wayland/agl-compositor_git.bb | 6 +++++- meta-agl-profile-graphical/recipes-graphics/wayland/weston-init.bbappend | 7 +++--- .../recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb | 3 +-- meta-app-framework/recipes-core/af-main/af-main_git.inc | 2 +- templates/base/99_local.conf.inc | 14 ++++++++++++ templates/feature/agl-compositor/50_local.conf.inc | 48 ----------------------------------------- templates/feature/agl-compositor/README_feature_agl-compositor.md | 13 ----------- 9 files changed, 38 insertions(+), 70 deletions(-) Bug-AGL: SPEC-3444 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Change-Id: Iea2b7367fdf1c9874b4b76a016b9d1a181b0e791
Diffstat (limited to 'meta-agl-bsp')
-rw-r--r--meta-agl-bsp/conf/include/agl_rcar.inc11
1 files changed, 11 insertions, 0 deletions
diff --git a/meta-agl-bsp/conf/include/agl_rcar.inc b/meta-agl-bsp/conf/include/agl_rcar.inc
index b88263f44..dd64ae772 100644
--- a/meta-agl-bsp/conf/include/agl_rcar.inc
+++ b/meta-agl-bsp/conf/include/agl_rcar.inc
@@ -29,6 +29,17 @@ DISTRO_FEATURES_append = " use_eva_pkg"
#DISTRO_FEATURES_append = " h265dec_lib mpeg2dec_lib"
DISTRO_FEATURES_append = " h264dec_lib h264enc_lib aaclcdec_lib aaclcdec_mdw"
+# Mask out meta-renesas-rcar-gen3's tweaks to weston-init, as they do
+# not seem necessary for anything in AGL, and the addition of
+# dbus.service and multi-user.target dependencies to the weston systemd
+# unit that is done is problematic with respect to potentially blocking
+# weston if any user units like application framework "platform"
+# services fail. They also likely affect boot up speed with respect to
+# getting weston started. There is no clear rationale expressed in the
+# meta-renesas-rcar-gen3 commit history for the extra dependencies, and
+# testing shows no issues on H3ULCB when not having them.
+BBMASK += "meta-rcar-gen3/recipes-graphics/wayland/weston-init.bbappend"
+
IMAGE_INSTALL_append_rcar-gen3 = " \
kernel-devicetree \
kernel-module-pvrsrvkm \