|
|
|
|
@ -1,7 +1,7 @@
|
|
|
|
|
%global forgeurl https://github.com/osbuild/osbuild
|
|
|
|
|
%global selinuxtype targeted
|
|
|
|
|
|
|
|
|
|
Version: 110
|
|
|
|
|
Version: 81
|
|
|
|
|
|
|
|
|
|
%forgemeta
|
|
|
|
|
|
|
|
|
|
@ -9,7 +9,7 @@ Version: 110
|
|
|
|
|
%global pkgdir %{_prefix}/lib/%{pypi_name}
|
|
|
|
|
|
|
|
|
|
Name: %{pypi_name}
|
|
|
|
|
Release: 1%{?dist}.alma.1
|
|
|
|
|
Release: 1%{?dist}
|
|
|
|
|
License: Apache-2.0
|
|
|
|
|
|
|
|
|
|
URL: %{forgeurl}
|
|
|
|
|
@ -33,18 +33,11 @@ Requires: glibc
|
|
|
|
|
Requires: policycoreutils
|
|
|
|
|
Requires: qemu-img
|
|
|
|
|
Requires: systemd
|
|
|
|
|
Requires: skopeo
|
|
|
|
|
Requires: tar
|
|
|
|
|
Requires: util-linux
|
|
|
|
|
Requires: python3-%{pypi_name} = %{version}-%{release}
|
|
|
|
|
Requires: (%{name}-selinux if selinux-policy-%{selinuxtype})
|
|
|
|
|
|
|
|
|
|
# This is required for `osbuild`, for RHEL-10 and above
|
|
|
|
|
# the stdlib toml package can be used instead
|
|
|
|
|
%if 0%{?rhel} < 10
|
|
|
|
|
Requires: python3-tomli
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
# Turn off dependency generators for runners. The reason is that runners are
|
|
|
|
|
# tailored to the platform, e.g. on RHEL they are using platform-python. We
|
|
|
|
|
# don't want to pick up those dependencies on other platform.
|
|
|
|
|
@ -122,33 +115,12 @@ Summary: Extra tools and utilities
|
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
|
Requires: python3-pyyaml
|
|
|
|
|
|
|
|
|
|
# These are required for `osbuild-dev`, only packaged for Fedora
|
|
|
|
|
%if 0%{?fedora}
|
|
|
|
|
Requires: python3-rich
|
|
|
|
|
Requires: python3-attrs
|
|
|
|
|
Requires: python3-typer
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%description tools
|
|
|
|
|
Contains additional tools and utilities for development of
|
|
|
|
|
manifests and osbuild.
|
|
|
|
|
|
|
|
|
|
%package depsolve-dnf
|
|
|
|
|
Summary: Dependency solving support for DNF
|
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
|
|
|
|
|
|
# Fedora 40 and later use libdnf5, RHEL and Fedora < 40 use libdnf
|
|
|
|
|
%if 0%{?fedora} >= 40
|
|
|
|
|
Requires: python3-libdnf5 >= 5.1.1
|
|
|
|
|
%else
|
|
|
|
|
Requires: python3-libdnf
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%description depsolve-dnf
|
|
|
|
|
Contains depsolving capabilities for package managers.
|
|
|
|
|
|
|
|
|
|
%prep
|
|
|
|
|
%forgeautosetup -p1
|
|
|
|
|
%forgesetup
|
|
|
|
|
|
|
|
|
|
%build
|
|
|
|
|
%py3_build
|
|
|
|
|
@ -164,14 +136,8 @@ bzip2 -9 osbuild.pp
|
|
|
|
|
%install
|
|
|
|
|
%py3_install
|
|
|
|
|
|
|
|
|
|
ln -rs %{_builddir}/%{name}-%{version}/runners/org.osbuild.rhel82 %{_builddir}/%{name}-%{version}/runners/org.osbuild.almalinux8
|
|
|
|
|
|
|
|
|
|
%if 0%{?almalinux} >= 9
|
|
|
|
|
ln -rs %{_builddir}/%{name}-%{version}/runners/org.osbuild.centos9 %{_builddir}/%{name}-%{version}/runners/org.osbuild.almalinux9
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
mkdir -p %{buildroot}%{pkgdir}/stages
|
|
|
|
|
install -p -m 0755 $(find stages -type f -not -name "test_*.py") %{buildroot}%{pkgdir}/stages/
|
|
|
|
|
install -p -m 0755 $(find stages -type f) %{buildroot}%{pkgdir}/stages/
|
|
|
|
|
|
|
|
|
|
mkdir -p %{buildroot}%{pkgdir}/assemblers
|
|
|
|
|
install -p -m 0755 $(find assemblers -type f) %{buildroot}%{pkgdir}/assemblers/
|
|
|
|
|
@ -214,18 +180,6 @@ install -D -p -m 0644 selinux/osbuild.if %{buildroot}%{_datadir}/selinux/devel/i
|
|
|
|
|
mkdir -p %{buildroot}%{_udevrulesdir}
|
|
|
|
|
install -p -m 0755 data/10-osbuild-inhibitor.rules %{buildroot}%{_udevrulesdir}
|
|
|
|
|
|
|
|
|
|
# Remove `osbuild-dev` on non-fedora systems
|
|
|
|
|
%{!?fedora:rm %{buildroot}%{_bindir}/osbuild-dev}
|
|
|
|
|
|
|
|
|
|
# Install `osbuild-depsolve-dnf` into libexec
|
|
|
|
|
mkdir -p %{buildroot}%{_libexecdir}
|
|
|
|
|
# Fedora 40 and later use dnf5-json, RHEL and Fedora < 40 use dnf-json
|
|
|
|
|
%if 0%{?fedora} >= 40
|
|
|
|
|
install -p -m 0755 tools/osbuild-depsolve-dnf5 %{buildroot}%{_libexecdir}/osbuild-depsolve-dnf
|
|
|
|
|
%else
|
|
|
|
|
install -p -m 0755 tools/osbuild-depsolve-dnf %{buildroot}%{_libexecdir}/osbuild-depsolve-dnf
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%check
|
|
|
|
|
exit 0
|
|
|
|
|
# We have some integration tests, but those require running a VM, so that would
|
|
|
|
|
@ -251,7 +205,6 @@ exit 0
|
|
|
|
|
%exclude %{pkgdir}/inputs/org.osbuild.ostree*
|
|
|
|
|
%exclude %{pkgdir}/sources/org.osbuild.ostree*
|
|
|
|
|
%exclude %{pkgdir}/stages/org.osbuild.ostree*
|
|
|
|
|
%exclude %{pkgdir}/stages/org.osbuild.experimental.ostree*
|
|
|
|
|
%exclude %{pkgdir}/stages/org.osbuild.rpm-ostree
|
|
|
|
|
|
|
|
|
|
%files -n python3-%{pypi_name}
|
|
|
|
|
@ -274,7 +227,6 @@ exit 0
|
|
|
|
|
%{pkgdir}/inputs/org.osbuild.ostree*
|
|
|
|
|
%{pkgdir}/sources/org.osbuild.ostree*
|
|
|
|
|
%{pkgdir}/stages/org.osbuild.ostree*
|
|
|
|
|
%{pkgdir}/stages/org.osbuild.experimental.ostree*
|
|
|
|
|
%{pkgdir}/stages/org.osbuild.rpm-ostree
|
|
|
|
|
|
|
|
|
|
%files selinux
|
|
|
|
|
@ -296,92 +248,9 @@ fi
|
|
|
|
|
|
|
|
|
|
%files tools
|
|
|
|
|
%{_bindir}/osbuild-mpp
|
|
|
|
|
%{?fedora:%{_bindir}/osbuild-dev}
|
|
|
|
|
|
|
|
|
|
%files depsolve-dnf
|
|
|
|
|
%{_libexecdir}/osbuild-depsolve-dnf
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Wed Mar 27 2024 Eduard Abdullin <eabdullin@almalinux.org> - 110-1.alma
|
|
|
|
|
- Add AlmaLinux runners
|
|
|
|
|
|
|
|
|
|
* Mon Feb 26 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 110-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
* Thu Feb 22 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 109-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Thu Feb 01 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 106-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Wed Jan 31 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 105-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Wed Jan 17 2024 Paweł Poławski <ppolawsk@redhat.com> - 104-2
|
|
|
|
|
- Fix unit tests in RHEL CI by backporting upstream fixes
|
|
|
|
|
|
|
|
|
|
* Tue Jan 16 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 104-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Tue Dec 19 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 101-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Mon Dec 11 2023 Paweł Poławski <ppolawsk@redhat.com> - 100-2
|
|
|
|
|
- Change unit-test timeout from 3h to 4h
|
|
|
|
|
|
|
|
|
|
* Fri Nov 24 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 100-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Wed Sep 27 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 96-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Wed Sep 13 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 95-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Wed Aug 30 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 94-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Wed Aug 23 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 93-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Thu Aug 17 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 92-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Wed Aug 02 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 91-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Thu Jul 20 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 90-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Tue Jun 27 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 89-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Tue Jun 27 2023 Tomáš Hozza <thozza@redhat.com> - 88-3
|
|
|
|
|
- Increase unit-test duration to 3h
|
|
|
|
|
|
|
|
|
|
* Fri Jun 23 2023 Tomáš Hozza <thozza@redhat.com> - 88-2
|
|
|
|
|
- Fix unit tests in RHEL CI and rebuild RPM
|
|
|
|
|
|
|
|
|
|
* Wed Jun 21 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 88-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Wed Jun 07 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 87-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Tue May 30 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 86-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Tue May 30 2023 Tomáš Hozza <thozza@redhat.com> - 85-2
|
|
|
|
|
- Backport upstream fixes for unit tests on RHEL-8 (PR#1316, PR#1317)
|
|
|
|
|
|
|
|
|
|
* Thu May 11 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 85-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Thu Apr 27 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 84-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Wed Mar 29 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 82-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Mon Feb 27 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 81-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
|