From 63cfe3b2497821761956a2d8a876c676c09df3a5 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 17 Jan 2025 14:05:26 +0100
Subject: [PATCH] centos: epel-next does not exist anymore since CentOS Stream
 10

Detailed in https://discussion.fedoraproject.org/t/epel-10-proposal/44304.
---
 mkosi.conf.d/20-centos/mkosi.conf.d/epel.conf |  2 +-
 mkosi/distributions/centos.py                 | 61 ++++++++++++-------
 .../mkosi.conf.d/10-centos/mkosi.conf         |  3 -
 .../10-centos/mkosi.conf.d/10-epel-10.conf    |  7 +++
 .../10-centos/mkosi.conf.d/10-epel-9.conf     |  7 +++
 5 files changed, 53 insertions(+), 27 deletions(-)
 create mode 100644 mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/10-epel-10.conf
 create mode 100644 mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/10-epel-9.conf

diff --git a/mkosi.conf.d/20-centos/mkosi.conf.d/epel.conf b/mkosi.conf.d/20-centos/mkosi.conf.d/epel.conf
index ab652c8d4..959440081 100644
--- a/mkosi.conf.d/20-centos/mkosi.conf.d/epel.conf
+++ b/mkosi.conf.d/20-centos/mkosi.conf.d/epel.conf
@@ -4,7 +4,7 @@
 Release=10
 
 [Distribution]
-Repositories=epel,epel-next
+Repositories=epel
 
 [Content]
 Packages=
diff --git a/mkosi/distributions/centos.py b/mkosi/distributions/centos.py
index 3cbbaabfc..b7817e182 100644
--- a/mkosi/distributions/centos.py
+++ b/mkosi/distributions/centos.py
@@ -227,12 +227,18 @@ class Installer(DistributionInstaller):
             return
 
         if mirror := context.config.mirror:
-            for repo, dir in (
+            # epel-next does not exist anymore since EPEL 10.
+            repodirs = [
                 ("epel", "epel"),
-                ("epel-next", "epel/next"),
                 ("epel-testing", "epel/testing"),
-                ("epel-next-testing", "epel/testing/next"),
-            ):
+            ]
+            if int(context.config.release) < 10:
+                repodirs += [
+                    ("epel-next", "epel/next"),
+                    ("epel-next-testing", "epel/testing/next"),
+                ]
+
+            for repo, dir in repodirs:
                 # For EPEL we make the assumption that epel is mirrored in the parent directory of the mirror
                 # URL and path we were given. Since this doesn't work for all scenarios, we also allow
                 # overriding the mirror via an environment variable.
@@ -257,7 +263,13 @@ class Installer(DistributionInstaller):
                 )
         else:
             url = "metalink=https://mirrors.fedoraproject.org/metalink?arch=$basearch"
-            for repo in ("epel", "epel-next"):
+
+            # epel-next does not exist anymore since EPEL 10.
+            repos = ["epel"]
+            if int(context.config.release) < 10:
+                repos += ["epel-next"]
+
+            for repo in repos:
                 yield RpmRepository(
                     repo,
                     f"{url}&repo={repo}-$releasever",
@@ -295,24 +307,27 @@ class Installer(DistributionInstaller):
                 gpgurls,
                 enabled=False,
             )
-            yield RpmRepository(
-                "epel-next-testing",
-                f"{url}&repo=epel-testing-next-$releasever",
-                gpgurls,
-                enabled=False,
-            )
-            yield RpmRepository(
-                "epel-next-testing-debuginfo",
-                f"{url}&repo=epel-testing-next-debug-$releasever",
-                gpgurls,
-                enabled=False,
-            )
-            yield RpmRepository(
-                "epel-next-testing-source",
-                f"{url}&repo=epel-testing-next-source-$releasever",
-                gpgurls,
-                enabled=False,
-            )
+
+            # epel-next does not exist anymore since EPEL 10.
+            if int(context.config.release) < 10:
+                yield RpmRepository(
+                    "epel-next-testing",
+                    f"{url}&repo=epel-testing-next-$releasever",
+                    gpgurls,
+                    enabled=False,
+                )
+                yield RpmRepository(
+                    "epel-next-testing-debuginfo",
+                    f"{url}&repo=epel-testing-next-debug-$releasever",
+                    gpgurls,
+                    enabled=False,
+                )
+                yield RpmRepository(
+                    "epel-next-testing-source",
+                    f"{url}&repo=epel-testing-next-source-$releasever",
+                    gpgurls,
+                    enabled=False,
+                )
 
     @classmethod
     def sig_repositories(cls, context: Context) -> Iterable[RpmRepository]:
diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf
index 384c992f7..985c95ed9 100644
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf
@@ -3,9 +3,6 @@
 [Match]
 Distribution=centos
 
-[Distribution]
-Repositories=epel,epel-next
-
 [Content]
 Packages=
         perf
diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/10-epel-10.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/10-epel-10.conf
new file mode 100644
index 000000000..9e4a010a3
--- /dev/null
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/10-epel-10.conf
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Release=10
+
+[Distribution]
+Repositories=epel
diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/10-epel-9.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/10-epel-9.conf
new file mode 100644
index 000000000..4c1b9e5f0
--- /dev/null
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/10-epel-9.conf
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Release=9
+
+[Distribution]
+Repositories=epel,epel-next
-- 
2.47.2