aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2023-01-26 12:35:34 +0000
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2023-01-26 20:58:50 +0000
commitb9d4796f44a56c6a9c8233d82e46c251a82f6020 (patch)
tree02d3b78d5b6ff6356fc32d7ed3210f4f790c4718
parent3ed8bec1f924c6f710a0453346679db57ce8b951 (diff)
Revert "weston-ini-conf: Add agl-shell-grpc-server"octopus_14.93.0octopus/14.93.014.93.0
This reverts commit 2f40613cbf42fd378feea57ccefbb3215ecc1355. Reason for revert: This breaks the runtime with: Jan 25 04:07:51 qemuarm agl-compositor[456]: malformed section header: [shell-client-ext]\ncommand=/usr/lib/agl-compositor/agl-shell-grpc-server\n Jan 25 04:07:51 qemuarm agl-compositor[456]: [04:07:51.432] fatal: error opening or reading config file '/etc/xdg/weston/weston.ini'. Change-Id: I09f74614a9d7ec55550d46224ec1c1b96528eb0b Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/28354 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Reviewed-by: Marius Vlad <marius.vlad@collabora.com> Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
-rw-r--r--meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb2
1 files changed, 0 insertions, 2 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 46558932c..50e51348a 100644
--- a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb
+++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb
@@ -55,8 +55,6 @@ do_compile() {
done
sed -i -e '$ d' ${WORKDIR}/weston.ini.default
- echo "[shell-client-ext]\ncommand=/usr/lib/agl-compositor/agl-shell-grpc-server\n" >> ${WORKDIR}/weston.ini.default
-
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