From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Sat, 7 Dec 2024 00:33:32 +0000 (+0000)
Subject: mkosi-initrd: remove dpkg in newer ubuntu/debian releases
X-Git-Tag: v25~121
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=719890bdf60f3f6bfa06ae53a82ba41f7ce42eab;p=thirdparty%2Fmkosi.git

mkosi-initrd: remove dpkg in newer ubuntu/debian releases
---

diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf
index 2d352292d..c75f5a8e9 100644
--- a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf
+++ b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf
@@ -26,9 +26,5 @@ Packages=
         # Various libraries that are dlopen'ed by systemd
         libfido2-1
 
-RemovePackages=
-        # TODO: Remove dpkg if dash ever loses its dependency on it.
-        # dpkg
-
 RemoveFiles=
         /usr/share/locale/*
diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/10-dpkg.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/10-dpkg.conf
new file mode 100644
index 000000000..7d41d76ff
--- /dev/null
+++ b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/10-dpkg.conf
@@ -0,0 +1,18 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[TriggerMatch]
+Distribution=debian
+Release=!bullseye
+Release=!bookworm
+
+[TriggerMatch]
+Distribution=ubuntu
+Release=!focal
+Release=!jammy
+Release=!noble
+Release=!oracular
+
+[Content]
+RemovePackages=
+        # Needs perl >= 5.40.0-8 and dash >= 0.5.12-7 to drop this
+        dpkg