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.

diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index 9010b1fcb7b97d9bf0fbf5bd7df8fc9768bc3d8b..b9ccd02c3ac5da00469dcbc71c70cbb133ab0926 100644 (file)
--- 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: |

diff --git a/mkosi.conf.d/05-qemu-mem.conf b/mkosi.conf.d/05-qemu-mem.conf
index 58de5fcf568cde52bf7ac06a68d171df147b1742..7dd02925c015a07bbeb8477637e50744034f9d01 100644 (file)
--- 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

diff --git a/mkosi.presets/00-base/mkosi.conf.d/10-centos-fedora.conf b/mkosi.presets/00-base/mkosi.conf.d/10-centos-fedora.conf
index ad44d46529fdd3aead957e54f22398f4722a2ef4..283369ff109a35c247ed904b09e2526c0b821a9e 100644 (file)
--- 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=

diff --git a/mkosi.presets/00-base/mkosi.conf.d/10-debian-ubuntu.conf b/mkosi.presets/00-base/mkosi.conf.d/10-debian-ubuntu.conf
index 1c4cb2d7acca7c2373d423dfceb20e903d2562f6..63b1daae0a51942e6fcc0eb981a1cbfef2b12a57 100644 (file)
--- 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=

diff --git a/mkosi.presets/10-initrd/mkosi.conf b/mkosi.presets/10-initrd/mkosi.conf
index 40fd6c40053ab5bca0a0ca217011ae61a69b5998..77e4896c1765192d6731b787c78d45a85f1f514f 100644 (file)
--- 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

diff --git a/mkosi.presets/10-initrd/mkosi.conf.d/10-default.conf b/mkosi.presets/10-initrd/mkosi.conf.d/10-default.conf
index a2a935226692f5b30c17b208bb26eebeabffb871..58e48989f3efee5062938a66d7584bb923390781 100644 (file)
--- 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

diff --git a/mkosi.presets/20-final/mkosi.conf.d/10-centos-fedora.conf b/mkosi.presets/20-final/mkosi.conf.d/10-centos-fedora.conf
index 02e11d095f0b0cd72f1906716fe846b3ea52594b..f22aed37006779149cf3a1763cac66b6adebca46 100644 (file)
--- 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=

diff --git a/mkosi.presets/20-final/mkosi.conf.d/10-debian-ubuntu.conf b/mkosi.presets/20-final/mkosi.conf.d/10-debian-ubuntu.conf
index 071e46fd44d08a763250e6be305822ee3f95a373..588f833c8f4a9b8c25ff1f63492c4b6c88ed01d4 100644 (file)
--- 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=

diff --git 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
index b11b13f70926266e0ccf045bea2c38fe9171427d..14b18727efcc01c886fe90f52b7d65df36d9e6de 100644 (file)
--- 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=

diff --git 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
index 653efa8f0c18fc38d52902c0baf78efa962dd880..f9413f1da64fc26386e182e05aa9c665d32848ca 100644 (file)
--- 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=