From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 13 Dec 2023 09:34:27 +0000 (+0100)
Subject: Allow building CentOS/Fedora default images for arm64 architecture
X-Git-Tag: v20~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33e2e6fbc2e2ebe55432b5249aa3fa03bbb2269a;p=thirdparty%2Fmkosi.git

Allow building CentOS/Fedora default images for arm64 architecture

Let's introduce a little conditionalization to allow building the
CentOS/Fedora default images for arm64.
---

diff --git a/mkosi.conf b/mkosi.conf
index ee1839c6d..f641a64ef 100644
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -8,7 +8,6 @@
 
 [Content]
 Autologin=yes
-BiosBootloader=grub
 ShimBootloader=signed
 BuildSourcesEphemeral=yes
 
diff --git a/mkosi.conf.d/15-x86-64.conf b/mkosi.conf.d/15-x86-64.conf
new file mode 100644
index 000000000..e997ac706
--- /dev/null
+++ b/mkosi.conf.d/15-x86-64.conf
@@ -0,0 +1,5 @@
+[Match]
+Architecture=x86-64
+
+[Content]
+BiosBootloader=grub
diff --git a/mkosi.conf.d/20-centos-fedora.conf b/mkosi.conf.d/20-centos-fedora/mkosi.conf
similarity index 95%
rename from mkosi.conf.d/20-centos-fedora.conf
rename to mkosi.conf.d/20-centos-fedora/mkosi.conf
index 9d7874047..4ed6c3332 100644
--- a/mkosi.conf.d/20-centos-fedora.conf
+++ b/mkosi.conf.d/20-centos-fedora/mkosi.conf
@@ -22,9 +22,7 @@ Packages=
         e2fsprogs
         edk2-ovmf
         erofs-utils
-        grub2-pc
         kernel-core
-        microcode_ctl
         mtools
         openssh-clients
         openssl
diff --git a/mkosi.conf.d/20-centos-fedora/mkosi.conf.d/20-x86-64.conf b/mkosi.conf.d/20-centos-fedora/mkosi.conf.d/20-x86-64.conf
new file mode 100644
index 000000000..6649e10fc
--- /dev/null
+++ b/mkosi.conf.d/20-centos-fedora/mkosi.conf.d/20-x86-64.conf
@@ -0,0 +1,7 @@
+[Match]
+Architecture=x86-64
+
+[Content]
+Packages=
+        microcode_ctl
+        grub2-pc