diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-07-05 11:56:44 +0200 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-07-15 16:17:33 +0200 |
| commit | 0e4a7ab6d5601785e326851b3f1b6a3367ec98ec (patch) | |
| tree | 1729a3a3b444167933e5528bcbb7fe8ed152bd2d /mkosi.images | |
| parent | mkosi: Introduce build image (diff) | |
| download | systemd-0e4a7ab6d5601785e326851b3f1b6a3367ec98ec.tar.xz systemd-0e4a7ab6d5601785e326851b3f1b6a3367ec98ec.zip | |
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.
Diffstat (limited to 'mkosi.images')
8 files changed, 17 insertions, 3 deletions
diff --git a/mkosi.images/build/mkosi.conf b/mkosi.images/build/mkosi.conf index 037d25c501..8a67c76ee5 100644 --- 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 d5148eacb6..610c76585e 100644 --- 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 06ea2acc8d..158b78bd35 100644 --- 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 99316bec5f..1dc4f0084a 100644 --- 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 index 0000000000..15849c5145 --- /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 a7464aafe3..84105008ed 100644 --- 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 1f001452eb..74a951ed2a 100644 --- 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 ad6388faf7..770a78bc2a 100644 --- 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 |