From: DaanDeMeyer Date: Wed, 9 Jul 2025 14:19:29 +0000 (+0200) Subject: tree-wide: Remove numbered prefixes from config files X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F3873%2Fhead;p=thirdparty%2Fmkosi.git tree-wide: Remove numbered prefixes from config files With the following changes, there's no more need for numbered prefixes for ordering: - Assume EPEL is available for CentOS Stream 9/10 - Stop enabling epel-next repository for CentOS Stream 9 - Remove orphan_file hack for ubuntu jammy since we do it internally now So we make these changes and remove the numbered prefixes throughout the tree. --- diff --git a/mkosi.conf.d/20-centos/mkosi.conf.d/epel.conf b/mkosi.conf.d/20-centos/mkosi.conf.d/epel.conf deleted file mode 100644 index 959440081..000000000 --- a/mkosi.conf.d/20-centos/mkosi.conf.d/epel.conf +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -[Match] -Release=10 - -[Distribution] -Repositories=epel - -[Content] -Packages= - rpmautospec diff --git a/mkosi.conf.d/30-debian-kali-ubuntu/mkosi.conf.d/20-ext4-orphan-file.conf b/mkosi.conf.d/30-debian-kali-ubuntu/mkosi.conf.d/20-ext4-orphan-file.conf deleted file mode 100644 index 75befe2e3..000000000 --- a/mkosi.conf.d/30-debian-kali-ubuntu/mkosi.conf.d/20-ext4-orphan-file.conf +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -[Match] -Distribution=ubuntu -Release=jammy - -[Build] -# "orphan_file" is enabled by default in recent versions of mkfs.ext4 but not supported by the Jammy kernel so we -# explicitly disable it. -Environment=SYSTEMD_REPART_MKFS_OPTIONS_EXT4="-O ^orphan_file" diff --git a/mkosi.conf.d/20-arch.conf b/mkosi.conf.d/arch.conf similarity index 100% rename from mkosi.conf.d/20-arch.conf rename to mkosi.conf.d/arch.conf diff --git a/mkosi.conf.d/30-azure-centos-fedora/mkosi.conf b/mkosi.conf.d/azure-centos-fedora/mkosi.conf similarity index 100% rename from mkosi.conf.d/30-azure-centos-fedora/mkosi.conf rename to mkosi.conf.d/azure-centos-fedora/mkosi.conf diff --git a/mkosi.conf.d/30-azure-centos-fedora/mkosi.conf.d/20-arm64.conf b/mkosi.conf.d/azure-centos-fedora/mkosi.conf.d/arm64.conf similarity index 100% rename from mkosi.conf.d/30-azure-centos-fedora/mkosi.conf.d/20-arm64.conf rename to mkosi.conf.d/azure-centos-fedora/mkosi.conf.d/arm64.conf diff --git a/mkosi.conf.d/30-azure-centos-fedora/mkosi.conf.d/20-uefi.conf b/mkosi.conf.d/azure-centos-fedora/mkosi.conf.d/uefi.conf similarity index 100% rename from mkosi.conf.d/30-azure-centos-fedora/mkosi.conf.d/20-uefi.conf rename to mkosi.conf.d/azure-centos-fedora/mkosi.conf.d/uefi.conf diff --git a/mkosi.conf.d/30-azure-centos-fedora/mkosi.conf.d/20-x86-64.conf b/mkosi.conf.d/azure-centos-fedora/mkosi.conf.d/x86-64.conf similarity index 100% rename from mkosi.conf.d/30-azure-centos-fedora/mkosi.conf.d/20-x86-64.conf rename to mkosi.conf.d/azure-centos-fedora/mkosi.conf.d/x86-64.conf diff --git a/mkosi.conf.d/20-azure.conf b/mkosi.conf.d/azure.conf similarity index 100% rename from mkosi.conf.d/20-azure.conf rename to mkosi.conf.d/azure.conf diff --git a/mkosi.conf.d/15-bootable.conf b/mkosi.conf.d/bootable.conf similarity index 100% rename from mkosi.conf.d/15-bootable.conf rename to mkosi.conf.d/bootable.conf diff --git a/mkosi.conf.d/20-centos/mkosi.conf b/mkosi.conf.d/centos.conf similarity index 87% rename from mkosi.conf.d/20-centos/mkosi.conf rename to mkosi.conf.d/centos.conf index ab255a638..0cade4bca 100644 --- a/mkosi.conf.d/20-centos/mkosi.conf +++ b/mkosi.conf.d/centos.conf @@ -7,9 +7,11 @@ Distribution=|rocky [Distribution] Release=10 +Repositories=epel [Content] # CentOS Stream 10 does not ship an unsigned shim ShimBootloader=none Packages= linux-firmware + rpmautospec diff --git a/mkosi.conf.d/30-debian-kali-ubuntu/mkosi.conf b/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf similarity index 100% rename from mkosi.conf.d/30-debian-kali-ubuntu/mkosi.conf rename to mkosi.conf.d/debian-kali-ubuntu/mkosi.conf diff --git a/mkosi.conf.d/30-debian-kali-ubuntu/mkosi.conf.d/20-efi.conf b/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/efi.conf similarity index 100% rename from mkosi.conf.d/30-debian-kali-ubuntu/mkosi.conf.d/20-efi.conf rename to mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/efi.conf diff --git a/mkosi.conf.d/30-debian-kali-ubuntu/mkosi.conf.d/20-x86-64.conf b/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/x86-64.conf similarity index 100% rename from mkosi.conf.d/30-debian-kali-ubuntu/mkosi.conf.d/20-x86-64.conf rename to mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/x86-64.conf diff --git a/mkosi.conf.d/20-debian/mkosi.conf b/mkosi.conf.d/debian.conf similarity index 100% rename from mkosi.conf.d/20-debian/mkosi.conf rename to mkosi.conf.d/debian.conf diff --git a/mkosi.conf.d/20-fedora/mkosi.conf b/mkosi.conf.d/fedora/mkosi.conf similarity index 100% rename from mkosi.conf.d/20-fedora/mkosi.conf rename to mkosi.conf.d/fedora/mkosi.conf diff --git a/mkosi.conf.d/20-fedora/mkosi.conf.d/20-arm64.conf b/mkosi.conf.d/fedora/mkosi.conf.d/arm64.conf similarity index 100% rename from mkosi.conf.d/20-fedora/mkosi.conf.d/20-arm64.conf rename to mkosi.conf.d/fedora/mkosi.conf.d/arm64.conf diff --git a/mkosi.conf.d/20-fedora/mkosi.conf.d/20-x86_64.conf b/mkosi.conf.d/fedora/mkosi.conf.d/x86_64.conf similarity index 100% rename from mkosi.conf.d/20-fedora/mkosi.conf.d/20-x86_64.conf rename to mkosi.conf.d/fedora/mkosi.conf.d/x86_64.conf diff --git a/mkosi.conf.d/20-kali/mkosi.conf b/mkosi.conf.d/kali.conf similarity index 100% rename from mkosi.conf.d/20-kali/mkosi.conf rename to mkosi.conf.d/kali.conf diff --git a/mkosi.conf.d/15-memory.conf b/mkosi.conf.d/memory.conf similarity index 100% rename from mkosi.conf.d/15-memory.conf rename to mkosi.conf.d/memory.conf diff --git a/mkosi.conf.d/15-metadata.conf b/mkosi.conf.d/metadata.conf similarity index 100% rename from mkosi.conf.d/15-metadata.conf rename to mkosi.conf.d/metadata.conf diff --git a/mkosi.conf.d/20-opensuse/mkosi.conf b/mkosi.conf.d/opensuse/mkosi.conf similarity index 100% rename from mkosi.conf.d/20-opensuse/mkosi.conf rename to mkosi.conf.d/opensuse/mkosi.conf diff --git a/mkosi.conf.d/20-opensuse/mkosi.conf.d/x86-64.conf b/mkosi.conf.d/opensuse/mkosi.conf.d/x86-64.conf similarity index 100% rename from mkosi.conf.d/20-opensuse/mkosi.conf.d/x86-64.conf rename to mkosi.conf.d/opensuse/mkosi.conf.d/x86-64.conf diff --git a/mkosi.conf.d/20-rhel-ubi.conf b/mkosi.conf.d/rhel-ubi.conf similarity index 100% rename from mkosi.conf.d/20-rhel-ubi.conf rename to mkosi.conf.d/rhel-ubi.conf diff --git a/mkosi.conf.d/30-rpm/mkosi.build.chroot b/mkosi.conf.d/rpm/mkosi.build.chroot similarity index 100% rename from mkosi.conf.d/30-rpm/mkosi.build.chroot rename to mkosi.conf.d/rpm/mkosi.build.chroot diff --git a/mkosi.conf.d/30-rpm/mkosi.conf b/mkosi.conf.d/rpm/mkosi.conf similarity index 100% rename from mkosi.conf.d/30-rpm/mkosi.conf rename to mkosi.conf.d/rpm/mkosi.conf diff --git a/mkosi.conf.d/30-rpm/mkosi.prepare b/mkosi.conf.d/rpm/mkosi.prepare similarity index 100% rename from mkosi.conf.d/30-rpm/mkosi.prepare rename to mkosi.conf.d/rpm/mkosi.prepare diff --git a/mkosi.conf.d/20-ubuntu/mkosi.conf b/mkosi.conf.d/ubuntu.conf similarity index 100% rename from mkosi.conf.d/20-ubuntu/mkosi.conf rename to mkosi.conf.d/ubuntu.conf diff --git a/mkosi.conf.d/15-x86-64.conf b/mkosi.conf.d/x86-64.conf similarity index 100% rename from mkosi.conf.d/15-x86-64.conf rename to mkosi.conf.d/x86-64.conf diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-arch.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/arch.conf similarity index 100% rename from mkosi/resources/mkosi-initrd/mkosi.conf.d/10-arch.conf rename to mkosi/resources/mkosi-initrd/mkosi.conf.d/arch.conf diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-azure-centos-fedora.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/azure-centos-fedora.conf similarity index 100% rename from mkosi/resources/mkosi-initrd/mkosi.conf.d/10-azure-centos-fedora.conf rename to mkosi/resources/mkosi-initrd/mkosi.conf.d/azure-centos-fedora.conf diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-azure.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/azure.conf similarity index 100% rename from mkosi/resources/mkosi-initrd/mkosi.conf.d/10-azure.conf rename to mkosi/resources/mkosi-initrd/mkosi.conf.d/azure.conf diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-centos/mkosi.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/centos/mkosi.conf similarity index 100% rename from mkosi/resources/mkosi-initrd/mkosi.conf.d/10-centos/mkosi.conf rename to mkosi/resources/mkosi-initrd/mkosi.conf.d/centos/mkosi.conf diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/centos/mkosi.conf.d/epel.conf similarity index 100% rename from mkosi/resources/mkosi-initrd/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages.conf rename to mkosi/resources/mkosi-initrd/mkosi.conf.d/centos/mkosi.conf.d/epel.conf diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf similarity index 100% rename from mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf rename to mkosi/resources/mkosi-initrd/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/10-dpkg.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/dpkg.conf similarity index 100% rename from mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/10-dpkg.conf rename to mkosi/resources/mkosi-initrd/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/dpkg.conf diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/10-libtss.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/libtss.conf similarity index 100% rename from mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/10-libtss.conf rename to mkosi/resources/mkosi-initrd/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/libtss.conf diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/10-systemd-cryptsetup.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/systemd-cryptsetup.conf similarity index 100% rename from mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/10-systemd-cryptsetup.conf rename to mkosi/resources/mkosi-initrd/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/systemd-cryptsetup.conf diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/10-systemd-repart.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/systemd-repart.conf similarity index 100% rename from mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/10-systemd-repart.conf rename to mkosi/resources/mkosi-initrd/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/systemd-repart.conf diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-fedora-stable.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/fedora-stable.conf similarity index 100% rename from mkosi/resources/mkosi-initrd/mkosi.conf.d/10-fedora-stable.conf rename to mkosi/resources/mkosi-initrd/mkosi.conf.d/fedora-stable.conf diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-fedora.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/fedora.conf similarity index 100% rename from mkosi/resources/mkosi-initrd/mkosi.conf.d/10-fedora.conf rename to mkosi/resources/mkosi-initrd/mkosi.conf.d/fedora.conf diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-opensuse.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/opensuse.conf similarity index 100% rename from mkosi/resources/mkosi-initrd/mkosi.conf.d/10-opensuse.conf rename to mkosi/resources/mkosi-initrd/mkosi.conf.d/opensuse.conf diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/20-stub.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/stub.conf similarity index 100% rename from mkosi/resources/mkosi-initrd/mkosi.conf.d/20-stub.conf rename to mkosi/resources/mkosi-initrd/mkosi.conf.d/stub.conf diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf index e9c8aaa6d..47a5551a3 100644 --- a/mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf +++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf @@ -6,6 +6,9 @@ Distribution=|alma Distribution=|rocky Distribution=|rhel +[Distribution] +Repositories=epel + [Content] Packages= dnf diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/10-epel-10.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/10-epel-10.conf deleted file mode 100644 index 9e4a010a3..000000000 --- a/mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/10-epel-10.conf +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -[Match] -Release=10 - -[Distribution] -Repositories=epel diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/10-epel-9.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/10-epel-9.conf deleted file mode 100644 index 4c1b9e5f0..000000000 --- a/mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/10-epel-9.conf +++ /dev/null @@ -1,7 +0,0 @@ -# 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/centos/mkosi.conf.d/20-epel-packages-10.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages-10.conf deleted file mode 100644 index bc3ba0f3d..000000000 --- a/mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages-10.conf +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -[Match] -Repositories=epel -Release=10 - -[Content] -Packages= - btrfs-progs - distribution-gpg-keys diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages-9.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/epel.conf similarity index 93% rename from mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages-9.conf rename to mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/epel.conf index 7faf1dd03..af653f6c2 100644 --- a/mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages-9.conf +++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/epel.conf @@ -2,7 +2,6 @@ [Match] Repositories=epel -Release=9 [Content] Packages= diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/20-erofs-utils.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/erofs-utils.conf similarity index 100% rename from mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/20-erofs-utils.conf rename to mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/erofs-utils.conf diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/20-hyperscale-experimental-packages.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/hyperscale-experimental-packages.conf similarity index 100% rename from mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/20-hyperscale-experimental-packages.conf rename to mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/hyperscale-experimental-packages.conf diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/20-pkcs11-provider.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/pkcs11-provider.conf similarity index 100% rename from mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/20-pkcs11-provider.conf rename to mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/pkcs11-provider.conf diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages-efi.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/sbsigntools.conf similarity index 100% rename from mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages-efi.conf rename to mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/sbsigntools.conf