aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNaoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>2023-04-23 05:21:11 +0900
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2023-05-09 15:29:36 +0000
commitbf0670906f4c011ccbab46c2b36433418c0c02b9 (patch)
tree3763b50b74fd901e75600063e61d3bf58aab80cf
parentf549f99c6c5fe521d9e70e3a8908a1da310e28bc (diff)
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: I3e7030f48fdd720c09898303a0e430654386f71c Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
-rw-r--r--recipes-graphics/wayland/agl-compositor-init-agl-container-guest/agl-compositor.conf4
-rw-r--r--recipes-graphics/wayland/agl-compositor-init-agl-container-guest/agl-compositor.env2
-rw-r--r--recipes-graphics/wayland/agl-compositor-init.bbappend1
-rw-r--r--recipes-graphics/wayland/agl-compositor-init_agl-container-guest-demo.inc15
4 files changed, 22 insertions, 0 deletions
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 \
+ "