diff --git a/.gitignore b/.gitignore index 393ac94..f4031d9 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ /osbuild-39.tar.gz /osbuild-42.tar.gz /osbuild-43.tar.gz +/osbuild-44.tar.gz diff --git a/osbuild.spec b/osbuild.spec index 538d17e..e90c8af 100644 --- a/osbuild.spec +++ b/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 @@ -68,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} @@ -155,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 @@ -167,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* @@ -180,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* @@ -208,6 +248,9 @@ fi %changelog +* Thu Dec 16 2021 Simon Steinbeiss - 44-1 +- New upstream release + * Wed Dec 01 2021 Achilleas Koutsou - 43-1 - New upstream release diff --git a/sources b/sources index ff2208d..80e466f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-43.tar.gz) = 2ce0a81e9e79984115542b4d58a48e8ac0dfb2e19ce38ebcd37acb1ce3c47adcf26cd1ef1a438443ef05ae38e11fc0f8aa283dd79c7e95f775d11d3bf353951a +SHA512 (osbuild-44.tar.gz) = 8b764758c172fc26c91a9cba8c5de27a328060c76b2de5b40b2ce34313025a0fe4f9913acc707914b0919c44e9e7e349f8f3e082d540a5d1746a8d1c3109f310