From 3d9a5cb055798ac54e3edc84bf250675467c33ce Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Sun, 7 Jul 2024 00:32:24 +0200 Subject: [PATCH] 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. --- mkosi/__init__.py | 5 ++++- .../mkosi.conf.d/10-centos-fedora/mkosi.conf | 1 + .../mkosi.conf.d/10-centos/mkosi.conf | 4 ++++ .../10-centos/mkosi.conf.d/10-epel.conf | 7 +++++++ .../10-centos/mkosi.conf.d/20-epel-packages.conf | 14 ++++++++++++++ .../mkosi.conf.d/10-fedora/mkosi.conf | 1 - mkosi/resources/mkosi.md | 16 ++++++++-------- 7 files changed, 38 insertions(+), 10 deletions(-) create mode 100644 mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf create mode 100644 mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/10-epel.conf create mode 100644 mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages.conf diff --git a/mkosi/__init__.py b/mkosi/__init__.py index aa625c002..54ab754a4 100644 --- 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 dc1e4913c..d1b2756b4 100644 --- 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 index 000000000..af4862d4b --- /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 index 000000000..4c1b9e5f0 --- /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 index 000000000..a13ecea7d --- /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 089766069..25f37e66f 100644 --- 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 8e4fc64fb..3ce7af2ea 100644 --- 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` | ✓ | ✓ | | | ✓ | | -- 2.47.2