meta-agl - meta-agl layer (core AGL)

diff options

author	Scott Murray <scott.murray@konsulko.com>	2024-06-20 10:53:43 -0400
committer	Scott Murray <scott.murray@konsulko.com>	2024-06-24 21:21:21 +0000
commit	75c7354a09c17447e0aa04aab945d8d4ea0bae80 (patch)
tree	66e816395367640480d1cfb84fd72fb6fc030204 /meta-agl-bsp/conf/include/agl_imx6-common.inc
parent	46d21f682544e862b258dc1d1f0bfb27722a3fb0 (diff)

weston-ini-conf: do not enable gRPC proxy by default

Since building the agl-compositor gRPC proxy is only enabled when using meta-agl-demo, referencing it in the default Weston configurations when building meta-agl-core standalone is less than ideal. To avoid this, refactor the WESTON_FRAGMENTS variable to use a WESTON_FRAGMENTS_BASE variable for the non-display fragments, and drop "grpc-proxy" from it. The bbappend in meta-agl-demo can now just append it WESTON_FRAGMENTS_BASE to get the desired end result for the demo images. Bug-AGL: SPEC-5183 Change-Id: Ia351212023d1e426acc5be23a21b3de84660a024 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/30017 ci-image-boot-test: Jenkins Job builder account Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account

Diffstat (limited to 'meta-agl-bsp/conf/include/agl_imx6-common.inc')

0 files changed, 0 insertions, 0 deletions

From 5fed5c51ca8c1574804362bfdea4930c16457d34 Mon Sep 17 00:00:00 2001 From: Michael Teyfel <mteyfel@de.adit-jv.com> Date: Fri, 12 Oct 2018 16:57:24 +0200 Subject: [PATCH 3/3] ivi-controller: load id-agent module Reworked for wayland-ivi-extension 2.2.0 by Scott Murray. Signed-off-by: Michael Teyfel <mteyfel@de.adit-jv.com> Signed-off-by: Scott Murray <scott.murray@konsulko.com> diff --git a/weston-ivi-shell/src/ivi-controller.c b/weston-ivi-shell/src/ivi-controller.c index 8faec2a..8fa51f4 100644 --- a/weston-ivi-shell/src/ivi-controller.c +++ b/weston-ivi-shell/src/ivi-controller.c @@ -2154,6 +2154,41 @@ load_input_module(struct ivishell *shell) return 0; } +static int load_id_agent_module(struct ivishell *shell) +{ + struct weston_config *config = wet_get_config(shell->compositor); + struct weston_config_section *section; + char *id_agent_module = NULL; + + int (*id_agent_module_init)(struct weston_compositor *compositor, + const struct ivi_layout_interface *interface); + + section = weston_config_get_section(config, "ivi-shell", NULL, NULL); + + if (weston_config_section_get_string(section, "ivi-id-agent-module", + &id_agent_module, NULL) < 0) { + /* input events are handled by weston's default grabs */ + weston_log("ivi-controller: No ivi-id-agent-module set\n"); + return 0; + } + + id_agent_module_init = wet_load_module_entrypoint(id_agent_module, "id_agent_module_init"); + if (!id_agent_module_init) { + free(id_agent_module); + return -1; + } + + if (id_agent_module_init(shell->compositor, shell->interface) != 0) { + weston_log("ivi-controller: Initialization of id-agent module failed\n"); + free(id_agent_module); + return -1; + } + + free(id_agent_module); + + return 0; +} + static void launch_client_process(void *data) { @@ -2221,6 +2256,10 @@ wet_module_init(struct weston_compositor *compositor, shell->destroy_listener.notify = ivi_shell_destroy; wl_signal_add(&compositor->destroy_signal, &shell->destroy_listener); + if (load_id_agent_module(shell) < 0) { + weston_log("ivi-controller: id-agent module not loaded\n"); + } + if (shell->bkgnd_surface_id && shell->ivi_client_name) { loop = wl_display_get_event_loop(compositor->wl_display); wl_event_loop_add_idle(loop, launch_client_process, shell);


context:
space:
mode: