From 9bd309a3ca87c7e79ad583e80a91f84582e97153 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 29 2022 15:48:58 +0000 Subject: import osbuild-50-1.el8 --- diff --git a/.gitignore b/.gitignore index 836e00a..97fe684 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osbuild-35.tar.gz +SOURCES/osbuild-50.tar.gz diff --git a/.osbuild.metadata b/.osbuild.metadata index a21aebf..95d7c57 100644 --- a/.osbuild.metadata +++ b/.osbuild.metadata @@ -1 +1 @@ -e7c0228039b6cbab841af199cbe2558254362526 SOURCES/osbuild-35.tar.gz +509c2c90b02ad8e88ff0adbd391e1aa6df8c1063 SOURCES/osbuild-50.tar.gz diff --git a/SPECS/osbuild.spec b/SPECS/osbuild.spec index ec3c42f..8c26b77 100644 --- a/SPECS/osbuild.spec +++ b/SPECS/osbuild.spec @@ -1,7 +1,7 @@ %global forgeurl https://github.com/osbuild/osbuild %global selinuxtype targeted -Version: 35 +Version: 50 %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} @@ -93,6 +112,7 @@ containers it uses to build OS artifacts. %package tools Summary: Extra tools and utilities Requires: %{name} = %{version}-%{release} +Requires: python3-pyyaml %description tools Contains additional tools and utilities for development of @@ -154,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 @@ -166,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* @@ -175,10 +207,19 @@ exit 0 %files -n python3-%{pypi_name} %license LICENSE -%doc README.md NEWS.md +%doc README.md %{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* @@ -205,7 +246,38 @@ fi %files tools %{_bindir}/osbuild-mpp + %changelog +* Sun Feb 27 2022 Simon Steinbeiss - 50-1 +- New upstream release + +* Wed Feb 23 2022 Simon Steinbeiss - 49-1 +- New upstream release + +* Thu Feb 17 2022 Chloe Kaubisch - 48-1 +- New upstream release + +* Thu Feb 03 2022 Jacob Kozol - 47-1 +- New upstream release + +* Wed Jan 19 2022 Simon Steinbeiss - 46-1 +- New upstream release + +* Mon Jan 10 2022 Tomas Hozza - 45-1 +- New upstream release + +* Wed Jan 05 2022 Simon Steinbeiss - 44-1 +- New upstream release + +* Wed Dec 01 2021 Achilleas Koutsou - 43-1 +- New upstream release + +* Mon Nov 29 2021 Ondřej Budai - 42-1 +- New upstream release + +* Fri Oct 15 2021 Achilleas Koutsou - 39-1 +- New upstream release + * Sun Aug 29 2021 Tom Gundersen - 35-1 - Upstream release 35