From 3800adc9e5e067e3869d95c75733368e11f4570a Mon Sep 17 00:00:00 2001 From: DaanDeMeyer Date: Wed, 9 Jul 2025 10:22:47 +0200 Subject: [PATCH] mkosi: Simplify centos/fedora configuration Both EPEL 9 and 10 now have the packages we need except for dhcp-server so let's get rid of the EPEL conditionals and simply skip the tests that require dhcp-server on CentOS. While we're at it, make sure we use the new Architecture=uefi match in mkosi to simplify the uefi checks. --- mkosi/mkosi.conf.d/centos-fedora/mkosi.conf | 4 ++++ .../centos-fedora/mkosi.conf.d/efi.conf | 11 +++++++++++ mkosi/mkosi.conf.d/centos/mkosi.conf | 1 + .../centos/mkosi.conf.d/10-epel.conf | 9 --------- .../centos/mkosi.conf.d/20-efi.conf | 18 ------------------ .../centos/mkosi.conf.d/20-epel-packages.conf | 12 ------------ .../debian-ubuntu/mkosi.conf.d/efi-debug.conf | 8 +------- .../debian-ubuntu/mkosi.conf.d/efi.conf | 8 +------- mkosi/mkosi.conf.d/fedora/mkosi.conf | 4 ---- .../mkosi.conf.d/fedora/mkosi.conf.d/efi.conf | 18 ------------------ .../opensuse/mkosi.conf.d/efi-debug.conf | 8 +------- .../opensuse/mkosi.conf.d/efi.conf | 9 +-------- 12 files changed, 20 insertions(+), 90 deletions(-) create mode 100644 mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/efi.conf delete mode 100644 mkosi/mkosi.conf.d/centos/mkosi.conf.d/10-epel.conf delete mode 100644 mkosi/mkosi.conf.d/centos/mkosi.conf.d/20-efi.conf delete mode 100644 mkosi/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages.conf delete mode 100644 mkosi/mkosi.conf.d/fedora/mkosi.conf.d/efi.conf diff --git a/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf b/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf index 69d1c229756..0de00d82aca 100644 --- a/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf +++ b/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf @@ -27,6 +27,8 @@ Packages= cryptsetup device-mapper-event device-mapper-multipath + dfuzzer + erofs-utils git-core glibc-langpack-de glibc-langpack-en @@ -38,6 +40,7 @@ Packages= iputils iscsi-initiator-utils kernel-core + knot libcap-ng-utils man-db nmap-ncat @@ -52,6 +55,7 @@ Packages= python3-pexpect # needed to upgrade and downgrade systemd-ukify in tests python3-zstd + qrencode quota rpm softhsm diff --git a/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/efi.conf b/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/efi.conf new file mode 100644 index 00000000000..90b7668f553 --- /dev/null +++ b/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/efi.conf @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +[Match] +Architecture=uefi + +[Content] +Packages= + sbsigntools + +VolatilePackages= + systemd-boot diff --git a/mkosi/mkosi.conf.d/centos/mkosi.conf b/mkosi/mkosi.conf.d/centos/mkosi.conf index 2961ee316b3..ea0a34b4fd0 100644 --- a/mkosi/mkosi.conf.d/centos/mkosi.conf +++ b/mkosi/mkosi.conf.d/centos/mkosi.conf @@ -5,6 +5,7 @@ Distribution=centos [Distribution] Release=10 +Repositories=epel,epel-next [Build] Environment= diff --git a/mkosi/mkosi.conf.d/centos/mkosi.conf.d/10-epel.conf b/mkosi/mkosi.conf.d/centos/mkosi.conf.d/10-epel.conf deleted file mode 100644 index 9e92a4f2261..00000000000 --- a/mkosi/mkosi.conf.d/centos/mkosi.conf.d/10-epel.conf +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -[Match] -Release=9 - -[Distribution] -Repositories= - epel - epel-next diff --git a/mkosi/mkosi.conf.d/centos/mkosi.conf.d/20-efi.conf b/mkosi/mkosi.conf.d/centos/mkosi.conf.d/20-efi.conf deleted file mode 100644 index edefbe79772..00000000000 --- a/mkosi/mkosi.conf.d/centos/mkosi.conf.d/20-efi.conf +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -[Match] -Repositories=epel -Architecture=|x86 -Architecture=|x86-64 -Architecture=|arm -Architecture=|arm64 -Architecture=|riscv32 -Architecture=|riscv64 -Architecture=|loongarch64 - -[Content] -Packages= - sbsigntools - -VolatilePackages= - systemd-boot diff --git a/mkosi/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages.conf b/mkosi/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages.conf deleted file mode 100644 index 6bcc663e59f..00000000000 --- a/mkosi/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages.conf +++ /dev/null @@ -1,12 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -[Match] -Repositories=epel - -[Content] -Packages= - dfuzzer - dhcp-server - erofs-utils - knot - qrencode diff --git a/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi-debug.conf b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi-debug.conf index b6422af16aa..9252d4b20ea 100644 --- a/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi-debug.conf +++ b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi-debug.conf @@ -4,13 +4,7 @@ Environment=WITH_DEBUG=1 [Match] -Architecture=|x86 -Architecture=|x86-64 -Architecture=|arm -Architecture=|arm64 -Architecture=|riscv32 -Architecture=|riscv64 -Architecture=|loongarch64 +Architecture=uefi [Content] VolatilePackages= diff --git a/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi.conf b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi.conf index c808ddd9cfd..3836792ad1b 100644 --- a/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi.conf +++ b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi.conf @@ -2,13 +2,7 @@ # sbsigntool exists only on UEFI architectures [Match] -Architecture=|x86 -Architecture=|x86-64 -Architecture=|arm -Architecture=|arm64 -Architecture=|riscv32 -Architecture=|riscv64 -Architecture=|loongarch64 +Architecture=uefi [Content] Packages= diff --git a/mkosi/mkosi.conf.d/fedora/mkosi.conf b/mkosi/mkosi.conf.d/fedora/mkosi.conf index b954d2802ae..e2a479eb6d3 100644 --- a/mkosi/mkosi.conf.d/fedora/mkosi.conf +++ b/mkosi/mkosi.conf.d/fedora/mkosi.conf @@ -10,15 +10,11 @@ Release=rawhide Packages= btrfs-progs compsize - dfuzzer dhcp-server dnf5 - erofs-utils f2fs-tools # Required for systemd-networkd-tests.py (netdevsim and sch_xxx modules) kernel-modules-extra kernel-modules-internal - knot - qrencode rpmautospec scsi-target-utils diff --git a/mkosi/mkosi.conf.d/fedora/mkosi.conf.d/efi.conf b/mkosi/mkosi.conf.d/fedora/mkosi.conf.d/efi.conf deleted file mode 100644 index 44de850ee0e..00000000000 --- a/mkosi/mkosi.conf.d/fedora/mkosi.conf.d/efi.conf +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -[Match] -Distribution=fedora -Architecture=|x86 -Architecture=|x86-64 -Architecture=|arm -Architecture=|arm64 -Architecture=|riscv32 -Architecture=|riscv64 -Architecture=|loongarch64 - -[Content] -Packages= - sbsigntools - -VolatilePackages= - systemd-boot diff --git a/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi-debug.conf b/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi-debug.conf index b63e00be5e6..9ef1833a884 100644 --- a/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi-debug.conf +++ b/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi-debug.conf @@ -4,13 +4,7 @@ Environment=WITH_DEBUG=1 [Match] -Architecture=|x86 -Architecture=|x86-64 -Architecture=|arm -Architecture=|arm64 -Architecture=|riscv32 -Architecture=|riscv64 -Architecture=|loongarch64 +Architecture=uefi [Content] VolatilePackages= diff --git a/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi.conf b/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi.conf index 7ee6b4eaf73..7cb650a44e8 100644 --- a/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi.conf +++ b/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi.conf @@ -1,14 +1,7 @@ # SPDX-License-Identifier: LGPL-2.1-or-later [Match] -Distribution=opensuse -Architecture=|x86 -Architecture=|x86-64 -Architecture=|arm -Architecture=|arm64 -Architecture=|riscv32 -Architecture=|riscv64 -Architecture=|loongarch64 +Architecture=uefi [Content] VolatilePackages= -- 2.47.3