mkosi: always install util-linux-script in Fedora

F41 is EOL, so we can unconditionally install this package, so that we
don't have to add a new version every time a new release is branched

Fixes test issues such as:

TEST-74-AUX-UTILS.sh[1363]: .//usr/lib/systemd/tests/testdata/units/TEST-74-AUX-UTILS.networkctl.sh: line 55: script: command not found

(cherry picked from commit 8fe50c025b36da43c1e95343d3cc08dd757b1cad)
(cherry picked from commit 6ea11208c6e6e959054eaf313dc10f40d7c8a181)
(cherry picked from commit 40482d0a3f3e129d10041ba255a6997ba400dc0f)

diff --git a/mkosi/mkosi.conf.d/fedora/mkosi.conf b/mkosi/mkosi.conf.d/fedora/mkosi.conf
index e2a479eb6d366cb8938d63ff99c862b2000479df..ef222dae504ec573d1132f39d3b6c21ed24acbbe 100644 (file)
--- a/mkosi/mkosi.conf.d/fedora/mkosi.conf
+++ b/mkosi/mkosi.conf.d/fedora/mkosi.conf
@@ -18,3 +18,4 @@ Packages=
         kernel-modules-internal
         rpmautospec
         scsi-target-utils
+        util-linux-script

diff --git a/mkosi/mkosi.conf.d/fedora/mkosi.conf.d/rawhide-42.conf b/mkosi/mkosi.conf.d/fedora/mkosi.conf.d/rawhide-42.conf
deleted file mode 100644 (file)
index d2b2f7d..0000000
--- a/mkosi/mkosi.conf.d/fedora/mkosi.conf.d/rawhide-42.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-Release=|rawhide
-Release=|42
-Release=|43
-Release=|44
-
-[Content]
-Packages=util-linux-script