From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 12 May 2024 09:54:18 +0000 (+0200)
Subject: Set $QEMU_ARCHITECTURE for configure scripts
X-Git-Tag: v23.1~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf02b63aaa9901d0f68730896f42a5ba427dfd87;p=thirdparty%2Fmkosi.git

Set $QEMU_ARCHITECTURE for configure scripts

Allows trivial access to the qemu binary that mkosi will use to run
qemu.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 724158d92..44608d5af 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -446,6 +446,7 @@ def run_configure_scripts(config: Config) -> Config:
         DISTRIBUTION=str(config.distribution),
         RELEASE=config.release,
         ARCHITECTURE=str(config.architecture),
+        QEMU_ARCHITECTURE=config.architecture.to_qemu(),
         SRCDIR="/work/src",
         MKOSI_UID=str(INVOKING_USER.uid),
         MKOSI_GID=str(INVOKING_USER.gid),
diff --git a/mkosi/resources/mkosi.md b/mkosi/resources/mkosi.md
index db34c6485..965bd6044 100644
--- a/mkosi/resources/mkosi.md
+++ b/mkosi/resources/mkosi.md
@@ -2171,6 +2171,10 @@ Scripts executed by mkosi receive the following environment variables:
   architecture of the host machine. See the documentation of
   `Architecture=` for possible values for this variable.
 
+* `$QEMU_ARCHITECTURE` contains the architecture from `$ARCHITECTURE` in
+   the format used by `qemu`. Useful for finding the qemu binary (
+    `qemu-system-$QEMU_ARCHITECTURE`).
+
 * `$DISTRIBUTION` contains the distribution from the `Distribution=` setting.
 
 * `$RELEASE` contains the release from the `Release=` setting.
@@ -2269,6 +2273,7 @@ Consult this table for which script receives which environment variables:
 | Variable            | `mkosi.configure` | `mkosi.sync` | `mkosi.prepare` | `mkosi.build` | `mkosi.postinst` | `mkosi.finalize` | `mkosi.clean` |
 |---------------------|-------------------|--------------|-----------------|---------------|------------------|------------------|---------------|
 | `ARCHITECTURE`      | X                 | X            | X               | X             | X                | X                | X             |
+| `QEMU_ARCHITECTURE` | X                 |              |                 |               |                  |                  |               |
 | `DISTRIBUTION`      | X                 | X            | X               | X             | X                | X                | X             |
 | `RELEASE`           | X                 | X            | X               | X             | X                | X                | X             |
 | `PROFILE`           | X                 | X            | X               | X             | X                | X                | X             |