From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Sat, 9 Aug 2025 14:05:48 +0000 (+0100)
Subject: mkosi-tools: move systemd-boot package to conf file matching older releases
X-Git-Tag: v26~157
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95f5c77fb7a4f55acfab331e51ebae808fdc9360;p=thirdparty%2Fmkosi.git

mkosi-tools: move systemd-boot package to conf file matching older releases

Since debian 13/ubuntu 25.04 the tools needed at build time
(bootctl) are in the systemd-boot-tools package, so there's
no need to pull in the systemd-boot package in the tools image,
since it is an integration point that sets up the local ESP and
so on
---

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/efi.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/efi.conf
index 3c46fbd23..a26a31e33 100644
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/efi.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/efi.conf
@@ -17,5 +17,4 @@ Architecture=uefi
 [Content]
 Packages=
         sbsigntool
-        systemd-boot
         systemd-boot-efi
diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/systemd-boot.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/systemd-boot.conf
new file mode 100644
index 000000000..fcbec7304
--- /dev/null
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/systemd-boot.conf
@@ -0,0 +1,20 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+# TODO: drop once these releases are EOL and systemd-boot-tools is available everywhere
+[TriggerMatch]
+Distribution=debian
+Release=|bullseye
+Release=|bookworm
+
+[TriggerMatch]
+Distribution=ubuntu
+Release=|jammy
+Release=|noble
+Release=|plucky
+
+[Match]
+Architecture=uefi
+
+[Content]
+Packages=
+        systemd-boot