From 9f89c2d420656bb3eb584408a142d7858fb17735 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Wed, 7 Jun 2023 15:59:03 +0200 Subject: [PATCH] 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. --- .github/workflows/mkosi.yml | 2 +- mkosi.conf.d/05-qemu-mem.conf | 4 ++-- mkosi.presets/00-base/mkosi.conf.d/10-centos-fedora.conf | 3 ++- mkosi.presets/00-base/mkosi.conf.d/10-debian-ubuntu.conf | 3 ++- mkosi.presets/10-initrd/mkosi.conf | 3 ++- mkosi.presets/10-initrd/mkosi.conf.d/10-default.conf | 2 +- mkosi.presets/20-final/mkosi.conf.d/10-centos-fedora.conf | 3 ++- mkosi.presets/20-final/mkosi.conf.d/10-debian-ubuntu.conf | 3 ++- .../20-final/mkosi.conf.d/20-kernel-centos-fedora.conf | 3 ++- .../20-final/mkosi.conf.d/20-kernel-debian-ubuntu.conf | 3 ++- 10 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml index 9010b1fcb7b..b9ccd02c3ac 100644 --- 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 58de5fcf568..7dd02925c01 100644 --- 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 ad44d46529f..283369ff109 100644 --- 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 1c4cb2d7acc..63b1daae0a5 100644 --- 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 40fd6c40053..77e4896c176 100644 --- 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 a2a93522669..58e48989f3e 100644 --- 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 02e11d095f0..f22aed37006 100644 --- 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 071e46fd44d..588f833c8f4 100644 --- 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 b11b13f7092..14b18727efc 100644 --- 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 653efa8f0c1..f9413f1da64 100644 --- 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= -- 2.47.3