Revert "Do not try to install packages that are listed in RemovePackages="

This reverts commit b3d6e69d8e01e0fcaf8409935ebe8ebf95d546c3.

Fixes #3911

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 98771a9ad1f8dc40fc1315b97a08402288531d1c..f4766ae71244a21caa5bcbf5b5376f617c706b33 100644 (file)
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -254,25 +254,18 @@ def remove_files(context: Context) -> None:
                         t.rmdir()
 
 
-def finalize_packages(config: Config) -> list[str]:
-    s = set(config.remove_packages)
-    return [p for p in config.packages if p not in s]
-
-
 def install_distribution(context: Context) -> None:
-    packages = finalize_packages(context.config)
-
     if context.config.base_trees:
-        if not packages:
+        if not context.config.packages:
             return
 
         with complete_step(
             f"Installing extra packages for {context.config.distribution.installer.pretty_name()}"
         ):
-            context.config.distribution.installer.install_packages(context, packages)
+            context.config.distribution.installer.install_packages(context, context.config.packages)
     else:
         if context.config.overlay or context.config.output_format.is_extension_image():
-            if packages:
+            if context.config.packages:
                 die(
                     "Cannot install packages in extension images without a base tree",
                     hint="Configure a base tree with the BaseTrees= setting",
@@ -307,8 +300,8 @@ def install_distribution(context: Context) -> None:
             with umask(~0o600):
                 (context.root / "boot/loader/entries.srel").write_text("type1\n")
 
-            if packages:
-                context.config.distribution.installer.install_packages(context, packages)
+            if context.config.packages:
+                context.config.distribution.installer.install_packages(context, context.config.packages)
 
     for f in (
         "var/lib/systemd/random-seed",

diff --git a/mkosi/config.py b/mkosi/config.py
index a6c4984cd04e4f28434623f814ecab874eecbb2c..ddd9e72e8969150b7031a16def5f94ca27a111ad 100644 (file)
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -2384,7 +2384,6 @@ class Config:
             ),
             "packages": sorted(self.packages),
             "build_packages": sorted(self.build_packages),
-            "remove_packages": sorted(self.remove_packages),
             "package_directories": [
                 (p.name, p.stat().st_mtime_ns)
                 for d in self.package_directories