From 71f9082c7bc8592b7605cc9c737cee044d1824fe Mon Sep 17 00:00:00 2001
From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Wed, 2 Jul 2025 21:56:27 +0100
Subject: [PATCH] mkosi: move efi packages to conditional drop-in

---
 mkosi/mkosi.conf.d/centos-fedora/mkosi.conf    |  1 -
 .../centos/mkosi.conf.d/20-efi.conf            | 18 ++++++++++++++++++
 .../centos/mkosi.conf.d/20-epel-packages.conf  |  1 -
 .../debian-ubuntu/mkosi.conf.d/debug.conf      |  1 -
 .../debian-ubuntu/mkosi.conf.d/efi-debug.conf  | 17 +++++++++++++++++
 mkosi/mkosi.conf.d/fedora/mkosi.conf           |  1 -
 .../mkosi.conf.d/fedora/mkosi.conf.d/efi.conf  | 18 ++++++++++++++++++
 mkosi/mkosi.conf.d/opensuse/mkosi.conf         |  2 --
 .../opensuse/mkosi.conf.d/debug.conf           |  1 -
 .../opensuse/mkosi.conf.d/efi-debug.conf       | 17 +++++++++++++++++
 .../opensuse/mkosi.conf.d/efi.conf             | 18 ++++++++++++++++++
 11 files changed, 88 insertions(+), 7 deletions(-)
 create mode 100644 mkosi/mkosi.conf.d/centos/mkosi.conf.d/20-efi.conf
 create mode 100644 mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi-debug.conf
 create mode 100644 mkosi/mkosi.conf.d/fedora/mkosi.conf.d/efi.conf
 create mode 100644 mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi-debug.conf
 create mode 100644 mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi.conf

diff --git a/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf b/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf
index 2b87dfaf22e..69d1c229756 100644
--- a/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf
+++ b/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf
@@ -8,7 +8,6 @@ Distribution=|fedora
 PrepareScripts=systemd.prepare
 VolatilePackages=
         systemd
-        systemd-boot
         systemd-container
         systemd-devel
         systemd-journal-remote
diff --git a/mkosi/mkosi.conf.d/centos/mkosi.conf.d/20-efi.conf b/mkosi/mkosi.conf.d/centos/mkosi.conf.d/20-efi.conf
new file mode 100644
index 00000000000..edefbe79772
--- /dev/null
+++ b/mkosi/mkosi.conf.d/centos/mkosi.conf.d/20-efi.conf
@@ -0,0 +1,18 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Repositories=epel
+Architecture=|x86
+Architecture=|x86-64
+Architecture=|arm
+Architecture=|arm64
+Architecture=|riscv32
+Architecture=|riscv64
+Architecture=|loongarch64
+
+[Content]
+Packages=
+        sbsigntools
+
+VolatilePackages=
+        systemd-boot
diff --git a/mkosi/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages.conf b/mkosi/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages.conf
index 11dc96918af..6bcc663e59f 100644
--- a/mkosi/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages.conf
+++ b/mkosi/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages.conf
@@ -10,4 +10,3 @@ Packages=
         erofs-utils
         knot
         qrencode
-        sbsigntools
diff --git a/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/debug.conf b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/debug.conf
index 2bb6164aa47..78e5e78cef1 100644
--- a/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/debug.conf
+++ b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/debug.conf
@@ -13,7 +13,6 @@ VolatilePackages=
         libsystemd-shared-dbgsym
         libsystemd0-dbgsym
         libudev1-dbgsym
-        systemd-boot-dbgsym
         systemd-container-dbgsym
         systemd-coredump-dbgsym
         systemd-cryptsetup-dbgsym
diff --git a/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi-debug.conf b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi-debug.conf
new file mode 100644
index 00000000000..b6422af16aa
--- /dev/null
+++ b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/efi-debug.conf
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Environment=WITH_DEBUG=1
+
+[Match]
+Architecture=|x86
+Architecture=|x86-64
+Architecture=|arm
+Architecture=|arm64
+Architecture=|riscv32
+Architecture=|riscv64
+Architecture=|loongarch64
+
+[Content]
+VolatilePackages=
+        systemd-boot-dbgsym
diff --git a/mkosi/mkosi.conf.d/fedora/mkosi.conf b/mkosi/mkosi.conf.d/fedora/mkosi.conf
index adb7779a1ea..b954d2802ae 100644
--- a/mkosi/mkosi.conf.d/fedora/mkosi.conf
+++ b/mkosi/mkosi.conf.d/fedora/mkosi.conf
@@ -21,5 +21,4 @@ Packages=
         knot
         qrencode
         rpmautospec
-        sbsigntools
         scsi-target-utils
diff --git a/mkosi/mkosi.conf.d/fedora/mkosi.conf.d/efi.conf b/mkosi/mkosi.conf.d/fedora/mkosi.conf.d/efi.conf
new file mode 100644
index 00000000000..44de850ee0e
--- /dev/null
+++ b/mkosi/mkosi.conf.d/fedora/mkosi.conf.d/efi.conf
@@ -0,0 +1,18 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=fedora
+Architecture=|x86
+Architecture=|x86-64
+Architecture=|arm
+Architecture=|arm64
+Architecture=|riscv32
+Architecture=|riscv64
+Architecture=|loongarch64
+
+[Content]
+Packages=
+        sbsigntools
+
+VolatilePackages=
+        systemd-boot
diff --git a/mkosi/mkosi.conf.d/opensuse/mkosi.conf b/mkosi/mkosi.conf.d/opensuse/mkosi.conf
index fbfa476bfb4..24cafd55e45 100644
--- a/mkosi/mkosi.conf.d/opensuse/mkosi.conf
+++ b/mkosi/mkosi.conf.d/opensuse/mkosi.conf
@@ -16,7 +16,6 @@ VolatilePackages=
         libsystemd0
         libudev1
         systemd
-        systemd-boot
         systemd-container
         systemd-devel
         systemd-doc
@@ -71,7 +70,6 @@ Packages=
         qrencode
         quota
         rsync
-        sbsigntools
         sed
         shadow
         softhsm
diff --git a/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/debug.conf b/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/debug.conf
index ac39456beaa..4614ea06a2a 100644
--- a/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/debug.conf
+++ b/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/debug.conf
@@ -7,7 +7,6 @@ Environment=WITH_DEBUG=1
 VolatilePackages=
         libsystemd0-debuginfo
         libudev1-debuginfo
-        systemd-boot-debuginfo
         systemd-container-debuginfo
         systemd-debuginfo
         systemd-debugsource
diff --git a/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi-debug.conf b/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi-debug.conf
new file mode 100644
index 00000000000..b63e00be5e6
--- /dev/null
+++ b/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi-debug.conf
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Environment=WITH_DEBUG=1
+
+[Match]
+Architecture=|x86
+Architecture=|x86-64
+Architecture=|arm
+Architecture=|arm64
+Architecture=|riscv32
+Architecture=|riscv64
+Architecture=|loongarch64
+
+[Content]
+VolatilePackages=
+        systemd-boot-debuginfo
diff --git a/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi.conf b/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi.conf
new file mode 100644
index 00000000000..7ee6b4eaf73
--- /dev/null
+++ b/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/efi.conf
@@ -0,0 +1,18 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=opensuse
+Architecture=|x86
+Architecture=|x86-64
+Architecture=|arm
+Architecture=|arm64
+Architecture=|riscv32
+Architecture=|riscv64
+Architecture=|loongarch64
+
+[Content]
+VolatilePackages=
+        systemd-boot
+
+Packages=
+        sbsigntools
-- 
2.47.3