From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 26 May 2023 10:16:50 +0000 (+0200)
Subject: debian: Fix foreign architecture builds
X-Git-Tag: v15~145
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0458ab40537625b8a2af57fb88f94bd0697725b;p=thirdparty%2Fmkosi.git

debian: Fix foreign architecture builds

--force-architecture forces dpkg to install packages for other
architectures than the host architecture. --force-depends is required
because when building for arm64 it seems it can't quite figure out
all the pre-depends. For extra safety, we also set APT::Architectures
on top of APT::Architecture.
---

diff --git a/mkosi/distributions/debian.py b/mkosi/distributions/debian.py
index eedabec69..3b5c34bc0 100644
--- a/mkosi/distributions/debian.py
+++ b/mkosi/distributions/debian.py
@@ -170,6 +170,7 @@ def setup_apt(state: MkosiState, repos: Sequence[str]) -> None:
         dedent(
             f"""\
             APT::Architecture "{debarch}";
+            APT::Architectures "{debarch}";
             APT::Immediate-Configure "off";
             APT::Install-Recommends "false";
             APT::Get::Assume-Yes "true";
@@ -189,6 +190,8 @@ def setup_apt(state: MkosiState, repos: Sequence[str]) -> None:
             DPkg::Options:: "--root={state.root}";
             DPkg::Options:: "--log={state.workspace / "apt/dpkg.log"}";
             DPkg::Options:: "--force-unsafe-io";
+            DPkg::Options:: "--force-architecture";
+            DPkg::Options:: "--force-depends";
             Dpkg::Use-Pty "false";
             DPkg::Install::Recursive::Minimum "1000";
             pkgCacheGen::ForceEssential ",";