From cb92ad7ec06de46193ef2815e88839556c7ede34 Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Wed, 14 Jun 2023 15:41:09 +0300 Subject: weston-ini-config: Fix gRPC missing in other images Flutter images in particular were affected because we only added the gRPC proxy in just the no-activate case. Change-Id: I32ee2ef739147e6cee3063004b98611ea7fd8198 Signed-off-by: Marius Vlad Suggested-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29017 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller --- meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb index 4c4748eec..e618a14a3 100644 --- a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb +++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb @@ -32,7 +32,7 @@ WESTON_DISPLAYS ?= "hdmi-a-1-90" # Configuration fragments to use in weston.ini.* # Note that some may be replaced/removed when building the landscape # configuration. -WESTON_FRAGMENTS = "core shell ${WESTON_DISPLAYS}" +WESTON_FRAGMENTS = "core shell grpc-proxy ${WESTON_DISPLAYS}" # On-target weston.ini directory weston_ini_dir = "${sysconfdir}/xdg/weston" @@ -65,7 +65,6 @@ do_compile() { cat ${WORKDIR}/weston.ini.default > ${WORKDIR}/weston.ini.default-no-activate sed -i -e 's#\[core\]#[core]\nactivate-by-default=false#' ${WORKDIR}/weston.ini.default-no-activate - cat ${WORKDIR}/grpc-proxy.cfg >> ${WORKDIR}/weston.ini.default-no-activate # Do it again, but filter fragments to configure for landscape # and a corresponding landscape-inverted that is 180 degrees @@ -94,7 +93,6 @@ do_compile() { cat ${WORKDIR}/weston.ini.landscape > ${WORKDIR}/weston.ini.landscape-no-activate sed -i -e 's#\[core\]#[core]\nactivate-by-default=false#' ${WORKDIR}/weston.ini.landscape-no-activate - cat ${WORKDIR}/grpc-proxy.cfg >> ${WORKDIR}/weston.ini.landscape-no-activate } do_install:append() { -- cgit 1.2.3-korg