mkosi: move efi packages to conditional drop-in

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

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

mkosi/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages.conf

@@ -10,4 +10,3 @@ Packages=
         erofs-utils
         knot
         qrencode
-        sbsigntools

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

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

mkosi/mkosi.conf.d/fedora/mkosi.conf

@@ -21,5 +21,4 @@ Packages=
         knot
         qrencode
         rpmautospec
-        sbsigntools
         scsi-target-utils

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

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

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

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

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