mkosi-tools: Stop installing dnf on Azure,OpenSUSE,Fedora

Let's stop installing dnf on in tools trees of these distributions
and only install dnf5.

Simplify the documentation of installed dnf packages while we're at it.

diff --git a/mkosi/resources/man/mkosi.1.md b/mkosi/resources/man/mkosi.1.md
index 10113c3c38a891ef662648167ad5dd8d06b989c7..2e2a8f002cbcf524e9a70b2a5697dba7dd815266 100644 (file)
--- a/mkosi/resources/man/mkosi.1.md
+++ b/mkosi/resources/man/mkosi.1.md
@@ -1256,9 +1256,6 @@ boolean argument: either `1`, `yes`, or `true` to enable, or `0`, `no`,
     | `diffutils`             | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
     | `distribution-gpg-keys` | ✓      | ✓      | ✓      | ✓    |        | ✓    | ✓        |
     | `dnf`                   | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
-    | `dnf-plugins-core`      | ✓      | ✓      |        |      |        |      | ✓        |
-    | `dnf5`                  | ✓      |        |        |      |        |      | ✓        |
-    | `dnf5-plugins`          | ✓      |        |        |      |        |      | ✓        |
     | `dosfstools`            | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
     | `e2fsprogs`             | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |
     | `edk2-ovmf`             | ✓      | ✓      | ✓      | ✓    | ✓      | ✓    | ✓        |

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf b/mkosi/resources/mkosi-tools/mkosi.conf
index ce34f7195f887aaa887ee99047ea4cdb7cdb915c..c0f03cedd85d17f4dbd92e3b54857c30d5d348b0 100644 (file)
--- a/mkosi/resources/mkosi-tools/mkosi.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf
@@ -20,7 +20,6 @@ Packages=
         cpio
         curl
         diffutils
-        dnf
         dosfstools
         e2fsprogs
         findutils

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-arch.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-arch.conf
index 8a3631145634a5f7b8949ee0ea76095bb1eef061..7ea74a9580229547912c49bfbf68ed09662b082b 100644 (file)
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-arch.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-arch.conf
@@ -12,6 +12,7 @@ Packages=
         createrepo_c
         debian-archive-keyring
         distribution-gpg-keys
+        dnf
         dpkg
         edk2-ovmf
         erofs-utils

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-azure-centos-fedora/mkosi.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-azure-centos-fedora/mkosi.conf
index 726f86c331675c312f0c2f1f10e099657304b57f..6f192ea2eb7be4dcb994622b5b0847e1b6ded543 100644 (file)
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-azure-centos-fedora/mkosi.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-azure-centos-fedora/mkosi.conf
@@ -11,7 +11,6 @@ Distribution=|azure
 [Content]
 Packages=
         createrepo_c
-        dnf-plugins-core
         git-core
         grub2-tools
         libseccomp

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf
index 985c95ed944ed92c7365dd67fd9a5dbc56756209..93c84ac4f16b79e8d6378b0d5e7cc9c9bb163baf 100644 (file)
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf
@@ -5,4 +5,6 @@ Distribution=centos
 
 [Content]
 Packages=
+        dnf
+        dnf-plugins-core
         perf

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf
index 101d3aa503f4b4c3266c19d12a5d85a597644250..746054cd1e51f5fa6f0753313e6bf689edfcabd8 100644 (file)
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf
@@ -16,6 +16,7 @@ Packages=
         btrfs-progs
         createrepo-c
         debian-archive-keyring
+        dnf
         erofs-utils
         fish
         git-core

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-opensuse.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-opensuse.conf
index cda60be02fa72e74999ca963b761e91284121641..8bd7fb253c789a18cbcdc2e6f3298a520163edda 100644 (file)
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-opensuse.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-opensuse.conf
@@ -9,7 +9,6 @@ Packages=
         ca-certificates-mozilla
         createrepo_c
         distribution-gpg-keys
-        dnf-plugins-core
         dnf5
         dnf5-plugins
         erofs-utils