From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 7 May 2024 18:46:47 +0000 (+0200)
Subject: Drop workaround
X-Git-Tag: v23.1~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50d6e95f5cbaf659988d25cbfdbea73a0ef44ff9;p=thirdparty%2Fmkosi.git

Drop workaround
---

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index de94c8078..9b24e2e13 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -158,15 +158,6 @@ jobs:
         QemuKvm=yes
         EOF
 
-        # Work around for https://src.fedoraproject.org/rpms/grub2/pull-request/61 by disabling obsoletes.
-        tee mkosi/resources/mkosi-tools/mkosi.local.conf <<EOF
-        [Distribution]
-        PackageManagerTrees=mkosi.pkgmngr
-        EOF
-
-        mkdir -p mkosi/resources/mkosi-tools/mkosi.pkgmngr/etc/dnf
-        echo -e "[main]\nobsoletes=0" > mkosi/resources/mkosi-tools/mkosi.pkgmngr/etc/dnf/dnf.conf
-
         # TODO: Remove once all distros have recent enough systemd that knows systemd.default_device_timeout_sec.
         mkdir -p mkosi-initrd/mkosi.extra/usr/lib/systemd/system.conf.d
         tee mkosi-initrd/mkosi.extra/usr/lib/systemd/system.conf.d/device-timeout.conf <<EOF