diff --git a/.gitignore b/.gitignore index eb64a08..2024d0e 100644 --- a/.gitignore +++ b/.gitignore @@ -123,3 +123,4 @@ /osbuild-155.tar.gz /osbuild-156.tar.gz /osbuild-158.tar.gz +/osbuild-162.tar.gz diff --git a/osbuild.spec b/osbuild.spec index 70bbd92..d7261dd 100644 --- a/osbuild.spec +++ b/osbuild.spec @@ -1,7 +1,7 @@ %global forgeurl https://github.com/osbuild/osbuild %global selinuxtype targeted -Version: 158 +Version: 162 %forgemeta @@ -21,6 +21,7 @@ Summary: A build system for OS images BuildRequires: make BuildRequires: python3-devel BuildRequires: python3-docutils +BuildRequires: python3-setuptools BuildRequires: systemd Requires: bash @@ -117,6 +118,20 @@ Contains the necessary SELinux policies that allows osbuild to use labels unknown to the host inside the containers it uses to build OS artifacts. +%package container-selinux +Summary: SELinux container policies +Requires: selinux-policy-%{selinuxtype} +Requires: container-selinux +Requires(post): selinux-policy-%{selinuxtype} +Requires(post): container-selinux +BuildRequires: selinux-policy-devel +BuildRequires: selinux-policy-devel +%{?selinux_requires} + +%description container-selinux +Contains the necessary SELinux policies that allows +running osbuild in a container. + %package tools Summary: Extra tools and utilities Requires: %{name} = %{version}-%{release} @@ -182,6 +197,9 @@ make man make -f /usr/share/selinux/devel/Makefile osbuild.pp bzip2 -9 osbuild.pp +make -f /usr/share/selinux/devel/Makefile osbuild-container.pp +bzip2 -9 osbuild-container.pp + %pre selinux %selinux_relabel_pre -s %{selinuxtype} @@ -225,6 +243,7 @@ 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}%{_datadir}/selinux/packages/%{selinuxtype} %{name}-container.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 @@ -319,6 +338,18 @@ fi %posttrans selinux %selinux_relabel_post -s %{selinuxtype} +%files container-selinux +%{_datadir}/selinux/packages/%{selinuxtype}/%{name}-container.pp.bz2 +%ghost %verify(not md5 size mode mtime) %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name}-container + +%post container-selinux +%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/%{name}-container.pp.bz2 + +%postun container-selinux +if [ $1 -eq 0 ]; then + %selinux_modules_uninstall -s %{selinuxtype} %{name}-container +fi + %files tools %{_bindir}/osbuild-image-info %{_bindir}/osbuild-mpp @@ -329,6 +360,9 @@ fi %{pkgdir}/solver.json %changelog +* Thu Oct 09 2025 imagebuilder-bot - 162-1 +- New upstream release + * Thu Aug 14 2025 imagebuilder-bot - 158-1 - New upstream release diff --git a/sources b/sources index d54cd03..fc85941 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-158.tar.gz) = 5016c426c0f33503bb54f7d0f2ef72e548866867e4bfc4608789e3ce9dc7ca1bbdfef7a512ad38e8a7d2891a8c009f5d14bd33e6770d1e3b9262bc5cbdcf7142 +SHA512 (osbuild-162.tar.gz) = ae0c8bb087c09c0ba95270913a8f22490d5dc1c16e77364c54f742772cbe2a6aa3dfed0ab65c72880de32867fd6048adfd9d1fd4040c6315eb6f9584415c79c2