rpms
/
rust-zincati
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mark runtime/ephemeral file entries as 'ghost' 

This drops some buggy file entries that were previously
shipped as part of the binary RPM under `/run`.
Overall, they were wrongly mixing up plain files with Unix
sockets. This could trip rpm-ostree conversion logic into producing
wrong/conflicting entries.
As a tmpfiles.d fragment is already shipped as part of the package,
we don't want such entries to exist (and be processed) at all.
%ghost placeholders are thus enough here.
This commit is contained in:
Luca BRUNO 2021-07-01 12:33:51 +00:00
parent 57585a8535
commit 1c1f69b737
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
rust-zincati.spec
View File

@ -11,7 +11,7 @@
Name: rust-%{crate}
Version: 0.0.21
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Update agent for Fedora CoreOS
# Upstream license specification: Apache-2.0
@ -288,12 +288,12 @@ License: ASL 2.0 and BSD and MIT and MPLv2.0 and zlib
%dir %{_prefix}/lib/%{crate}
%dir %{_prefix}/lib/%{crate}/config.d
%{_prefix}/lib/%{crate}/config.d/*.toml
%attr(0775, zincati, zincati) %dir /run/%{crate}
%attr(0775, zincati, zincati) %dir /run/%{crate}/config.d
%attr(0770, zincati, zincati) %dir /run/%{crate}/private
%attr(0775, zincati, zincati) %dir /run/%{crate}/public
%verify(not size mtime md5) /run/%{crate}/public/metrics.promsock
%verify(not size mtime md5) /run/%{crate}/private/metrics.promsock
%attr(0775, zincati, zincati) %ghost /run/%{crate}
%attr(0775, zincati, zincati) %ghost /run/%{crate}/config.d
%attr(0770, zincati, zincati) %ghost /run/%{crate}/private
%attr(0775, zincati, zincati) %ghost /run/%{crate}/public
%attr(0755, zincati, zincati) %ghost /run/%{crate}/public/metrics.promsock
%ghost /run/%{crate}/private/metrics.promsock
%dir %{_sysconfdir}/%{crate}
%dir %{_sysconfdir}/%{crate}/config.d
%{_unitdir}/zincati.service
@ -356,10 +356,6 @@ mkdir -p %{buildroot}%{_libexecdir}
mv %{buildroot}%{_bindir}/zincati %{buildroot}%{_libexecdir}/zincati
install -Dpm0644 -t %{buildroot}%{_prefix}/lib/%{crate}/config.d \
dist/config.d/*.toml
mkdir -p %{buildroot}/run/%{crate}/config.d
mkdir -p %{buildroot}/run/%{crate}/private
mkdir -p %{buildroot}/run/%{crate}/public
touch %{buildroot}/run/%{crate}/public/metrics.promsock
mkdir -p %{buildroot}%{_sysconfdir}/%{crate}/config.d
install -Dpm0644 -t %{buildroot}%{_unitdir} \
dist/systemd/system/*.service
@ -373,7 +369,6 @@ install -Dpm0644 -t %{buildroot}%{_datadir}/polkit-1/actions \
dist/polkit-1/actions/org.coreos.zincati.*
install -Dpm0644 -t %{buildroot}%{_datadir}/dbus-1/system.d \
dist/dbus-1/system.d/*.conf
ln -snf /run/%{crate}/public/metrics.promsock %{buildroot}/run/%{crate}/private/metrics.promsock
%if %{with check}
%check
@ -381,6 +376,9 @@ ln -snf /run/%{crate}/public/metrics.promsock %{buildroot}/run/%{crate}/private/
%endif
%changelog
* Thu Jul 01 2021 Luca BRUNO <lucab@lucabruno.net> - 0.0.21-2
- Mark runtime/ephemeral file entries as 'ghost'
* Fri May 21 2021 Luca BRUNO <lucab@lucabruno.net> - 0.0.21-1
- New upstream version
https://github.com/coreos/zincati/releases/tag/v0.0.21
@ -418,7 +416,7 @@ ln -snf /run/%{crate}/public/metrics.promsock %{buildroot}/run/%{crate}/private/
- Update to 0.0.13
* Wed Sep 23 2020 Kelvin Fan <kfan@redhat.com> - 0.0.12-6
- Remove unnecessary usage of systemd RPM macro in %pre
- Remove unnecessary usage of systemd RPM macro in 'pre'
* Sun Aug 16 15:01:58 GMT 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.0.12-5
- Rebuild