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 ee1839c6d90be27b7270ea41dff1457227f3caea..f641a64eff53d421f3e7daf7a6b6233ce595e812 100644 (file)
--- 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 (file)
index 0000000..e997ac7
--- /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 9d7874047210721c343cbc8120748b2be4b225a9..4ed6c33321edd0589ab7864d238f0e348a17f76c 100644 (file)
--- 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 (file)
index 0000000..6649e10
--- /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