Move efi-specific packages to efi-specific config files

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/azure-centos-fedora.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/azure-centos-fedora/mkosi.conf
similarity index 94%
rename from mkosi/resources/mkosi-tools/mkosi.conf.d/azure-centos-fedora.conf
rename to mkosi/resources/mkosi-tools/mkosi.conf.d/azure-centos-fedora/mkosi.conf
index c1ad0ff4a6bb3c5bd48719a43e591b4eac6d4be0..444d72bb9ead2974060af0d64b5b3551c0e1319c 100644 (file)
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/azure-centos-fedora.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/azure-centos-fedora/mkosi.conf
@@ -11,7 +11,6 @@ Distribution=|azure
 [Content]
 Packages=
         createrepo_c
-        grub2-tools
         libseccomp
         policycoreutils
         qemu-img

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/azure-centos-fedora/mkosi.conf.d/efi.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/azure-centos-fedora/mkosi.conf.d/efi.conf
new file mode 100644 (file)
index 0000000..24823cb
--- /dev/null
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/azure-centos-fedora/mkosi.conf.d/efi.conf
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Architecture=uefi
+
+[Content]
+Packages=
+        grub2-tools

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/azure-fedora/mkosi.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/azure-fedora/mkosi.conf
new file mode 100644 (file)
index 0000000..cbd3cf5
--- /dev/null
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/azure-fedora/mkosi.conf
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=|fedora
+Distribution=|azure
+Architecture=uefi
+
+[Content]
+Packages=
+        sbsigntools

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages-9.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages-9.conf
index 1bd96e47409235f6bdf26a5d7d7a0d7c1c67616e..7faf1dd032a7c0538133c39f7f27e551e800b7b9 100644 (file)
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages-9.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages-9.conf
@@ -8,4 +8,3 @@ Release=9
 Packages=
         btrfs-progs
         distribution-gpg-keys
-        sbsigntools

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages-efi.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages-efi.conf
new file mode 100644 (file)
index 0000000..ca14ae3
--- /dev/null
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/centos/mkosi.conf.d/20-epel-packages-efi.conf
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Repositories=epel
+Architecture=uefi
+
+[Content]
+Packages=
+        sbsigntools

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf
index 0f48bf255748e76ce85177be0de18fcb1d2413bf..bccef070fb5d16ed9bc023eaca599cfa55dc641a 100644 (file)
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf
@@ -18,6 +18,5 @@ Packages=
         policycoreutils
         python3-pefile
         reprepro
-        sbsigntool
         squashfs-tools
         xz-utils

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/efi.conf
similarity index 84%
rename from mkosi/resources/mkosi-tools/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/systemd-boot.conf
rename to mkosi/resources/mkosi-tools/mkosi.conf.d/debian-kali-ubuntu/mkosi.conf.d/efi.conf
index bbe0a94aee5f2f613f91c5c448ded293469c7ee9..3c46fbd23a93e0a001c12f6232eb45092458d90c 100644 (file)
--- 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/efi.conf
@@ -11,7 +11,11 @@ Release=!jammy
 [TriggerMatch]
 Distribution=kali
 
+[Match]
+Architecture=uefi
+
 [Content]
 Packages=
+        sbsigntool
         systemd-boot
         systemd-boot-efi

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/opensuse.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/opensuse.conf
index 6b28ed41f82596fe2ae725198402d6edbcf65260..5c4704ea6fc60c13e7a9a69ff70efc3b46a41b0e 100644 (file)
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/opensuse.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/opensuse.conf
@@ -14,7 +14,6 @@ Packages=
         pkcs11-provider
         policycoreutils
         python3-pefile
-        sbsigntools
         squashfs
         systemd-experimental
         tpm2.0-tools

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/fedora/mkosi.conf.d/sbsigntools.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/opensuse/mkosi.conf.d/sbsigntools.conf
similarity index 69%
rename from mkosi/resources/mkosi-tools/mkosi.conf.d/fedora/mkosi.conf.d/sbsigntools.conf
rename to mkosi/resources/mkosi-tools/mkosi.conf.d/opensuse/mkosi.conf.d/sbsigntools.conf
index 5d1e58f6bee47264ee2bd3903ed70beffe3a5e6b..94a64945e1c06a35f4a73ab6ccac322f24d0b70a 100644 (file)
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/fedora/mkosi.conf.d/sbsigntools.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/opensuse/mkosi.conf.d/sbsigntools.conf
@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Match]
-Architecture=|x86-64
-Architecture=|arm64
+Distribution=opensuse
+Architecture=uefi
 
 [Content]
 Packages=

diff --git a/mkosi/resources/mkosi-tools/mkosi.profiles/runtime/mkosi.conf.d/opensuse.conf b/mkosi/resources/mkosi-tools/mkosi.profiles/runtime/mkosi.conf.d/opensuse/mkosi.conf
similarity index 75%
rename from mkosi/resources/mkosi-tools/mkosi.profiles/runtime/mkosi.conf.d/opensuse.conf
rename to mkosi/resources/mkosi-tools/mkosi.profiles/runtime/mkosi.conf.d/opensuse/mkosi.conf
index 27732959bd43e096cc77935ff294f60f55f46c9f..41d1ddb5217cf8941db0a4669aa5f26dce2ab7b3 100644 (file)
--- a/mkosi/resources/mkosi-tools/mkosi.profiles/runtime/mkosi.conf.d/opensuse.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.profiles/runtime/mkosi.conf.d/opensuse/mkosi.conf
@@ -6,11 +6,7 @@ Distribution=opensuse
 [Content]
 Packages=
         openssh-clients
-        ovmf
         qemu-headless
-        qemu-ipxe
-        qemu-ovmf-x86_64
-        qemu-uefi-aarch64
         shadow
         systemd-container
         systemd-journal-remote

diff --git a/mkosi/resources/mkosi-tools/mkosi.profiles/runtime/mkosi.conf.d/opensuse/mkosi.conf.d/efi.conf b/mkosi/resources/mkosi-tools/mkosi.profiles/runtime/mkosi.conf.d/opensuse/mkosi.conf.d/efi.conf
new file mode 100644 (file)
index 0000000..6909bed
--- /dev/null
+++ b/mkosi/resources/mkosi-tools/mkosi.profiles/runtime/mkosi.conf.d/opensuse/mkosi.conf.d/efi.conf
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Architecture=uefi
+
+[Content]
+Packages=
+        ovmf
+        qemu-ipxe
+        qemu-ovmf-x86_64
+        qemu-uefi-aarch64