mkosi: Drop number prefixes from configuration files

We already removed these in some places, let's migrate the others as
well. There's no ordering required at all between these configuration
files so let's not bother with any numbered prefixes.

diff --git a/.packit.yml b/.packit.yml
index 75d5f6557ac5b1595410c40d874e6d88323b0b3c..5a0be6131f0b4a951e81352bcbf9549a2aeefb29 100644 (file)
--- a/.packit.yml
+++ b/.packit.yml
@@ -19,7 +19,7 @@ actions:
   post-upstream-clone:
     # Use the Fedora Rawhide specfile
     - git clone https://src.fedoraproject.org/rpms/systemd .packit_rpm
-    - bash -c 'git -C .packit_rpm checkout "$(grep GIT_COMMIT= mkosi.conf.d/10-centos-fedora/mkosi.conf | cut -d= -f2)"'
+    - bash -c 'git -C .packit_rpm checkout "$(grep GIT_COMMIT= mkosi.conf.d/centos-fedora/mkosi.conf | cut -d= -f2)"'
     - bash -c 'echo "%bcond upstream 1" > .packit_rpm/systemd.spec.new'
     - bash -c 'echo "%define meson_extra_configure_options --werror" >> .packit_rpm/systemd.spec.new'
     - bash -c 'cat .packit_rpm/systemd.spec >> .packit_rpm/systemd.spec.new'

diff --git a/mkosi.conf.d/10-arch/mkosi.conf b/mkosi.conf.d/arch/mkosi.conf
similarity index 100%
rename from mkosi.conf.d/10-arch/mkosi.conf
rename to mkosi.conf.d/arch/mkosi.conf

diff --git a/mkosi.conf.d/10-arch/mkosi.conf.d/10-debug.conf b/mkosi.conf.d/arch/mkosi.conf.d/debug.conf
similarity index 100%
rename from mkosi.conf.d/10-arch/mkosi.conf.d/10-debug.conf
rename to mkosi.conf.d/arch/mkosi.conf.d/debug.conf

diff --git a/mkosi.conf.d/10-arch/mkosi.prepare b/mkosi.conf.d/arch/mkosi.prepare
similarity index 100%
rename from mkosi.conf.d/10-arch/mkosi.prepare
rename to mkosi.conf.d/arch/mkosi.prepare

diff --git a/mkosi.conf.d/20-build.conf b/mkosi.conf.d/build.conf
similarity index 100%
rename from mkosi.conf.d/20-build.conf
rename to mkosi.conf.d/build.conf

diff --git a/mkosi.conf.d/10-centos-fedora/mkosi.conf b/mkosi.conf.d/centos-fedora/mkosi.conf
similarity index 100%
rename from mkosi.conf.d/10-centos-fedora/mkosi.conf
rename to mkosi.conf.d/centos-fedora/mkosi.conf

diff --git a/mkosi.conf.d/10-centos-fedora/mkosi.conf.d/10-debug.conf b/mkosi.conf.d/centos-fedora/mkosi.conf.d/debug.conf
similarity index 100%
rename from mkosi.conf.d/10-centos-fedora/mkosi.conf.d/10-debug.conf
rename to mkosi.conf.d/centos-fedora/mkosi.conf.d/debug.conf

diff --git a/mkosi.conf.d/10-centos-fedora/mkosi.conf.d/10-selinux.conf b/mkosi.conf.d/centos-fedora/mkosi.conf.d/selinux.conf
similarity index 100%
rename from mkosi.conf.d/10-centos-fedora/mkosi.conf.d/10-selinux.conf
rename to mkosi.conf.d/centos-fedora/mkosi.conf.d/selinux.conf

diff --git a/mkosi.conf.d/10-centos-fedora/mkosi.prepare b/mkosi.conf.d/centos-fedora/mkosi.prepare
similarity index 100%
rename from mkosi.conf.d/10-centos-fedora/mkosi.prepare
rename to mkosi.conf.d/centos-fedora/mkosi.prepare

diff --git a/mkosi.conf.d/10-centos/mkosi.conf b/mkosi.conf.d/centos/mkosi.conf
similarity index 100%
rename from mkosi.conf.d/10-centos/mkosi.conf
rename to mkosi.conf.d/centos/mkosi.conf

diff --git a/mkosi.conf.d/10-centos/mkosi.conf.d/10-epel.conf b/mkosi.conf.d/centos/mkosi.conf.d/10-epel.conf
similarity index 100%
rename from mkosi.conf.d/10-centos/mkosi.conf.d/10-epel.conf
rename to mkosi.conf.d/centos/mkosi.conf.d/10-epel.conf

diff --git a/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages.conf b/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages.conf
similarity index 100%
rename from mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages.conf
rename to mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages.conf

diff --git a/mkosi.conf.d/10-debian-ubuntu/mkosi.conf b/mkosi.conf.d/debian-ubuntu/mkosi.conf
similarity index 100%
rename from mkosi.conf.d/10-debian-ubuntu/mkosi.conf
rename to mkosi.conf.d/debian-ubuntu/mkosi.conf

diff --git a/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/10-debug.conf b/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/debug.conf
similarity index 100%
rename from mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/10-debug.conf
rename to mkosi.conf.d/debian-ubuntu/mkosi.conf.d/debug.conf

diff --git a/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/efi.conf b/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi.conf
similarity index 100%
rename from mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/efi.conf
rename to mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi.conf

diff --git a/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/network.conf b/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/network.conf
similarity index 100%
rename from mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/network.conf
rename to mkosi.conf.d/debian-ubuntu/mkosi.conf.d/network.conf

diff --git a/mkosi.conf.d/10-debian-ubuntu/mkosi.prepare b/mkosi.conf.d/debian-ubuntu/mkosi.prepare
similarity index 100%
rename from mkosi.conf.d/10-debian-ubuntu/mkosi.prepare
rename to mkosi.conf.d/debian-ubuntu/mkosi.prepare

diff --git a/mkosi.conf.d/10-debian/mkosi.conf b/mkosi.conf.d/debian/mkosi.conf
similarity index 100%
rename from mkosi.conf.d/10-debian/mkosi.conf
rename to mkosi.conf.d/debian/mkosi.conf

diff --git a/mkosi.conf.d/10-debian/mkosi.conf.d/arm64.conf b/mkosi.conf.d/debian/mkosi.conf.d/arm64.conf
similarity index 100%
rename from mkosi.conf.d/10-debian/mkosi.conf.d/arm64.conf
rename to mkosi.conf.d/debian/mkosi.conf.d/arm64.conf

diff --git a/mkosi.conf.d/10-debian/mkosi.conf.d/x86-64.conf b/mkosi.conf.d/debian/mkosi.conf.d/x86-64.conf
similarity index 100%
rename from mkosi.conf.d/10-debian/mkosi.conf.d/x86-64.conf
rename to mkosi.conf.d/debian/mkosi.conf.d/x86-64.conf

diff --git a/mkosi.conf.d/20-extra-search-path.conf b/mkosi.conf.d/extra-search-path.conf
similarity index 100%
rename from mkosi.conf.d/20-extra-search-path.conf
rename to mkosi.conf.d/extra-search-path.conf

diff --git a/mkosi.conf.d/10-fedora/mkosi.conf b/mkosi.conf.d/fedora/mkosi.conf
similarity index 100%
rename from mkosi.conf.d/10-fedora/mkosi.conf
rename to mkosi.conf.d/fedora/mkosi.conf

diff --git a/mkosi.conf.d/10-fedora/mkosi.conf.d/rawhide-42.conf b/mkosi.conf.d/fedora/mkosi.conf.d/rawhide-42.conf
similarity index 100%
rename from mkosi.conf.d/10-fedora/mkosi.conf.d/rawhide-42.conf
rename to mkosi.conf.d/fedora/mkosi.conf.d/rawhide-42.conf

diff --git a/mkosi.conf.d/20-none.conf b/mkosi.conf.d/none.conf
similarity index 100%
rename from mkosi.conf.d/20-none.conf
rename to mkosi.conf.d/none.conf

diff --git a/mkosi.conf.d/10-opensuse/macros.db_backend b/mkosi.conf.d/opensuse/macros.db_backend
similarity index 100%
rename from mkosi.conf.d/10-opensuse/macros.db_backend
rename to mkosi.conf.d/opensuse/macros.db_backend

diff --git a/mkosi.conf.d/10-opensuse/mkosi.conf b/mkosi.conf.d/opensuse/mkosi.conf
similarity index 100%
rename from mkosi.conf.d/10-opensuse/mkosi.conf
rename to mkosi.conf.d/opensuse/mkosi.conf

diff --git a/mkosi.conf.d/10-opensuse/mkosi.conf.d/10-debug.conf b/mkosi.conf.d/opensuse/mkosi.conf.d/debug.conf
similarity index 100%
rename from mkosi.conf.d/10-opensuse/mkosi.conf.d/10-debug.conf
rename to mkosi.conf.d/opensuse/mkosi.conf.d/debug.conf

diff --git a/mkosi.conf.d/10-opensuse/mkosi.prepare b/mkosi.conf.d/opensuse/mkosi.prepare
similarity index 100%
rename from mkosi.conf.d/10-opensuse/mkosi.prepare
rename to mkosi.conf.d/opensuse/mkosi.prepare

diff --git a/mkosi.conf.d/05-tools/mkosi.conf b/mkosi.conf.d/tools/mkosi.conf
similarity index 100%
rename from mkosi.conf.d/05-tools/mkosi.conf
rename to mkosi.conf.d/tools/mkosi.conf

diff --git a/mkosi.conf.d/05-tools/mkosi.conf.d/arch.conf b/mkosi.conf.d/tools/mkosi.conf.d/arch.conf
similarity index 100%
rename from mkosi.conf.d/05-tools/mkosi.conf.d/arch.conf
rename to mkosi.conf.d/tools/mkosi.conf.d/arch.conf

diff --git a/mkosi.conf.d/05-tools/mkosi.conf.d/centos-fedora.conf b/mkosi.conf.d/tools/mkosi.conf.d/centos-fedora.conf
similarity index 100%
rename from mkosi.conf.d/05-tools/mkosi.conf.d/centos-fedora.conf
rename to mkosi.conf.d/tools/mkosi.conf.d/centos-fedora.conf

diff --git a/mkosi.conf.d/05-tools/mkosi.conf.d/debian-ubuntu.conf b/mkosi.conf.d/tools/mkosi.conf.d/debian-ubuntu.conf
similarity index 100%
rename from mkosi.conf.d/05-tools/mkosi.conf.d/debian-ubuntu.conf
rename to mkosi.conf.d/tools/mkosi.conf.d/debian-ubuntu.conf

diff --git a/mkosi.conf.d/05-tools/mkosi.conf.d/fedora.conf b/mkosi.conf.d/tools/mkosi.conf.d/fedora.conf
similarity index 100%
rename from mkosi.conf.d/05-tools/mkosi.conf.d/fedora.conf
rename to mkosi.conf.d/tools/mkosi.conf.d/fedora.conf

diff --git a/mkosi.conf.d/05-tools/mkosi.conf.d/opensuse.conf b/mkosi.conf.d/tools/mkosi.conf.d/opensuse.conf
similarity index 100%
rename from mkosi.conf.d/05-tools/mkosi.conf.d/opensuse.conf
rename to mkosi.conf.d/tools/mkosi.conf.d/opensuse.conf

diff --git a/mkosi.conf.d/05-tools/mkosi.conf.d/ubuntu/mkosi.conf b/mkosi.conf.d/tools/mkosi.conf.d/ubuntu/mkosi.conf
similarity index 100%
rename from mkosi.conf.d/05-tools/mkosi.conf.d/ubuntu/mkosi.conf
rename to mkosi.conf.d/tools/mkosi.conf.d/ubuntu/mkosi.conf

diff --git a/mkosi.conf.d/05-tools/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf b/mkosi.conf.d/tools/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf
similarity index 58%
rename from mkosi.conf.d/05-tools/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf
rename to mkosi.conf.d/tools/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf
index bbddf8e25fa424f481b9f7f99c340f18fe1e1559..ac5676a90995be7eba429b542b2b6ee32b343a89 100644 (file)
--- a/mkosi.conf.d/05-tools/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf
+++ b/mkosi.conf.d/tools/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf
@@ -7,4 +7,4 @@ Architecture=!x86
 ToolsTreeRelease=noble
 
 [Build]
-ToolsTreeSandboxTrees=%D/mkosi.conf.d/10-ubuntu/noble-backports-ports.sources:/etc/apt/sources.list.d/noble-backports-ports.sources
+ToolsTreeSandboxTrees=%D/mkosi.conf.d/ubuntu/noble-backports-ports.sources:/etc/apt/sources.list.d/noble-backports-ports.sources

diff --git a/mkosi.conf.d/05-tools/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf b/mkosi.conf.d/tools/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf
similarity index 60%
rename from mkosi.conf.d/05-tools/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf
rename to mkosi.conf.d/tools/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf
index 9a6aa05cfbdcd544c8bdcf4d770165c6468701cd..ef4c494561b978956e4249c3fa6beb23e45d5f00 100644 (file)
--- a/mkosi.conf.d/05-tools/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf
+++ b/mkosi.conf.d/tools/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf
@@ -7,4 +7,4 @@ Architecture=|x86
 ToolsTreeRelease=noble
 
 [Build]
-ToolsTreeSandboxTrees=%D/mkosi.conf.d/10-ubuntu/noble-backports.sources:/etc/apt/sources.list.d/noble-backports.sources
+ToolsTreeSandboxTrees=%D/mkosi.conf.d/ubuntu/noble-backports.sources:/etc/apt/sources.list.d/noble-backports.sources

diff --git a/mkosi.conf.d/10-ubuntu/mkosi.conf b/mkosi.conf.d/ubuntu/mkosi.conf
similarity index 100%
rename from mkosi.conf.d/10-ubuntu/mkosi.conf
rename to mkosi.conf.d/ubuntu/mkosi.conf

diff --git a/mkosi.conf.d/10-ubuntu/mkosi.conf.d/non-x86.conf b/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf
similarity index 100%
rename from mkosi.conf.d/10-ubuntu/mkosi.conf.d/non-x86.conf
rename to mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf

diff --git a/mkosi.conf.d/10-ubuntu/mkosi.conf.d/x86.conf b/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf
similarity index 100%
rename from mkosi.conf.d/10-ubuntu/mkosi.conf.d/x86.conf
rename to mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf

diff --git a/mkosi.conf.d/10-ubuntu/noble-backports-ports.sources b/mkosi.conf.d/ubuntu/noble-backports-ports.sources
similarity index 100%
rename from mkosi.conf.d/10-ubuntu/noble-backports-ports.sources
rename to mkosi.conf.d/ubuntu/noble-backports-ports.sources

diff --git a/mkosi.conf.d/10-ubuntu/noble-backports.sources b/mkosi.conf.d/ubuntu/noble-backports.sources
similarity index 100%
rename from mkosi.conf.d/10-ubuntu/noble-backports.sources
rename to mkosi.conf.d/ubuntu/noble-backports.sources

diff --git a/mkosi.images/exitrd/mkosi.conf.d/10-arch.conf b/mkosi.images/exitrd/mkosi.conf.d/arch.conf
similarity index 100%
rename from mkosi.images/exitrd/mkosi.conf.d/10-arch.conf
rename to mkosi.images/exitrd/mkosi.conf.d/arch.conf

diff --git a/mkosi.images/exitrd/mkosi.conf.d/20-build.conf b/mkosi.images/exitrd/mkosi.conf.d/build.conf
similarity index 100%
rename from mkosi.images/exitrd/mkosi.conf.d/20-build.conf
rename to mkosi.images/exitrd/mkosi.conf.d/build.conf

diff --git a/mkosi.images/exitrd/mkosi.conf.d/10-centos-fedora.conf b/mkosi.images/exitrd/mkosi.conf.d/centos-fedora.conf
similarity index 100%
rename from mkosi.images/exitrd/mkosi.conf.d/10-centos-fedora.conf
rename to mkosi.images/exitrd/mkosi.conf.d/centos-fedora.conf

diff --git a/mkosi.images/exitrd/mkosi.conf.d/10-debian.conf b/mkosi.images/exitrd/mkosi.conf.d/debian.conf
similarity index 100%
rename from mkosi.images/exitrd/mkosi.conf.d/10-debian.conf
rename to mkosi.images/exitrd/mkosi.conf.d/debian.conf

diff --git a/mkosi.images/exitrd/mkosi.conf.d/10-opensuse.conf b/mkosi.images/exitrd/mkosi.conf.d/opensuse.conf
similarity index 100%
rename from mkosi.images/exitrd/mkosi.conf.d/10-opensuse.conf
rename to mkosi.images/exitrd/mkosi.conf.d/opensuse.conf

diff --git a/mkosi.images/exitrd/mkosi.conf.d/10-ubuntu.conf b/mkosi.images/exitrd/mkosi.conf.d/ubuntu.conf
similarity index 100%
rename from mkosi.images/exitrd/mkosi.conf.d/10-ubuntu.conf
rename to mkosi.images/exitrd/mkosi.conf.d/ubuntu.conf

diff --git a/mkosi.images/minimal-base/mkosi.conf.d/10-arch.conf b/mkosi.images/minimal-base/mkosi.conf.d/arch.conf
similarity index 100%
rename from mkosi.images/minimal-base/mkosi.conf.d/10-arch.conf
rename to mkosi.images/minimal-base/mkosi.conf.d/arch.conf

diff --git a/mkosi.images/minimal-base/mkosi.conf.d/20-build.conf b/mkosi.images/minimal-base/mkosi.conf.d/build.conf
similarity index 100%
rename from mkosi.images/minimal-base/mkosi.conf.d/20-build.conf
rename to mkosi.images/minimal-base/mkosi.conf.d/build.conf

diff --git a/mkosi.images/minimal-base/mkosi.conf.d/10-centos-fedora.conf b/mkosi.images/minimal-base/mkosi.conf.d/centos-fedora.conf
similarity index 100%
rename from mkosi.images/minimal-base/mkosi.conf.d/10-centos-fedora.conf
rename to mkosi.images/minimal-base/mkosi.conf.d/centos-fedora.conf

diff --git a/mkosi.images/minimal-base/mkosi.conf.d/10-debian-ubuntu.conf b/mkosi.images/minimal-base/mkosi.conf.d/debian-ubuntu.conf
similarity index 100%
rename from mkosi.images/minimal-base/mkosi.conf.d/10-debian-ubuntu.conf
rename to mkosi.images/minimal-base/mkosi.conf.d/debian-ubuntu.conf

diff --git a/mkosi.images/minimal-base/mkosi.conf.d/10-opensuse.conf b/mkosi.images/minimal-base/mkosi.conf.d/opensuse.conf
similarity index 100%
rename from mkosi.images/minimal-base/mkosi.conf.d/10-opensuse.conf
rename to mkosi.images/minimal-base/mkosi.conf.d/opensuse.conf