[libvirt PATCH 0/3] spec: misc cleanups
This will be pushed to git master from https://gitlab.com/libvirt/libvirt/-/merge_requests/94 once CI completes. Zbigniew Jędrzejewski-Szmek (3): spec: drop/update dependencies on systemd-{units,sysv} spec: avoid repeated calls to systemd macros and binaries spec: avoid rpm warning about macro in comment libvirt.spec.in | 60 +++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 29 deletions(-) -- 2.31.1
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> -sysv was probably a left-over, and the -units deps was outdated and not necessary, see https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/#_depen.... Only for 'systemctl mask' which is executed in %post, we want to make sure that /usr/bin/systemctl is installed, so keep that dependency. (A file dep is used to avoid issues if the systemd package is further split later on.) Ferried over from https://src.fedoraproject.org/rpms/libvirt/pull-request/7. Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> --- libvirt.spec.in | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index c1ccd2f74e..7f12a92b7f 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -247,7 +247,6 @@ BuildRequires: ninja-build BuildRequires: git BuildRequires: perl-interpreter BuildRequires: python3 -BuildRequires: systemd-units %if %{with_libxl} BuildRequires: xen-devel %endif @@ -412,10 +411,7 @@ Requires: polkit >= 0.112 Requires: dmidecode %endif # For service management -Requires(post): systemd-units -Requires(post): systemd-sysv -Requires(preun): systemd-units -Requires(postun): systemd-units +Requires(post): /usr/bin/systemctl %if %{with_numad} Requires: numad %endif -- 2.31.1
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> The macro can take multiple arguments, and the calls are more efficient if done in one go. Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> --- libvirt.spec.in | 50 +++++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 7f12a92b7f..39226175ce 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1257,31 +1257,35 @@ getent group libvirt >/dev/null || groupadd -r libvirt exit 0 %post daemon +%global post_units \\\ + virtlockd.socket virtlockd-admin.socket \\\ + virtlogd.socket virtlogd-admin.socket \\\ + libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket \\\ + libvirtd-tcp.socket libvirtd-tls.socket \\\ + libvirtd.service \\\ + libvirt-guests.service -%systemd_post virtlockd.socket virtlockd-admin.socket -%systemd_post virtlogd.socket virtlogd-admin.socket -%systemd_post libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket -%systemd_post libvirtd-tcp.socket libvirtd-tls.socket -%systemd_post libvirtd.service -%systemd_post libvirt-guests.service +%systemd_post %post_units # request daemon restart in posttrans mkdir -p %{_localstatedir}/lib/rpm-state/libvirt || : touch %{_localstatedir}/lib/rpm-state/libvirt/restart || : %preun daemon -%systemd_preun libvirtd.service -%systemd_preun libvirtd-tcp.socket libvirtd-tls.socket -%systemd_preun libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket -%systemd_preun virtlogd.socket virtlogd-admin.socket virtlogd.service -%systemd_preun virtlockd.socket virtlockd-admin.socket virtlockd.service -%systemd_preun libvirt-guests.service +%global preun_units \\\ + libvirtd.service \\\ + libvirtd-tcp.socket libvirtd-tls.socket \\\ + libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket \\\ + virtlogd.socket virtlogd-admin.socket virtlogd.service \\\ + virtlockd.socket virtlockd-admin.socket virtlockd.service \\\ + libvirt-guests.service + +%systemd_preun %preun_units %postun daemon /bin/systemctl daemon-reload >/dev/null 2>&1 || : if [ $1 -ge 1 ] ; then - /bin/systemctl reload-or-try-restart virtlockd.service >/dev/null 2>&1 || : - /bin/systemctl reload-or-try-restart virtlogd.service >/dev/null 2>&1 || : + /bin/systemctl reload-or-try-restart virtlockd.service virtlogd.service >/dev/null 2>&1 || : fi %systemd_postun libvirt-guests.service @@ -1308,11 +1312,12 @@ if [ -f %{_localstatedir}/lib/rpm-state/libvirt/restart ]; then # systemd socket activation, because switching things # might confuse mgmt tool like puppet/ansible that # expect the old style libvirtd - /bin/systemctl mask libvirtd.socket >/dev/null 2>&1 || : - /bin/systemctl mask libvirtd-ro.socket >/dev/null 2>&1 || : - /bin/systemctl mask libvirtd-admin.socket >/dev/null 2>&1 || : - /bin/systemctl mask libvirtd-tls.socket >/dev/null 2>&1 || : - /bin/systemctl mask libvirtd-tcp.socket >/dev/null 2>&1 || : + /bin/systemctl mask \ + libvirtd.socket \ + libvirtd-ro.socket \ + libvirtd-admin.socket \ + libvirtd-tls.socket \ + libvirtd-tcp.socket >/dev/null 2>&1 || : else # Old libvirtd owns the sockets and will delete them on # shutdown. Can't use a try-restart as libvirtd will simply @@ -1324,9 +1329,10 @@ if [ -f %{_localstatedir}/lib/rpm-state/libvirt/restart ]; then then /bin/systemctl stop libvirtd.service >/dev/null 2>&1 || : - /bin/systemctl try-restart libvirtd.socket >/dev/null 2>&1 || : - /bin/systemctl try-restart libvirtd-ro.socket >/dev/null 2>&1 || : - /bin/systemctl try-restart libvirtd-admin.socket >/dev/null 2>&1 || : + /bin/systemctl try-restart \ + libvirtd.socket \ + libvirtd-ro.socket \ + libvirtd-admin.socket >/dev/null 2>&1 || : /bin/systemctl start libvirtd.service >/dev/null 2>&1 || : fi -- 2.31.1
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> --- libvirt.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 39226175ce..cb48dd0be0 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1182,7 +1182,7 @@ rm -f $RPM_BUILD_ROOT%{wireshark_plugindir}/libvirt.la %endif install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/lib/libvirt/dnsmasq/ -# We don't want to install /etc/libvirt/qemu/networks in the main %files list +# We don't want to install /etc/libvirt/qemu/networks in the main %%files list # because if the admin wants to delete the default network completely, we don't # want to end up re-incarnating it on every RPM upgrade. install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/ @@ -1191,7 +1191,7 @@ cp $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml \ # libvirt saves this file with mode 0600 chmod 0600 $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml -# nwfilter files are installed in /usr/share/libvirt and copied to /etc in %post +# nwfilter files are installed in /usr/share/libvirt and copied to /etc in %%post # to avoid verification errors on changed files in /etc install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/libvirt/nwfilter/ cp -a $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/nwfilter/*.xml \ -- 2.31.1
participants (1)
-
Daniel P. Berrangé