From 4c2cb4e120bd337ee40aaa1e673296f4863f266d Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Sat, 29 Apr 2023 16:32:05 +0300 Subject: [PATCH] recipes-graphics/wayland/weston-ini-conf: Remove grcp-server.cfg And add it meta-agl/mega-agl-core, like all our other ini configuration. Reason being we group all our ini config files there, and this is harmless, it won't depend on anything. We already build grpc-proxy PACKAGECONFIG for agl-demo, starting with octopus. This is basically a revert of 1b347d8823, '[weston-ini-conf] Fix dependency issue with grpc in meta-agl-core' Bug-AGL: SPEC-4776 Change-Id: I2502a3828d7c3a71707fac7cc535df6c312eabc5 Signed-off-by: Marius Vlad Suggested-by: Scott Murray --- recipes-graphics/wayland/weston-ini-conf/grpc-server.cfg | 4 ---- recipes-graphics/wayland/weston-ini-conf_agldemo.inc | 3 --- 2 files changed, 7 deletions(-) delete mode 100644 recipes-graphics/wayland/weston-ini-conf/grpc-server.cfg diff --git a/recipes-graphics/wayland/weston-ini-conf/grpc-server.cfg b/recipes-graphics/wayland/weston-ini-conf/grpc-server.cfg deleted file mode 100644 index 14805b969..000000000 --- a/recipes-graphics/wayland/weston-ini-conf/grpc-server.cfg +++ /dev/null @@ -1,4 +0,0 @@ - -[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 9eabf5801..003d411ce 100644 --- a/recipes-graphics/wayland/weston-ini-conf_agldemo.inc +++ b/recipes-graphics/wayland/weston-ini-conf_agldemo.inc @@ -2,9 +2,6 @@ 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" -- 2.16.6