[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>

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 (file)
index 0000000..14805b9
--- /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 003d411..9eabf58 100644 (file)
--- 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"