From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 1 Apr 2025 11:22:29 +0000 (+0200)
Subject: mkosi: Drop orphan_file workaround
X-Git-Tag: v258-rc1~958^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac6f49003236a7b2454fa8d5cb8222547ff7621e;p=thirdparty%2Fsystemd.git

mkosi: Drop orphan_file workaround

mkosi now handles this workaround itself internally.
---

diff --git a/mkosi.conf.d/10-centos/mkosi.conf.d/10-orphan-file.conf b/mkosi.conf.d/10-centos/mkosi.conf.d/10-orphan-file.conf
deleted file mode 100644
index 075df651963..00000000000
--- a/mkosi.conf.d/10-centos/mkosi.conf.d/10-orphan-file.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-ToolsTreeDistribution=|!centos
-ToolsTreeRelease=|!9
-
-[Build]
-# 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. Except that older versions
-# of mkfs.ext4 don't know about "orphan_file" so we skip it on some tools tree variants where
-# we know "orphan_file" is not supported.
-Environment=
-        SYSTEMD_REPART_MKFS_OPTIONS_EXT4="-O ^orphan_file"