rpms/rpm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Drop fsverity plugin from RHEL builds

Browse Source 
The fsverity plugin subpackage is not planned to be shipped in RHEL, so
avoid the build dependency by not building it at all.
This commit is contained in:
Yaakov Selkowitz 2023-07-24 23:32:25 -04:00
parent ee04b3651c
commit dfc1484732
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rpm.spec
View File

@ -16,7 +16,11 @@
# build with libimaevm.so # build with libimaevm.so
%bcond_without libimaevm %bcond_without libimaevm
# build with fsverity support? # build with fsverity support?
%if 0%{?rhel}
%bcond_with fsverity
%else
%bcond_without fsverity %bcond_without fsverity
%endif
# build with zstd support? # build with zstd support?
%bcond_without zstd %bcond_without zstd
# build with ndb backend? # build with ndb backend?
@ -32,7 +36,7 @@
%global rpmver 4.18.91 %global rpmver 4.18.91
#global snapver rc1 #global snapver rc1
%global baserelease 8 %global baserelease 9
%global sover 10 %global sover 10
%global srcver %{rpmver}%{?snapver:-%{snapver}} %global srcver %{rpmver}%{?snapver:-%{snapver}}
@ -329,12 +333,14 @@ Requires: rpm-libs%{_isa} = %{version}-%{release}
%description plugin-audit %description plugin-audit
%{summary}. %{summary}.
%if %{with fsverity}
%package plugin-fsverity %package plugin-fsverity
Summary: Rpm plugin for fsverity file signatures Summary: Rpm plugin for fsverity file signatures
Requires: rpm-libs%{_isa} = %{version}-%{release} Requires: rpm-libs%{_isa} = %{version}-%{release}
%description plugin-fsverity %description plugin-fsverity
%{summary}. %{summary}.
%endif
%package plugin-fapolicyd %package plugin-fapolicyd
Summary: Rpm plugin for fapolicyd support Summary: Rpm plugin for fapolicyd support
@ -543,8 +549,10 @@ fi
%{_mandir}/man8/rpm-plugin-ima.8* %{_mandir}/man8/rpm-plugin-ima.8*
%endif %endif
%if %{with fsverity}
%files plugin-fsverity %files plugin-fsverity
%{_libdir}/rpm-plugins/fsverity.so %{_libdir}/rpm-plugins/fsverity.so
%endif
%files plugin-fapolicyd %files plugin-fapolicyd
%{_libdir}/rpm-plugins/fapolicyd.so %{_libdir}/rpm-plugins/fapolicyd.so
@ -624,6 +632,9 @@ fi
%doc %{_defaultdocdir}/rpm/API/ %doc %{_defaultdocdir}/rpm/API/
%changelog %changelog
* Tue Jul 25 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 4.18.91-9
- Drop fsverity plugin from RHEL builds
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.18.91-8 * Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.18.91-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild