From 93500637270f0d2e5f4a4185c09e65661e101a82 Mon Sep 17 00:00:00 2001 From: Naoto Yamaguchi Date: Sun, 27 Aug 2023 15:11:41 +0900 Subject: Fix service file of agl-compositor for guest integration After the commit 4b4c0f15d1d2a52e636aa22e56cf864d1a8a656b1 of meta-agl, AGL Demo IVI based container guest was not showing display. The container guest need to drop tty dependency. Before that commit, agl-compositore did not have tty dependency. But that commit added new systemd service file, it has tty dependency. This patch re-remove tty dependency from agl-compositor. Bug-AGL: SPEC-4888 Change-Id: I485041b19b89f06df5c26a557546dfd7d8ecaa73 Signed-off-by: Naoto Yamaguchi Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/29172 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 (cherry picked from commit 2d399c18c9ea60230ee1e19d9a52f240c56a008b) Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/29199 --- .../agl-compositor-guest.conf | 14 ++++++++++++++ .../agl-compositor.conf | 4 ---- .../agl-compositor-init_agl-container-guest-demo.inc | 2 ++ 3 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 recipes-graphics/wayland/agl-compositor-init-agl-container-guest/agl-compositor-guest.conf delete mode 100644 recipes-graphics/wayland/agl-compositor-init-agl-container-guest/agl-compositor.conf (limited to 'recipes-graphics/wayland') diff --git a/recipes-graphics/wayland/agl-compositor-init-agl-container-guest/agl-compositor-guest.conf b/recipes-graphics/wayland/agl-compositor-init-agl-container-guest/agl-compositor-guest.conf new file mode 100644 index 000000000..b98108edc --- /dev/null +++ b/recipes-graphics/wayland/agl-compositor-init-agl-container-guest/agl-compositor-guest.conf @@ -0,0 +1,14 @@ +# This is a system unit for launching AGL compositor in container guest. +# Need to drop tty dependency. +[Unit] +ConditionPathExists= + +[Service] +TTYPath= +TTYReset= +TTYVHangup= +TTYVTDisallocate= + +StandardInput=null + +UtmpIdentifier= diff --git a/recipes-graphics/wayland/agl-compositor-init-agl-container-guest/agl-compositor.conf b/recipes-graphics/wayland/agl-compositor-init-agl-container-guest/agl-compositor.conf deleted file mode 100644 index 0ff470552..000000000 --- a/recipes-graphics/wayland/agl-compositor-init-agl-container-guest/agl-compositor.conf +++ /dev/null @@ -1,4 +0,0 @@ -[Unit] - -[Service] -Environment=XDG_SESSION_TYPE=wayland diff --git a/recipes-graphics/wayland/agl-compositor-init_agl-container-guest-demo.inc b/recipes-graphics/wayland/agl-compositor-init_agl-container-guest-demo.inc index 9fa2daf94..fe9bd098b 100644 --- a/recipes-graphics/wayland/agl-compositor-init_agl-container-guest-demo.inc +++ b/recipes-graphics/wayland/agl-compositor-init_agl-container-guest-demo.inc @@ -2,12 +2,14 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/agl-compositor-init-agl-container-guest:" SRC_URI:append = " \ file://agl-compositor.env \ + file://agl-compositor-guest.conf \ " DRM_LEASE_DEVICE = "lease" do_install:append() { install -Dm644 ${WORKDIR}/agl-compositor.env ${D}${sysconfdir}/default/agl-compositor + install -m644 ${WORKDIR}/agl-compositor-guest.conf ${D}/${systemd_system_unitdir}/agl-compositor.service.d/agl-compositor-guest.conf } FILES:${PN} += "\ -- cgit 1.2.3-korg