From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Wed, 6 Sep 2023 19:20:01 +0000 (+0200)
Subject: Revert "mkosi: pin CentOS9 kernel to working version"
X-Git-Tag: v255-rc1~529
X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=5898cef22a35ceefa068d5f46929eced2baab0ed;p=systemd%2F.git

Revert "mkosi: pin CentOS9 kernel to working version"

The original issue should be fixed in kernel-5.14.0-362.el9.

This reverts commit b0881b65a69e83decab3df0d2b23206cea59bb1b.
---

diff --git a/mkosi.presets/system/mkosi.conf.d/10-centos-fedora.conf b/mkosi.presets/system/mkosi.conf.d/10-centos-fedora.conf
index 7b69969da4..ad77a2b8d4 100644
--- a/mkosi.presets/system/mkosi.conf.d/10-centos-fedora.conf
+++ b/mkosi.presets/system/mkosi.conf.d/10-centos-fedora.conf
@@ -13,6 +13,8 @@ Packages=
         glib2
         iproute
         iproute-tc
+        kernel-core
+        kernel-modules # For squashfs support
         libcap-ng-utils
         netcat
         openssh-server
diff --git a/mkosi.presets/system/mkosi.conf.d/10-centos8.conf b/mkosi.presets/system/mkosi.conf.d/10-centos8.conf
deleted file mode 100644
index f38b26582e..0000000000
--- a/mkosi.presets/system/mkosi.conf.d/10-centos8.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-Distribution=centos
-Release=8
-
-[Content]
-Packages=
-        kernel-core
-        kernel-modules # For squashfs support
diff --git a/mkosi.presets/system/mkosi.conf.d/10-centos9.conf b/mkosi.presets/system/mkosi.conf.d/10-centos9.conf
deleted file mode 100644
index 01138514fc..0000000000
--- a/mkosi.presets/system/mkosi.conf.d/10-centos9.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-Distribution=centos
-Release=9
-
-[Content]
-Packages=
-        kernel-core-5.14.0-354.el9
-        kernel-modules-5.14.0-354.el9 # For squashfs support
diff --git a/mkosi.presets/system/mkosi.conf.d/10-fedora.conf b/mkosi.presets/system/mkosi.conf.d/10-fedora.conf
index c48b678ad8..42d0093a89 100644
--- a/mkosi.presets/system/mkosi.conf.d/10-fedora.conf
+++ b/mkosi.presets/system/mkosi.conf.d/10-fedora.conf
@@ -8,5 +8,3 @@ Packages=
         btrfs-progs
         compsize
         f2fs-tools
-        kernel-core
-        kernel-modules # For squashfs support