[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/latest] 11 commits: control: daemon Depends on daemon-log
Andrea Bolognani (@abologna)
gitlab at salsa.debian.org
Wed Nov 13 23:27:42 GMT 2024
Andrea Bolognani pushed to branch debian/latest at Libvirt Packaging Team / libvirt
Commits:
c1978c6b by Andrea Bolognani at 2024-11-08T22:28:55+01:00
control: daemon Depends on daemon-log
libvirtd.service Requires=virtlogd.socket, which means that the
main daemon can't be started at all if the log daemon is not
present. The current relationship (Recommends) is not strong
enough, we need to turn it into a Depends.
See: #1082939
- - - - -
81015c2b by Andrea Bolognani at 2024-11-08T22:28:55+01:00
control: daemon-driver-lxc Depends on daemon-driver-network
This somewhat surprising dependency between drivers is well
documented in the upstream spec file.
- - - - -
f73bb3c2 by Andrea Bolognani at 2024-11-08T22:28:55+01:00
control: daemon-driver-storage-* Depends on daemon-driver-storage
The latter contains the main storage driver, without which none
of the drivers for the various storage technologies can work.
- - - - -
8b727e3a by Andrea Bolognani at 2024-11-08T22:28:55+01:00
control: Fix Depends between arch:any and arch:all packages
When an arch:any package Depends on an arch:all package, the
version constraint should be defined in terms of ${source:Version}
instead of ${binary:Version}. We had gotten this wrong in a
couple of cases.
Closes: #1056988
- - - - -
f316a890 by Andrea Bolognani at 2024-11-08T22:28:55+01:00
control: daemon-driver-storage only Suggests nfs-common
This was the case for the longest time, but the relationship
was accidentally made stronger in 10.6.0-2 when the
daemon-driver-storage binary package was introduced.
Closes: #1081981
- - - - -
7d61238f by Andrea Bolognani at 2024-11-08T22:28:55+01:00
control: Drop Recommends on init system
This is a leftover from when we had separate daemon-system-systemd
and daemon-system-sysv packages and we needed to ensure that only
one of them, specifically the one matching the host's init system,
would be installed.
Now that we are back to shipping both systemd unit files and sysv
init scripts in a single package, this dependency has become
pointless. Not explicitly depending on an init system, in addition
to being more in line with the usual practice for daemons in
Debian, has the advantage of making them suitable for running
inside a container, where the presence of an init system is
generally not necessary or desirable.
Unfortunately this doesn't quite solve things for us since we
still depend on polkitd, which depends on logind, which in turn
will bring in the init system, but at least it gets us closer.
- - - - -
3785ee5a by Andrea Bolognani at 2024-11-08T22:28:55+01:00
control: daemon-driver-qemu Depends on systemd-container
Until the recent split daemon-system had a hard dependency on
this package, which has then been relaxed. In retrospect, that
change didn't make a whole lot of sense, especially since the
daemon can now be installed without the QEMU driver.
- - - - -
96d37752 by Andrea Bolognani at 2024-11-08T22:28:55+01:00
control: daemon-driver-lxc Depends on systemd-container
Just like the QEMU driver, the LXC driver talks to
systemd-machined and needs a matching dependency.
- - - - -
527cf925 by Andrea Bolognani at 2024-11-08T22:28:55+01:00
control: Drop Depends on firewalld
libvirt needs to integrate with firewalld to ensure that the
packet filtering rules it creates to implement guest networking
work as expected and don't get in the way, but if firewalld is
not present on the system there is no loss of functionality.
Hence the dependency is not justified, even as the non-default
option.
- - - - -
d9fb1b09 by Andrea Bolognani at 2024-11-08T22:31:09+01:00
control: daemon-driver-qemu Depends on QEMU itself
The dependency was originally a weak one in order to make it
possible to create a QEMU-less deployment, but today that can
be achieved by uninstalling the daemon-driver-qemu package
itself so we can make things more reasonable.
- - - - -
e994d4c7 by Andrea Bolognani at 2024-11-08T22:31:09+01:00
control: Introduce ARCHES_DMIDECODE
This was made a Recommends to cope with the fact that dmidecode
is not available on all architectures. A better solution is to
make it a Depends only on the architectures where libvirt would
actually use it, which as it happens are also the ones where the
package gets built.
- - - - -
3 changed files:
- debian/arches.mk
- debian/control
- debian/control.in
Changes:
=====================================
debian/arches.mk
=====================================
@@ -4,6 +4,7 @@ ARCHES_QEMU = amd64 arm64 armel armhf i386 loong64 mips64el mipsel powerpc ppc64
ARCHES_LXC = alpha amd64 arm64 armel armhf hppa i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sh4 sparc64 x32
ARCHES_XEN = amd64 arm64 armhf
ARCHES_VBOX = amd64 i386
+ARCHES_DMIDECODE = amd64 arm64 armhf i386 riscv64 loong64 x32
# Keep this list empty until we have AppArmor support
ARCHES_NBDKIT =
=====================================
debian/control
=====================================
@@ -76,7 +76,7 @@ Depends:
${misc:Depends},
${shlibs:Depends},
Suggests:
- libvirt-clients-qemu (= ${binary:Version}) [amd64 arm64 armel armhf i386 loong64 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
+ libvirt-clients-qemu (= ${source:Version}) [amd64 arm64 armel armhf i386 loong64 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sparc64 x32],
libvirt-daemon (= ${binary:Version}) [linux-any],
libvirt-login-shell (= ${binary:Version}) [alpha amd64 arm64 armel armhf hppa i386 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sh4 sparc64 x32],
Breaks:
@@ -142,6 +142,7 @@ Architecture: linux-any
Depends:
libvirt-common (= ${binary:Version}),
libvirt-daemon-common (= ${binary:Version}),
+ libvirt-daemon-log (= ${binary:Version}),
libvirt0 (= ${binary:Version}),
logrotate,
${misc:Depends},
@@ -163,7 +164,6 @@ Recommends:
libvirt-daemon-driver-vbox (= ${binary:Version}) [amd64 i386],
libvirt-daemon-driver-xen (= ${binary:Version}) [amd64 arm64 armhf],
libvirt-daemon-lock (= ${binary:Version}),
- libvirt-daemon-log (= ${binary:Version}),
libvirt-daemon-plugin-lockd (= ${binary:Version}),
libvirt-daemon-plugin-sanlock (= ${binary:Version}),
Suggests:
@@ -194,6 +194,7 @@ Section: admin
Architecture: linux-any
Depends:
adduser,
+ dmidecode [amd64 arm64 armhf i386 riscv64 loong64 x32],
gettext-base,
iproute2,
libvirt-common (= ${binary:Version}),
@@ -203,9 +204,7 @@ Depends:
${misc:Depends},
${shlibs:Depends},
Recommends:
- dmidecode,
netcat-openbsd,
- systemd-sysv | sysvinit-core,
Suggests:
apparmor,
auditd,
@@ -284,14 +283,14 @@ Depends:
libvirt-daemon-log (= ${binary:Version}),
libvirt0 (= ${binary:Version}),
logrotate,
+ qemu-kvm | qemu-system,
+ systemd-container | sysvinit-core,
${misc:Depends},
${shlibs:Depends},
Recommends:
passt,
- qemu-kvm | qemu-system,
swtpm,
swtpm-tools,
- systemd-container | sysvinit-core,
Suggests:
numad,
Enhances:
@@ -318,8 +317,10 @@ Multi-Arch: no
Depends:
libvirt-common (= ${binary:Version}),
libvirt-daemon (= ${binary:Version}),
+ libvirt-daemon-driver-network (= ${binary:Version}),
libvirt0 (= ${binary:Version}),
logrotate,
+ systemd-container | sysvinit-core,
${misc:Depends},
${shlibs:Depends},
Breaks:
@@ -388,9 +389,10 @@ Depends:
libvirt-daemon (= ${binary:Version}),
libvirt0 (= ${binary:Version}),
mount,
- nfs-common,
${misc:Depends},
${shlibs:Depends},
+Suggests:
+ nfs-common,
Breaks:
libvirt-daemon (<< 10.6.0-2~),
Replaces:
@@ -410,6 +412,7 @@ Multi-arch: no
Depends:
libvirt-common (= ${binary:Version}),
libvirt-daemon (= ${binary:Version}),
+ libvirt-daemon-driver-storage (= ${binary:Version}),
libvirt0 (= ${binary:Version}),
parted,
${misc:Depends},
@@ -434,6 +437,7 @@ Multi-Arch: no
Depends:
libvirt-common (= ${binary:Version}),
libvirt-daemon (= ${binary:Version}),
+ libvirt-daemon-driver-storage (= ${binary:Version}),
libvirt0 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
@@ -452,6 +456,7 @@ Multi-arch: no
Depends:
libvirt-common (= ${binary:Version}),
libvirt-daemon (= ${binary:Version}),
+ libvirt-daemon-driver-storage (= ${binary:Version}),
libvirt0 (= ${binary:Version}),
open-iscsi,
${misc:Depends},
@@ -475,6 +480,7 @@ Multi-Arch: no
Depends:
libvirt-common (= ${binary:Version}),
libvirt-daemon (= ${binary:Version}),
+ libvirt-daemon-driver-storage (= ${binary:Version}),
libvirt0 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
@@ -496,6 +502,7 @@ Multi-arch: no
Depends:
libvirt-common (= ${binary:Version}),
libvirt-daemon (= ${binary:Version}),
+ libvirt-daemon-driver-storage (= ${binary:Version}),
libvirt0 (= ${binary:Version}),
lvm2,
${misc:Depends},
@@ -520,6 +527,7 @@ Multi-arch: no
Depends:
libvirt-common (= ${binary:Version}),
libvirt-daemon (= ${binary:Version}),
+ libvirt-daemon-driver-storage (= ${binary:Version}),
libvirt0 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
@@ -542,6 +550,7 @@ Multi-Arch: no
Depends:
libvirt-common (= ${binary:Version}),
libvirt-daemon (= ${binary:Version}),
+ libvirt-daemon-driver-storage (= ${binary:Version}),
libvirt0 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
@@ -560,6 +569,7 @@ Multi-arch: no
Depends:
libvirt-common (= ${binary:Version}),
libvirt-daemon (= ${binary:Version}),
+ libvirt-daemon-driver-storage (= ${binary:Version}),
libvirt0 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
@@ -582,6 +592,7 @@ Multi-Arch: no
Depends:
libvirt-common (= ${binary:Version}),
libvirt-daemon (= ${binary:Version}),
+ libvirt-daemon-driver-storage (= ${binary:Version}),
libvirt0 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
@@ -601,7 +612,7 @@ Architecture: linux-any
Multi-arch: no
Depends:
dnsmasq-base,
- iptables | firewalld,
+ iptables,
libvirt-common (= ${binary:Version}),
libvirt-daemon (= ${binary:Version}),
libvirt0 (= ${binary:Version}),
@@ -883,7 +894,7 @@ Depends:
${misc:Depends},
${shlibs:Depends},
Recommends:
- libvirt-l10n (= ${binary:Version}),
+ libvirt-l10n (= ${source:Version}),
Description: library for interfacing with different virtualization systems
Libvirt is a C toolkit to interact with the virtualization capabilities
of recent versions of Linux (and other OSes). The library aims at providing
=====================================
debian/control.in
=====================================
@@ -76,7 +76,7 @@ Depends:
${misc:Depends},
${shlibs:Depends},
Suggests:
- libvirt-clients-qemu (= ${binary:Version}) [${ARCHES_QEMU}],
+ libvirt-clients-qemu (= ${source:Version}) [${ARCHES_QEMU}],
libvirt-daemon (= ${binary:Version}) [linux-any],
libvirt-login-shell (= ${binary:Version}) [${ARCHES_LXC}],
Breaks:
@@ -142,6 +142,7 @@ Architecture: linux-any
Depends:
libvirt-common (= ${binary:Version}),
libvirt-daemon-common (= ${binary:Version}),
+ libvirt-daemon-log (= ${binary:Version}),
libvirt0 (= ${binary:Version}),
logrotate,
${misc:Depends},
@@ -163,7 +164,6 @@ Recommends:
libvirt-daemon-driver-vbox (= ${binary:Version}) [${ARCHES_VBOX}],
libvirt-daemon-driver-xen (= ${binary:Version}) [${ARCHES_XEN}],
libvirt-daemon-lock (= ${binary:Version}),
- libvirt-daemon-log (= ${binary:Version}),
libvirt-daemon-plugin-lockd (= ${binary:Version}),
libvirt-daemon-plugin-sanlock (= ${binary:Version}),
Suggests:
@@ -194,6 +194,7 @@ Section: admin
Architecture: linux-any
Depends:
adduser,
+ dmidecode [${ARCHES_DMIDECODE}],
gettext-base,
iproute2,
libvirt-common (= ${binary:Version}),
@@ -203,9 +204,7 @@ Depends:
${misc:Depends},
${shlibs:Depends},
Recommends:
- dmidecode,
netcat-openbsd,
- systemd-sysv | sysvinit-core,
Suggests:
apparmor,
auditd,
@@ -284,14 +283,14 @@ Depends:
libvirt-daemon-log (= ${binary:Version}),
libvirt0 (= ${binary:Version}),
logrotate,
+ qemu-kvm | qemu-system,
+ systemd-container | sysvinit-core,
${misc:Depends},
${shlibs:Depends},
Recommends:
passt,
- qemu-kvm | qemu-system,
swtpm,
swtpm-tools,
- systemd-container | sysvinit-core,
Suggests:
numad,
Enhances:
@@ -318,8 +317,10 @@ Multi-Arch: no
Depends:
libvirt-common (= ${binary:Version}),
libvirt-daemon (= ${binary:Version}),
+ libvirt-daemon-driver-network (= ${binary:Version}),
libvirt0 (= ${binary:Version}),
logrotate,
+ systemd-container | sysvinit-core,
${misc:Depends},
${shlibs:Depends},
Breaks:
@@ -388,9 +389,10 @@ Depends:
libvirt-daemon (= ${binary:Version}),
libvirt0 (= ${binary:Version}),
mount,
- nfs-common,
${misc:Depends},
${shlibs:Depends},
+Suggests:
+ nfs-common,
Breaks:
libvirt-daemon (<< 10.6.0-2~),
Replaces:
@@ -410,6 +412,7 @@ Multi-arch: no
Depends:
libvirt-common (= ${binary:Version}),
libvirt-daemon (= ${binary:Version}),
+ libvirt-daemon-driver-storage (= ${binary:Version}),
libvirt0 (= ${binary:Version}),
parted,
${misc:Depends},
@@ -434,6 +437,7 @@ Multi-Arch: no
Depends:
libvirt-common (= ${binary:Version}),
libvirt-daemon (= ${binary:Version}),
+ libvirt-daemon-driver-storage (= ${binary:Version}),
libvirt0 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
@@ -452,6 +456,7 @@ Multi-arch: no
Depends:
libvirt-common (= ${binary:Version}),
libvirt-daemon (= ${binary:Version}),
+ libvirt-daemon-driver-storage (= ${binary:Version}),
libvirt0 (= ${binary:Version}),
open-iscsi,
${misc:Depends},
@@ -475,6 +480,7 @@ Multi-Arch: no
Depends:
libvirt-common (= ${binary:Version}),
libvirt-daemon (= ${binary:Version}),
+ libvirt-daemon-driver-storage (= ${binary:Version}),
libvirt0 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
@@ -496,6 +502,7 @@ Multi-arch: no
Depends:
libvirt-common (= ${binary:Version}),
libvirt-daemon (= ${binary:Version}),
+ libvirt-daemon-driver-storage (= ${binary:Version}),
libvirt0 (= ${binary:Version}),
lvm2,
${misc:Depends},
@@ -520,6 +527,7 @@ Multi-arch: no
Depends:
libvirt-common (= ${binary:Version}),
libvirt-daemon (= ${binary:Version}),
+ libvirt-daemon-driver-storage (= ${binary:Version}),
libvirt0 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
@@ -542,6 +550,7 @@ Multi-Arch: no
Depends:
libvirt-common (= ${binary:Version}),
libvirt-daemon (= ${binary:Version}),
+ libvirt-daemon-driver-storage (= ${binary:Version}),
libvirt0 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
@@ -560,6 +569,7 @@ Multi-arch: no
Depends:
libvirt-common (= ${binary:Version}),
libvirt-daemon (= ${binary:Version}),
+ libvirt-daemon-driver-storage (= ${binary:Version}),
libvirt0 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
@@ -582,6 +592,7 @@ Multi-Arch: no
Depends:
libvirt-common (= ${binary:Version}),
libvirt-daemon (= ${binary:Version}),
+ libvirt-daemon-driver-storage (= ${binary:Version}),
libvirt0 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
@@ -601,7 +612,7 @@ Architecture: linux-any
Multi-arch: no
Depends:
dnsmasq-base,
- iptables | firewalld,
+ iptables,
libvirt-common (= ${binary:Version}),
libvirt-daemon (= ${binary:Version}),
libvirt0 (= ${binary:Version}),
@@ -883,7 +894,7 @@ Depends:
${misc:Depends},
${shlibs:Depends},
Recommends:
- libvirt-l10n (= ${binary:Version}),
+ libvirt-l10n (= ${source:Version}),
Description: library for interfacing with different virtualization systems
Libvirt is a C toolkit to interact with the virtualization capabilities
of recent versions of Linux (and other OSes). The library aims at providing
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/49e8455738b77c25b842faa835b3aa70eb7d5898...e994d4c7ffbe1953405310b5ef2dc4ee20ff0ea9
--
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/49e8455738b77c25b842faa835b3aa70eb7d5898...e994d4c7ffbe1953405310b5ef2dc4ee20ff0ea9
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/20241113/713e5d4d/attachment-0001.htm>
More information about the Pkg-libvirt-commits
mailing list