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.
2025-01-09 01:18:19 +03:00 · 2024-07-05 11:56:44 +02:00 · 2024-07-05 11:56:44 +02:00 · 0e4a7ab6d5
commit 0e4a7ab6d5
parent 7205fc7dc3
17 changed files with 67 additions and 16 deletions
--- 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
--- 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=
--- 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
--- 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=
--- a/mkosi.conf.d/10-centos/mkosi.conf.d/10-epel.conf
+++ 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
--- 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
@ -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
--- 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=
--- 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
--- 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

--- a/mkosi.images/build/mkosi.conf
+++ b/mkosi.images/build/mkosi.conf
@ -3,7 +3,6 @@
 [Content]
 Packages=
        clang
-        erofs-utils
        lld
        llvm

--- 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
--- 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
--- 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
--- 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
@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Repositories=epel
+
+[Content]
+Packages=
+        erofs-utils
+        rpmautospec-rpm-macros
--- 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
--- 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
--- 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