Add AlmaLinux repositories

This commit is contained in:
Eduard Abdullin 2026-08-24 13:29:53 +00:00 committed by root
commit 6c6369f451
3 changed files with 36 additions and 13 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/osbuild-composer-164.tar.gz
SOURCES/osbuild-composer-176.tar.gz

View File

@ -1 +1 @@
17f78cbff0d6ced491a61fbf4bc9a96abe68120b SOURCES/osbuild-composer-164.tar.gz
27e4c79eca9e6e687b9e541c36d1d8ffad4ed642 SOURCES/osbuild-composer-176.tar.gz

View File

@ -8,11 +8,11 @@
%bcond_with relax_requires
# The minimum required osbuild version
%global min_osbuild_version 171
%global min_osbuild_version 183
%global goipath github.com/osbuild/osbuild-composer
Version: 164
Version: 176
%gometa
@ -160,11 +160,11 @@ install -m 0644 -vp vendor/github.com/osbuild/images/data/repositories/almalinux
# Latest CentOS supports building all CentOS versions
%if 0%{?centos} >= 10
install -m 0644 -vp vendor/github.com/osbuild/images/data/repositories/centos-* %{buildroot}%{_datadir}/osbuild-composer/repositories/
install -m 0644 -vp vendor/github.com/osbuild/image-builder/data/repositories/centos-* %{buildroot}%{_datadir}/osbuild-composer/repositories/
%else
# All other CentOS versions support building for the same version
install -m 0644 -vp vendor/github.com/osbuild/images/data/repositories/centos-%{centos}* %{buildroot}%{_datadir}/osbuild-composer/repositories/
install -m 0644 -vp vendor/github.com/osbuild/image-builder/data/repositories/centos-%{centos}* %{buildroot}%{_datadir}/osbuild-composer/repositories/
# centos-stream-* are symlinks
cp -a repositories/centos-stream-%{centos}* %{buildroot}%{_datadir}/osbuild-composer/repositories/
%endif
@ -174,7 +174,13 @@ cp -a repositories/centos-stream-%{centos}* %{buildroot}%{_datadir}/osb
%if 0%{?rhel}
# RHEL 10 supports building all RHEL versions
%if 0%{?rhel} >= 10
for REPO_FILE in $(ls vendor/github.com/osbuild/images/data/repositories/rhel-* ); do
for REPO_FILE in $(ls vendor/github.com/osbuild/image-builder/data/repositories/rhel-* ); do
install -m 0644 -vp ${REPO_FILE} %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE})
done
# temporary RHEL 9.7 and 9.8 overrides for new PQC key (for building RHEL 9 on 10)
for REPO_FILE in $(ls repositories/rhel-9*.json); do
install -m 0644 -vp ${REPO_FILE} %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE})
done
@ -185,15 +191,21 @@ done
%else
# All other RHEL versions support building for the same version
for REPO_FILE in $(ls vendor/github.com/osbuild/images/data/repositories/rhel-%{rhel}* ); do
for REPO_FILE in $(ls vendor/github.com/osbuild/image-builder/data/repositories/rhel-%{rhel}* ); do
install -m 0644 -vp ${REPO_FILE} %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE})
done
# RHEL 9 supports building also for RHEL 8
%if 0%{?rhel} == 9
for REPO_FILE in $(ls vendor/github.com/osbuild/images/data/repositories/rhel-8* ); do
# RHEL 9 supports building also for RHEL 8
for REPO_FILE in $(ls vendor/github.com/osbuild/image-builder/data/repositories/rhel-8* ); do
install -m 0644 -vp ${REPO_FILE} %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE})
done
# temporary RHEL 9.7 and 9.8 overrides for new PQC key
for REPO_FILE in $(ls repositories/rhel-9*.json); do
install -m 0644 -vp ${REPO_FILE} %{buildroot}%{_datadir}/osbuild-composer/repositories/$(basename ${REPO_FILE})
done
%endif
%endif
@ -204,7 +216,7 @@ done
# Fedora can build for all included fedora releases
%if 0%{?fedora}
install -m 0644 -vp vendor/github.com/osbuild/images/data/repositories/fedora-* %{buildroot}%{_datadir}/osbuild-composer/repositories/
install -m 0644 -vp vendor/github.com/osbuild/image-builder/data/repositories/fedora-* %{buildroot}%{_datadir}/osbuild-composer/repositories/
%endif
install -m 0755 -vd %{buildroot}%{_unitdir}
@ -246,6 +258,9 @@ install -m 0755 -vp test/cases/*.sh %{buildroot}%
install -m 0755 -vd %{buildroot}%{_libexecdir}/tests/osbuild-composer/api
install -m 0755 -vp test/cases/api/*.sh %{buildroot}%{_libexecdir}/tests/osbuild-composer/api/
install -m 0755 -vd %{buildroot}%{_libexecdir}/tests/osbuild-composer/api/bootc
install -m 0755 -vp test/cases/api/bootc/*.sh %{buildroot}%{_libexecdir}/tests/osbuild-composer/api/bootc/
install -m 0755 -vd %{buildroot}%{_libexecdir}/tests/osbuild-composer/api/common
install -m 0755 -vp test/cases/api/common/*.sh %{buildroot}%{_libexecdir}/tests/osbuild-composer/api/common/
@ -334,6 +349,7 @@ The core osbuild-composer binary. This is suitable both for spawning in containe
%package worker
Summary: The worker for osbuild-composer
Requires: podman
Requires: systemd
Requires: qemu-img
Requires: osbuild >= %{min_osbuild_version}
@ -420,7 +436,11 @@ Requires: firewalld
%if (0%{?rhel} && 0%{?rhel} < 10) || (0%{?fedora} && 0%{?fedora} < 40)
Requires: podman-plugins
%endif
Requires: dnf-plugins-core
%if 0%{?fedora} || 0%{?rhel} >= 11
Requires: dnf5-command(copr)
%else
Requires: dnf-command(copr)
%endif
Requires: skopeo
Requires: make
Requires: python3-pip
@ -446,9 +466,12 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
%endif
%changelog
* Tue Apr 21 2026 Eduard Abdullin <eabdullin@almalinux.org> - 164-1.alma.1
* Mon Aug 24 2026 Eduard Abdullin <eabdullin@almalinux.org> - 176-1.alma.1
- Add AlmaLinux repositories
* Tue Jul 14 2026 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 176-1
- New upstream release
* Mon Feb 23 2026 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 164-1
- New upstream release