summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiago De Franco <hiago.franco@toradex.com>2025-02-04 12:57:52 -0300
committerHiago De Franco <hiago.franco@toradex.com>2025-02-04 12:58:46 -0300
commit1f6cd8bc2099811aa80cb09350b73a40e9b8c3ce (patch)
tree45cdbf7ccb662f3a066dbd8ed2708c95c42a9c32
parente6162dd1bdc19670a300d21705766222ddac7ec8 (diff)
wayland-app-launch: Remove APPLICATION_ENVIRONMENT variable
When the APPLICATION_ENVIRONMENT is not set, the second "Environment" inside wayland-app-launch gets empty. As example: Environment=WAYLAND_DISPLAY=/run/wayland-0 Environment= This causes systemd to clear all the enviroment variables, unsetting the WAYLAND_DISPLAY previously set, which causes the some apps to no function anymore (e.g. weston-simple-egl). Therefore remove it and if anyone needs to add more environment variables, this should be done by bbappending the recipe and changing the systemd service file. Related-to: ELB-6229 Signed-off-by: Hiago De Franco <hiago.franco@toradex.com>
-rw-r--r--recipes-graphics/wayland-app-launch/wayland-app-launch.inc3
-rw-r--r--recipes-graphics/wayland-app-launch/wayland-app-launch/wayland-app-launch.service.in1
2 files changed, 0 insertions, 4 deletions
diff --git a/recipes-graphics/wayland-app-launch/wayland-app-launch.inc b/recipes-graphics/wayland-app-launch/wayland-app-launch.inc
index b0fc3125..cce6607b 100644
--- a/recipes-graphics/wayland-app-launch/wayland-app-launch.inc
+++ b/recipes-graphics/wayland-app-launch/wayland-app-launch.inc
@@ -14,11 +14,8 @@ SRC_URI = " \
"
FILESEXTRAPATHS:prepend := "${THISDIR}/wayland-app-launch:"
-APPLICATION_ENVIRONMENT ??= ""
-
do_compile () {
sed -e "s:@@wayland-application@@:${WAYLAND_APPLICATION}:" \
- -e "s:@@application-environment@@:${APPLICATION_ENVIRONMENT}:" \
wayland-app-launch.service.in > wayland-app-launch.service
}
diff --git a/recipes-graphics/wayland-app-launch/wayland-app-launch/wayland-app-launch.service.in b/recipes-graphics/wayland-app-launch/wayland-app-launch/wayland-app-launch.service.in
index 31499c14..4343839a 100644
--- a/recipes-graphics/wayland-app-launch/wayland-app-launch/wayland-app-launch.service.in
+++ b/recipes-graphics/wayland-app-launch/wayland-app-launch/wayland-app-launch.service.in
@@ -8,7 +8,6 @@ Type=simple
User=root
PAMName=login
Environment=WAYLAND_DISPLAY=/run/wayland-0
-Environment=@@application-environment@@
ExecStart=@@wayland-application@@
Restart=on-failure
RestartSec=1