From: Jan-Simon Moeller Date: Thu, 16 Feb 2023 13:30:40 +0000 (+0100) Subject: [weston-ini-conf] Fix dependency issue with grpc in meta-agl-core X-Git-Tag: 15.91.0~59 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=AGL%2Fmeta-agl-demo.git;a=commitdiff_plain;h=1b347d8823db32ee0b58bacd8c8d54553aca1f2f [weston-ini-conf] Fix dependency issue with grpc in meta-agl-core grpc is not in the core layer but in meta-oe . Guard the dependency and only enable when prerequisites are met. This also affects weston-ini-conf. We move this into meta-agl-demo. Bug-AGL: SPEC-4707 Change-Id: Id7c1d88e94fa03b7933678789aef7ed4e5751148 Signed-off-by: Jan-Simon Moeller --- diff --git a/recipes-graphics/wayland/weston-ini-conf/grpc-server.cfg b/recipes-graphics/wayland/weston-ini-conf/grpc-server.cfg new file mode 100644 index 000000000..14805b969 --- /dev/null +++ b/recipes-graphics/wayland/weston-ini-conf/grpc-server.cfg @@ -0,0 +1,4 @@ + +[shell-client-ext] +command=/usr/lib/agl-compositor/agl-shell-grpc-server + diff --git a/recipes-graphics/wayland/weston-ini-conf_agldemo.inc b/recipes-graphics/wayland/weston-ini-conf_agldemo.inc index 003d411ce..9eabf5801 100644 --- a/recipes-graphics/wayland/weston-ini-conf_agldemo.inc +++ b/recipes-graphics/wayland/weston-ini-conf_agldemo.inc @@ -2,6 +2,9 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/weston-ini-conf:" SRC_URI += "file://weston.ini.kvm.in" +# as grpc-server is enabled in meta-agl-demo, we can enable it here +SRC_URI += "file://grpc-server.cfg" + GUEST_VM1_IMAGE ?= "agl-ivi-demo-platform-flutter" GUEST_VM2_IMAGE ?= "agl-cluster-demo-platform-flutter"