mkosi: Install musl in tools trees on Fedora/Arch

For debugging purposes.

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index c1b27679582c5b03854dc64829e20c392f00ca01..ed65950a34efb45f16114e082c5d55f15d835f66 100644 (file)
--- 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 8eec906c5ce0fc1337342f4a9d9f56d73af25d39..52889cb0b4357d9f18a4d434e7fa4b6f6fd03c6a 100644 (file)
--- 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 e32cf27e986e9b3b4c4228f709c7250b9f69a5ff..7a9301c566cd12dd749174b75609617ebdf8e352 100644 (file)
--- 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