From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 25 Feb 2025 17:51:18 +0000 (+0100)
Subject: rpm: Enable plugins again
X-Git-Tag: v26~350^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aeef3535164f235b5217d99fce3ddb7c99c8268f;p=thirdparty%2Fmkosi.git

rpm: Enable plugins again

We disabled this a long time ago, likely when we were still using
/etc from the host, let's try enabling the plugins again and see
what happens in CI.
---

diff --git a/mkosi/installer/rpm.py b/mkosi/installer/rpm.py
index c6afd06f8..b70892ba4 100644
--- a/mkosi/installer/rpm.py
+++ b/mkosi/installer/rpm.py
@@ -1,7 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 import dataclasses
-import subprocess
 import textwrap
 from pathlib import Path
 from typing import Literal, Optional, overload
@@ -9,7 +8,6 @@ from typing import Literal, Optional, overload
 from mkosi.context import Context
 from mkosi.distributions import Distribution
 from mkosi.log import die
-from mkosi.run import run
 from mkosi.util import PathString
 
 
@@ -94,18 +92,6 @@ def setup_rpm(
     if dbbackend:
         (confdir / "macros.db_backend").write_text(f"%_db_backend {dbbackend}")
 
-    plugindir = Path(
-        run(
-            ["rpm", "--eval", "%{__plugindir}"],
-            sandbox=context.sandbox(),
-            stdout=subprocess.PIPE,
-        ).stdout.strip()
-    )
-    if (plugindir := context.config.tools() / plugindir.relative_to("/")).exists():
-        with (confdir / "macros.disable-plugins").open("w") as f:
-            for plugin in plugindir.iterdir():
-                f.write(f"%__transaction_{plugin.stem} %{{nil}}\n")
-
     if context.config.distribution == Distribution.opensuse or (
         context.config.distribution.is_centos_variant() and context.config.release == "9"
     ):