From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Tue, 19 Dec 2023 11:06:24 +0000 (+0100)
Subject: Revert "mkosi: pin CentOS8 kernel to working version"
X-Git-Tag: v256-rc1~1457
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97e52d62fbf9890bfc55193898ccffdc638ec182;p=thirdparty%2Fsystemd.git

Revert "mkosi: pin CentOS8 kernel to working version"

A fixed kernel finally landed on mirrors, so let's revert the C8S kernel
pin.

This reverts commit a64398b2ca1cdaee291550face0d1ce5f8ea52f6.
---

diff --git a/mkosi.images/system/mkosi.conf.d/10-centos-fedora.conf b/mkosi.images/system/mkosi.conf.d/10-centos-fedora.conf
index 145c79bf63d..67d46432d40 100644
--- a/mkosi.images/system/mkosi.conf.d/10-centos-fedora.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-centos-fedora.conf
@@ -14,6 +14,7 @@ Packages=
         integritysetup
         iproute
         iproute-tc
+        kernel-core
         libcap-ng-utils
         netcat
         openssh-server
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 af4862d4b14..146e03a8955 100644
--- a/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf
@@ -2,3 +2,7 @@
 
 [Match]
 Distribution=centos
+
+[Content]
+Packages=
+        kernel-modules # For squashfs support
diff --git a/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf.d/10-centos8.conf b/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf.d/10-centos8.conf
deleted file mode 100644
index 30643e72b36..00000000000
--- a/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf.d/10-centos8.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-Release=8
-
-[Content]
-Packages=
-        kernel-core-4.18.0-521.el8
-        kernel-modules-4.18.0-521.el8 # For squashfs support
diff --git a/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf.d/10-centos9.conf b/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf.d/10-centos9.conf
deleted file mode 100644
index a21739f2300..00000000000
--- a/mkosi.images/system/mkosi.conf.d/10-centos/mkosi.conf.d/10-centos9.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-Release=9
-
-[Content]
-Packages=
-        kernel-core
-        kernel-modules
diff --git a/mkosi.images/system/mkosi.conf.d/10-fedora.conf b/mkosi.images/system/mkosi.conf.d/10-fedora.conf
index 620688e51b9..5863f03b19c 100644
--- a/mkosi.images/system/mkosi.conf.d/10-fedora.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-fedora.conf
@@ -9,4 +9,3 @@ Packages=
         compsize
         f2fs-tools
         glibc-langpack-en
-        kernel-core