From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 13 Jun 2024 21:44:28 +0000 (+0200)
Subject: centos: Support building centos stream 10 default images
X-Git-Tag: v24~95
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27cb321e2746e4d0398144b2cdbd8d14f32d1b66;p=thirdparty%2Fmkosi.git

centos: Support building centos stream 10 default images

Stream 10 does not have EPEL yet so we make those few packages Fedora
only for now.
---

diff --git a/mkosi.conf.d/20-centos.conf b/mkosi.conf.d/20-centos.conf
index 833475a77..48bb3c51c 100644
--- a/mkosi.conf.d/20-centos.conf
+++ b/mkosi.conf.d/20-centos.conf
@@ -7,10 +7,10 @@ Distribution=|rocky
 
 [Distribution]
 @Release=9
-Repositories=epel
-             epel-next
 
 [Content]
+# CentOS Stream 10 does not ship an unsigned shim
+@ShimBootloader=none
 Packages=
         linux-firmware
         dnf
diff --git a/mkosi.conf.d/20-fedora/mkosi.conf b/mkosi.conf.d/20-fedora/mkosi.conf
index 0bf52d378..8e3f667d1 100644
--- a/mkosi.conf.d/20-fedora/mkosi.conf
+++ b/mkosi.conf.d/20-fedora/mkosi.conf
@@ -8,11 +8,16 @@ Distribution=fedora
 
 [Content]
 Packages=
+        apt
         archlinux-keyring
         btrfs-progs
+        debian-keyring
+        distribution-gpg-keys
         dnf5
         dnf5-plugins
+        erofs-utils
         pacman
         qemu-user-static
+        systemd-networkd
         systemd-ukify
         zypper
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 5d1e58f6b..644355b41 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,3 +7,4 @@ Architecture=|arm64
 [Content]
 Packages=
         sbsigntools
+        shim-unsigned-x64
diff --git a/mkosi.conf.d/30-centos-fedora/mkosi.conf b/mkosi.conf.d/30-centos-fedora/mkosi.conf
index 5d37deb38..4c8e3e674 100644
--- a/mkosi.conf.d/30-centos-fedora/mkosi.conf
+++ b/mkosi.conf.d/30-centos-fedora/mkosi.conf
@@ -8,18 +8,14 @@ Distribution=|fedora
 
 [Content]
 Packages=
-        apt
         bash
         bubblewrap
         ca-certificates
         coreutils
         cpio
         curl-minimal
-        debian-keyring
-        distribution-gpg-keys
         dosfstools
         e2fsprogs
-        erofs-utils
         git-core
         iproute
         iputils
@@ -38,7 +34,6 @@ Packages=
         swtpm
         systemd
         systemd-container
-        systemd-networkd
         systemd-resolved
         systemd-udev
         tar
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 895a4b18a..8e23538fb 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
@@ -12,5 +12,4 @@ Packages=
         kernel-uki-virt
         pesign
         shim
-        shim-unsigned-x64
         systemd-boot