[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/latest] 2 commits: Drop obsolete package transition logic
Andrea Bolognani (@abologna)
gitlab at salsa.debian.org
Sun Jan 15 10:45:19 GMT 2023
Andrea Bolognani pushed to branch debian/latest at Libvirt Packaging Team / libvirt
Commits:
40fe229d by Andrea Bolognani at 2023-01-15T10:05:52+00:00
Drop obsolete package transition logic
All the packaging changes that the Break/Replaces relationships
and the maintainer script bits are there for predate libvirt
6.0.0-1, the version in Ubuntu 20.04.
So we can assume that all the corresponding changes have already
been performed on the target systems and drop a bunch of dead
code.
- - - - -
5bb56e96 by Andrea Bolognani at 2023-01-15T10:05:52+00:00
Drop obsolete UML-related files
The UML driver has been dropped upstream in libvirt 5.0.0, but
some files related to it have survived in the Debian package to
this day. Finally get rid of them.
- - - - -
4 changed files:
- debian/control
- debian/libvirt-daemon-system.dirs
- − debian/libvirt-daemon-system.maintscript
- debian/libvirt-daemon-system.postinst
Changes:
=====================================
debian/control
=====================================
@@ -182,10 +182,8 @@ Depends:
${shlibs:Depends},
Breaks:
libvirt-clients (<< 6.9.0-2~),
- libvirt-daemon (<< 6.0.0-1~),
Replaces:
libvirt-clients (<< 6.9.0-2~),
- libvirt-daemon (<< 6.0.0-1~),
Recommends:
swtpm,
swtpm-tools,
@@ -227,10 +225,6 @@ Depends:
libvirt0 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
-Breaks:
- libvirt-daemon (<< 6.0.0-1~),
-Replaces:
- libvirt-daemon (<< 6.0.0-1~),
Description: Virtualization daemon VirtualBox connection driver
Libvirt is a C toolkit to interact with the virtualization capabilities
of recent versions of Linux (and other OSes). The library aims at providing
@@ -248,10 +242,6 @@ Depends:
libvirt0 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
-Breaks:
- libvirt-daemon (<< 6.0.0-1~),
-Replaces:
- libvirt-daemon (<< 6.0.0-1~),
Description: Virtualization daemon Xen connection driver
Libvirt is a C toolkit to interact with the virtualization capabilities
of recent versions of Linux (and other OSes). The library aims at providing
@@ -269,10 +259,6 @@ Depends:
libvirt0 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
-Breaks:
- libvirt-daemon (<< 3.7.0-3~),
-Replaces:
- libvirt-daemon (<< 3.7.0-3~),
Description: Virtualization daemon glusterfs storage driver
Libvirt is a C toolkit to interact with the virtualization capabilities
of recent versions of Linux (and other OSes). The library aims at providing
@@ -310,10 +296,6 @@ Depends:
libvirt0 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
-Breaks:
- libvirt-daemon (<< 3.7.0-3~),
-Replaces:
- libvirt-daemon (<< 3.7.0-3~),
Description: Virtualization daemon RBD storage driver
Libvirt is a C toolkit to interact with the virtualization capabilities
of recent versions of Linux (and other OSes). The library aims at providing
@@ -331,10 +313,6 @@ Depends:
libvirt0 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
-Breaks:
- libvirt-daemon (<< 3.7.0-3~),
-Replaces:
- libvirt-daemon (<< 3.7.0-3~),
Description: Virtualization daemon ZFS storage driver
Libvirt is a C toolkit to interact with the virtualization capabilities
of recent versions of Linux (and other OSes). The library aims at providing
@@ -408,10 +386,6 @@ Architecture: all
Depends:
lsb-base,
${misc:Depends},
-Breaks:
- libvirt-daemon-system (<< 5.6.0-4~),
-Replaces:
- libvirt-daemon-system (<< 5.6.0-4~),
Description: Libvirt daemon configuration files (sysv)
Libvirt is a C toolkit to interact with the virtualization capabilities
of recent versions of Linux (and other OSes). The library aims at providing
@@ -466,10 +440,6 @@ Depends:
${shlibs:Depends},
Recommends:
libvirt-l10n (= ${binary:Version}),
-Breaks:
- libvirt-daemon (<< 4.10.0-2~),
-Replaces:
- libvirt-daemon (<< 4.10.0-2~),
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/libvirt-daemon-system.dirs
=====================================
@@ -12,4 +12,3 @@ var/lib/libvirt/qemu/channel/target
var/lib/libvirt/sanlock
var/log/libvirt/lxc
var/log/libvirt/qemu
-var/log/libvirt/uml
=====================================
debian/libvirt-daemon-system.maintscript deleted
=====================================
@@ -1,5 +0,0 @@
-# drop sysV scripts to avoid upgrade issues with virtlogd-admin.socket (LP: #1786179)
-rm_conffile /etc/init.d/libvirt-guests 5.6.0-3~ libvirt-daemon-system
-rm_conffile /etc/init.d/libvirtd 5.6.0-3~ libvirt-daemon-system
-rm_conffile /etc/init.d/virtlogd 5.6.0-3~ libvirt-daemon-system
-rm_conffile /etc/logrotate.d/libvirtd.uml 5.0.0-2~
=====================================
debian/libvirt-daemon-system.postinst
=====================================
@@ -114,11 +114,15 @@ case "$1" in
# Make sure the directories don't get removed on package removal since
# logrotate chokes otherwise.
- for dir in qemu uml lxc; do
+ for dir in qemu lxc; do
touch /var/log/libvirt/"${dir}"/.placeholder
done
- # Remove left over empty directory from pre 1.2.7
- [ ! -d /etc/apparmor.d/libvirtd ] || rmdir --ignore-fail-on-non-empty /etc/apparmor.d/libvirtd
+
+ # Obsolete UML stuff included until 8.10.0-4
+ rm -f /var/log/libvirt/uml/.placeholder
+ if [ -d /var/log/libvirt/uml ]; then
+ rmdir --ignore-fail-on-non-empty /var/log/libvirt/uml
+ fi
# Force refresh of capabilities (#731815)
rm -f /var/cache/libvirt/qemu/capabilities/*.xml
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/45d077a29b177d3139b3f3a49dff364ad5bae30e...5bb56e96b16df54e8166d4fdb5d710ee3e4baaff
--
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/45d077a29b177d3139b3f3a49dff364ad5bae30e...5bb56e96b16df54e8166d4fdb5d710ee3e4baaff
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/20230115/fcf8ccd7/attachment-0001.htm>
More information about the Pkg-libvirt-commits
mailing list