aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Vlad <marius.vlad@collabora.com>2023-06-14 15:41:09 +0300
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2023-06-22 14:53:41 +0000
commitcb92ad7ec06de46193ef2815e88839556c7ede34 (patch)
tree131f7722c3326f61860c301bdf48c00749a6c1fb
parent97a0215f940376ba3cc16fda511e4c6eee7daab8 (diff)
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 <marius.vlad@collabora.com> Suggested-by: Scott Murray <scott.murray@konsulko.com> 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 <jsmoeller@linuxfoundation.org>
-rw-r--r--meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb4
1 files changed, 1 insertions, 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() {