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)

3 files changed, 21 insertions, 0 deletions

diff --git a/conf/include/agl-kvm.inc b/conf/include/agl-kvm.inc
new file mode 100644
index 00000000..12d8ae19
--- /dev/null
+++ b/conf/include/agl-kvm.inc
@@ -0,0 +1,15 @@
+DISTRO_FEATURES:append = " virtualization"
+
+BBMULTICONFIG = "agl-kvm-guest"
+
+AGL_FEATURES:append = " agl-kvm"
+
+# Override remote display network configuration to use KVM demo's
+# network configuration
+TRANSMITTER_OUTPUT_HOST = "172.16.10.3"
+
+# Override cluster dashboard VIS server host for KVM demo's network
+# configuration
+CLUSTER_DEMO_VISS_HOSTNAME = "172.16.10.2"
+
+include mc-conf-${BB_CURRENT_MC}.inc
diff --git a/conf/include/mc-conf-agl-kvm-guest.inc b/conf/include/mc-conf-agl-kvm-guest.inc
new file mode 100644
index 00000000..6777b2c6
--- /dev/null
+++ b/conf/include/mc-conf-agl-kvm-guest.inc
@@ -0,0 +1,3 @@
+# Override the default virtio-can configuration, as we do not have
+# a backend to be able to use it.
+CANBUS_NETWORK_CONFIG:virtio-all = "canbus-can.network"
diff --git a/conf/include/mc-conf-default.inc b/conf/include/mc-conf-default.inc
new file mode 100644
index 00000000..c60c999b
--- /dev/null
+++ b/conf/include/mc-conf-default.inc
@@ -0,0 +1,3 @@
+# We don't want the app framework bits (specifically the user session) in
+# the KVM host image.
+AGL_FEATURES:remove = "agl-app-fw"