From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 3 Jan 2025 13:36:18 +0000 (+0100)
Subject: Tools fixes
X-Git-Tag: v25~87^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc4af6118325c25c35462191bb8c19b445fdfffb;p=thirdparty%2Fmkosi.git

Tools fixes
---

diff --git a/mkosi.conf.d/40-tools/mkosi.conf b/mkosi.conf.d/40-tools/mkosi.conf
index 84414c124..bd4fba4df 100644
--- a/mkosi.conf.d/40-tools/mkosi.conf
+++ b/mkosi.conf.d/40-tools/mkosi.conf
@@ -1,6 +1 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Build]
-ToolsTreePackages=
-        ruff
-        mypy
diff --git a/mkosi.conf.d/40-tools/mkosi.conf.d/arch.conf b/mkosi.conf.d/40-tools/mkosi.conf.d/arch.conf
index 8f053f6a1..bde7df91a 100644
--- a/mkosi.conf.d/40-tools/mkosi.conf.d/arch.conf
+++ b/mkosi.conf.d/40-tools/mkosi.conf.d/arch.conf
@@ -5,4 +5,6 @@ ToolsTreeDistribution=arch
 
 [Build]
 ToolsTreePackages=
+        mypy
         python-pytest
+        ruff
diff --git a/mkosi.conf.d/40-tools/mkosi.conf.d/azure-centos-fedora.conf b/mkosi.conf.d/40-tools/mkosi.conf.d/azure-centos-fedora.conf
new file mode 100644
index 000000000..7a9fd493e
--- /dev/null
+++ b/mkosi.conf.d/40-tools/mkosi.conf.d/azure-centos-fedora.conf
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+ToolsTreeDistribution=|azure
+ToolsTreeDistribution=|centos
+ToolsTreeDistribution=|fedora
+
+[Build]
+ToolsTreePackages=
+        python3-mypy
+        python3-pytest
diff --git a/mkosi.conf.d/40-tools/mkosi.conf.d/debian-kali-ubuntu.conf b/mkosi.conf.d/40-tools/mkosi.conf.d/debian-kali-ubuntu.conf
new file mode 100644
index 000000000..027afcf6c
--- /dev/null
+++ b/mkosi.conf.d/40-tools/mkosi.conf.d/debian-kali-ubuntu.conf
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+ToolsTreeDistribution=|debian
+ToolsTreeDistribution=|kali
+ToolsTreeDistribution=|ubuntu
+
+[Build]
+ToolsTreePackages=
+        mypy
+        python3-pytest
diff --git a/mkosi.conf.d/40-tools/mkosi.conf.d/fedora.conf b/mkosi.conf.d/40-tools/mkosi.conf.d/fedora.conf
new file mode 100644
index 000000000..0b6bd4a5a
--- /dev/null
+++ b/mkosi.conf.d/40-tools/mkosi.conf.d/fedora.conf
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+ToolsTreeDistribution=fedora
+
+[Build]
+ToolsTreePackages=
+        ruff
diff --git a/mkosi.conf.d/40-tools/mkosi.conf.d/other.conf b/mkosi.conf.d/40-tools/mkosi.conf.d/opensuse.conf
similarity index 64%
rename from mkosi.conf.d/40-tools/mkosi.conf.d/other.conf
rename to mkosi.conf.d/40-tools/mkosi.conf.d/opensuse.conf
index 8dac2a8e5..bf6ffb87e 100644
--- a/mkosi.conf.d/40-tools/mkosi.conf.d/other.conf
+++ b/mkosi.conf.d/40-tools/mkosi.conf.d/opensuse.conf
@@ -1,8 +1,10 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Match]
-ToolsTreeDistribution=!arch
+ToolsTreeDistribution=opensuse
 
 [Build]
 ToolsTreePackages=
+        mypy
         python3-pytest
+        ruff