]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Add rpm script to run rpm on the build root
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Sun, 5 Nov 2023 12:14:14 +0000 (13:14 +0100)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Mon, 6 Nov 2023 15:06:06 +0000 (16:06 +0100)
We provide a dnf script, so we should also provide an rpm script.

mkosi/installer/__init__.py
mkosi/installer/dnf.py

index 11d2523d6be64f24204c0b8501257c93ea5726a4..6299e8508ee20b0ac72fb8b8d3bec099fdfd2d03 100644 (file)
@@ -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",
index 859e98e953ee1d8e17b4e6b6780660d2b776e69e..551bb0f1d99880cf9a9614b81e0d019a9edc79e6 100644 (file)
@@ -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]