Merging upstream version 256.4.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 41 insertions, 0 deletions

diff --git a/mkosi.conf.d/10-centos/mkosi.conf b/mkosi.conf.d/10-centos/mkosi.conf
new file mode 100644
index 0000000..d97b081
--- /dev/null
+++ b/mkosi.conf.d/10-centos/mkosi.conf
@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=centos
+
+[Distribution]
+Release=10
+
+[Content]
+Environment=
+        # We'd prefer to use XFS here but it fails to mount on duplicate filesystem UUIDs which
+        # happens when running tests in parallel so we use ext4 instead.
+        SYSTEMD_REPART_OVERRIDE_FSTYPE_ROOT=ext4
+        # The kernel versions in CentOS Stream 9 doesn't support orphan_file, but later versions of
+        # mkfs.ext4 enabled it by default, so we disable it explicitly.
+        SYSTEMD_REPART_MKFS_OPTIONS_EXT4="-O ^orphan_file"
+
+Packages=
+        kernel-modules # For squashfs
diff --git a/mkosi.conf.d/10-centos/mkosi.conf.d/10-epel.conf b/mkosi.conf.d/10-centos/mkosi.conf.d/10-epel.conf
new file mode 100644
index 0000000..9e92a4f
--- /dev/null
+++ b/mkosi.conf.d/10-centos/mkosi.conf.d/10-epel.conf
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Release=9
+
+[Distribution]
+Repositories=
+        epel
+        epel-next
diff --git a/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages.conf b/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages.conf
new file mode 100644
index 0000000..11dc969
--- /dev/null
+++ b/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages.conf
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Repositories=epel
+
+[Content]
+Packages=
+        dfuzzer
+        dhcp-server
+        erofs-utils
+        knot
+        qrencode
+        sbsigntools