Merge pull request #3314 from DaanDeMeyer/centos

Centos tools tree fixes
systemd · Jan 3, 2025 · 0594682 · 0594682
2 parents ce565fb + b7e7404
commit 0594682
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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 → ....conf.d/40-tools/mkosi.conf.d/fedora.conf b/mkosi.conf.d/40-tools/mkosi.conf → ....conf.d/40-tools/mkosi.conf.d/fedora.conf
@@ -1,6 +1,8 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
+[Match]
+ToolsTreeDistribution=fedora
+
 [Build]
 ToolsTreePackages=
         ruff
-        mypy
diff --git a/...i.conf.d/40-tools/mkosi.conf.d/other.conf → ...onf.d/40-tools/mkosi.conf.d/opensuse.conf b/...i.conf.d/40-tools/mkosi.conf.d/other.conf → ...onf.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
diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages-10.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages-10.conf
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Repositories=epel
+Release=10
+
+[Content]
+Packages=
+        btrfs-progs
+        distribution-gpg-keys
+        fish
diff --git a/...centos/mkosi.conf.d/20-epel-packages.conf → ...ntos/mkosi.conf.d/20-epel-packages-9.conf b/...centos/mkosi.conf.d/20-epel-packages.conf → ...ntos/mkosi.conf.d/20-epel-packages-9.conf
@@ -2,11 +2,13 @@
 
 [Match]
 Repositories=epel
+Release=9
 
 [Content]
 Packages=
         apt
         archlinux-keyring
+        btrfs-progs
         debian-keyring
         distribution-gpg-keys
         fish
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,4 +5,6 @@ ToolsTreeDistribution=arch @@
     [Build]
     ToolsTreePackages=
+            mypy
             python-pytest
+            ruff