aarch64 fixes for default image packages

diff --git a/mkosi.conf.d/20-fedora/mkosi.conf.d/20-arm64.conf b/mkosi.conf.d/20-fedora/mkosi.conf.d/20-arm64.conf
new file mode 100644 (file)
index 0000000..4f8c19b
--- /dev/null
+++ b/mkosi.conf.d/20-fedora/mkosi.conf.d/20-arm64.conf
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Architecture=arm64
+
+[Content]
+Packages=
+        shim-unsigned-aarch64

diff --git a/mkosi.conf.d/20-fedora/mkosi.conf.d/20-uefi.conf b/mkosi.conf.d/20-fedora/mkosi.conf.d/20-uefi.conf
index 644355b41842cd647e9d47fc6f5ed01439cd8873..5d1e58f6bee47264ee2bd3903ed70beffe3a5e6b 100644 (file)
--- a/mkosi.conf.d/20-fedora/mkosi.conf.d/20-uefi.conf
+++ b/mkosi.conf.d/20-fedora/mkosi.conf.d/20-uefi.conf
@@ -7,4 +7,3 @@ Architecture=|arm64
 [Content]
 Packages=
         sbsigntools
-        shim-unsigned-x64

diff --git a/mkosi.conf.d/20-fedora/mkosi.conf.d/20-x86_64.conf b/mkosi.conf.d/20-fedora/mkosi.conf.d/20-x86_64.conf
index 44e347f689878de6524f3eb72a2b9a6eb461d0d3..1ffd9d4e21ab67359746418c9c0c6e2a60d4d1fd 100644 (file)
--- a/mkosi.conf.d/20-fedora/mkosi.conf.d/20-x86_64.conf
+++ b/mkosi.conf.d/20-fedora/mkosi.conf.d/20-x86_64.conf
@@ -6,3 +6,4 @@ Architecture=x86-64
 [Content]
 Packages=
         amd-ucode-firmware
+        shim-unsigned-x64

diff --git a/mkosi.conf.d/30-centos-fedora/mkosi.conf.d/20-arm64.conf b/mkosi.conf.d/30-centos-fedora/mkosi.conf.d/20-arm64.conf
new file mode 100644 (file)
index 0000000..da610d0
--- /dev/null
+++ b/mkosi.conf.d/30-centos-fedora/mkosi.conf.d/20-arm64.conf
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Architecture=arm64
+
+[Content]
+Packages=
+        grub2-efi-aa64-modules

diff --git a/mkosi.conf.d/30-centos-fedora/mkosi.conf.d/20-uefi.conf b/mkosi.conf.d/30-centos-fedora/mkosi.conf.d/20-uefi.conf
index 8e23538fb03585a68e0f5231398aa3afaacd7b76..e6b919c487dd32bb3c650e53ef6d0fa4bba3108b 100644 (file)
--- a/mkosi.conf.d/30-centos-fedora/mkosi.conf.d/20-uefi.conf
+++ b/mkosi.conf.d/30-centos-fedora/mkosi.conf.d/20-uefi.conf
@@ -8,8 +8,6 @@ Architecture=|arm64
 Packages=
         edk2-ovmf
         grub2-efi
-        grub2-efi-x64-modules
-        kernel-uki-virt
         pesign
         shim
         systemd-boot

diff --git a/mkosi.conf.d/30-centos-fedora/mkosi.conf.d/20-x86-64.conf b/mkosi.conf.d/30-centos-fedora/mkosi.conf.d/20-x86-64.conf
index 0ca155c0c96292d700cbe64f96e1aea40877dfa8..f558d660ba1abc1d5b2139a613d7fb69daeeef65 100644 (file)
--- a/mkosi.conf.d/30-centos-fedora/mkosi.conf.d/20-x86-64.conf
+++ b/mkosi.conf.d/30-centos-fedora/mkosi.conf.d/20-x86-64.conf
@@ -5,5 +5,7 @@ Architecture=x86-64
 
 [Content]
 Packages=
-        microcode_ctl
+        grub2-efi-x64-modules
         grub2-pc
+        kernel-uki-virt
+        microcode_ctl