From: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
Date: Sat, 22 Apr 2023 20:21:11 +0000 (+0900)
Subject: Overwrite agl-compositor-init setting to become adopt guest container
X-Git-Tag: 15.0.3~6
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=4922574f29ffef9341177b394a350bd054e20a68;p=AGL%2Fmeta-agl-demo.git

Overwrite agl-compositor-init setting to become adopt guest container

When existing agl demo integrate to container guest, need to overwrite
agl-compositor-init setting.

- Remove real tty device dependency.
- Adjust drm lease setting from default.

This patch realize this overwrite method in case of container guest.

Bug-AGL: SPEC-4766

Change-Id: If3acc66a2836d7ab78e408b14931126071e3d32c
Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
---

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
new file mode 100644
index 000000000..0ff470552
--- /dev/null
+++ b/recipes-graphics/wayland/agl-compositor-init-agl-container-guest/agl-compositor.conf
@@ -0,0 +1,4 @@
+[Unit]
+
+[Service]
+Environment=XDG_SESSION_TYPE=wayland
diff --git a/recipes-graphics/wayland/agl-compositor-init-agl-container-guest/agl-compositor.env b/recipes-graphics/wayland/agl-compositor-init-agl-container-guest/agl-compositor.env
new file mode 100644
index 000000000..d817effa6
--- /dev/null
+++ b/recipes-graphics/wayland/agl-compositor-init-agl-container-guest/agl-compositor.env
@@ -0,0 +1,2 @@
+DLM_RUNTIME_PATH=/var/display/drm-lease-manager
+DRM_LEASE_DEVICE=lease
diff --git a/recipes-graphics/wayland/agl-compositor-init.bbappend b/recipes-graphics/wayland/agl-compositor-init.bbappend
new file mode 100644
index 000000000..e78295624
--- /dev/null
+++ b/recipes-graphics/wayland/agl-compositor-init.bbappend
@@ -0,0 +1 @@
+require ${@bb.utils.contains('AGL_FEATURES', 'agl-container-guest-demo', 'agl-compositor-init_agl-container-guest-demo.inc', '', d)}
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
new file mode 100644
index 000000000..9fa2daf94
--- /dev/null
+++ b/recipes-graphics/wayland/agl-compositor-init_agl-container-guest-demo.inc
@@ -0,0 +1,15 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/agl-compositor-init-agl-container-guest:"
+
+SRC_URI:append = " \
+    file://agl-compositor.env \
+    "
+
+DRM_LEASE_DEVICE = "lease"
+
+do_install:append() {
+    install -Dm644 ${WORKDIR}/agl-compositor.env ${D}${sysconfdir}/default/agl-compositor
+}
+
+FILES:${PN} += "\
+    ${sysconfdir}/default/agl-compositor \
+    "