From 20fcd4159ce4602329278e1c3af44d5ed44417bb Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Wed, 18 Jan 2023 20:47:11 -0500 Subject: Run agl-compositor in system scope for QEMU+KVM demo image To allow usefully depending on the native-shell-client "homescreen" application from the systemd units running QEMU, tweak things to drop the use of agl-session from the agl-kvm-demo-platform host image. The motivation for this is to have the VM guest start up ordering work as expected, avoiding unnecessary delays from race failures on boot. Changes: - Rework agl-kvm template to use conf/include/agl-kvm.inc include file to match other featurs and simplify development. - Add include files for the host ("default" in BitBake) and guest (so agl-kvm-guest) multiconfigs to allow disabling the agl-demo feature in the host build, which disables agl-session. - Update native-shell-client systemd unit to run at system scope and depend upon agl-compositor directly. - Update agl-qemu-runner systemd template unit to depend directly on native-shell-client. Note that a consequence of these changes is that building images other than agl-kvm-demo-platform when the "agl-kvm" feature is used will likely not yield the desired results. Future work will investigate avoiding this problem, or forcing explicit compatibility errors to avoid user confusion. Bug-AGL: SPEC-4618 Change-Id: I295caf2969c5f4179c93f1b57afa703f1a866457 Signed-off-by: Scott Murray (cherry picked from commit 94ee287730b16820003aece648e790923a9a5b79) --- recipes-extended/agl-qemu-runner/files/agl-qemu-runner.sh | 2 +- recipes-extended/agl-qemu-runner/files/agl-qemu-runner@.service | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'recipes-extended') diff --git a/recipes-extended/agl-qemu-runner/files/agl-qemu-runner.sh b/recipes-extended/agl-qemu-runner/files/agl-qemu-runner.sh index ab3a02c9..d050bdbf 100755 --- a/recipes-extended/agl-qemu-runner/files/agl-qemu-runner.sh +++ b/recipes-extended/agl-qemu-runner/files/agl-qemu-runner.sh @@ -37,7 +37,7 @@ if [ -n "$QEMU_TASKSET_CPUS" ]; then fi export SDL_VIDEODRIVER=wayland -export XDG_RUNTIME_DIR=/run/user/1001 +export XDG_RUNTIME_DIR=/run/user/200 # The following may be needed if the socket is not wayland-0, as SDL # seems to lack detection logic for that case. #export WAYLAND_DISPLAY=wayland-1 diff --git a/recipes-extended/agl-qemu-runner/files/agl-qemu-runner@.service b/recipes-extended/agl-qemu-runner/files/agl-qemu-runner@.service index a9e9f334..95b1fe08 100644 --- a/recipes-extended/agl-qemu-runner/files/agl-qemu-runner@.service +++ b/recipes-extended/agl-qemu-runner/files/agl-qemu-runner@.service @@ -1,6 +1,6 @@ [Unit] -Requires=agl-session@agl-driver.service -After=agl-session@agl-driver.service +Requires=native-shell-client.service +After=native-shell-client.service [Service] Type=simple -- cgit 1.2.3-korg