From 75930315f67622457733f321ef807b8901ad56ef Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Tue, 1 Apr 2025 13:22:09 +0200 Subject: [PATCH 1/5] mkosi: Update to latest --- .github/workflows/coverage.yml | 2 +- .github/workflows/mkosi.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index c51e4da1091..c89e47455cc 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -25,7 +25,7 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: systemd/mkosi@03d1a1b4cdc474c55166a2f48be244748011206d + - uses: systemd/mkosi@660874417bbe355121d705d2a049af39ddf28b58 # Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space # immediately, we remove the files in the background. However, we first move them to a different location diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml index 2f130792520..c35316edd95 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -120,7 +120,7 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - uses: systemd/mkosi@03d1a1b4cdc474c55166a2f48be244748011206d + - uses: systemd/mkosi@660874417bbe355121d705d2a049af39ddf28b58 # Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space # immediately, we remove the files in the background. However, we first move them to a different location From ac6f49003236a7b2454fa8d5cb8222547ff7621e Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Tue, 1 Apr 2025 13:22:29 +0200 Subject: [PATCH 2/5] mkosi: Drop orphan_file workaround mkosi now handles this workaround itself internally. --- .../10-centos/mkosi.conf.d/10-orphan-file.conf | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 mkosi.conf.d/10-centos/mkosi.conf.d/10-orphan-file.conf diff --git a/mkosi.conf.d/10-centos/mkosi.conf.d/10-orphan-file.conf b/mkosi.conf.d/10-centos/mkosi.conf.d/10-orphan-file.conf deleted file mode 100644 index 075df651963..00000000000 --- a/mkosi.conf.d/10-centos/mkosi.conf.d/10-orphan-file.conf +++ /dev/null @@ -1,13 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -[Match] -ToolsTreeDistribution=|!centos -ToolsTreeRelease=|!9 - -[Build] -# The kernel versions in CentOS Stream 9 doesn't support orphan_file, but later versions of -# mkfs.ext4 enabled it by default, so we disable it explicitly. Except that older versions -# of mkfs.ext4 don't know about "orphan_file" so we skip it on some tools tree variants where -# we know "orphan_file" is not supported. -Environment= - SYSTEMD_REPART_MKFS_OPTIONS_EXT4="-O ^orphan_file" From 1852c92592ca665b4d081e03355c0ffe7f4e7ada Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Tue, 1 Apr 2025 13:23:02 +0200 Subject: [PATCH 3/5] 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. --- .packit.yml | 2 +- mkosi.conf.d/{10-arch => arch}/mkosi.conf | 0 .../mkosi.conf.d/10-debug.conf => arch/mkosi.conf.d/debug.conf} | 0 mkosi.conf.d/{10-arch => arch}/mkosi.prepare | 0 mkosi.conf.d/{20-build.conf => build.conf} | 0 mkosi.conf.d/{10-centos-fedora => centos-fedora}/mkosi.conf | 0 .../10-debug.conf => centos-fedora/mkosi.conf.d/debug.conf} | 0 .../10-selinux.conf => centos-fedora/mkosi.conf.d/selinux.conf} | 0 mkosi.conf.d/{10-centos-fedora => centos-fedora}/mkosi.prepare | 0 mkosi.conf.d/{10-centos => centos}/mkosi.conf | 0 mkosi.conf.d/{10-centos => centos}/mkosi.conf.d/10-epel.conf | 0 .../{10-centos => centos}/mkosi.conf.d/20-epel-packages.conf | 0 mkosi.conf.d/{10-debian-ubuntu => debian-ubuntu}/mkosi.conf | 0 .../10-debug.conf => debian-ubuntu/mkosi.conf.d/debug.conf} | 0 .../{10-debian-ubuntu => debian-ubuntu}/mkosi.conf.d/efi.conf | 0 .../mkosi.conf.d/network.conf | 0 mkosi.conf.d/{10-debian-ubuntu => debian-ubuntu}/mkosi.prepare | 0 mkosi.conf.d/{10-debian => debian}/mkosi.conf | 0 mkosi.conf.d/{10-debian => debian}/mkosi.conf.d/arm64.conf | 0 mkosi.conf.d/{10-debian => debian}/mkosi.conf.d/x86-64.conf | 0 .../{20-extra-search-path.conf => extra-search-path.conf} | 0 mkosi.conf.d/{10-fedora => fedora}/mkosi.conf | 0 mkosi.conf.d/{10-fedora => fedora}/mkosi.conf.d/rawhide-42.conf | 0 mkosi.conf.d/{20-none.conf => none.conf} | 0 mkosi.conf.d/{10-opensuse => opensuse}/macros.db_backend | 0 mkosi.conf.d/{10-opensuse => opensuse}/mkosi.conf | 0 .../10-debug.conf => opensuse/mkosi.conf.d/debug.conf} | 0 mkosi.conf.d/{10-opensuse => opensuse}/mkosi.prepare | 0 mkosi.conf.d/{05-tools => tools}/mkosi.conf | 0 mkosi.conf.d/{05-tools => tools}/mkosi.conf.d/arch.conf | 0 .../{05-tools => tools}/mkosi.conf.d/centos-fedora.conf | 0 .../{05-tools => tools}/mkosi.conf.d/debian-ubuntu.conf | 0 mkosi.conf.d/{05-tools => tools}/mkosi.conf.d/fedora.conf | 0 mkosi.conf.d/{05-tools => tools}/mkosi.conf.d/opensuse.conf | 0 mkosi.conf.d/{05-tools => tools}/mkosi.conf.d/ubuntu/mkosi.conf | 0 .../mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf | 2 +- .../mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf | 2 +- mkosi.conf.d/{10-ubuntu => ubuntu}/mkosi.conf | 0 mkosi.conf.d/{10-ubuntu => ubuntu}/mkosi.conf.d/non-x86.conf | 0 mkosi.conf.d/{10-ubuntu => ubuntu}/mkosi.conf.d/x86.conf | 0 .../{10-ubuntu => ubuntu}/noble-backports-ports.sources | 0 mkosi.conf.d/{10-ubuntu => ubuntu}/noble-backports.sources | 0 mkosi.images/exitrd/mkosi.conf.d/{10-arch.conf => arch.conf} | 0 mkosi.images/exitrd/mkosi.conf.d/{20-build.conf => build.conf} | 0 .../mkosi.conf.d/{10-centos-fedora.conf => centos-fedora.conf} | 0 .../exitrd/mkosi.conf.d/{10-debian.conf => debian.conf} | 0 .../exitrd/mkosi.conf.d/{10-opensuse.conf => opensuse.conf} | 0 .../exitrd/mkosi.conf.d/{10-ubuntu.conf => ubuntu.conf} | 0 .../minimal-base/mkosi.conf.d/{10-arch.conf => arch.conf} | 0 .../minimal-base/mkosi.conf.d/{20-build.conf => build.conf} | 0 .../mkosi.conf.d/{10-centos-fedora.conf => centos-fedora.conf} | 0 .../mkosi.conf.d/{10-debian-ubuntu.conf => debian-ubuntu.conf} | 0 .../mkosi.conf.d/{10-opensuse.conf => opensuse.conf} | 0 53 files changed, 3 insertions(+), 3 deletions(-) rename mkosi.conf.d/{10-arch => arch}/mkosi.conf (100%) rename mkosi.conf.d/{10-arch/mkosi.conf.d/10-debug.conf => arch/mkosi.conf.d/debug.conf} (100%) rename mkosi.conf.d/{10-arch => arch}/mkosi.prepare (100%) rename mkosi.conf.d/{20-build.conf => build.conf} (100%) rename mkosi.conf.d/{10-centos-fedora => centos-fedora}/mkosi.conf (100%) rename mkosi.conf.d/{10-centos-fedora/mkosi.conf.d/10-debug.conf => centos-fedora/mkosi.conf.d/debug.conf} (100%) rename mkosi.conf.d/{10-centos-fedora/mkosi.conf.d/10-selinux.conf => centos-fedora/mkosi.conf.d/selinux.conf} (100%) rename mkosi.conf.d/{10-centos-fedora => centos-fedora}/mkosi.prepare (100%) rename mkosi.conf.d/{10-centos => centos}/mkosi.conf (100%) rename mkosi.conf.d/{10-centos => centos}/mkosi.conf.d/10-epel.conf (100%) rename mkosi.conf.d/{10-centos => centos}/mkosi.conf.d/20-epel-packages.conf (100%) rename mkosi.conf.d/{10-debian-ubuntu => debian-ubuntu}/mkosi.conf (100%) rename mkosi.conf.d/{10-debian-ubuntu/mkosi.conf.d/10-debug.conf => debian-ubuntu/mkosi.conf.d/debug.conf} (100%) rename mkosi.conf.d/{10-debian-ubuntu => debian-ubuntu}/mkosi.conf.d/efi.conf (100%) rename mkosi.conf.d/{10-debian-ubuntu => debian-ubuntu}/mkosi.conf.d/network.conf (100%) rename mkosi.conf.d/{10-debian-ubuntu => debian-ubuntu}/mkosi.prepare (100%) rename mkosi.conf.d/{10-debian => debian}/mkosi.conf (100%) rename mkosi.conf.d/{10-debian => debian}/mkosi.conf.d/arm64.conf (100%) rename mkosi.conf.d/{10-debian => debian}/mkosi.conf.d/x86-64.conf (100%) rename mkosi.conf.d/{20-extra-search-path.conf => extra-search-path.conf} (100%) rename mkosi.conf.d/{10-fedora => fedora}/mkosi.conf (100%) rename mkosi.conf.d/{10-fedora => fedora}/mkosi.conf.d/rawhide-42.conf (100%) rename mkosi.conf.d/{20-none.conf => none.conf} (100%) rename mkosi.conf.d/{10-opensuse => opensuse}/macros.db_backend (100%) rename mkosi.conf.d/{10-opensuse => opensuse}/mkosi.conf (100%) rename mkosi.conf.d/{10-opensuse/mkosi.conf.d/10-debug.conf => opensuse/mkosi.conf.d/debug.conf} (100%) rename mkosi.conf.d/{10-opensuse => opensuse}/mkosi.prepare (100%) rename mkosi.conf.d/{05-tools => tools}/mkosi.conf (100%) rename mkosi.conf.d/{05-tools => tools}/mkosi.conf.d/arch.conf (100%) rename mkosi.conf.d/{05-tools => tools}/mkosi.conf.d/centos-fedora.conf (100%) rename mkosi.conf.d/{05-tools => tools}/mkosi.conf.d/debian-ubuntu.conf (100%) rename mkosi.conf.d/{05-tools => tools}/mkosi.conf.d/fedora.conf (100%) rename mkosi.conf.d/{05-tools => tools}/mkosi.conf.d/opensuse.conf (100%) rename mkosi.conf.d/{05-tools => tools}/mkosi.conf.d/ubuntu/mkosi.conf (100%) rename mkosi.conf.d/{05-tools => tools}/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf (58%) rename mkosi.conf.d/{05-tools => tools}/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf (60%) rename mkosi.conf.d/{10-ubuntu => ubuntu}/mkosi.conf (100%) rename mkosi.conf.d/{10-ubuntu => ubuntu}/mkosi.conf.d/non-x86.conf (100%) rename mkosi.conf.d/{10-ubuntu => ubuntu}/mkosi.conf.d/x86.conf (100%) rename mkosi.conf.d/{10-ubuntu => ubuntu}/noble-backports-ports.sources (100%) rename mkosi.conf.d/{10-ubuntu => ubuntu}/noble-backports.sources (100%) rename mkosi.images/exitrd/mkosi.conf.d/{10-arch.conf => arch.conf} (100%) rename mkosi.images/exitrd/mkosi.conf.d/{20-build.conf => build.conf} (100%) rename mkosi.images/exitrd/mkosi.conf.d/{10-centos-fedora.conf => centos-fedora.conf} (100%) rename mkosi.images/exitrd/mkosi.conf.d/{10-debian.conf => debian.conf} (100%) rename mkosi.images/exitrd/mkosi.conf.d/{10-opensuse.conf => opensuse.conf} (100%) rename mkosi.images/exitrd/mkosi.conf.d/{10-ubuntu.conf => ubuntu.conf} (100%) rename mkosi.images/minimal-base/mkosi.conf.d/{10-arch.conf => arch.conf} (100%) rename mkosi.images/minimal-base/mkosi.conf.d/{20-build.conf => build.conf} (100%) rename mkosi.images/minimal-base/mkosi.conf.d/{10-centos-fedora.conf => centos-fedora.conf} (100%) rename mkosi.images/minimal-base/mkosi.conf.d/{10-debian-ubuntu.conf => debian-ubuntu.conf} (100%) rename mkosi.images/minimal-base/mkosi.conf.d/{10-opensuse.conf => opensuse.conf} (100%) diff --git a/.packit.yml b/.packit.yml index 75d5f6557ac..5a0be6131f0 100644 --- 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 bbddf8e25fa..ac5676a9099 100644 --- 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 9a6aa05cfbd..ef4c494561b 100644 --- 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 From 9ead378ba079d237f33ae25231e5fc92bce2b660 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Tue, 1 Apr 2025 13:25:47 +0200 Subject: [PATCH 4/5] mkosi: Use mkosi.tools.conf for tools tree configuration This allows us to use the regular settings instead of having to bother with ToolsTreeXXX variants. It'll also allow us to share configuration between the regular images and the tools tree image, which we'll make use of in the next commit. --- mkosi.conf.d/tools/mkosi.conf.d/centos-fedora.conf | 11 ----------- mkosi.conf.d/tools/mkosi.conf.d/debian-ubuntu.conf | 13 ------------- mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf | 2 +- mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf | 2 +- {mkosi.conf.d/tools => mkosi.tools.conf}/mkosi.conf | 6 +++--- .../mkosi.conf.d/arch.conf | 8 ++++---- mkosi.tools.conf/mkosi.conf.d/centos-fedora.conf | 11 +++++++++++ mkosi.tools.conf/mkosi.conf.d/debian-ubuntu.conf | 13 +++++++++++++ .../mkosi.conf.d/fedora.conf | 6 +++--- .../mkosi.conf.d/opensuse.conf | 8 ++++---- .../mkosi.conf.d/ubuntu/mkosi.conf | 2 +- .../mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf | 4 ++-- .../mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf | 4 ++-- test/integration-tests/README.md | 6 +++--- 14 files changed, 48 insertions(+), 48 deletions(-) delete mode 100644 mkosi.conf.d/tools/mkosi.conf.d/centos-fedora.conf delete mode 100644 mkosi.conf.d/tools/mkosi.conf.d/debian-ubuntu.conf rename {mkosi.conf.d/tools => mkosi.tools.conf}/mkosi.conf (70%) rename {mkosi.conf.d/tools => mkosi.tools.conf}/mkosi.conf.d/arch.conf (53%) create mode 100644 mkosi.tools.conf/mkosi.conf.d/centos-fedora.conf create mode 100644 mkosi.tools.conf/mkosi.conf.d/debian-ubuntu.conf rename {mkosi.conf.d/tools => mkosi.tools.conf}/mkosi.conf.d/fedora.conf (66%) rename {mkosi.conf.d/tools => mkosi.tools.conf}/mkosi.conf.d/opensuse.conf (51%) rename {mkosi.conf.d/tools => mkosi.tools.conf}/mkosi.conf.d/ubuntu/mkosi.conf (65%) rename {mkosi.conf.d/tools => mkosi.tools.conf}/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf (51%) rename {mkosi.conf.d/tools => mkosi.tools.conf}/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf (53%) diff --git a/mkosi.conf.d/tools/mkosi.conf.d/centos-fedora.conf b/mkosi.conf.d/tools/mkosi.conf.d/centos-fedora.conf deleted file mode 100644 index 2645e6df5d2..00000000000 --- a/mkosi.conf.d/tools/mkosi.conf.d/centos-fedora.conf +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -[Match] -ToolsTreeDistribution=|fedora -ToolsTreeDistribution=|centos - -[Build] -ToolsTreePrepareScripts=%D/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.prepare -ToolsTreePackages= - python3-mypy - rpm-build diff --git a/mkosi.conf.d/tools/mkosi.conf.d/debian-ubuntu.conf b/mkosi.conf.d/tools/mkosi.conf.d/debian-ubuntu.conf deleted file mode 100644 index b6715b5c507..00000000000 --- a/mkosi.conf.d/tools/mkosi.conf.d/debian-ubuntu.conf +++ /dev/null @@ -1,13 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later - -[Match] -ToolsTreeDistribution=|debian -ToolsTreeDistribution=|ubuntu - -[Build] -ToolsTreePrepareScripts=%D/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.prepare -ToolsTreePackages= - gh - lcov - mypy - shellcheck diff --git a/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf b/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf index 8e0e3c0d785..255358967c8 100644 --- a/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf +++ b/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf @@ -7,4 +7,4 @@ Architecture=!x86 Release=noble [Build] -SandboxTrees=noble-backports-ports.sources:/etc/apt/sources.list.d/noble-backports-ports.sources +SandboxTrees=%D/mkosi.conf.d/ubuntu/noble-backports-ports.sources:/etc/apt/sources.list.d/noble-backports-ports.sources diff --git a/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf b/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf index e0e96b2c184..5463bd794a2 100644 --- a/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf +++ b/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf @@ -7,4 +7,4 @@ Architecture=|x86 Release=noble [Build] -SandboxTrees=noble-backports.sources:/etc/apt/sources.list.d/noble-backports.sources +SandboxTrees=%D/mkosi.conf.d/ubuntu/noble-backports.sources:/etc/apt/sources.list.d/noble-backports.sources diff --git a/mkosi.conf.d/tools/mkosi.conf b/mkosi.tools.conf/mkosi.conf similarity index 70% rename from mkosi.conf.d/tools/mkosi.conf rename to mkosi.tools.conf/mkosi.conf index adbbf98ebff..a83e07a13e6 100644 --- a/mkosi.conf.d/tools/mkosi.conf +++ b/mkosi.tools.conf/mkosi.conf @@ -1,8 +1,8 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -[Build] -ToolsTreeSyncScripts=%D/mkosi.sync -ToolsTreePackages= +[Content] +SyncScripts=%D/mkosi.sync +Packages= gdb llvm meson # Also needed in the NO_BUILD case so we list it explicitly. diff --git a/mkosi.conf.d/tools/mkosi.conf.d/arch.conf b/mkosi.tools.conf/mkosi.conf.d/arch.conf similarity index 53% rename from mkosi.conf.d/tools/mkosi.conf.d/arch.conf rename to mkosi.tools.conf/mkosi.conf.d/arch.conf index 4de8b2bd588..2ccbf7c192e 100644 --- a/mkosi.conf.d/tools/mkosi.conf.d/arch.conf +++ b/mkosi.tools.conf/mkosi.conf.d/arch.conf @@ -1,11 +1,11 @@ # SPDX-License-Identifier: LGPL-2.1-or-later [Match] -ToolsTreeDistribution=arch +Distribution=arch -[Build] -ToolsTreePrepareScripts=%D/mkosi.images/build/mkosi.conf.d/arch/mkosi.prepare -ToolsTreePackages= +[Content] +PrepareScripts=%D/mkosi.images/build/mkosi.conf.d/arch/mkosi.prepare +Packages= base-devel github-cli lcov diff --git a/mkosi.tools.conf/mkosi.conf.d/centos-fedora.conf b/mkosi.tools.conf/mkosi.conf.d/centos-fedora.conf new file mode 100644 index 00000000000..b360b1d55b9 --- /dev/null +++ b/mkosi.tools.conf/mkosi.conf.d/centos-fedora.conf @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +[Match] +Distribution=|fedora +Distribution=|centos + +[Content] +PrepareScripts=%D/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.prepare +Packages= + python3-mypy + rpm-build diff --git a/mkosi.tools.conf/mkosi.conf.d/debian-ubuntu.conf b/mkosi.tools.conf/mkosi.conf.d/debian-ubuntu.conf new file mode 100644 index 00000000000..2b962da2ea7 --- /dev/null +++ b/mkosi.tools.conf/mkosi.conf.d/debian-ubuntu.conf @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +[Match] +Distribution=|debian +Distribution=|ubuntu + +[Content] +PrepareScripts=%D/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.prepare +Packages= + gh + lcov + mypy + shellcheck diff --git a/mkosi.conf.d/tools/mkosi.conf.d/fedora.conf b/mkosi.tools.conf/mkosi.conf.d/fedora.conf similarity index 66% rename from mkosi.conf.d/tools/mkosi.conf.d/fedora.conf rename to mkosi.tools.conf/mkosi.conf.d/fedora.conf index 66592b86ad4..e32cf27e986 100644 --- a/mkosi.conf.d/tools/mkosi.conf.d/fedora.conf +++ b/mkosi.tools.conf/mkosi.conf.d/fedora.conf @@ -1,10 +1,10 @@ # SPDX-License-Identifier: LGPL-2.1-or-later [Match] -ToolsTreeDistribution=fedora +Distribution=fedora -[Build] -ToolsTreePackages= +[Content] +Packages= lcov gh ruff diff --git a/mkosi.conf.d/tools/mkosi.conf.d/opensuse.conf b/mkosi.tools.conf/mkosi.conf.d/opensuse.conf similarity index 51% rename from mkosi.conf.d/tools/mkosi.conf.d/opensuse.conf rename to mkosi.tools.conf/mkosi.conf.d/opensuse.conf index b7af1419645..9e016bcfb27 100644 --- a/mkosi.conf.d/tools/mkosi.conf.d/opensuse.conf +++ b/mkosi.tools.conf/mkosi.conf.d/opensuse.conf @@ -1,11 +1,11 @@ # SPDX-License-Identifier: LGPL-2.1-or-later [Match] -ToolsTreeDistribution=opensuse +Distribution=opensuse -[Build] -ToolsTreePrepareScripts=%D/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.prepare -ToolsTreePackages= +[Content] +PrepareScripts=%D/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.prepare +Packages= gh lcov mypy diff --git a/mkosi.conf.d/tools/mkosi.conf.d/ubuntu/mkosi.conf b/mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf similarity index 65% rename from mkosi.conf.d/tools/mkosi.conf.d/ubuntu/mkosi.conf rename to mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf index 3078782ae30..b9fd7bcf342 100644 --- a/mkosi.conf.d/tools/mkosi.conf.d/ubuntu/mkosi.conf +++ b/mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf @@ -1,4 +1,4 @@ # SPDX-License-Identifier: LGPL-2.1-or-later [Match] -ToolsTreeDistribution=ubuntu +Distribution=ubuntu diff --git a/mkosi.conf.d/tools/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf b/mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf similarity index 51% rename from mkosi.conf.d/tools/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf rename to mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf index ac5676a9099..255358967c8 100644 --- a/mkosi.conf.d/tools/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf +++ b/mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/non-x86.conf @@ -4,7 +4,7 @@ [Match] Architecture=!x86-64 Architecture=!x86 -ToolsTreeRelease=noble +Release=noble [Build] -ToolsTreeSandboxTrees=%D/mkosi.conf.d/ubuntu/noble-backports-ports.sources:/etc/apt/sources.list.d/noble-backports-ports.sources +SandboxTrees=%D/mkosi.conf.d/ubuntu/noble-backports-ports.sources:/etc/apt/sources.list.d/noble-backports-ports.sources diff --git a/mkosi.conf.d/tools/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf b/mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf similarity index 53% rename from mkosi.conf.d/tools/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf rename to mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf index ef4c494561b..5463bd794a2 100644 --- a/mkosi.conf.d/tools/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf +++ b/mkosi.tools.conf/mkosi.conf.d/ubuntu/mkosi.conf.d/x86.conf @@ -4,7 +4,7 @@ [Match] Architecture=|x86-64 Architecture=|x86 -ToolsTreeRelease=noble +Release=noble [Build] -ToolsTreeSandboxTrees=%D/mkosi.conf.d/ubuntu/noble-backports.sources:/etc/apt/sources.list.d/noble-backports.sources +SandboxTrees=%D/mkosi.conf.d/ubuntu/noble-backports.sources:/etc/apt/sources.list.d/noble-backports.sources diff --git a/test/integration-tests/README.md b/test/integration-tests/README.md index 3f477dcba6d..1314bf01310 100644 --- a/test/integration-tests/README.md +++ b/test/integration-tests/README.md @@ -169,9 +169,9 @@ ToolsTree= On the other hand, if the rpms are available but not installed on the host system, you'll want to make sure they're installed into the mkosi tools tree so -that they're used to build the image by using either -`ToolsTreePackageDirectories=` or `ToolsTreeSandboxTrees=` similarly to -`PackageDirectories=` or `SandboxTrees=` mentioned above. +that they're used to build the image by again using either +`PackageDirectories=` or `SandboxTrees=`, but this time in +`mkosi.tools.conf/mkosi.local.conf` instead of `mkosi.local.conf`. Finally, we'll make use of the standalone mode of running the integration tests to avoid having to install any build dependencies. From ce68d4349e0db866181c51a9a5d8a9432fa6d51a Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Tue, 1 Apr 2025 14:57:22 +0200 Subject: [PATCH 5/5] mkosi: Stop passing package environment variables to tools image The tools image is not guaranteed to be the same distribution as the target distribution and so might have different package environment variables than the main image yet we currently unconditionally use the same package environment variables for both of them. Let's fix this by not passing the package environment variables to the tools image and subimages anymore, and instead having the main, tools and build images separately include a config file with the required environment variables. --- .packit.yml | 2 +- mkosi.conf | 5 ----- mkosi.conf.d/arch/mkosi.conf | 7 ------- mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf | 11 +++++++++++ mkosi.conf.d/centos-fedora/mkosi.conf | 7 ------- mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf | 12 ++++++++++++ mkosi.conf.d/debian-ubuntu/mkosi.conf | 8 -------- mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf | 13 +++++++++++++ mkosi.conf.d/opensuse/mkosi.conf | 6 ------ mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf | 12 ++++++++++++ mkosi.images/build/mkosi.conf.d/arch/mkosi.conf | 3 +++ .../build/mkosi.conf.d/centos-fedora/mkosi.conf | 3 +++ .../build/mkosi.conf.d/debian-ubuntu/mkosi.conf | 3 +++ mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf | 3 +++ mkosi.tools.conf/mkosi.conf.d/arch.conf | 3 +++ mkosi.tools.conf/mkosi.conf.d/centos-fedora.conf | 3 +++ mkosi.tools.conf/mkosi.conf.d/debian-ubuntu.conf | 3 +++ mkosi.tools.conf/mkosi.conf.d/opensuse.conf | 3 +++ tools/fetch-distro.py | 2 +- 19 files changed, 74 insertions(+), 35 deletions(-) create mode 100644 mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf create mode 100644 mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf create mode 100644 mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf create mode 100644 mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf diff --git a/.packit.yml b/.packit.yml index 5a0be6131f0..19fbce9cdd5 100644 --- 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/centos-fedora/mkosi.conf | cut -d= -f2)"' + - bash -c 'git -C .packit_rpm checkout "$(grep GIT_COMMIT= mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.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 b/mkosi.conf index 033b92d5915..8c3695bef24 100644 --- a/mkosi.conf +++ b/mkosi.conf @@ -23,11 +23,6 @@ PassEnvironment= ASAN_OPTIONS COVERAGE VCS_TAG - GIT_URL - GIT_SUBDIR - GIT_BRANCH - GIT_COMMIT - PKG_SUBDIR [Output] RepartDirectories=mkosi.repart diff --git a/mkosi.conf.d/arch/mkosi.conf b/mkosi.conf.d/arch/mkosi.conf index 79c189bf034..f897d7d31c1 100644 --- a/mkosi.conf.d/arch/mkosi.conf +++ b/mkosi.conf.d/arch/mkosi.conf @@ -3,13 +3,6 @@ [Match] Distribution=arch -[Build] -Environment= - GIT_URL=https://gitlab.archlinux.org/archlinux/packaging/packages/systemd.git - GIT_BRANCH=main - GIT_COMMIT=1b4994657df1c7495607f0c2f20db73550b94f34 - PKG_SUBDIR=arch - [Content] VolatilePackages= systemd diff --git a/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf b/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf new file mode 100644 index 00000000000..66244583313 --- /dev/null +++ b/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +[Match] +Distribution=arch + +[Build] +Environment= + GIT_URL=https://gitlab.archlinux.org/archlinux/packaging/packages/systemd.git + GIT_BRANCH=main + GIT_COMMIT=1b4994657df1c7495607f0c2f20db73550b94f34 + PKG_SUBDIR=arch diff --git a/mkosi.conf.d/centos-fedora/mkosi.conf b/mkosi.conf.d/centos-fedora/mkosi.conf index 6f996fd578a..7c941046f77 100644 --- a/mkosi.conf.d/centos-fedora/mkosi.conf +++ b/mkosi.conf.d/centos-fedora/mkosi.conf @@ -4,13 +4,6 @@ Distribution=|centos Distribution=|fedora -[Build] -Environment= - GIT_URL=https://src.fedoraproject.org/rpms/systemd.git - GIT_BRANCH=rawhide - GIT_COMMIT=617952132de4ed882b9b00ceeed077f843130f91 - PKG_SUBDIR=fedora - [Content] VolatilePackages= systemd diff --git a/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf b/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf new file mode 100644 index 00000000000..63caaede597 --- /dev/null +++ b/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +[Match] +Distribution=|centos +Distribution=|fedora + +[Build] +Environment= + GIT_URL=https://src.fedoraproject.org/rpms/systemd.git + GIT_BRANCH=rawhide + GIT_COMMIT=617952132de4ed882b9b00ceeed077f843130f91 + PKG_SUBDIR=fedora diff --git a/mkosi.conf.d/debian-ubuntu/mkosi.conf b/mkosi.conf.d/debian-ubuntu/mkosi.conf index 3b85be300be..30138c00fbc 100644 --- a/mkosi.conf.d/debian-ubuntu/mkosi.conf +++ b/mkosi.conf.d/debian-ubuntu/mkosi.conf @@ -4,14 +4,6 @@ Distribution=|debian Distribution=|ubuntu -[Build] -Environment= - GIT_URL=https://salsa.debian.org/systemd-team/systemd.git - GIT_SUBDIR=debian - GIT_BRANCH=debian/master - GIT_COMMIT=d8c7f8f7f461b1edc3bf5040509e697ea574c990 - PKG_SUBDIR=debian - [Content] VolatilePackages= libnss-myhostname diff --git a/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf b/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf new file mode 100644 index 00000000000..1f8fe976f42 --- /dev/null +++ b/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +[Match] +Distribution=|debian +Distribution=|ubuntu + +[Build] +Environment= + GIT_URL=https://salsa.debian.org/systemd-team/systemd.git + GIT_SUBDIR=debian + GIT_BRANCH=debian/master + GIT_COMMIT=d8c7f8f7f461b1edc3bf5040509e697ea574c990 + PKG_SUBDIR=debian diff --git a/mkosi.conf.d/opensuse/mkosi.conf b/mkosi.conf.d/opensuse/mkosi.conf index 6509ea4f168..32ff446fec5 100644 --- a/mkosi.conf.d/opensuse/mkosi.conf +++ b/mkosi.conf.d/opensuse/mkosi.conf @@ -9,12 +9,6 @@ Repositories=non-oss [Build] SandboxTrees=macros.db_backend:/etc/rpm/macros.db_backend -Environment= - GIT_URL=https://github.com/bmwiedemann/openSUSE - GIT_SUBDIR=packages/s/systemd - GIT_BRANCH=master - GIT_COMMIT=9002a773f0ab185908dc8fb6c831c1cd9fdf11f0 - PKG_SUBDIR=opensuse [Content] VolatilePackages= diff --git a/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf b/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf new file mode 100644 index 00000000000..ac1ddf5e929 --- /dev/null +++ b/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +[Match] +Distribution=opensuse + +[Build] +Environment= + GIT_URL=https://github.com/bmwiedemann/openSUSE + GIT_SUBDIR=packages/s/systemd + GIT_BRANCH=master + GIT_COMMIT=9002a773f0ab185908dc8fb6c831c1cd9fdf11f0 + PKG_SUBDIR=opensuse diff --git a/mkosi.images/build/mkosi.conf.d/arch/mkosi.conf b/mkosi.images/build/mkosi.conf.d/arch/mkosi.conf index d7a79d11c10..2e54455354c 100644 --- a/mkosi.images/build/mkosi.conf.d/arch/mkosi.conf +++ b/mkosi.images/build/mkosi.conf.d/arch/mkosi.conf @@ -3,6 +3,9 @@ [Match] Distribution=arch +[Include] +Include=%D/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf + [Content] Packages= base diff --git a/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf b/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf index 4d0ca8917d8..89fdfc4b20a 100644 --- a/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf +++ b/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf @@ -4,6 +4,9 @@ Distribution=|centos Distribution=|fedora +[Include] +Include=%D/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf + [Content] Packages= clang-devel diff --git a/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf b/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf index 81c79a2c219..7fac74772b9 100644 --- a/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf +++ b/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf @@ -4,6 +4,9 @@ Distribution=|debian Distribution=|ubuntu +[Include] +Include=%D/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf + [Content] Packages= apt diff --git a/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf b/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf index 70a1b31b641..00a45fce5b7 100644 --- a/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf +++ b/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf @@ -3,6 +3,9 @@ [Match] Distribution=opensuse +[Include] +Include=%D/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf + [Content] Packages= clang diff --git a/mkosi.tools.conf/mkosi.conf.d/arch.conf b/mkosi.tools.conf/mkosi.conf.d/arch.conf index 2ccbf7c192e..75570ffe0c6 100644 --- a/mkosi.tools.conf/mkosi.conf.d/arch.conf +++ b/mkosi.tools.conf/mkosi.conf.d/arch.conf @@ -3,6 +3,9 @@ [Match] Distribution=arch +[Include] +Include=%D/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf + [Content] PrepareScripts=%D/mkosi.images/build/mkosi.conf.d/arch/mkosi.prepare Packages= diff --git a/mkosi.tools.conf/mkosi.conf.d/centos-fedora.conf b/mkosi.tools.conf/mkosi.conf.d/centos-fedora.conf index b360b1d55b9..8f5f07addf5 100644 --- a/mkosi.tools.conf/mkosi.conf.d/centos-fedora.conf +++ b/mkosi.tools.conf/mkosi.conf.d/centos-fedora.conf @@ -4,6 +4,9 @@ Distribution=|fedora Distribution=|centos +[Include] +Include=%D/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf + [Content] PrepareScripts=%D/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.prepare Packages= diff --git a/mkosi.tools.conf/mkosi.conf.d/debian-ubuntu.conf b/mkosi.tools.conf/mkosi.conf.d/debian-ubuntu.conf index 2b962da2ea7..0a34b867c9b 100644 --- a/mkosi.tools.conf/mkosi.conf.d/debian-ubuntu.conf +++ b/mkosi.tools.conf/mkosi.conf.d/debian-ubuntu.conf @@ -4,6 +4,9 @@ Distribution=|debian Distribution=|ubuntu +[Include] +Include=%D/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf + [Content] PrepareScripts=%D/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.prepare Packages= diff --git a/mkosi.tools.conf/mkosi.conf.d/opensuse.conf b/mkosi.tools.conf/mkosi.conf.d/opensuse.conf index 9e016bcfb27..6fd1c746d60 100644 --- a/mkosi.tools.conf/mkosi.conf.d/opensuse.conf +++ b/mkosi.tools.conf/mkosi.conf.d/opensuse.conf @@ -3,6 +3,9 @@ [Match] Distribution=opensuse +[Include] +Include=%D/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf + [Content] PrepareScripts=%D/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.prepare Packages= diff --git a/tools/fetch-distro.py b/tools/fetch-distro.py index 77c46d45a20..c7d30f18c13 100755 --- a/tools/fetch-distro.py +++ b/tools/fetch-distro.py @@ -127,7 +127,7 @@ def update_distro(args, distro: str, config: dict): changes = subprocess.check_output(cmd, text=True).strip() conf_dir = Path('mkosi.conf.d') - files = conf_dir.glob('*/*.conf') + files = conf_dir.glob('**/pkgenv.conf') for file in files: s = file.read_text() if old_commit in s: