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 833475a77228cd4d1857339027d5cf0f8050157d..48bb3c51c1e7380d4218ad966a2a4a19a2dccaae 100644 (file)
--- 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 0bf52d37848ad0f09dce2b99d58f38688ee9413a..8e3f667d1bf3b9c29323748a8711e14bbe437247 100644 (file)
--- 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 5d1e58f6bee47264ee2bd3903ed70beffe3a5e6b..644355b41842cd647e9d47fc6f5ed01439cd8873 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,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 5d37deb387ea147c2e100db7bea897ec35b3c7a3..4c8e3e674ebc9b680c9287626818e75a03eaba5d 100644 (file)
--- 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 895a4b18a990b815dba63af9a22a2c8b4c4506b2..8e23538fb03585a68e0f5231398aa3afaacd7b76 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
@@ -12,5 +12,4 @@ Packages=
         kernel-uki-virt
         pesign
         shim
-        shim-unsigned-x64
         systemd-boot