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 7d48cfc7c71d248225192fe073f6513db2766e9f..cdbffc9457d9b71a5b0856f5a2c4d50e4d925869 100644 (file)
--- 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,
     ]