From b18cc87513d3f0f81cd98a350180b7a044b12c9c Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Thu, 23 Jan 2025 11:02:59 +0100 Subject: [PATCH 1/4] mkosi-tools: Move linux-perf package definition into shared logic --- .../mkosi.conf.d/linux-perf.conf} | 6 +++--- mkosi/resources/mkosi-tools/mkosi.conf.d/10-kali.conf | 8 -------- 2 files changed, 3 insertions(+), 11 deletions(-) rename mkosi/resources/mkosi-tools/mkosi.conf.d/{10-debian.conf => 10-debian-kali-ubuntu/mkosi.conf.d/linux-perf.conf} (52%) delete mode 100644 mkosi/resources/mkosi-tools/mkosi.conf.d/10-kali.conf diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/linux-perf.conf similarity index 52% rename from mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian.conf rename to mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/linux-perf.conf index 50dfa11db..3aaddca3a 100644 --- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian.conf +++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/linux-perf.conf @@ -1,8 +1,8 @@ # SPDX-License-Identifier: LGPL-2.1-or-later [Match] -Distribution=debian +Distribution=|debian +Distribution=|kali [Content] -Packages= - linux-perf +Packages=linux-perf diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-kali.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-kali.conf deleted file mode 100644 index 5b4a0aae0..000000000 --- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-kali.conf +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -[Match] -Distribution=kali - -[Content] -Packages= - linux-perf From a1922f729163e31082287287cb28c11ba49fb1c7 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Thu, 23 Jan 2025 11:16:17 +0100 Subject: [PATCH 2/4] mkosi-tools: Install pkcs11-provider on CentOS Stream 10 --- mkosi/resources/man/mkosi.1.md | 2 +- .../10-centos/mkosi.conf.d/20-pkcs11-provider.conf | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/20-pkcs11-provider.conf diff --git a/mkosi/resources/man/mkosi.1.md b/mkosi/resources/man/mkosi.1.md index 5444a8f8d..a73c94e81 100644 --- a/mkosi/resources/man/mkosi.1.md +++ b/mkosi/resources/man/mkosi.1.md @@ -1282,7 +1282,7 @@ boolean argument: either `1`, `yes`, or `true` to enable, or `0`, `no`, | `opensc` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | `openssh` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | `openssl` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | `pkcs11-provider` | ✓ | | ✓ | ✓ | ✓ | ✓ | ✓ | + | `pkcs11-provider` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | `perf` | ✓ | ✓ | ✓ | ✓ | | ✓ | ✓ | | `sed` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | `pacman` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/20-pkcs11-provider.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/20-pkcs11-provider.conf new file mode 100644 index 000000000..ef3ab6db5 --- /dev/null +++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/20-pkcs11-provider.conf @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +[Match] +Release=10 + +[Content] +Packages=pkcs11-provider From bd6de4b141b3129a2dbe8336942e0706e30eb9ea Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Thu, 23 Jan 2025 11:20:47 +0100 Subject: [PATCH 3/4] mkosi-tools: Install virt-firmware on Debian/Kali/Ubuntu/OpenSUSE --- mkosi/resources/man/mkosi.1.md | 2 +- .../mkosi.conf.d/python3-virt-firmware.conf | 17 +++++++++++++++++ .../mkosi-tools/mkosi.conf.d/10-opensuse.conf | 1 + 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/python3-virt-firmware.conf diff --git a/mkosi/resources/man/mkosi.1.md b/mkosi/resources/man/mkosi.1.md index a73c94e81..04140a070 100644 --- a/mkosi/resources/man/mkosi.1.md +++ b/mkosi/resources/man/mkosi.1.md @@ -1299,7 +1299,7 @@ boolean argument: either `1`, `yes`, or `true` to enable, or `0`, `no`, | `ubuntu-keyring` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | | `util-linux` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | `virtiofsd` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | `virt-firmware` | ✓ | ✓ | | | | ✓ | | + | `virt-firmware` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | `xfsprogs` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | `xz` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | `zstd` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/python3-virt-firmware.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/python3-virt-firmware.conf new file mode 100644 index 000000000..82519a849 --- /dev/null +++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/python3-virt-firmware.conf @@ -0,0 +1,17 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +[TriggerMatch] +Distribution=debian +Release=!bookworm +Release=!bullseye + +[TriggerMatch] +Distribution=ubuntu +Release=!jammy + +[TriggerMatch] +Distribution=kali + +[Content] +Packages= + python3-virt-firmware 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 b5a37e29a..ac61f1ca6 100644 --- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-opensuse.conf +++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-opensuse.conf @@ -40,6 +40,7 @@ Packages= systemd-experimental systemd-journal-remote tpm2.0-tools + virt-firmware virtiofsd xz zypper From 3dcc7c8786a656f97dab8e43547eef3d5b3f11e6 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Thu, 23 Jan 2025 11:10:26 +0100 Subject: [PATCH 4/4] mkosi-tools: Fix docs --- mkosi/resources/man/mkosi.1.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mkosi/resources/man/mkosi.1.md b/mkosi/resources/man/mkosi.1.md index 04140a070..4025d81db 100644 --- a/mkosi/resources/man/mkosi.1.md +++ b/mkosi/resources/man/mkosi.1.md @@ -1252,7 +1252,7 @@ boolean argument: either `1`, `yes`, or `true` to enable, or `0`, `no`, | `archlinux-keyring` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | | `attr` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | `bash` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | `btrfs-progs` | ✓ | | ✓ | ✓ | ✓ | ✓ | ✓ | + | `btrfs-progs` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | `ca-certificates` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | `coreutils` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | `cpio` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | @@ -1260,15 +1260,15 @@ boolean argument: either `1`, `yes`, or `true` to enable, or `0`, `no`, | `curl` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | `debian-keyring` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | | `diffutils` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | `distribution-gpg-keys` | ✓ | ✓ | | | | ✓ | ✓ | + | `distribution-gpg-keys` | ✓ | ✓ | ✓ | ✓ | | ✓ | ✓ | | `dnf` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | `dnf-plugins-core` | ✓ | ✓ | | | | | ✓ | - | `dnf5` | ✓ | | | | | | | - | `dnf5-plugins` | ✓ | | | | | | | + | `dnf5` | ✓ | | | | | | ✓ | + | `dnf5-plugins` | ✓ | | | | | | ✓ | | `dosfstools` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | `e2fsprogs` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | `edk2-ovmf` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | `erofs-utils` | ✓ | | ✓ | ✓ | ✓ | ✓ | ✓ | + | `erofs-utils` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | `findutils` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | `git` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | `grep` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | @@ -1303,7 +1303,7 @@ boolean argument: either `1`, `yes`, or `true` to enable, or `0`, `no`, | `xfsprogs` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | `xz` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | `zstd` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | - | `zypper` | ✓ | | ✓ | ✓ | ✓ | ✓ | | + | `zypper` | ✓ | | ✓ | ✓ | ✓ | | ✓ | `ToolsTreeDistribution=`, `--tools-tree-distribution=` : Set the distribution to use for the default tools tree. Defaults to the host distribution except for