- Add AlmaLinux support patch

- Add AlmaLinux-Kitten support patch
This commit is contained in:
eabdullin 2024-08-26 15:48:01 +03:00
parent 981fa52d63
commit 8657d9a59b
4 changed files with 1592 additions and 1 deletions

1
.gitignore vendored
View File

@ -97,3 +97,4 @@
/osbuild-composer-114.tar.gz /osbuild-composer-114.tar.gz
/osbuild-composer-115.tar.gz /osbuild-composer-115.tar.gz
/osbuild-composer-116.tar.gz /osbuild-composer-116.tar.gz
osbuild-composer-116

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -25,7 +25,7 @@ It is compatible with composer-cli and cockpit-composer clients.
} }
Name: osbuild-composer Name: osbuild-composer
Release: 1%{?dist} Release: 1%{?dist}.alma.1
Summary: An image building service based on osbuild Summary: An image building service based on osbuild
# osbuild-composer doesn't have support for building i686 and armv7hl images # osbuild-composer doesn't have support for building i686 and armv7hl images
@ -36,6 +36,8 @@ License: Apache-2.0
URL: %{gourl} URL: %{gourl}
Source0: %{gosource} Source0: %{gosource}
Patch1000: 0001-AlmaLinux-support-patch.patch
Patch1001: 0001-Add-AlmaLinux-Kitten-support.patch
BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
BuildRequires: systemd BuildRequires: systemd
@ -155,6 +157,24 @@ install -m 0755 -vp _bin/osbuild-jobsite-builder %{buildroot}%
install -m 0755 -vd %{buildroot}%{_datadir}/osbuild-composer/repositories install -m 0755 -vd %{buildroot}%{_datadir}/osbuild-composer/repositories
# CentOS also defines rhel so we check for centos first # CentOS also defines rhel so we check for centos first
%if 0%{?almalinux}
# AL10 support all AL versions
%if 0%{?almalinux} >= 10
install -m 0644 -vp repositories/almalinux* %{buildroot}%{_datadir}/osbuild-composer/repositories/
%else
# AL8 supports in AL9 and AL8
install -m 0644 -vp repositories/almalinux-8* %{buildroot}%{_datadir}/osbuild-composer/repositories/
# TODO: Should be deleted before public release
install -m 0644 -vp repositories/almalinux-kitten-8* %{buildroot}%{_datadir}/osbuild-composer/repositories/
%if 0%{?rhel} == 9
install -m 0644 -vp repositories/almalinux-9* %{buildroot}%{_datadir}/osbuild-composer/repositories/
%endif
%endif
%else
# Check for CentOS
%if 0%{?centos} %if 0%{?centos}
# Latest CentOS supports building all CentOS versions # Latest CentOS supports building all CentOS versions
@ -197,6 +217,7 @@ done
%endif %endif
%endif %endif
%endif %endif
%endif
# Fedora can build for all included fedora releases # Fedora can build for all included fedora releases
%if 0%{?fedora} %if 0%{?fedora}
@ -452,6 +473,10 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
%endif %endif
%changelog %changelog
* Mon Aug 26 2024 Eduard Abdullin <eabdullin@almalinux.org> - 116-1.alma.1
- Add AlmaLinux support patch
- Add AlmaLinux-Kitten support patch
* Thu Aug 15 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 116-1 * Thu Aug 15 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 116-1
- New upstream release - New upstream release