]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
mkosi: Use zstd compression on non-centos distros
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Tue, 9 May 2023 13:04:56 +0000 (15:04 +0200)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Fri, 12 May 2023 09:38:02 +0000 (11:38 +0200)
Just because centos doesn't support it doesn't mean we can't use it
on the other distros.

mkosi.presets/10-initrd/mkosi.conf [moved from mkosi.presets/10-initrd.conf with 80% similarity]
mkosi.presets/10-initrd/mkosi.conf.d/10-centos.conf [new file with mode: 0644]
mkosi.presets/10-initrd/mkosi.conf.d/10-default.conf [new file with mode: 0644]

similarity index 80%
rename from mkosi.presets/10-initrd.conf
rename to mkosi.presets/10-initrd/mkosi.conf
index 6516b510c7dc715d61adc81a8392169d05a74603..40fd6c40053ab5bca0a0ca217011ae61a69b5998 100644 (file)
@@ -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 (file)
index 0000000..c25a17a
--- /dev/null
@@ -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 (file)
index 0000000..98f0b7d
--- /dev/null
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=arch debian fedora opensuse ubuntu
+
+[Output]
+CompressOutput=zst