From 77b3ddf2aa6d1c3ad6397428fcc8fb1f092d8db1 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan@amutable.com>
Date: Sat, 14 Feb 2026 23:30:34 +0100
Subject: [PATCH] mkosi: Install musl in tools trees on Fedora/Arch

For debugging purposes.
---
 .github/workflows/linter.yml                    | 4 ----
 mkosi/mkosi.tools.conf/mkosi.conf.d/arch.conf   | 1 +
 mkosi/mkosi.tools.conf/mkosi.conf.d/fedora.conf | 7 ++++++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index c1b2767958..ed65950a34 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -50,10 +50,6 @@ jobs:
           [Build]
           ToolsTreeDistribution=fedora
           ToolsTreeRelease=rawhide
-          ToolsTreePackages=
-                libgcrypt-devel
-                libgpg-error-devel
-                musl-gcc
           EOF
 
           mkosi -f box -- true
diff --git a/mkosi/mkosi.tools.conf/mkosi.conf.d/arch.conf b/mkosi/mkosi.tools.conf/mkosi.conf.d/arch.conf
index 8eec906c5c..52889cb0b4 100644
--- a/mkosi/mkosi.tools.conf/mkosi.conf.d/arch.conf
+++ b/mkosi/mkosi.tools.conf/mkosi.conf.d/arch.conf
@@ -11,6 +11,7 @@ Packages=
         github-cli
         lcov
         libucontext
+        musl
         mypy
         pkgconf
         ruff
diff --git a/mkosi/mkosi.tools.conf/mkosi.conf.d/fedora.conf b/mkosi/mkosi.tools.conf/mkosi.conf.d/fedora.conf
index e32cf27e98..7a9301c566 100644
--- a/mkosi/mkosi.tools.conf/mkosi.conf.d/fedora.conf
+++ b/mkosi/mkosi.tools.conf/mkosi.conf.d/fedora.conf
@@ -5,7 +5,12 @@ Distribution=fedora
 
 [Content]
 Packages=
-        lcov
         gh
+        lcov
+        libgcrypt-devel
+        libgpg-error-devel
+        musl-libc
+        musl-clang
+        musl-gcc
         ruff
         shellcheck