From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Wed, 2 Jul 2025 20:23:49 +0000 (+0100)
Subject: Move efi-specific packages to efi-specific config files
X-Git-Tag: v26~187^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6506a3bd6b03f6a91405d1e970fc3aa44bbfb40;p=thirdparty%2Fmkosi.git

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 c1ad0ff4a..444d72bb9 100644
--- 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
index 000000000..24823cbe0
--- /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
index 000000000..cbd3cf54f
--- /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 1bd96e474..7faf1dd03 100644
--- 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
index 000000000..ca14ae34e
--- /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 0f48bf255..bccef070f 100644
--- 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 bbe0a94ae..3c46fbd23 100644
--- 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 6b28ed41f..5c4704ea6 100644
--- 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 5d1e58f6b..94a64945e 100644
--- 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 27732959b..41d1ddb52 100644
--- 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
index 000000000..6909bedff
--- /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