From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 7 Jul 2022 12:30:37 +0000 (+0200)
Subject: Stop installing -release packages explicitly
X-Git-Tag: v14~107^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ec136743721dd719f14f8419de4ef40acc0a46a;p=thirdparty%2Fmkosi.git

Stop installing -release packages explicitly

These get pulled in as dependencies by default so no need to install
them explicitly.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index b18bd9cde..b18e2e315 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -2234,7 +2234,7 @@ def install_fedora(args: MkosiArgs, root: Path, do_run_build_script: bool) -> No
     setup_dnf(args, root, repos)
 
     packages = {*args.packages}
-    add_packages(args, packages, "fedora-release", "systemd", "util-linux")
+    add_packages(args, packages, "systemd", "util-linux")
 
     if fedora_release_cmp(release, "34") < 0:
         add_packages(args, packages, "glibc-minimal-langpack", conditional="glibc")
@@ -2540,7 +2540,7 @@ def install_centos(args: MkosiArgs, root: Path, do_run_build_script: bool) -> No
         workspace(root).joinpath("vars/stream").write_text(args.release)
 
     packages = {*args.packages}
-    add_packages(args, packages, "centos-release", "systemd")
+    add_packages(args, packages, "systemd")
     if not do_run_build_script and args.bootable:
         add_packages(args, packages, "kernel", "dracut")
         if epel_release <= 7:
@@ -2561,9 +2561,6 @@ def install_centos(args: MkosiArgs, root: Path, do_run_build_script: bool) -> No
     if do_run_build_script:
         packages.update(args.build_packages)
 
-    if args.distribution == Distribution.centos_epel:
-        add_packages(args, packages, "epel-release")
-
     if do_run_build_script:
         packages.update(args.build_packages)
 
@@ -2591,7 +2588,7 @@ def install_rocky(args: MkosiArgs, root: Path, do_run_build_script: bool) -> Non
     install_rocky_repos(args, root, epel_release)
 
     packages = {*args.packages}
-    add_packages(args, packages, "rocky-release", "systemd")
+    add_packages(args, packages, "systemd")
     if not do_run_build_script and args.bootable:
         add_packages(args, packages, "kernel", "dracut")
         add_packages(args, packages, "systemd-udev", conditional="systemd")
@@ -2599,9 +2596,6 @@ def install_rocky(args: MkosiArgs, root: Path, do_run_build_script: bool) -> Non
     if do_run_build_script:
         packages.update(args.build_packages)
 
-    if args.distribution == Distribution.rocky_epel:
-        add_packages(args, packages, "epel-release")
-
     if do_run_build_script:
         packages.update(args.build_packages)
 
@@ -2622,7 +2616,7 @@ def install_alma(args: MkosiArgs, root: Path, do_run_build_script: bool) -> None
     install_alma_repos(args, root, epel_release)
 
     packages = {*args.packages}
-    add_packages(args, packages, "almalinux-release", "systemd")
+    add_packages(args, packages, "systemd")
     if not do_run_build_script and args.bootable:
         add_packages(args, packages, "kernel", "dracut")
         add_packages(args, packages, "systemd-udev", conditional="systemd")
@@ -2630,9 +2624,6 @@ def install_alma(args: MkosiArgs, root: Path, do_run_build_script: bool) -> None
     if do_run_build_script:
         packages.update(args.build_packages)
 
-    if args.distribution == Distribution.alma_epel:
-        add_packages(args, packages, "epel-release")
-
     if do_run_build_script:
         packages.update(args.build_packages)