mkosi-vm: install cloud kernel for debian/arm64 builds

The non-cloud arm64 kernel does not enable some configs
that are needed for the qemu runs, like generic TPM support

diff --git a/mkosi/resources/mkosi-vm/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf b/mkosi/resources/mkosi-vm/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf
index f4fe0fd128580bc0d219f0b7242f318aaae2bdad..a979b06a9b8d69283cd12f5c87cda0b900ebf185 100644 (file)
--- a/mkosi/resources/mkosi-vm/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf
+++ b/mkosi/resources/mkosi-vm/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf
@@ -11,7 +11,6 @@ Packages=
         dbus-broker
         iproute2
         iputils-ping
-        linux-image-generic
         login
         polkitd
         systemd-coredump

diff --git a/mkosi/resources/mkosi-vm/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/arm64.conf b/mkosi/resources/mkosi-vm/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/arm64.conf
new file mode 100644 (file)
index 0000000..01fc2b0
--- /dev/null
+++ b/mkosi/resources/mkosi-vm/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/arm64.conf
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Architecture=arm64
+Distribution=debian
+
+[Content]
+# The non-cloud arm64 kernel does not enable various options
+# that are needed for our qemu builds, like generic TPM support
+Packages=
+        linux-image-cloud-arm64

diff --git a/mkosi/resources/mkosi-vm/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/kernel-generic.conf b/mkosi/resources/mkosi-vm/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/kernel-generic.conf
new file mode 100644 (file)
index 0000000..6237c4c
--- /dev/null
+++ b/mkosi/resources/mkosi-vm/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/kernel-generic.conf
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Architecture=|!arm64
+Distribution=|ubuntu
+Distribution=|kali
+
+[Content]
+Packages=
+        linux-image-generic