Tools fixes

diff --git a/mkosi.conf.d/40-tools/mkosi.conf b/mkosi.conf.d/40-tools/mkosi.conf
index 84414c1247427db125def6238936188bb3c365c2..bd4fba4dfea950c2718f2c4dc5ecf9f352a02fbb 100644 (file)
--- 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 8f053f6a1083cf4355098367a743c39a32346277..bde7df91ac74beb23c4e468cea061f383217098b 100644 (file)
--- 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 (file)
index 0000000..7a9fd49
--- /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 (file)
index 0000000..027afcf
--- /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 (file)
index 0000000..0b6bd4a
--- /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 8dac2a8e5a04150d415496c88b42673d5837ccda..bf6ffb87e22aaaf86b43915ffc78d5c35f9e6234 100644 (file)
--- 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