diff options
| author |   Marius Vlad <marius.vlad@collabora.com> | 2023-04-29 12:15:19 +0300 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2023-05-03 15:26:46 +0000 |
| commit | fc0c7e0cce1a6dd2bf05a1071399d1dac6183b49 (patch) | |
| tree | f8edeef53e881430c08cf9febb31f8d3804be51e /meta-agl-core/recipes-graphics/wayland | |
| parent | 718394298c12ab1d1a384d940d883c2b60adf8d9 (diff) | |
weston-ini-conf: Add grpc-shell-server to no-activate ini
This embeddeds the grpc-proxy configuration file into the no-activate
configuration file, rather than creating a new no-activate-grpc-proxy,
or no-activate-landscape-grpc-proxy.
The grpc-proxy.cfg file is just a rename of grpc-server.cfg from
meta-agl-demo/ tree, introduced with 1b347d8823, '[weston-ini-conf] Fix
dependency issue with grpc in meta-agl-core'.
Bug-AGL: SPEC-4776
Change-Id: Ie6183887cdb7b6e3f7cb431f01edb8da75e05946
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/+/28738
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>
Diffstat (limited to 'meta-agl-core/recipes-graphics/wayland')
| -rw-r--r-- | meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb | 3 | ||||
| -rw-r--r-- | meta-agl-core/recipes-graphics/wayland/weston-ini-conf/grpc-proxy.cfg | 4 |
2 files changed, 7 insertions, 0 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 ae5eb5565..f7b281e7b 100644 --- a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb +++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb @@ -15,6 +15,7 @@ SRC_URI = " \ file://virtual-90.cfg \ file://virtual-180.cfg \ file://virtual-270.cfg \ + file://grpc-proxy.cfg \ " S = "${WORKDIR}" @@ -60,6 +61,7 @@ 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 @@ -85,6 +87,7 @@ 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() { diff --git a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/grpc-proxy.cfg b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/grpc-proxy.cfg new file mode 100644 index 000000000..14805b969 --- /dev/null +++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/grpc-proxy.cfg @@ -0,0 +1,4 @@ + +[shell-client-ext] +command=/usr/lib/agl-compositor/agl-shell-grpc-server + |