Enable EPEL again for CentOS default tools tree

Now that we have a Repositories= match, we can conditionally enable
EPEL for CentOS Stream 9 only and override the repositories when we
call mkosi dependencies. This means that the CentOS Stream 9 default
tools tree will have all the EPEL packages but we won't list them in
the output of mkosi dependencies.

We also add various missing packages to the CentOS Stream default tools
tree.

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index aa625c002c4d6fc968d9b5146acc9183e7a9d592..54ab754a413e513be404f8265345e0498a53d333 100644 (file)
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -4695,7 +4695,10 @@ def run_verb(args: Args, images: Sequence[Config], *, resources: Path) -> None:
         return bump_image_version()
 
     if args.verb == Verb.dependencies:
-        _, [deps] = parse_config(["--directory", "", "--include=mkosi-tools", "build"], resources=resources)
+        _, [deps] = parse_config(
+            ["--directory", "", "--repositories", "", "--include=mkosi-tools", "build"],
+            resources=resources,
+        )
 
         for p in deps.packages:
             print(p)

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos-fedora/mkosi.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos-fedora/mkosi.conf
index dc1e4913c2452248f5d6febd5291010a6c052d3a..d1b2756b40658daae0ac839d2183cbf7ccd4dde1 100644 (file)
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos-fedora/mkosi.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos-fedora/mkosi.conf
@@ -24,6 +24,7 @@ Packages=
         systemd-container
         systemd-journal-remote
         systemd-udev
+        systemd-ukify
         virt-firmware
         virtiofsd
         xz

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
new file mode 100644 (file)
index 0000000..af4862d
--- /dev/null
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=centos

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/10-epel.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/10-epel.conf
new file mode 100644 (file)
index 0000000..4c1b9e5
--- /dev/null
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/10-epel.conf
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Release=9
+
+[Distribution]
+Repositories=epel,epel-next

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages.conf
new file mode 100644 (file)
index 0000000..a13ecea
--- /dev/null
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages.conf
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Repositories=epel
+
+[Content]
+Packages=
+        apt
+        archlinux-keyring
+        debian-keyring
+        distribution-gpg-keys
+        pacman
+        sbsigntools
+        ubu-keyring

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-fedora/mkosi.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-fedora/mkosi.conf
index 089766069c58efc5b6475b35415a4e53fea24b1a..25f37e66f3b2ffd302317c780a0ce10c152cb471 100644 (file)
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-fedora/mkosi.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-fedora/mkosi.conf
@@ -18,6 +18,5 @@ Packages=
         qemu-system-ppc-core
         qemu-system-s390x-core
         reprepro
-        systemd-ukify
         ubu-keyring
         zypper

diff --git a/mkosi/resources/mkosi.md b/mkosi/resources/mkosi.md
index 8e4fc64fbff1616a2bbb5ea263343eea540e9244..3ce7af2ead355692e95eba433d43a2f748f92470 100644 (file)
--- a/mkosi/resources/mkosi.md
+++ b/mkosi/resources/mkosi.md
@@ -1483,8 +1483,8 @@ boolean argument: either `1`, `yes`, or `true` to enable, or `0`, `no`,
     |                         | Fedora | CentOS | Debian | Ubuntu | Arch | openSUSE |
     |-------------------------|:------:|:------:|:------:|:------:|:----:|:--------:|
     | `acl`                   | ✓      | ✓      | ✓      | ✓      | ✓    | ✓        |
-    | `apt`                   | ✓      |        | ✓      | ✓      | ✓    |          |
-    | `archlinux-keyring`     | ✓      |        | ✓      | ✓      | ✓    |          |
+    | `apt`                   | ✓      | ✓      | ✓      | ✓      | ✓    |          |
+    | `archlinux-keyring`     | ✓      | ✓      | ✓      | ✓      | ✓    |          |
     | `attr`                  | ✓      | ✓      | ✓      | ✓      | ✓    | ✓        |
     | `bash`                  | ✓      | ✓      | ✓      | ✓      | ✓    | ✓        |
     | `btrfs-progs`           | ✓      |        | ✓      | ✓      | ✓    | ✓        |
@@ -1493,9 +1493,9 @@ boolean argument: either `1`, `yes`, or `true` to enable, or `0`, `no`,
     | `coreutils`             | ✓      | ✓      | ✓      | ✓      | ✓    | ✓        |
     | `cpio`                  | ✓      | ✓      | ✓      | ✓      | ✓    | ✓        |
     | `curl`                  | ✓      | ✓      | ✓      | ✓      | ✓    | ✓        |
-    | `debian-keyring`        | ✓      |        | ✓      | ✓      | ✓    |          |
+    | `debian-keyring`        | ✓      | ✓      | ✓      | ✓      | ✓    |          |
     | `diffutils`             | ✓      | ✓      | ✓      | ✓      | ✓    | ✓        |
-    | `distribution-gpg-keys` | ✓      |        |        |        | ✓    | ✓        |
+    | `distribution-gpg-keys` | ✓      | ✓      |        |        | ✓    | ✓        |
     | `dnf`                   | ✓      | ✓      | ✓      | ✓      | ✓    | ✓        |
     | `dnf-plugins-core`      | ✓      | ✓      |        |        |      | ✓        |
     | `dnf5`                  | ✓      |        |        |        |      |          |
@@ -1516,19 +1516,19 @@ boolean argument: either `1`, `yes`, or `true` to enable, or `0`, `no`,
     | `openssh`               | ✓      | ✓      | ✓      | ✓      | ✓    | ✓        |
     | `openssl`               | ✓      | ✓      | ✓      | ✓      | ✓    | ✓        |
     | `sed`                   | ✓      | ✓      | ✓      | ✓      | ✓    | ✓        |
-    | `pacman`                | ✓      |        | ✓      | ✓      | ✓    |          |
+    | `pacman`                | ✓      | ✓      | ✓      | ✓      | ✓    |          |
     | `pesign`                | ✓      | ✓      | ✓      | ✓      | ✓    | ✓        |
     | `policycoreutils`       | ✓      | ✓      | ✓      | ✓      |      | ✓        |
     | `qemu`                  | ✓      | ✓      | ✓      | ✓      | ✓    | ✓        |
-    | `sbsigntools`           | ✓      |        | ✓      | ✓      | ✓    | ✓        |
+    | `sbsigntools`           | ✓      | ✓      | ✓      | ✓      | ✓    | ✓        |
     | `socat`                 | ✓      | ✓      | ✓      | ✓      | ✓    | ✓        |
     | `squashfs-tools`        | ✓      | ✓      | ✓      | ✓      | ✓    | ✓        |
     | `strace`                | ✓      | ✓      | ✓      | ✓      | ✓    | ✓        |
     | `swtpm`                 | ✓      | ✓      | ✓      | ✓      | ✓    | ✓        |
     | `systemd`               | ✓      | ✓      | ✓      | ✓      | ✓    | ✓        |
-    | `ukify`                 | ✓      |        | ✓      | ✓      | ✓    | ✓        |
+    | `ukify`                 | ✓      | ✓      | ✓      | ✓      | ✓    | ✓        |
     | `tar`                   | ✓      | ✓      | ✓      | ✓      | ✓    | ✓        |
-    | `ubuntu-keyring`        | ✓      |        | ✓      | ✓      | ✓    |          |
+    | `ubuntu-keyring`        | ✓      | ✓      | ✓      | ✓      | ✓    |          |
     | `util-linux`            | ✓      | ✓      | ✓      | ✓      | ✓    | ✓        |
     | `virtiofsd`             | ✓      | ✓      | ✓      | ✓      | ✓    | ✓        |
     | `virt-firmware`         | ✓      | ✓      |        |        | ✓    |          |