From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sat, 29 Jun 2024 08:31:45 +0000 (+0200)
Subject: aarch64 fixes for default image packages
X-Git-Tag: v24~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b20c26553456dce065d047cc07b86cf87b0ef93e;p=thirdparty%2Fmkosi.git

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
index 000000000..4f8c19b35
--- /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 644355b41..5d1e58f6b 100644
--- 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 44e347f68..1ffd9d4e2 100644
--- 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
index 000000000..da610d0e0
--- /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 8e23538fb..e6b919c48 100644
--- 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 0ca155c0c..f558d660b 100644
--- 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