From: Marek Vasut <marex@denx.de>
Date: Thu, 1 Sep 2022 00:16:09 +0000 (-0400)
Subject: debian/ubuntu: Pass Architecture option to apt
X-Git-Tag: v14~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fabea447cdf867843ef7d28ab9123e24c5d4c07;p=thirdparty%2Fmkosi.git

debian/ubuntu: Pass Architecture option to apt

Pass the target architecture to apt, otherwise mkosi ... --architecture
pulls in packages for the host architecture. This fixes generation of
container images for non-host architectures, e.g. generation of images
on amd64 host for arm64 target.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 7d48cfc7c..cdbffc945 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -2451,10 +2451,13 @@ def invoke_apt(
     **kwargs: Any,
 ) -> CompletedProcess:
 
+    debarch = DEBIAN_ARCHITECTURES[config.architecture]
+
     cmdline = [
         f"/usr/bin/apt-{subcommand}",
         "-o", f"Dir={root}",
         "-o", f"DPkg::Chroot-Directory={root}",
+        "-o", f"APT::Architecture={debarch}",
         operation,
         *extra,
     ]