From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Fri, 27 Oct 2023 12:36:48 +0000 (+0200)
Subject: fedora: allow cross builds with dnf5
X-Git-Tag: v19~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c638bc2ceca157df08162b5656a099f958624588;p=thirdparty%2Fmkosi.git

fedora: allow cross builds with dnf5

The `--forcearch` flag is global an can be used in dnf5 from v5.1.6 up.

Co-authored-by: Malte Poll <mp@edgeless.systems>
---

diff --git a/mkosi/installer/dnf.py b/mkosi/installer/dnf.py
index a6410b686..d5273501a 100644
--- a/mkosi/installer/dnf.py
+++ b/mkosi/installer/dnf.py
@@ -34,10 +34,7 @@ def find_rpm_gpgkey(state: MkosiState, key: str, url: str) -> str:
 
 
 def dnf_executable(state: MkosiState) -> str:
-    # dnf5 does not support building for foreign architectures yet (missing --forcearch)
-    dnf = shutil.which("dnf5") if state.config.architecture.is_native() else None
-    dnf = dnf or shutil.which("dnf") or "yum"
-    return dnf
+    return shutil.which("dnf5") or shutil.which("dnf") or "yum"
 
 
 def setup_dnf(state: MkosiState, repos: Iterable[Repo], filelists: bool = True) -> None: