Don't show default tools trees in the summary

Instead, let's show individual tools tree packages in the summary.
This makes things a bit more consistent as we don't show default
initrd presets in the summary either (and making that happen is no
trivial task so we opt to do the reverse and not show default tools
trees either).

We also add a table to the documentation showing which packages are
in the default tools tree for which distributions.

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index b7e61c3af52c2ba3f071d79c831b4abdee7701ce..0cb5a633625467d5d0f8aa5170812a36bc3f7460 100644 (file)
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -2389,8 +2389,6 @@ def run_verb(args: MkosiArgs, presets: Sequence[MkosiConfig]) -> None:
     if args.verb == Verb.bump:
         return bump_image_version()
 
-    presets = finalize_tools(args, presets)
-
     if args.verb == Verb.summary:
         text = ""
 
@@ -2400,6 +2398,7 @@ def run_verb(args: MkosiArgs, presets: Sequence[MkosiConfig]) -> None:
         page(text, args.pager)
         return
 
+    presets = finalize_tools(args, presets)
     last = presets[-1]
 
     if args.verb in (Verb.shell, Verb.boot):

diff --git a/mkosi/config.py b/mkosi/config.py
index 3f4b7c12daf4c7a2b8abbcd9120378d35293637f..e987d559402526e666ceeee70c36e6934c12eb62 100644 (file)
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -2500,6 +2500,7 @@ Clean Package Manager Metadata: {yes_no_auto(config.clean_package_metadata)}
                     Tools Tree: {config.tools_tree}
        Tools Tree Distribution: {none_to_none(config.tools_tree_distribution)}
             Tools Tree Release: {none_to_none(config.tools_tree_release)}
+           Tools Tree Packages: {line_join_list(config.tools_tree_packages)}
                  Runtime Trees: {line_join_source_target_list(config.runtime_trees)}
 
                       QEMU GUI: {yes_no(config.qemu_gui)}

diff --git a/mkosi/resources/mkosi.md b/mkosi/resources/mkosi.md
index d808a692ac78b2864c02ca9bb0d913ffc63f6c65..8487b713228437fa5a09c15fd64664506fcf477e 100644 (file)
--- a/mkosi/resources/mkosi.md
+++ b/mkosi/resources/mkosi.md
@@ -1149,7 +1149,47 @@ boolean argument: either `1`, `yes`, or `true` to enable, or `0`, `no`,
   given tools tree.
 
 : If set to `default`, mkosi will automatically add an extra tools tree
-  preset and use it as the tools tree.
+  preset and use it as the tools tree. The following table shows for
+  which distributions default tools tree packages are defined and which
+  packages are included in those default tools trees:
+
+  |                     | Fedora | CentOS | Debian |  Arch  | openSUSE |
+  |---------------------|--------|--------|--------|--------|----------|
+  | `apt`               | X      | X      | X      |        |          |
+  | `archlinux-keyring` | X      |        | X      | X      |          |
+  | `bash`              | X      | X      | X      | X      | X        |
+  | `btrfs-progs`       | X      |        | X      | X      | X        |
+  | `bubblewrap`        | X      | X      | X      | X      | X        |
+  | `ca-certificates`   | X      | X      | X      | X      | X        |
+  | `coreutils`         | X      | X      | X      | X      | X        |
+  | `cpio`              | X      | X      | X      | X      | X        |
+  | `curl`              | X      | X      | X      | X      | X        |
+  | `debian-keyring`    | X      | X      | X      | X      |          |
+  | `dnf`               | X      | X      | X      | X      | X        |
+  | `dosfstools`        | X      | X      | X      | X      | X        |
+  | `e2fsprogs`         | X      | X      | X      | X      | X        |
+  | `edk2-ovmf`         | X      | X      | X      | X      | X        |
+  | `erofs-utils`       | X      |        | X      | X      | X        |
+  | `mtools`            | X      | X      | X      | X      | X        |
+  | `openssh`           | X      | X      | X      | X      | X        |
+  | `openssl`           | X      | X      | X      | X      | X        |
+  | `pacman`            | X      |        | X      | X      |          |
+  | `pesign`            |        | X      |        |        |          |
+  | `qemu`              | X      | X      | X      | X      | X        |
+  | `sbsigntools`       | X      |        | X      | X      | X        |
+  | `socat`             | X      | X      | X      | X      | X        |
+  | `squashfs-tools`    | X      | X      | X      | X      | X        |
+  | `strace`            | X      | X      | X      | X      | X        |
+  | `swtpm`             | X      | X      | X      | X      | X        |
+  | `systemd`           | X      | X      | X      | X      | X        |
+  | `ukify`             | X      |        | X      | X      | X        |
+  | `tar`               | X      | X      | X      | X      | X        |
+  | `util-linux`        | X      | X      | X      | X      | X        |
+  | `virtiofsd`         | X      | X      |        | X      | X        |
+  | `xfsprogs`          | X      | X      | X      | X      | X        |
+  | `xz`                | X      | X      | X      | X      | X        |
+  | `zstd`              | X      | X      | X      | X      | X        |
+  | `zypper`            | X      |        | X      | X      |          |
 
 `ToolsTreeDistribution=`, `--tools-tree-distribution=`