From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 25 Nov 2022 20:19:18 +0000 (+0100)
Subject: Bump alma/rocky default release to "9"
X-Git-Tag: v15~378^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fee9cdfd63cc1029b2312720749b4f2a1cd74899;p=thirdparty%2Fmkosi.git

Bump alma/rocky default release to "9"
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index b6f196053..7fc3854de 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -4979,9 +4979,9 @@ def load_args(args: argparse.Namespace) -> MkosiConfig:
         elif args.distribution in (Distribution.centos, Distribution.centos_epel):
             args.release = "9-stream"
         elif args.distribution in (Distribution.rocky, Distribution.rocky_epel):
-            args.release = "8"
+            args.release = "9"
         elif args.distribution in (Distribution.alma, Distribution.alma_epel):
-            args.release = "8"
+            args.release = "9"
         elif args.distribution == Distribution.mageia:
             args.release = "7"
         elif args.distribution == Distribution.debian:
diff --git a/mkosi/distributions/alma.py b/mkosi/distributions/alma.py
index 70388a6a0..143a5aad9 100644
--- a/mkosi/distributions/alma.py
+++ b/mkosi/distributions/alma.py
@@ -11,8 +11,8 @@ class AlmaInstaller(CentosInstaller):
     @staticmethod
     def _gpg_locations(epel_release: int) -> Tuple[Path, str]:
         return (
-            Path("/etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux"),
-            "https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux"
+            Path(f"/etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-{epel_release}"),
+            f"https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux-{epel_release}",
         )
 
     @classmethod
diff --git a/mkosi/distributions/centos.py b/mkosi/distributions/centos.py
index 2a9b58384..2b22466a0 100644
--- a/mkosi/distributions/centos.py
+++ b/mkosi/distributions/centos.py
@@ -119,18 +119,28 @@ class CentosInstaller(DistributionInstaller):
 
         if config.local_mirror:
             appstream_url = f"baseurl={config.local_mirror}"
-            baseos_url = extras_url = powertools_url = epel_url = None
+            baseos_url = extras_url = powertools_url = crb_url = epel_url = None
         elif config.mirror:
             appstream_url = f"baseurl={config.mirror}/{directory}/{config.release}/AppStream/$basearch/os"
             baseos_url = f"baseurl={config.mirror}/{directory}/{config.release}/BaseOS/$basearch/os"
             extras_url = f"baseurl={config.mirror}/{directory}/{config.release}/extras/$basearch/os"
-            powertools_url = f"baseurl={config.mirror}/{directory}/{config.release}/PowerTools/$basearch/os"
+            if epel_release >= 9:
+                crb_url = f"baseurl={config.mirror}/{directory}/{config.release}/CRB/$basearch/os"
+                powertools_url = None
+            else:
+                crb_url = None
+                powertools_url = f"baseurl={config.mirror}/{directory}/{config.release}/PowerTools/$basearch/os"
             epel_url = f"baseurl={config.mirror}/epel/{epel_release}/Everything/$basearch"
         else:
             appstream_url = f"mirrorlist={cls._mirror_repo_url(config, 'AppStream')}"
             baseos_url = f"mirrorlist={cls._mirror_repo_url(config, 'BaseOS')}"
             extras_url = f"mirrorlist={cls._mirror_repo_url(config, 'extras')}"
-            powertools_url = f"mirrorlist={cls._mirror_repo_url(config, 'PowerTools')}"
+            if epel_release >= 9:
+                crb_url = f"mirrorlist={cls._mirror_repo_url(config, 'CRB')}"
+                powertools_url = None
+            else:
+                crb_url = None
+                powertools_url = f"mirrorlist={cls._mirror_repo_url(config, 'PowerTools')}"
             epel_url = f"mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=epel-{epel_release}&arch=$basearch"
 
         repos = [Repo("AppStream", appstream_url, gpgpath, gpgurl)]
@@ -138,6 +148,8 @@ class CentosInstaller(DistributionInstaller):
             repos += [Repo("BaseOS", baseos_url, gpgpath, gpgurl)]
         if extras_url is not None:
             repos += [Repo("extras", extras_url, gpgpath, gpgurl)]
+        if crb_url is not None:
+            repos += [Repo("CRB", crb_url, gpgpath, gpgurl)]
         if powertools_url is not None:
             repos += [Repo("PowerTools", powertools_url, gpgpath, gpgurl)]
         if epel_url is not None and cls._is_epel():