From f65296a9c598ae81620e6c1d64ecf5f83bd11dee Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Wed, 23 Nov 2022 13:36:06 -0500
Subject: [PATCH] Add agl-kvm feature template

Add feature template for enabling agl-kvm-guest multiconfig.  Changes
to leverage this to add a host image that includes guest VM images
will follow.

Bug-AGL: SPEC-4618

Change-Id: If8134359a1da7709d81b4ddd186d8c22de05280d
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
---
 conf/multiconfig/agl-kvm-guest.conf                | 24 ++++++++++++++++++++++
 templates/feature/agl-kvm/50_bblayers.conf.inc     |  4 ++++
 templates/feature/agl-kvm/50_local.conf.inc        |  4 ++++
 .../feature/agl-kvm/README_feature_agl-kvm.md      | 14 +++++++++++++
 templates/feature/agl-kvm/included.dep             |  1 +
 5 files changed, 47 insertions(+)
 create mode 100644 conf/multiconfig/agl-kvm-guest.conf
 create mode 100644 templates/feature/agl-kvm/50_bblayers.conf.inc
 create mode 100644 templates/feature/agl-kvm/50_local.conf.inc
 create mode 100644 templates/feature/agl-kvm/README_feature_agl-kvm.md
 create mode 100644 templates/feature/agl-kvm/included.dep

diff --git a/conf/multiconfig/agl-kvm-guest.conf b/conf/multiconfig/agl-kvm-guest.conf
new file mode 100644
index 000000000..b13630db4
--- /dev/null
+++ b/conf/multiconfig/agl-kvm-guest.conf
@@ -0,0 +1,24 @@
+TMPDIR = "${TOPDIR}/tmp-${BB_CURRENT_MC}"
+
+MACHINE = "virtio-aarch64"
+
+# Avoid parse errors caused by linux-renesas, and all the other
+# random bbappends in meta-rcar-gen3.
+BBMASK += "meta-rcar-gen3/ meta-agl-refhw-gen3/"
+
+DISTRO_FEATURES:append = " kvm virtualization"
+
+# Use our own wks file
+WKS_FILE = "directdisk.wks.in"
+
+# We only need ext4 images for guests for now
+AGL_DEFAULT_IMAGE_FSTYPES = "ext4"
+AGL_EXTRA_IMAGE_FSTYPES = ""
+
+# Need to run QEMU with virtio-gpu device
+#PACKAGECONFIG:append:pn-qemu-system-native = " virglrenderer glx gtk+"
+PACKAGECONFIG:append:pn-qemu-system-target = " virglrenderer glx"
+
+# Until aglsetup.sh potentially changes to split features per multiconfig,
+# remove problematic ones from the host build here
+AGL_FEATURES:remove = "agl-refhw-h3"
diff --git a/templates/feature/agl-kvm/50_bblayers.conf.inc b/templates/feature/agl-kvm/50_bblayers.conf.inc
new file mode 100644
index 000000000..e5e39118a
--- /dev/null
+++ b/templates/feature/agl-kvm/50_bblayers.conf.inc
@@ -0,0 +1,4 @@
+AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python"
+AGL_META_NETWORKING = "${METADIR}/external/meta-openembedded/meta-networking"
+AGL_META_FILESYSTEMS = "${METADIR}/external/meta-openembedded/meta-filesystems"
+AGL_META_VIRTUALIZATION = "${METADIR}/external/meta-virtualization"
diff --git a/templates/feature/agl-kvm/50_local.conf.inc b/templates/feature/agl-kvm/50_local.conf.inc
new file mode 100644
index 000000000..dc586eaa6
--- /dev/null
+++ b/templates/feature/agl-kvm/50_local.conf.inc
@@ -0,0 +1,4 @@
+DISTRO_FEATURES:append = " virtualization"
+
+BBMULTICONFIG = "agl-kvm-guest"
+
diff --git a/templates/feature/agl-kvm/README_feature_agl-kvm.md b/templates/feature/agl-kvm/README_feature_agl-kvm.md
new file mode 100644
index 000000000..83c0a0c26
--- /dev/null
+++ b/templates/feature/agl-kvm/README_feature_agl-kvm.md
@@ -0,0 +1,14 @@
+---
+description: Feature agl-kvm
+authors: Scott Murray <scott.murray@konsulko.com>
+---
+
+### Feature agl-kvm
+
+* Enables support for building multiconfig based KVM+QEMU demo images
+
+### Dependent features pulled by agl-kvm
+
+The following features are pulled:
+
+* agl-demo
diff --git a/templates/feature/agl-kvm/included.dep b/templates/feature/agl-kvm/included.dep
new file mode 100644
index 000000000..82639da07
--- /dev/null
+++ b/templates/feature/agl-kvm/included.dep
@@ -0,0 +1 @@
+agl-demo
-- 
2.16.6