diff --git a/.gitignore b/.gitignore index ff24fd2..79af06e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osbuild-43.tar.gz +SOURCES/osbuild-44.tar.gz diff --git a/.osbuild.metadata b/.osbuild.metadata index f86f887..2cdb204 100644 --- a/.osbuild.metadata +++ b/.osbuild.metadata @@ -1 +1 @@ -79d8ce23463ce0a1e2421bf02144e0f787b53529 SOURCES/osbuild-43.tar.gz +949d3841355957371d0356dc6522676ea54f7c45 SOURCES/osbuild-44.tar.gz diff --git a/SPECS/osbuild.spec b/SPECS/osbuild.spec index 52997a7..c7509fc 100644 --- a/SPECS/osbuild.spec +++ b/SPECS/osbuild.spec @@ -1,7 +1,7 @@ %global forgeurl https://github.com/osbuild/osbuild %global selinuxtype targeted -Version: 43 +Version: 44 %forgemeta @@ -21,6 +21,7 @@ Summary: A build system for OS images BuildRequires: make BuildRequires: python3-devel BuildRequires: python3-docutils +BuildRequires: systemd Requires: bash Requires: bubblewrap @@ -30,7 +31,6 @@ Requires: dnf Requires: e2fsprogs Requires: glibc Requires: policycoreutils -Requires: python36 Requires: qemu-img Requires: systemd Requires: tar @@ -54,9 +54,7 @@ Requires: (%{name}-selinux if selinux-policy-%{selinuxtype}) # RHEL NB: Since assemblers and stages are not excluded from the dependency # generator, this also means that an additional dependency on /usr/bin/python3 # will be added. This is intended and needed, so that in the host build root -# /usr/bin/python3 is present so stages and assemblers can be run. Although, -# on RHEL 8, we also explicitly require python36, since the exact version is -# used by the RHEL 8 runners to set up /etc/alternatives for python3. +# /usr/bin/python3 is present so stages and assemblers can be run. %global __brp_mangle_shebangs_exclude_from ^%{pkgdir}/(assemblers|runners|stages)/.*$ %{?python_enable_dependency_generator} @@ -71,6 +69,24 @@ Summary: %{summary} %description -n python3-%{pypi_name} A build system for OS images +%package lvm2 +Summary: LVM2 support +Requires: %{name} = %{version}-%{release} +Requires: lvm2 + +%description lvm2 +Contains the necessary stages and device host +services to build LVM2 based images. + +%package luks2 +Summary: LUKS2 support +Requires: %{name} = %{version}-%{release} +Requires: cryptsetup + +%description luks2 +Contains the necessary stages and device host +services to build LUKS2 encrypted images. + %package ostree Summary: OSTree support Requires: %{name} = %{version}-%{release} @@ -158,6 +174,10 @@ install -p -m 0644 -t %{buildroot}%{_mandir}/man5/ docs/*.5 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 +# Udev rules +mkdir -p %{buildroot}%{_udevrulesdir} +install -p -m 0755 data/10-osbuild-inhibitor.rules %{buildroot}%{_udevrulesdir} + %check exit 0 # We have some integration tests, but those require running a VM, so that would @@ -170,6 +190,14 @@ exit 0 %{_mandir}/man5/%{name}-manifest.5* %{_datadir}/osbuild/schemas %{pkgdir} +%{_udevrulesdir}/*.rules +# the following files are in the lvm2 sub-package +%exclude %{pkgdir}/devices/org.osbuild.lvm2* +%exclude %{pkgdir}/stages/org.osbuild.lvm2* +# the following files are in the luks2 sub-package +%exclude %{pkgdir}/devices/org.osbuild.luks2* +%exclude %{pkgdir}/stages/org.osbuild.crypttab +%exclude %{pkgdir}/stages/org.osbuild.luks2* # the following files are in the ostree sub-package %exclude %{pkgdir}/assemblers/org.osbuild.ostree* %exclude %{pkgdir}/inputs/org.osbuild.ostree* @@ -183,6 +211,15 @@ exit 0 %{python3_sitelib}/%{pypi_name}-*.egg-info/ %{python3_sitelib}/%{pypi_name}/ +%files lvm2 +%{pkgdir}/devices/org.osbuild.lvm2* +%{pkgdir}/stages/org.osbuild.lvm2* + +%files luks2 +%{pkgdir}/devices/org.osbuild.luks2* +%{pkgdir}/stages/org.osbuild.crypttab +%{pkgdir}/stages/org.osbuild.luks2* + %files ostree %{pkgdir}/assemblers/org.osbuild.ostree* %{pkgdir}/inputs/org.osbuild.ostree* @@ -211,6 +248,9 @@ fi %changelog +* Wed Jan 05 2022 Simon Steinbeiss - 44-1 +- New upstream release + * Wed Dec 01 2021 Achilleas Koutsou - 43-1 - New upstream release