[PATCH] rpm: add conditionals around post scripts

Daniel P. Berrangé posted 1 patch 2 years, 7 months ago
Test syntax-check failed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/20210805095909.3538595-1-berrange@redhat.com
libvirt.spec.in | 8 ++++++++
1 file changed, 8 insertions(+)
[PATCH] rpm: add conditionals around post scripts
Posted by Daniel P. Berrangé 2 years, 7 months ago
The hypervisor drivers can be disabled in certain build scenarios, so
their corresponding post scripts need to match.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 libvirt.spec.in | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libvirt.spec.in b/libvirt.spec.in
index a162bc333d..011f5dd49e 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1458,6 +1458,7 @@ fi
 %libvirt_daemon_perform_restart virtstoraged
 
 
+%if %{with_qemu}
 %post daemon-driver-qemu
 %if %{with_modular_daemons}
 %libvirt_daemon_systemd_post virtqemud
@@ -1469,8 +1470,10 @@ fi
 
 %posttrans daemon-driver-qemu
 %libvirt_daemon_perform_restart virtqemud
+%endif
 
 
+%if %{with_lxc}
 %post daemon-driver-lxc
 %if %{with_modular_daemons}
 %libvirt_daemon_systemd_post virtlxcd
@@ -1482,8 +1485,10 @@ fi
 
 %posttrans daemon-driver-lxc
 %libvirt_daemon_perform_restart virtlxcd
+%endif
 
 
+%if %{with_vbox}
 %post daemon-driver-vbox
 %if %{with_modular_daemons}
 %libvirt_daemon_systemd_post virtvboxd
@@ -1495,8 +1500,10 @@ fi
 
 %posttrans daemon-driver-vbox
 %libvirt_daemon_perform_restart virtvboxd
+%endif
 
 
+%if %{with_libxl}
 %post daemon-driver-libxl
 %if %{with_modular_daemons}
 %libvirt_daemon_systemd_post virtxend
@@ -1508,6 +1515,7 @@ fi
 
 %posttrans daemon-driver-libxl
 %libvirt_daemon_perform_restart virtxend
+%endif
 
 
 %post daemon-config-network
-- 
2.31.1

Re: [PATCH] rpm: add conditionals around post scripts
Posted by Michal Prívozník 2 years, 7 months ago
On 8/5/21 11:59 AM, Daniel P. Berrangé wrote:
> The hypervisor drivers can be disabled in certain build scenarios, so
> their corresponding post scripts need to match.
> 
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>  libvirt.spec.in | 8 ++++++++
>  1 file changed, 8 insertions(+)

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

Michal