mkosi: Update to latest

mkosi's match syntax was changed so we update our config files to use the new match syntax which mimicks the systemd condition syntax.
2026-04-14 00:14:32 +09:00 · 2023-06-07 15:59:03 +02:00
parent 9e7e9c72c4
commit 9f89c2d420
10 changed files with 18 additions and 11 deletions
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -76,7 +76,7 @@ jobs:

    steps:
    - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
-    - uses: systemd/mkosi@e59f763872e4d5f96acb11b4a77995b986bb31cc
+    - uses: systemd/mkosi@8fde39857993c2120bcc6e480dab9fbb47dc2a7e

    - name: Configure
      run: |
--- a/mkosi.conf.d/05-qemu-mem.conf
+++ b/mkosi.conf.d/05-qemu-mem.conf
@@ -4,8 +4,8 @@
 # them without OOMing.

 [Match]
-Distribution=arch centos
-Release=rolling 8
+Distribution=|arch
+Distribution=|centos

 [Host]
 QemuMem=3G
--- a/mkosi.presets/00-base/mkosi.conf.d/10-centos-fedora.conf
+++ b/mkosi.presets/00-base/mkosi.conf.d/10-centos-fedora.conf
@@ -1,7 +1,8 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later

 [Match]
-Distribution=centos fedora
+Distribution=|centos
+Distribution=|fedora

 [Content]
 Packages=
--- a/mkosi.presets/00-base/mkosi.conf.d/10-debian-ubuntu.conf
+++ b/mkosi.presets/00-base/mkosi.conf.d/10-debian-ubuntu.conf
@@ -1,7 +1,8 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later

 [Match]
-Distribution=debian ubuntu
+Distribution=|debian
+Distribution=|ubuntu

 [Content]
 Packages=
--- a/mkosi.presets/10-initrd/mkosi.conf
+++ b/mkosi.presets/10-initrd/mkosi.conf
@@ -1,7 +1,8 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later

 [Match]
-Bootable=auto,yes
+Bootable=|auto
+Bootable=|yes

 [Output]
 Format=cpio
--- a/mkosi.presets/10-initrd/mkosi.conf.d/10-default.conf
+++ b/mkosi.presets/10-initrd/mkosi.conf.d/10-default.conf
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later

 [Match]
-Distribution=arch debian fedora opensuse ubuntu
+Distribution=!centos

 [Output]
 CompressOutput=zst
--- a/mkosi.presets/20-final/mkosi.conf.d/10-centos-fedora.conf
+++ b/mkosi.presets/20-final/mkosi.conf.d/10-centos-fedora.conf
@@ -1,7 +1,8 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later

 [Match]
-Distribution=centos fedora
+Distribution=|centos
+Distribution=|fedora

 [Content]
 Packages=
--- a/mkosi.presets/20-final/mkosi.conf.d/10-debian-ubuntu.conf
+++ b/mkosi.presets/20-final/mkosi.conf.d/10-debian-ubuntu.conf
@@ -1,7 +1,8 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later

 [Match]
-Distribution=debian ubuntu
+Distribution=|debian
+Distribution=|ubuntu

 [Content]
 Packages=
--- a/mkosi.presets/20-final/mkosi.conf.d/20-kernel-centos-fedora.conf
+++ b/mkosi.presets/20-final/mkosi.conf.d/20-kernel-centos-fedora.conf
@@ -2,7 +2,8 @@

 [Match]
 PathExists=../../mkosi.kernel/
-Distribution=centos fedora
+Distribution=|centos
+Distribution=|fedora

 [Content]
 Packages=
--- a/mkosi.presets/20-final/mkosi.conf.d/20-kernel-debian-ubuntu.conf
+++ b/mkosi.presets/20-final/mkosi.conf.d/20-kernel-debian-ubuntu.conf
@@ -2,7 +2,8 @@

 [Match]
 PathExists=../../mkosi.kernel/
-Distribution=debian ubuntu
+Distribution=|debian
+Distribution=|ubuntu

 [Content]
 Packages=