summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2023-02-16 14:30:40 +0100
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2023-02-16 16:56:28 +0000
commit1b347d8823db32ee0b58bacd8c8d54553aca1f2f (patch)
treed72c52f32cdebfd83c2f82d6afe8732aa7c82355
parentcaa767d4733da26875a628d8f438c57fbd7447ea (diff)
[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 <jsmoeller@linuxfoundation.org>
-rw-r--r--recipes-graphics/wayland/weston-ini-conf/grpc-server.cfg4
-rw-r--r--recipes-graphics/wayland/weston-ini-conf_agldemo.inc3
2 files changed, 7 insertions, 0 deletions
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"