|
|
|
@ -1,7 +1,7 @@
|
|
|
|
|
%global forgeurl https://github.com/osbuild/osbuild
|
|
|
|
|
%global selinuxtype targeted
|
|
|
|
|
|
|
|
|
|
Version: 65
|
|
|
|
|
Version: 93
|
|
|
|
|
|
|
|
|
|
%forgemeta
|
|
|
|
|
|
|
|
|
@ -9,8 +9,8 @@ Version: 65
|
|
|
|
|
%global pkgdir %{_prefix}/lib/%{pypi_name}
|
|
|
|
|
|
|
|
|
|
Name: %{pypi_name}
|
|
|
|
|
Release: 1%{?dist}
|
|
|
|
|
License: ASL 2.0
|
|
|
|
|
Release: 1%{?dist}.1
|
|
|
|
|
License: Apache-2.0
|
|
|
|
|
|
|
|
|
|
URL: %{forgeurl}
|
|
|
|
|
|
|
|
|
@ -18,6 +18,9 @@ Source0: %{forgesource}
|
|
|
|
|
BuildArch: noarch
|
|
|
|
|
Summary: A build system for OS images
|
|
|
|
|
|
|
|
|
|
# https://github.com/osbuild/osbuild/commit/dcb0850a2edccd1067385c4a50dd2aab62778009
|
|
|
|
|
Patch0: stages-org.osbuild.keymap-create-xorg.conf.d-if-it-d.patch
|
|
|
|
|
|
|
|
|
|
BuildRequires: make
|
|
|
|
|
BuildRequires: python3-devel
|
|
|
|
|
BuildRequires: python3-docutils
|
|
|
|
@ -33,6 +36,7 @@ Requires: glibc
|
|
|
|
|
Requires: policycoreutils
|
|
|
|
|
Requires: qemu-img
|
|
|
|
|
Requires: systemd
|
|
|
|
|
Requires: skopeo
|
|
|
|
|
Requires: tar
|
|
|
|
|
Requires: util-linux
|
|
|
|
|
Requires: python3-%{pypi_name} = %{version}-%{release}
|
|
|
|
@ -100,7 +104,8 @@ to build OSTree based images.
|
|
|
|
|
%package selinux
|
|
|
|
|
Summary: SELinux policies
|
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
|
BuildRequires: selinux-policy
|
|
|
|
|
Requires: selinux-policy-%{selinuxtype}
|
|
|
|
|
Requires(post): selinux-policy-%{selinuxtype}
|
|
|
|
|
BuildRequires: selinux-policy-devel
|
|
|
|
|
%{?selinux_requires}
|
|
|
|
|
|
|
|
|
@ -114,12 +119,19 @@ 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.
|
|
|
|
|
|
|
|
|
|
%prep
|
|
|
|
|
%forgesetup
|
|
|
|
|
%forgeautosetup -p1
|
|
|
|
|
|
|
|
|
|
%build
|
|
|
|
|
%py3_build
|
|
|
|
@ -129,7 +141,7 @@ make man
|
|
|
|
|
make -f /usr/share/selinux/devel/Makefile osbuild.pp
|
|
|
|
|
bzip2 -9 osbuild.pp
|
|
|
|
|
|
|
|
|
|
%pre
|
|
|
|
|
%pre selinux
|
|
|
|
|
%selinux_relabel_pre -s %{selinuxtype}
|
|
|
|
|
|
|
|
|
|
%install
|
|
|
|
@ -173,11 +185,15 @@ install -p -m 0644 -t %{buildroot}%{_mandir}/man5/ docs/*.5
|
|
|
|
|
# SELinux
|
|
|
|
|
install -D -m 0644 -t %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype} %{name}.pp.bz2
|
|
|
|
|
install -D -m 0644 -t %{buildroot}%{_mandir}/man8 selinux/%{name}_selinux.8
|
|
|
|
|
install -D -p -m 0644 selinux/osbuild.if %{buildroot}%{_datadir}/selinux/devel/include/distributed/%{name}.if
|
|
|
|
|
|
|
|
|
|
# Udev rules
|
|
|
|
|
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}
|
|
|
|
|
|
|
|
|
|
%check
|
|
|
|
|
exit 0
|
|
|
|
|
# We have some integration tests, but those require running a VM, so that would
|
|
|
|
@ -230,7 +246,8 @@ exit 0
|
|
|
|
|
%files selinux
|
|
|
|
|
%{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2
|
|
|
|
|
%{_mandir}/man8/%{name}_selinux.8.*
|
|
|
|
|
%ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name}
|
|
|
|
|
%{_datadir}/selinux/devel/include/distributed/%{name}.if
|
|
|
|
|
%ghost %verify(not md5 size mode mtime) %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name}
|
|
|
|
|
|
|
|
|
|
%post selinux
|
|
|
|
|
%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2
|
|
|
|
@ -245,9 +262,88 @@ fi
|
|
|
|
|
|
|
|
|
|
%files tools
|
|
|
|
|
%{_bindir}/osbuild-mpp
|
|
|
|
|
%{?fedora:%{_bindir}/osbuild-dev}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Fri Jan 26 2024 Tomáš Hozza <thozza@redhat.com> - 93-1.1
|
|
|
|
|
- stages/org.osbuild.keymap: create xorg.conf.d if it doesn't exist (RHEL-22840)
|
|
|
|
|
|
|
|
|
|
* 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
|
|
|
|
|
|
|
|
|
|
* Mon Feb 20 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 80-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Wed Feb 15 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 79-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Tue Feb 07 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 78-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Fri Jan 20 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 77-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Thu Jan 19 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 76-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Wed Jan 04 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 75-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Wed Dec 07 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 73-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Wed Nov 23 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 72-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Wed Nov 09 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 71-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Wed Oct 26 2022 imagebuilder-bots+imagebuilder-bot@redhat.com <imagebuilder-bot> - 70-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
* Fri Aug 26 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 65-1
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|