From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 5 Nov 2023 12:14:14 +0000 (+0100)
Subject: Add rpm script to run rpm on the build root
X-Git-Tag: v19~26^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55bfc64fa2271c03e00c52f4580f5d05d441d716;p=thirdparty%2Fmkosi.git

Add rpm script to run rpm on the build root

We provide a dnf script, so we should also provide an rpm script.
---

diff --git a/mkosi/installer/__init__.py b/mkosi/installer/__init__.py
index 11d2523d6..6299e8508 100644
--- a/mkosi/installer/__init__.py
+++ b/mkosi/installer/__init__.py
@@ -4,7 +4,7 @@ import os
 
 from mkosi.config import ConfigFeature
 from mkosi.installer.apt import apt_cmd
-from mkosi.installer.dnf import dnf_cmd
+from mkosi.installer.dnf import dnf_cmd, rpm_cmd
 from mkosi.installer.pacman import pacman_cmd
 from mkosi.installer.zypper import zypper_cmd
 from mkosi.run import apivfs_cmd
@@ -42,6 +42,7 @@ def package_manager_scripts(state: MkosiState) -> dict[str, list[PathString]]:
         "pacman": apivfs_cmd(state.root) + pacman_cmd(state),
         "zypper": apivfs_cmd(state.root) + zypper_cmd(state),
         "dnf"   : apivfs_cmd(state.root) + dnf_cmd(state),
+        "rpm"   : apivfs_cmd(state.root) + rpm_cmd(state),
     } | {
         command: apivfs_cmd(state.root) + apt_cmd(state, command) for command in (
             "apt",
diff --git a/mkosi/installer/dnf.py b/mkosi/installer/dnf.py
index 859e98e95..551bb0f1d 100644
--- a/mkosi/installer/dnf.py
+++ b/mkosi/installer/dnf.py
@@ -164,3 +164,7 @@ def fixup_rpmdb_location(root: Path) -> None:
     rmtree(rpmdb)
     shutil.move(rpmdb_home, rpmdb)
     rpmdb_home.symlink_to(os.path.relpath(rpmdb, start=rpmdb_home.parent))
+
+
+def rpm_cmd(state: MkosiState) -> list[PathString]:
+    return ["rpm", "--root", state.root]