Fix --mirror for CentOS and Fedora

Let's unify the interface for --mirror and only require users to
specify a url and add the entire path ourselves in mkosi. This is
required to use EPEL repositories with --mirror= as the epel
repositories are mirrored under <url>/fedora/epel whereas the CentOS
Stream repositories are under <url>/centos-stream

diff --git a/mkosi/distributions/centos.py b/mkosi/distributions/centos.py
index e01cfb9c1c43fa757111390e4bac47e373e9946c..0e389f1002085ce5f14d99533dc9eff5efa3a2c8 100644 (file)
--- a/mkosi/distributions/centos.py
+++ b/mkosi/distributions/centos.py
@@ -130,12 +130,12 @@ class Installer(DistributionInstaller):
                 if repo == "extras":
                     yield RpmRepository(
                         repo.lower(),
-                        f"baseurl={join_mirror(mirror, f'SIGs/$stream/{repo}/$basearch/extras-common')}",
+                        f"baseurl={join_mirror(mirror, f'centos-stream/SIGs/$stream/{repo}/$basearch/extras-common')}",
                         cls.gpgurls(context),
                     )
                     yield RpmRepository(
                         f"{repo.lower()}-source",
-                        f"baseurl={join_mirror(mirror, f'SIGs/$stream/{repo}/source/extras-common')}",
+                        f"baseurl={join_mirror(mirror, f'centos-stream/SIGs/$stream/{repo}/source/extras-common')}",
                         cls.gpgurls(context),
                         enabled=False,
                     )
@@ -143,18 +143,18 @@ class Installer(DistributionInstaller):
                 else:
                     yield RpmRepository(
                         repo.lower(),
-                        f"baseurl={join_mirror(mirror, f'$stream/{repo}/$basearch/os')}",
+                        f"baseurl={join_mirror(mirror, f'centos-stream/$stream/{repo}/$basearch/os')}",
                         cls.gpgurls(context),
                     )
                     yield RpmRepository(
                         f"{repo.lower()}-debuginfo",
-                        f"baseurl={join_mirror(mirror, f'$stream/{repo}/$basearch/debug/tree')}",
+                        f"baseurl={join_mirror(mirror, f'centos-stream/$stream/{repo}/$basearch/debug/tree')}",
                         cls.gpgurls(context),
                         enabled=False,
                     )
                     yield RpmRepository(
                         f"{repo.lower()}-source",
-                        f"baseurl={join_mirror(mirror, f'$stream/{repo}/source/tree')}",
+                        f"baseurl={join_mirror(mirror, f'centos-stream/$stream/{repo}/source/tree')}",
                         cls.gpgurls(context),
                         enabled=False,
                     )
@@ -252,19 +252,19 @@ class Installer(DistributionInstaller):
             ):
                 yield RpmRepository(
                     repo,
-                    f"baseurl={join_mirror(mirror, f'{dir}/$releasever/Everything/$basearch')}",
+                    f"baseurl={join_mirror(mirror, f'fedora/{dir}/$releasever/Everything/$basearch')}",
                     gpgurls,
                     enabled=False,
                 )
                 yield RpmRepository(
                     f"{repo}-debuginfo",
-                    f"baseurl={join_mirror(mirror, f'{dir}/$releasever/Everything/$basearch/debug')}",
+                    f"baseurl={join_mirror(mirror, f'fedora/{dir}/$releasever/Everything/$basearch/debug')}",
                     gpgurls,
                     enabled=False,
                 )
                 yield RpmRepository(
                     f"{repo}-source",
-                    f"baseurl={join_mirror(mirror, f'{dir}/$releasever/Everything/source/tree')}",
+                    f"baseurl={join_mirror(mirror, f'fedora/{dir}/$releasever/Everything/source/tree')}",
                     gpgurls,
                     enabled=False,
                 )
@@ -349,7 +349,7 @@ class Installer(DistributionInstaller):
                         )
                         yield RpmRepository(
                             f"{sig}-{c}-debuginfo",
-                            f"baseurl={join_mirror(mirror, f'$stream/{sig}/$basearch')}",
+                            f"baseurl={join_mirror(mirror, f'centos-debuginfo/$stream/{sig}/$basearch')}",
                             gpgurls,
                             enabled=False,
                         )
@@ -362,19 +362,19 @@ class Installer(DistributionInstaller):
                     else:
                         yield RpmRepository(
                             f"{sig}-{c}",
-                            f"baseurl={join_mirror(mirror, f'SIGs/$stream/{sig}/$basearch/{c}')}",
+                            f"baseurl={join_mirror(mirror, f'centos-stream/SIGs/$stream/{sig}/$basearch/{c}')}",
                             gpgurls,
                             enabled=False,
                         )
                         yield RpmRepository(
                             f"{sig}-{c}-debuginfo",
-                            f"baseurl={join_mirror(mirror, f'SIGs/$stream/{sig}/$basearch/{c}/debug')}",
+                            f"baseurl={join_mirror(mirror, f'centos-stream/SIGs/$stream/{sig}/$basearch/{c}/debug')}",
                             gpgurls,
                             enabled=False,
                         )
                         yield RpmRepository(
                             f"{sig}-{c}-source",
-                            f"baseurl={join_mirror(mirror, f'SIGs/$stream/{sig}/source/{c}')}",
+                            f"baseurl={join_mirror(mirror, f'centos-stream/SIGs/$stream/{sig}/source/{c}')}",
                             gpgurls,
                             enabled=False,
                         )

diff --git a/mkosi/distributions/fedora.py b/mkosi/distributions/fedora.py
index 105f25eea3fb148d8141dacae3408a7cefaa21f5..dc865819d5daf6244e25e4b1ae61ad775dbb51ee 100644 (file)
--- a/mkosi/distributions/fedora.py
+++ b/mkosi/distributions/fedora.py
@@ -65,7 +65,7 @@ class Installer(DistributionInstaller):
                 ]
         elif context.config.mirror:
             directory = "development" if context.config.release == "rawhide" else "releases"
-            url = f"baseurl={join_mirror(context.config.mirror, f'{directory}/$releasever/Everything')}"
+            url = f"baseurl={join_mirror(context.config.mirror, f'fedora/{directory}/$releasever/Everything')}"
             repos += [
                 RpmRepository("fedora", f"{url}/$basearch/os", gpgurls),
                 RpmRepository("fedora-debuginfo", f"{url}/$basearch/debug/tree", gpgurls, enabled=False),