From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 30 May 2023 10:15:42 +0000 (+0200)
Subject: Use dnf when building foreign architectures
X-Git-Tag: v15~140^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1592%2Fhead;p=thirdparty%2Fmkosi.git

Use dnf when building foreign architectures

dnf5 does not support --forcearch yet which means it can't build
foreign architectures.
---

diff --git a/mkosi/distributions/fedora.py b/mkosi/distributions/fedora.py
index db42e647f..cd7b9840d 100644
--- a/mkosi/distributions/fedora.py
+++ b/mkosi/distributions/fedora.py
@@ -159,7 +159,9 @@ def invoke_dnf(
     state.workspace.joinpath("log").mkdir(exist_ok=True)
     state.workspace.joinpath("persist").mkdir(exist_ok=True)
 
-    dnf = shutil.which("dnf5") or shutil.which("dnf") or "yum"
+    # 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"
 
     cmdline = [
         dnf,