From 556659adfeffcec7a74192096fd65a44866fd8ea Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 28 May 2024 14:09:57 +0200
Subject: [PATCH] mkosi: Switch back to cloud/KVM kernel packages

Now that we don't need megasas2 anymore, let's switch back to the
KVM/cloud kernel images to save on image size, build times and boot
times.
---
 .../system/mkosi.conf.d/10-centos-fedora/mkosi.conf       | 1 -
 mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf     | 1 +
 mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf     | 4 ----
 .../system/mkosi.conf.d/10-debian/mkosi.conf.d/arm64.conf | 8 ++++++++
 .../mkosi.conf.d/10-debian/mkosi.conf.d/x86-64.conf       | 8 ++++++++
 mkosi.images/system/mkosi.conf.d/10-fedora/mkosi.conf     | 1 +
 6 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf.d/arm64.conf
 create mode 100644 mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf.d/x86-64.conf

diff --git a/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.conf
index 26b45e8e9c7..799de75e539 100644
--- a/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.conf
@@ -40,7 +40,6 @@ Packages=
         iputils
         iscsi-initiator-utils
         kernel-core
-        kernel-modules # For squashfs and megasas2
         libasan
         libcap-ng-utils
         libubsan
diff --git a/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf
index 843b96d9a61..15f888168dc 100644
--- a/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf
@@ -5,4 +5,5 @@ Distribution=centos
 
 [Content]
 Packages=
+        kernel-modules # For squashfs
         rpmautospec-rpm-macros
diff --git a/mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf
index 64410963223..c6b6155dda3 100644
--- a/mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf
@@ -2,7 +2,3 @@
 
 [Match]
 Distribution=debian
-
-[Content]
-Packages=
-        linux-image-generic
diff --git a/mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf.d/arm64.conf b/mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf.d/arm64.conf
new file mode 100644
index 00000000000..af923fa4427
--- /dev/null
+++ b/mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf.d/arm64.conf
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Architecture=arm64
+
+[Content]
+Packages=
+        linux-image-cloud-arm64
diff --git a/mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf.d/x86-64.conf b/mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf.d/x86-64.conf
new file mode 100644
index 00000000000..615de52499e
--- /dev/null
+++ b/mkosi.images/system/mkosi.conf.d/10-debian/mkosi.conf.d/x86-64.conf
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Architecture=x86-64
+
+[Content]
+Packages=
+        linux-image-cloud-amd64
diff --git a/mkosi.images/system/mkosi.conf.d/10-fedora/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-fedora/mkosi.conf
index 8c1b04dbd2f..3acec1092c3 100644
--- a/mkosi.images/system/mkosi.conf.d/10-fedora/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-fedora/mkosi.conf
@@ -10,6 +10,7 @@ Packages=
         dnf5
         f2fs-tools
         scsi-target-utils
+        # Required for systemd-networkd-tests.py (netdevsim and sch_xxx modules)
         kernel-modules-extra
         kernel-modules-internal
 
-- 
2.47.3