diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2023-01-18 20:47:11 -0500 |
|---|---|---|
| committer | Scott Murray <scott.murray@konsulko.com> | 2023-01-19 15:34:12 -0500 |
| commit | 94ee287730b16820003aece648e790923a9a5b79 (patch) | |
| tree | 0e096c5f23cb8320a95a28e5617845c1d6e4e5fa /templates/feature | |
| parent | 5109016c566a4a46e4a85f2c7b9dfcd6b8540233 (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: I7f2f2ad9a453b5d99bed4cfc33d99eb3002bcceb
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Diffstat (limited to 'templates/feature')
| -rw-r--r-- | templates/feature/agl-kvm/50_local.conf.inc | 6 | ||||
| -rw-r--r-- | templates/feature/agl-kvm/README_feature_agl-kvm.md | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/templates/feature/agl-kvm/50_local.conf.inc b/templates/feature/agl-kvm/50_local.conf.inc index dc586eaa6..2798116a2 100644 --- a/templates/feature/agl-kvm/50_local.conf.inc +++ b/templates/feature/agl-kvm/50_local.conf.inc @@ -1,4 +1,2 @@ -DISTRO_FEATURES:append = " virtualization" - -BBMULTICONFIG = "agl-kvm-guest" - +#see meta-agl-demo/conf/include/agl-kvm.inc +require conf/include/agl-kvm.inc diff --git a/templates/feature/agl-kvm/README_feature_agl-kvm.md b/templates/feature/agl-kvm/README_feature_agl-kvm.md index 83c0a0c26..46ab15514 100644 --- a/templates/feature/agl-kvm/README_feature_agl-kvm.md +++ b/templates/feature/agl-kvm/README_feature_agl-kvm.md @@ -12,3 +12,6 @@ authors: Scott Murray <scott.murray@konsulko.com> The following features are pulled: * agl-demo + +Note that enabling this feature results in a configuration where building images +other than agl-kvm-demo-platform will likely not give the desired results. |