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.

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 26b45e8e9c76dd047df54de9130f94c9fa1dcbf8..799de75e539a3d7228fbfd32864d976525f6f7d8 100644 (file)
--- 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 843b96d9a61f37b02153f53f68df5ce6a258d2d3..15f888168dc38adc54d5075f4b59183626192331 100644 (file)
--- 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 6441096322331b903e54e307faf3eb2c2bb635b9..c6b6155dda343d793f9b1d947746097287303b07 100644 (file)
--- 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 (file)
index 0000000..af923fa
--- /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 (file)
index 0000000..615de52
--- /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 8c1b04dbd2f4a75f5d7e3ca692df554909e601f6..3acec1092c39c22c0c514af2998b02c2d05d53d3 100644 (file)
--- 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