diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2023-01-18 20:47:11 -0500 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2023-01-29 14:29:37 +0000 |
| commit | 20fcd4159ce4602329278e1c3af44d5ed44417bb (patch) | |
| tree | 8b380bce25fdf9c4357b35e18153ab6250e727cd /recipes-demo/native-shell-client/files/native-shell-client.service | |
| parent | 0300d09b49aabb5878a08522dae0ef0329f34d0a (diff) | |
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 <scott.murray@konsulko.com>
(cherry picked from commit 94ee287730b16820003aece648e790923a9a5b79)
Diffstat (limited to 'recipes-demo/native-shell-client/files/native-shell-client.service')
| -rw-r--r-- | recipes-demo/native-shell-client/files/native-shell-client.service | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/recipes-demo/native-shell-client/files/native-shell-client.service b/recipes-demo/native-shell-client/files/native-shell-client.service index 4d77513a9..d7a2fe684 100644 --- a/recipes-demo/native-shell-client/files/native-shell-client.service +++ b/recipes-demo/native-shell-client/files/native-shell-client.service @@ -1,11 +1,12 @@ [Unit] -Requires=agl-compositor.service -After=agl-compositor.service +Requires=weston.service +After=weston.service [Service] Type=simple +Environment=XDG_RUNTIME_DIR=/run/user/200 ExecStart=/usr/bin/native-shell-client Restart=on-failure [Install] -WantedBy=agl-session.target +WantedBy=multi-user.target |