[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/master] 5 commits: libvirt-daemon-config-*: Install target directories

[Guido Günther]

Guido Günther pushed to branch debian/master at Libvirt Packaging Team / libvirt


Commits:
4f3e06e4 by Andrea Bolognani at 2021-01-22T00:19:42+01:00
libvirt-daemon-config-*: Install target directories

Although the dependency on libvirt-daemon-system currently
ensure that these directories already exist when the packages
are installed, that's no longer going to be the case once we
can drop the strong Depends and turn it into a weaker
Recommends.

Additionally, including the directory in the packages will
serve as a way for the user to figure out where the
configuration that's generated from the included templates is
stored, so it'd be nice to have regardless of future changes.

Gbp-Dch: Ignore

- - - - -
f5c0ebf5 by Andrea Bolognani at 2021-01-22T00:24:52+01:00
control: Strengthen dependencies between packages

When splitting a package, such as we did when we moved the QEMU
driver from libvirt-daemon to libvirt-daemon-driver-qemu, you
need to maintain at least some level of dependency between the
original package and the new one, or apt will simply not know
that it needs to install the latter in an upgrade scenario.

Using Recommends works for most cases, since Debian systems are
configured to install those by default; however, there are a
couple of cases where it's better to have a stronger dependency.

More specifically, due to the way libvirt has been packaged
until now, people expect that installing the libvirt-daemon
package will result in the QEMU driver being available, and
that installing the libvirt-daemon-system package will result
in the default network and default set of nwfilters being
configured.

The stronger dependencies help both for upgrades and in the
context of other packages' autopkgtests; unfortunately, it
also makes the package less flexible. We're going turn these
Depends back into Recommends once bullseye is out.

- - - - -
ebf12d4c by Andrea Bolognani at 2021-01-22T00:41:11+01:00
control: Avoid circular dependencies

Circular dependencies are best avoided because they can cause
dependency resolution issues, especially during upgrades. In
order to break the cycle, make it so the more specific package,
such as libvirt-daemon-driver-qemu, no longer depends on the
more generic package, in this case libvirt-daemon.

Unfortunately, this means that the user might end up installing
a virtualization driver without getting the daemon itself
installed, which is not the best experience. We will be able to
improve upon that in bookworm by reintroducing these
dependencies once bullseye is out.

- - - - -
25d529bf by Andrea Bolognani at 2021-01-22T00:41:46+01:00
control: Update description for libvirt-daemon-config-*

After the recent changes, it is no longer possible to uninstall
these packages without removing other important parts of
libvirt.

Gbp-Dch: Ignore

- - - - -
d92d4f41 by Andrea Bolognani at 2021-01-22T00:45:01+01:00
libvirt-daemon-system: Update NEWS file

Since it's no longer possible to uninstall
libvirt-daemon-config-* without taking libvirt-daemon-system
along with it, tweak the NEWS entry accordingly to avoid
misinforming the user.

Gbp-Dch: Ignore

- - - - -


4 changed files:

- debian/control
- + debian/libvirt-daemon-config-network.dirs
- + debian/libvirt-daemon-config-nwfilter.dirs
- debian/libvirt-daemon-system.NEWS


Changes:

=====================================
debian/control
=====================================
@@ -124,12 +124,12 @@ Package: libvirt-daemon
 Section: admin
 Architecture: any
 Depends:
+ libvirt-daemon-driver-qemu,
  libvirt0 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
  libvirt-daemon-driver-lxc,
- libvirt-daemon-driver-qemu,
  libvirt-daemon-driver-vbox,
  libvirt-daemon-driver-xen,
  libxml2-utils,
@@ -165,7 +165,6 @@ Package: libvirt-daemon-driver-qemu
 Section: admin
 Architecture: linux-any
 Depends:
- libvirt-daemon (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Breaks:
@@ -323,6 +322,8 @@ Depends:
  iptables (>= 1.8.1-1) [linux-any] | firewalld,
  libvirt-clients (= ${binary:Version}),
  libvirt-daemon (= ${binary:Version}),
+ libvirt-daemon-config-network,
+ libvirt-daemon-config-nwfilter,
  libvirt-daemon-system-systemd | libvirt-daemon-system-sysv,
  logrotate,
  policykit-1 [linux-any],
@@ -331,8 +332,6 @@ Recommends:
  dmidecode,
  dnsmasq-base (>= 2.46-1),
  iproute2,
- libvirt-daemon-config-network,
- libvirt-daemon-config-nwfilter,
  mdevctl,
  parted,
 Suggests:
@@ -403,7 +402,6 @@ Package: libvirt-daemon-config-network
 Section: admin
 Architecture: all
 Depends:
- libvirt-daemon-system (>= ${source:Version}),
  ${misc:Depends},
 Breaks:
  libvirt-daemon-system (<< 6.9.0-2~),
@@ -415,16 +413,12 @@ Description: Libvirt daemon configuration files (default network)
  a long term stable C API for different virtualization mechanisms. It currently
  supports QEMU, KVM, XEN, OpenVZ, LXC, and VirtualBox.
  .
- This package contains the configuration for the 'default' libvirt network,
- which only needs to exist if your VMs are configured to use it or some other
- application expects it to be present; if that's not the case, this package
- can safely be uninstalled.
+ This package contains the configuration for the 'default' libvirt network.
 
 Package: libvirt-daemon-config-nwfilter
 Section: admin
 Architecture: all
 Depends:
- libvirt-daemon-system (>= ${source:Version}),
  ${misc:Depends},
 Breaks:
  libvirt-daemon-system (<< 6.9.0-2~),
@@ -436,10 +430,7 @@ Description: Libvirt daemon configuration files (default network filters)
  a long term stable C API for different virtualization mechanisms. It currently
  supports QEMU, KVM, XEN, OpenVZ, LXC, and VirtualBox.
  .
- This package contains the configuration for the default libvirt network
- filters, which only needs to exist if your VMs are configured to use them or
- some other application expects them to be present; if that's not the case,
- this package can safely be uninstalled.
+ This package contains the configuration for the default set of nwfilters.
 
 Package: libvirt0
 Architecture: any


=====================================
debian/libvirt-daemon-config-network.dirs
=====================================
@@ -0,0 +1 @@
+etc/libvirt/qemu/networks


=====================================
debian/libvirt-daemon-config-nwfilter.dirs
=====================================
@@ -0,0 +1 @@
+etc/libvirt/nwfilter


=====================================
debian/libvirt-daemon-system.NEWS
=====================================
@@ -1,14 +1,11 @@
-libvirt (6.9.0-2) experimental; urgency=medium
+libvirt (6.9.0-4) experimental; urgency=medium
 
   The configuration for the default network and the default set
   of nwfilters have been moved from the libvirt-daemon-system
   package to the new libvirt-daemon-config-network and
-  libvirt-daemon-config-nwfilter packages respectively: this
-  change makes it possible to get rid of either configuration by
-  simply uninstalling the corresponding package or, for new
-  installations, not installing them in the first place.
+  libvirt-daemon-config-nwfilter packages respectively.
 
- -- Andrea Bolognani <eof at kiyuko.org>  Thu, 31 Dec 2020 17:05:45 +0100
+ -- Andrea Bolognani <eof at kiyuko.org>  Thu, 21 Jan 2020 21:54:03 +0100
 
 libvirt (6.0.0-2) unstable; urgency=medium
 



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/31c34e58976918ed89b2ddaf0e658e914ce0a02b...d92d4f410af6fc03fb5d4a189c69c572d489564a

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/31c34e58976918ed89b2ddaf0e658e914ce0a02b...d92d4f410af6fc03fb5d4a189c69c572d489564a
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20210122/2ad0755a/attachment-0001.html>