|
|
|
|
@ -9,7 +9,7 @@
|
|
|
|
|
|
|
|
|
|
%global goipath github.com/osbuild/osbuild-composer
|
|
|
|
|
|
|
|
|
|
Version: 58
|
|
|
|
|
Version: 75
|
|
|
|
|
|
|
|
|
|
%gometa
|
|
|
|
|
|
|
|
|
|
@ -29,7 +29,7 @@ Summary: An image building service based on osbuild
|
|
|
|
|
ExcludeArch: i686 armv7hl
|
|
|
|
|
|
|
|
|
|
# Upstream license specification: Apache-2.0
|
|
|
|
|
License: ASL 2.0
|
|
|
|
|
License: Apache-2.0
|
|
|
|
|
URL: %{gourl}
|
|
|
|
|
Source0: %{gosource}
|
|
|
|
|
|
|
|
|
|
@ -56,17 +56,6 @@ Requires: systemd
|
|
|
|
|
|
|
|
|
|
Provides: weldr
|
|
|
|
|
|
|
|
|
|
%if 0%{?rhel}
|
|
|
|
|
Obsoletes: lorax-composer <= 29
|
|
|
|
|
Conflicts: lorax-composer
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
# Remove when we stop releasing into Fedora 35
|
|
|
|
|
%if 0%{?fedora} >= 34
|
|
|
|
|
# lorax 34.3 is the first one without the composer subpackage
|
|
|
|
|
Obsoletes: lorax-composer < 34.3
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%description
|
|
|
|
|
%{common_description}
|
|
|
|
|
|
|
|
|
|
@ -205,6 +194,7 @@ install -m 0755 -vp tools/libvirt_test.sh %{buildroot}%
|
|
|
|
|
install -m 0755 -vp tools/s3_test.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
|
|
|
|
install -m 0755 -vp tools/generic_s3_test.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
|
|
|
|
install -m 0755 -vp tools/generic_s3_https_test.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
|
|
|
|
install -m 0755 -vp tools/run-mock-auth-servers.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
|
|
|
|
install -m 0755 -vp tools/set-env-variables.sh %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
|
|
|
|
install -m 0755 -vp tools/test-case-generators/generate-test-cases %{buildroot}%{_libexecdir}/osbuild-composer-test/
|
|
|
|
|
install -m 0755 -vd %{buildroot}%{_libexecdir}/tests/osbuild-composer
|
|
|
|
|
@ -250,9 +240,6 @@ install -m 0644 -vp test/data/koji/* %{buildroot}%
|
|
|
|
|
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/x509
|
|
|
|
|
install -m 0644 -vp test/data/x509/* %{buildroot}%{_datadir}/tests/osbuild-composer/x509/
|
|
|
|
|
|
|
|
|
|
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/openshift
|
|
|
|
|
install -m 0644 -vp test/data/openshift/* %{buildroot}%{_datadir}/tests/osbuild-composer/openshift/
|
|
|
|
|
|
|
|
|
|
install -m 0755 -vd %{buildroot}%{_datadir}/tests/osbuild-composer/schemas
|
|
|
|
|
install -m 0644 -vp pkg/jobqueue/dbjobqueue/schemas/* %{buildroot}%{_datadir}/tests/osbuild-composer/schemas/
|
|
|
|
|
|
|
|
|
|
@ -308,10 +295,10 @@ The core osbuild-composer binary. This is suitable both for spawning in containe
|
|
|
|
|
Summary: The worker for osbuild-composer
|
|
|
|
|
Requires: systemd
|
|
|
|
|
Requires: qemu-img
|
|
|
|
|
Requires: osbuild >= 62
|
|
|
|
|
Requires: osbuild-ostree >= 62
|
|
|
|
|
Requires: osbuild-lvm2 >= 62
|
|
|
|
|
Requires: osbuild-luks2 >= 62
|
|
|
|
|
Requires: osbuild >= 80
|
|
|
|
|
Requires: osbuild-ostree >= 80
|
|
|
|
|
Requires: osbuild-lvm2 >= 80
|
|
|
|
|
Requires: osbuild-luks2 >= 80
|
|
|
|
|
Requires: %{name}-dnf-json = %{version}-%{release}
|
|
|
|
|
|
|
|
|
|
%description worker
|
|
|
|
|
@ -328,8 +315,9 @@ The worker for osbuild-composer
|
|
|
|
|
%preun worker
|
|
|
|
|
# systemd_preun uses systemctl disable --now which doesn't work well with template services.
|
|
|
|
|
# See https://github.com/systemd/systemd/issues/15620
|
|
|
|
|
# The following lines mimicks its behaviour by running two commands:
|
|
|
|
|
if [ -d /run/systemd/system ]; then
|
|
|
|
|
# The following lines mimicks its behaviour by running two commands.
|
|
|
|
|
# The scriptlet is supposed to run only when the package is being removed.
|
|
|
|
|
if [ $1 -eq 0 ] && [ -d /run/systemd/system ]; then
|
|
|
|
|
# disable and stop all the worker services
|
|
|
|
|
systemctl --no-reload disable osbuild-worker@.service osbuild-remote-worker@.service
|
|
|
|
|
systemctl stop "osbuild-worker@*.service" "osbuild-remote-worker@*.service"
|
|
|
|
|
@ -343,7 +331,7 @@ fi
|
|
|
|
|
Summary: The dnf-json binary used by osbuild-composer and the workers
|
|
|
|
|
|
|
|
|
|
# Conflicts with older versions of composer that provide the same files
|
|
|
|
|
# this can be removed when RHEL 8 and Fedora 35 reach EOL
|
|
|
|
|
# this can be removed when RHEL 8 reaches EOL
|
|
|
|
|
Conflicts: osbuild-composer <= 35
|
|
|
|
|
|
|
|
|
|
%description dnf-json
|
|
|
|
|
@ -352,6 +340,12 @@ The dnf-json binary used by osbuild-composer and the workers.
|
|
|
|
|
%files dnf-json
|
|
|
|
|
%{_libexecdir}/osbuild-composer/dnf-json
|
|
|
|
|
|
|
|
|
|
%post dnf-json
|
|
|
|
|
# Fix ownership of the rpmmd cache files from previous versions where it was owned by root:root
|
|
|
|
|
if [ -e /var/cache/osbuild-composer/rpmmd ]; then
|
|
|
|
|
chown -f -R --from root:root _osbuild-composer:_osbuild-composer /var/cache/osbuild-composer/rpmmd
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
%if %{with tests} || 0%{?rhel}
|
|
|
|
|
|
|
|
|
|
%package tests
|
|
|
|
|
@ -423,6 +417,42 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Wed Feb 22 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 75-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Wed Feb 08 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 74-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Wed Jan 25 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 73-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Wed Jan 11 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 72-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Wed Dec 28 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 71-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Wed Dec 14 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 70-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Wed Nov 30 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 69-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Wed Nov 16 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 68-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Wed Nov 02 2022 imagebuilder-bots+imagebuilder-bot@redhat.com <imagebuilder-bot> - 67-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Mon Aug 29 2022 Ondřej Budai <ondrej@budai.cz> - 62-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Wed Aug 24 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 60-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Thu Aug 11 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 59-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Thu Jul 28 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 58-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
|