mkosi: Make epel repositories optional for CentOS Stream 9

This allows us to add CI for CentOS Stream 10 as EPEL 10 doesn't
exist yet and won't exist for quite some time.

CentOS Stream 10 will be enabled later as soon as
https://issues.redhat.com/browse/RHEL-46604 is resolved.

diff --git a/mkosi.conf b/mkosi.conf
index 5654af0956c8d6c3d0c7d2fc92d2db6501ebff22..dfcd9fe0404f88350f0f7074f898b6ab1c636bba 100644 (file)
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -78,12 +78,12 @@ KernelCommandLine=systemd.crash_shell
                   # These don't ship proper units with [Install] directives so we have to mask them instead.
                   systemd.mask=isc-dhcp-server.service
                   systemd.mask=mdmonitor.service
+                  psi=1
 
 KernelModulesInitrdExclude=.*
 KernelModulesInitrdInclude=default
 
 InitrdPackages=
-        btrfs-progs
         findutils
         grep
         sed
@@ -93,14 +93,12 @@ Packages=
         attr
         bash-completion
         bpftrace
-        btrfs-progs
         coreutils
         curl
         diffutils
         dnsmasq
         dosfstools
         e2fsprogs
-        erofs-utils
         findutils
         gdb
         grep
@@ -109,7 +107,6 @@ Packages=
         kbd
         kexec-tools
         kmod
-        knot
         less
         lvm2
         man
@@ -123,7 +120,6 @@ Packages=
         p11-kit
         pciutils
         python3
-        qrencode
         radvd
         rsync
         sed

diff --git a/mkosi.conf.d/10-arch/mkosi.conf b/mkosi.conf.d/10-arch/mkosi.conf
index e7288cc19dffe4bacfabeb7093003dece6823b4e..7b719ff7b09bcaef30d1447ab8ffc60ed784e74b 100644 (file)
--- a/mkosi.conf.d/10-arch/mkosi.conf
+++ b/mkosi.conf.d/10-arch/mkosi.conf
@@ -15,16 +15,19 @@ VolatilePackages=
 Packages=
         bind
         bpf
+        btrfs-progs
         compsize
         cryptsetup
         dbus-broker
         dbus-broker-units
         dhcp
+        erofs-utils
         f2fs-tools
         git
         gnutls
         iproute
         iputils
+        knot
         linux
         man-db
         multipath-tools
@@ -39,6 +42,7 @@ Packages=
         psmisc
         python-pexpect
         python-psutil
+        qrencode
         quota-tools
         sbsigntools
         shadow
@@ -50,6 +54,7 @@ Packages=
         vim
 
 InitrdPackages=
+        btrfs-progs
         tpm2-tools
 
 InitrdVolatilePackages=

diff --git a/mkosi.conf.d/10-centos-fedora/mkosi.conf b/mkosi.conf.d/10-centos-fedora/mkosi.conf
index d046eb218b5cde2a786fe4127c9fc12ef1771edd..8882c89b1b94c6d700d15ca1465a5315e0dfe880 100644 (file)
--- a/mkosi.conf.d/10-centos-fedora/mkosi.conf
+++ b/mkosi.conf.d/10-centos-fedora/mkosi.conf
@@ -27,8 +27,6 @@ Packages=
         cryptsetup
         device-mapper-event
         device-mapper-multipath
-        dfuzzer
-        dhcp-server
         dnf
         git-core
         glibc-langpack-de
@@ -54,7 +52,6 @@ Packages=
         python3-pexpect
         quota
         rpm
-        sbsigntools
         softhsm
         squashfs-tools
         stress-ng

diff --git a/mkosi.conf.d/10-centos/mkosi.conf b/mkosi.conf.d/10-centos/mkosi.conf
index f9ea9a6596e6d6b8e5fe90a15ee7ca6422275588..88b863c5a03848ba23d6245a0ae9ba9b6f35fcd1 100644 (file)
--- a/mkosi.conf.d/10-centos/mkosi.conf
+++ b/mkosi.conf.d/10-centos/mkosi.conf
@@ -5,10 +5,6 @@ Distribution=centos
 
 [Distribution]
 Release=9
-Repositories=epel
-             epel-next
-             hyperscale-packages-main
-             hyperscale-packages-experimental
 
 [Content]
 Environment=

diff --git a/mkosi.conf.d/10-centos/mkosi.conf.d/10-epel.conf b/mkosi.conf.d/10-centos/mkosi.conf.d/10-epel.conf
new file mode 100644 (file)
index 0000000..9e92a4f
--- /dev/null
+++ b/mkosi.conf.d/10-centos/mkosi.conf.d/10-epel.conf
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Release=9
+
+[Distribution]
+Repositories=
+        epel
+        epel-next

diff --git a/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages.conf b/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages.conf
new file mode 100644 (file)
index 0000000..11dc969
--- /dev/null
+++ b/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages.conf
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Repositories=epel
+
+[Content]
+Packages=
+        dfuzzer
+        dhcp-server
+        erofs-utils
+        knot
+        qrencode
+        sbsigntools

diff --git a/mkosi.conf.d/10-debian-ubuntu/mkosi.conf b/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
index 41f1972e1f52939d6878afdda83a8f69839fb283..d282b47fb666efde628c27d038ebee8aacd7e58f 100644 (file)
--- a/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
+++ b/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
@@ -36,12 +36,14 @@ VolatilePackages=
         udev
 
 Packages=
+        btrfs-progs
         apt
         bind9-dnsutils
         cryptsetup-bin
         dbus-broker
         dbus-user-session
         dmsetup
+        erofs-utils
         f2fs-tools
         fdisk
         git-core
@@ -49,6 +51,7 @@ Packages=
         iproute2
         iputils-ping
         isc-dhcp-server
+        knot
         libcap-ng-utils
         locales
         man-db
@@ -63,6 +66,7 @@ Packages=
         psmisc
         python3-pexpect
         python3-psutil
+        qrencode
         quota
         softhsm2
         squashfs-tools
@@ -73,6 +77,7 @@ Packages=
         xxd
 
 InitrdPackages=
+        btrfs-progs
         tpm2-tools
 
 InitrdVolatilePackages=

diff --git a/mkosi.conf.d/10-fedora/mkosi.conf b/mkosi.conf.d/10-fedora/mkosi.conf
index 1b76d9ac941557e163235c32b19a34cde9695e59..92f0c7e9b0fc32197bb700070130b977cd2def2f 100644 (file)
--- a/mkosi.conf.d/10-fedora/mkosi.conf
+++ b/mkosi.conf.d/10-fedora/mkosi.conf
@@ -8,10 +8,21 @@ Release=rawhide
 
 [Content]
 Packages=
+        btrfs-progs
         compsize
+        dfuzzer
+        dhcp-server
         dnf5
+        erofs-utils
         f2fs-tools
-        scsi-target-utils
         # Required for systemd-networkd-tests.py (netdevsim and sch_xxx modules)
         kernel-modules-extra
         kernel-modules-internal
+        knot
+        qrencode
+        rpmautospec
+        sbsigntools
+        scsi-target-utils
+
+InitrdPackages=
+        btrfs-progs

diff --git a/mkosi.conf.d/10-opensuse/mkosi.conf b/mkosi.conf.d/10-opensuse/mkosi.conf
index df01c3b6bed4dec23cced1d1eff729ffcbc5cda1..2a6bd6e7bf7289e0acdf8deb19e60d0459cef2a3 100644 (file)
--- a/mkosi.conf.d/10-opensuse/mkosi.conf
+++ b/mkosi.conf.d/10-opensuse/mkosi.conf
@@ -34,10 +34,12 @@ VolatilePackages=
 Packages=
         bind-utils
         bpftool
+        btrfs-progs
         cryptsetup
         device-mapper
         dhcp-server
         docbook-xsl-stylesheets
+        erofs-utils
         f2fs-tools
         gawk
         git-core
@@ -48,6 +50,7 @@ Packages=
         iputils
         kernel-default
         kmod
+        knot
         multipath-tools
         ncat
         open-iscsi
@@ -61,6 +64,7 @@ Packages=
         python3-pefile
         python3-pexpect
         python3-psutil
+        qrencode
         quota
         rsync
         sbsigntools
@@ -78,6 +82,7 @@ Packages=
         zypper
 
 InitrdPackages=
+        btrfs-progs
         kmod
         tpm2.0-tools
 

diff --git a/mkosi.images/build/mkosi.conf b/mkosi.images/build/mkosi.conf
index 037d25c501649d9d880bb0563fb5f4a2d81b1a1a..8a67c76ee5951829925f9de566937bc2c3af3709 100644 (file)
--- a/mkosi.images/build/mkosi.conf
+++ b/mkosi.images/build/mkosi.conf
@@ -3,7 +3,6 @@
 [Content]
 Packages=
         clang
-        erofs-utils
         lld
         llvm
 

diff --git a/mkosi.images/build/mkosi.conf.d/arch/mkosi.conf b/mkosi.images/build/mkosi.conf.d/arch/mkosi.conf
index d5148eacb66ca1cca511b8ea4b3a9fc1edacd1d6..610c76585e069b34a0b7867b5e2332798f63f2f4 100644 (file)
--- a/mkosi.images/build/mkosi.conf.d/arch/mkosi.conf
+++ b/mkosi.images/build/mkosi.conf.d/arch/mkosi.conf
@@ -13,4 +13,5 @@ Packages=
         base
         base-devel
         diffutils
+        erofs-utils
         git

diff --git a/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf b/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf
index 06ea2acc8df6c2ce8212209ceabf2f47f2feae97..158b78bd356195c01500bae5d0e03872782345aa 100644 (file)
--- a/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf
+++ b/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf
@@ -11,4 +11,3 @@ Packages=
         libasan
         libubsan
         rpm-build
-        rpmautospec

diff --git a/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf b/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf
index 99316bec5f6332750c40ef1f44ff44ef7e3ee947..1dc4f0084a02dc7bb1e24db2be3f203e39846743 100644 (file)
--- a/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf
+++ b/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf
@@ -6,7 +6,7 @@ Distribution=centos
 [Content]
 Packages=
         rsync # TODO: Drop when CentOS Stream 9 CI is removed.
-        rpmautospec-rpm-macros
+        squashfs-tools
 
 Environment=
         GIT_URL=https://git.centos.org/rpms/systemd.git

diff --git a/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf.d/epel-packages.conf b/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf.d/epel-packages.conf
new file mode 100644 (file)
index 0000000..15849c5
--- /dev/null
+++ b/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf.d/epel-packages.conf
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Repositories=epel
+
+[Content]
+Packages=
+        erofs-utils
+        rpmautospec-rpm-macros

diff --git a/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf b/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf
index a7464aafe3e1829b08ff93cbc943fa36618ef285..84105008ed835f2a1caf71ca3041f68e5941f03c 100644 (file)
--- a/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf
+++ b/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf
@@ -13,6 +13,7 @@ Environment=
 
 Packages=
         apt
+        erofs-utils
         git-core
         libclang-rt-dev
         dpkg-dev

diff --git a/mkosi.images/build/mkosi.conf.d/fedora/mkosi.conf b/mkosi.images/build/mkosi.conf.d/fedora/mkosi.conf
index 1f001452eb365e9ffb5c13b62d301761d9c4025c..74a951ed2a78db7c7d2b9b0eea1bdc40cc4b7f8a 100644 (file)
--- a/mkosi.images/build/mkosi.conf.d/fedora/mkosi.conf
+++ b/mkosi.images/build/mkosi.conf.d/fedora/mkosi.conf
@@ -8,3 +8,7 @@ Environment=
         GIT_URL=https://src.fedoraproject.org/rpms/systemd.git
         GIT_BRANCH=rawhide
         GIT_COMMIT=a3524fc837f5e7b68f86b3e0a9d470a94a04c4c8
+
+Packages=
+        erofs-utils
+        rpmautospec

diff --git a/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf b/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf
index ad6388faf7b2e25a9b0a50dacaeb0c6f71e0874d..770a78bc2a797c0a4ab75a9f1dce29b3fb918adc 100644 (file)
--- a/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf
+++ b/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf
@@ -11,6 +11,7 @@ Environment=
 
 Packages=
         gcc-c++
+        erofs-utils
         git-core
         patterns-base-minimal_base
         rpm-build