1. Patchew
  2. Libvirt
  3. [PATCH 0/7] spec: Decompose the daemon subpackage
  4. View patch

[PATCH 6/7] spec: Remove libvirt-daemon dependecy from drivers

Jim Fehlig posted 7 patches 3 years, 2 months ago
There is a newer version of this series
[PATCH 6/7] spec: Remove libvirt-daemon dependecy from drivers
Posted by Jim Fehlig 3 years, 2 months ago 
Remove the libvirt-daemon dependency from all the libvirt-daemon-driver-*
packages.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>
---
 libvirt.spec.in | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 381f74c222..a7a80d7733 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -538,7 +538,6 @@ the monolithic libvirtd
 %package daemon-config-network
 Summary: Default configuration files for the libvirtd daemon
 
-Requires: libvirt-daemon = %{version}-%{release}
 Requires: libvirt-daemon-driver-network = %{version}-%{release}
 
 %description daemon-config-network
@@ -547,7 +546,6 @@ Default configuration files for setting up NAT based networking
 %package daemon-config-nwfilter
 Summary: Network filter configuration files for the libvirtd daemon
 
-Requires: libvirt-daemon = %{version}-%{release}
 Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
 
 %description daemon-config-nwfilter
@@ -555,7 +553,6 @@ Network filter configuration files for cleaning guest traffic
 
 %package daemon-driver-network
 Summary: Network driver plugin for the libvirtd daemon
-Requires: libvirt-daemon = %{version}-%{release}
 Requires: libvirt-libs = %{version}-%{release}
 Requires: dnsmasq >= 2.41
 Requires: iptables
@@ -568,7 +565,6 @@ bridge capabilities.
 
 %package daemon-driver-nwfilter
 Summary: Nwfilter driver plugin for the libvirtd daemon
-Requires: libvirt-daemon = %{version}-%{release}
 Requires: libvirt-libs = %{version}-%{release}
 Requires: iptables
 Requires: ebtables
@@ -581,7 +577,6 @@ iptables and ip6tables capabilities
 
 %package daemon-driver-nodedev
 Summary: Nodedev driver plugin for the libvirtd daemon
-Requires: libvirt-daemon = %{version}-%{release}
 Requires: libvirt-libs = %{version}-%{release}
 # needed for device enumeration
 Requires: systemd >= 185
@@ -596,7 +591,6 @@ capabilities.
 
 %package daemon-driver-interface
 Summary: Interface driver plugin for the libvirtd daemon
-Requires: libvirt-daemon = %{version}-%{release}
 Requires: libvirt-libs = %{version}-%{release}
 %if %{with_netcf}
 Requires: netcf-libs >= 0.2.2
@@ -608,7 +602,6 @@ an implementation of the host network interface APIs.
 
 %package daemon-driver-secret
 Summary: Secret driver plugin for the libvirtd daemon
-Requires: libvirt-daemon = %{version}-%{release}
 Requires: libvirt-libs = %{version}-%{release}
 
 %description daemon-driver-secret
@@ -617,7 +610,6 @@ an implementation of the secret key APIs.
 
 %package daemon-driver-storage-core
 Summary: Storage driver plugin including base backends for the libvirtd daemon
-Requires: libvirt-daemon = %{version}-%{release}
 Requires: libvirt-libs = %{version}-%{release}
 Requires: nfs-utils
 # For mkfs
@@ -778,7 +770,6 @@ parted and more.
 %if %{with_qemu}
 %package daemon-driver-qemu
 Summary: QEMU driver plugin for the libvirtd daemon
-Requires: libvirt-daemon = %{version}-%{release}
 Requires: libvirt-libs = %{version}-%{release}
 Requires: /usr/bin/qemu-img
 # For image compression
@@ -799,7 +790,6 @@ QEMU
 %if %{with_lxc}
 %package daemon-driver-lxc
 Summary: LXC driver plugin for the libvirtd daemon
-Requires: libvirt-daemon = %{version}-%{release}
 Requires: libvirt-libs = %{version}-%{release}
 # There really is a hard cross-driver dependency here
 Requires: libvirt-daemon-driver-network = %{version}-%{release}
@@ -815,7 +805,6 @@ the Linux kernel
 %if %{with_vbox}
 %package daemon-driver-vbox
 Summary: VirtualBox driver plugin for the libvirtd daemon
-Requires: libvirt-daemon = %{version}-%{release}
 Requires: libvirt-libs = %{version}-%{release}
 
 %description daemon-driver-vbox
@@ -828,7 +817,6 @@ VirtualBox
 %if %{with_libxl}
 %package daemon-driver-libxl
 Summary: Libxl driver plugin for the libvirtd daemon
-Requires: libvirt-daemon = %{version}-%{release}
 Requires: libvirt-libs = %{version}-%{release}
 Obsoletes: libvirt-daemon-driver-xen < 4.3.0
 
@@ -1004,7 +992,6 @@ Summary: Sanlock lock manager plugin for QEMU driver
 Requires: sanlock >= 2.4
 #for virt-sanlock-cleanup require augeas
 Requires: augeas
-Requires: libvirt-daemon = %{version}-%{release}
 Requires: libvirt-libs = %{version}-%{release}
 
 %description lock-sanlock
-- 
2.38.1
Re: [PATCH 6/7] spec: Remove libvirt-daemon dependecy from drivers
Posted by Daniel P. Berrangé 3 years, 1 month ago 
Typo in $SUBJECT dependecy -> dependency

On Fri, Dec 02, 2022 at 05:17:37PM -0700, Jim Fehlig wrote:
> Remove the libvirt-daemon dependency from all the libvirt-daemon-driver-*
> packages.
> 
> Signed-off-by: Jim Fehlig <jfehlig@suse.com>
> ---
>  libvirt.spec.in | 13 -------------
>  1 file changed, 13 deletions(-)
> 
> diff --git a/libvirt.spec.in b/libvirt.spec.in
> index 381f74c222..a7a80d7733 100644
> --- a/libvirt.spec.in
> +++ b/libvirt.spec.in
> @@ -538,7 +538,6 @@ the monolithic libvirtd
>  %package daemon-config-network
>  Summary: Default configuration files for the libvirtd daemon
>  
> -Requires: libvirt-daemon = %{version}-%{release}
>  Requires: libvirt-daemon-driver-network = %{version}-%{release}
>  
>  %description daemon-config-network
> @@ -547,7 +546,6 @@ Default configuration files for setting up NAT based networking
>  %package daemon-config-nwfilter
>  Summary: Network filter configuration files for the libvirtd daemon
>  
> -Requires: libvirt-daemon = %{version}-%{release}
>  Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
>  
>  %description daemon-config-nwfilter
> @@ -555,7 +553,6 @@ Network filter configuration files for cleaning guest traffic
>  
>  %package daemon-driver-network
>  Summary: Network driver plugin for the libvirtd daemon
> -Requires: libvirt-daemon = %{version}-%{release}
>  Requires: libvirt-libs = %{version}-%{release}
>  Requires: dnsmasq >= 2.41
>  Requires: iptables
> @@ -568,7 +565,6 @@ bridge capabilities.
>  
>  %package daemon-driver-nwfilter
>  Summary: Nwfilter driver plugin for the libvirtd daemon
> -Requires: libvirt-daemon = %{version}-%{release}
>  Requires: libvirt-libs = %{version}-%{release}
>  Requires: iptables
>  Requires: ebtables
> @@ -581,7 +577,6 @@ iptables and ip6tables capabilities
>  
>  %package daemon-driver-nodedev
>  Summary: Nodedev driver plugin for the libvirtd daemon
> -Requires: libvirt-daemon = %{version}-%{release}
>  Requires: libvirt-libs = %{version}-%{release}
>  # needed for device enumeration
>  Requires: systemd >= 185
> @@ -596,7 +591,6 @@ capabilities.
>  
>  %package daemon-driver-interface
>  Summary: Interface driver plugin for the libvirtd daemon
> -Requires: libvirt-daemon = %{version}-%{release}
>  Requires: libvirt-libs = %{version}-%{release}
>  %if %{with_netcf}
>  Requires: netcf-libs >= 0.2.2
> @@ -608,7 +602,6 @@ an implementation of the host network interface APIs.
>  
>  %package daemon-driver-secret
>  Summary: Secret driver plugin for the libvirtd daemon
> -Requires: libvirt-daemon = %{version}-%{release}
>  Requires: libvirt-libs = %{version}-%{release}
>  
>  %description daemon-driver-secret
> @@ -617,7 +610,6 @@ an implementation of the secret key APIs.
>  
>  %package daemon-driver-storage-core
>  Summary: Storage driver plugin including base backends for the libvirtd daemon
> -Requires: libvirt-daemon = %{version}-%{release}
>  Requires: libvirt-libs = %{version}-%{release}
>  Requires: nfs-utils
>  # For mkfs
> @@ -778,7 +770,6 @@ parted and more.
>  %if %{with_qemu}
>  %package daemon-driver-qemu
>  Summary: QEMU driver plugin for the libvirtd daemon
> -Requires: libvirt-daemon = %{version}-%{release}
>  Requires: libvirt-libs = %{version}-%{release}
>  Requires: /usr/bin/qemu-img
>  # For image compression
> @@ -799,7 +790,6 @@ QEMU
>  %if %{with_lxc}
>  %package daemon-driver-lxc
>  Summary: LXC driver plugin for the libvirtd daemon
> -Requires: libvirt-daemon = %{version}-%{release}
>  Requires: libvirt-libs = %{version}-%{release}
>  # There really is a hard cross-driver dependency here
>  Requires: libvirt-daemon-driver-network = %{version}-%{release}
> @@ -815,7 +805,6 @@ the Linux kernel
>  %if %{with_vbox}
>  %package daemon-driver-vbox
>  Summary: VirtualBox driver plugin for the libvirtd daemon
> -Requires: libvirt-daemon = %{version}-%{release}
>  Requires: libvirt-libs = %{version}-%{release}
>  
>  %description daemon-driver-vbox
> @@ -828,7 +817,6 @@ VirtualBox
>  %if %{with_libxl}
>  %package daemon-driver-libxl
>  Summary: Libxl driver plugin for the libvirtd daemon
> -Requires: libvirt-daemon = %{version}-%{release}
>  Requires: libvirt-libs = %{version}-%{release}
>  Obsoletes: libvirt-daemon-driver-xen < 4.3.0
>  
> @@ -1004,7 +992,6 @@ Summary: Sanlock lock manager plugin for QEMU driver
>  Requires: sanlock >= 2.4
>  #for virt-sanlock-cleanup require augeas
>  Requires: augeas
> -Requires: libvirt-daemon = %{version}-%{release}
>  Requires: libvirt-libs = %{version}-%{release}
>  
>  %description lock-sanlock
> -- 
> 2.38.1
> 

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
Re: [PATCH 6/7] spec: Remove libvirt-daemon dependecy from drivers
Posted by Daniel P. Berrangé 3 years, 1 month ago 
On Fri, Dec 02, 2022 at 05:17:37PM -0700, Jim Fehlig wrote:
> Remove the libvirt-daemon dependency from all the libvirt-daemon-driver-*
> packages.
> 
> Signed-off-by: Jim Fehlig <jfehlig@suse.com>
> ---
>  libvirt.spec.in | 13 -------------
>  1 file changed, 13 deletions(-)
> 
> diff --git a/libvirt.spec.in b/libvirt.spec.in
> index 381f74c222..a7a80d7733 100644
> --- a/libvirt.spec.in
> +++ b/libvirt.spec.in
> @@ -538,7 +538,6 @@ the monolithic libvirtd
>  %package daemon-config-network
>  Summary: Default configuration files for the libvirtd daemon
>  
> -Requires: libvirt-daemon = %{version}-%{release}
>  Requires: libvirt-daemon-driver-network = %{version}-%{release}
>  
>  %description daemon-config-network
> @@ -547,7 +546,6 @@ Default configuration files for setting up NAT based networking
>  %package daemon-config-nwfilter
>  Summary: Network filter configuration files for the libvirtd daemon
>  
> -Requires: libvirt-daemon = %{version}-%{release}
>  Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
>  
>  %description daemon-config-nwfilter
> @@ -555,7 +553,6 @@ Network filter configuration files for cleaning guest traffic
>  
>  %package daemon-driver-network
>  Summary: Network driver plugin for the libvirtd daemon
> -Requires: libvirt-daemon = %{version}-%{release}
>  Requires: libvirt-libs = %{version}-%{release}
>  Requires: dnsmasq >= 2.41
>  Requires: iptables

This is a problem, because we rely on that package to provide ownership
of

  %dir %attr(0755, root, root) %{_libdir}/libvirt/connection-driver/

since all the daemon-driver-XXX packages will install .so into
that directory.

If that %dir ends up in libvirt-daemon-common, then this patch needs
to change 'libvirt-daemon' to 'libvirt-daemon-common' instead.


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.