From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 9 May 2023 13:04:56 +0000 (+0200)
Subject: mkosi: Use zstd compression on non-centos distros
X-Git-Tag: v254-rc1~495
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=104afc730070fdf3ffad6636e6c465d234d79f54;p=thirdparty%2Fsystemd.git

mkosi: Use zstd compression on non-centos distros

Just because centos doesn't support it doesn't mean we can't use it
on the other distros.
---

diff --git a/mkosi.presets/10-initrd.conf b/mkosi.presets/10-initrd/mkosi.conf
similarity index 80%
rename from mkosi.presets/10-initrd.conf
rename to mkosi.presets/10-initrd/mkosi.conf
index 6516b510c7d..40fd6c40053 100644
--- a/mkosi.presets/10-initrd.conf
+++ b/mkosi.presets/10-initrd/mkosi.conf
@@ -5,11 +5,9 @@ Bootable=auto,yes
 
 [Output]
 Format=cpio
-# TODO: Switch to zstd once we stop building CentOS Stream 8.
-CompressOutput=xz
 
 [Content]
-BaseTrees=mkosi.output/base
+BaseTrees=../../mkosi.output/base
 MakeInitrd=yes
 
 # Arch Linux doesn't split their gcc-libs package so we manually remove unneeded stuff here to make sure it
diff --git a/mkosi.presets/10-initrd/mkosi.conf.d/10-centos.conf b/mkosi.presets/10-initrd/mkosi.conf.d/10-centos.conf
new file mode 100644
index 00000000000..c25a17a030b
--- /dev/null
+++ b/mkosi.presets/10-initrd/mkosi.conf.d/10-centos.conf
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=centos
+
+[Output]
+# TODO: Switch to zstd once we stop building CentOS Stream 8.
+CompressOutput=xz
diff --git a/mkosi.presets/10-initrd/mkosi.conf.d/10-default.conf b/mkosi.presets/10-initrd/mkosi.conf.d/10-default.conf
new file mode 100644
index 00000000000..98f0b7dffb2
--- /dev/null
+++ b/mkosi.presets/10-initrd/mkosi.conf.d/10-default.conf
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=arch debian fedora opensuse ubuntu
+
+[Output]
+CompressOutput=zst