mkosi: move efi packages to conditional drop-in

diff --git a/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf b/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf
index 2b87dfaf22eb2324e9c7c78bee5dcdaac876ebcc..69d1c2297568c8951350e98fde31896c91add96b 100644 (file)
--- 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 (file)
index 0000000..edefbe7
--- /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 11dc96918af3f3fb612195fb4af2050bee02c35e..6bcc663e59fb1983cb7f51beb1010de114a13f0e 100644 (file)
--- 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 2bb6164aa47ee890eb8b3be0732dbf4b906dd87c..78e5e78cef14643a46b3f9a46b7c7311af0150c8 100644 (file)
--- 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 (file)
index 0000000..b6422af
--- /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 adb7779a1ea716d9d9e78d4087881934c513adcd..b954d2802aea01d39ff18f79df0b7d545b7af1c7 100644 (file)
--- 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 (file)
index 0000000..44de850
--- /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 fbfa476bfb4eba71b887caad6d2a15ce4bf36aee..24cafd55e45eeb4a7ac12d04ed62cbc6c26d3e69 100644 (file)
--- 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 ac39456beaa406b676959e9b2afa7c8fd13d4d7b..4614ea06a2adc52ea0722d98dcbdf831b445b547 100644 (file)
--- 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 (file)
index 0000000..b63e00b
--- /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 (file)
index 0000000..7ee6b4e
--- /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