[Pkg-libvirt-maintainers] Bug#1064126: libvirt: install NSS modules into /usr
Michael Biebl
biebl at debian.org
Tue Aug 6 21:46:36 BST 2024
Hi Andrea
On Sat, 17 Feb 2024 14:01:59 +0100 Michael Biebl <biebl at debian.org> wrote:
> Source: libvirt
> Version: 10.0.0-2
> Severity: normal
> Tags: patch
> User: helmutg at debian.org
> Usertags: dep17m2
>
> We want to finalize the /usr-merge via DEP17 by moving all files to
> /usr. libvirt installs files into /lib; these should be moved into the
> respective canonical locations in /usr/.
>
> Please find a patch attached. It has been build-tested.
>
> This should not be backported to bookworm. If you intend to
> backport, please use dh_movetousr instead.
>
> If your package will change for the t64 transition or otherwise
> rename/split/move its binaries (packages) during trixie, please
> then upload to experimental and get in touch with the UsrMerge
> driver, please see the wiki [1].
>
> Michael
>
> [1] https://wiki.debian.org/UsrMerge
I just uploaded the attached debdiff to DELAYED/7.
As discussed in this bug report, the changes for usrmerge *must* happen
for trixie and are not optional. So it is better to get those out of the
way. Your planned package restructuring can still happen for trixie, but
in this case, please upload to experimental first as dumat will then
flag the potential issues. Please get in contact with the usrmerge team
then and we are happy to assist you.
I acknowledge that you wanted to do the usrmove changes and the package
restructuring at the same time. But experience has shown that it's
actually better to do those separately.
Regards,
Michael
-------------- next part --------------
diff -Nru libvirt-10.5.0/debian/changelog libvirt-10.5.0/debian/changelog
--- libvirt-10.5.0/debian/changelog 2024-07-04 00:44:29.000000000 +0200
+++ libvirt-10.5.0/debian/changelog 2024-08-06 21:54:36.000000000 +0200
@@ -1,3 +1,10 @@
+libvirt (10.5.0-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * Install NSS modules and systemd units into /usr (Closes: #1064126)
+
+ -- Michael Biebl <biebl at debian.org> Tue, 06 Aug 2024 21:54:36 +0200
+
libvirt (10.5.0-1) unstable; urgency=medium
* [a8c62f5] New upstream version 10.5.0
diff -Nru libvirt-10.5.0/debian/libnss-libvirt.install libvirt-10.5.0/debian/libnss-libvirt.install
--- libvirt-10.5.0/debian/libnss-libvirt.install 2024-07-04 00:44:29.000000000 +0200
+++ libvirt-10.5.0/debian/libnss-libvirt.install 2024-08-06 21:54:36.000000000 +0200
@@ -1,3 +1,3 @@
etc/apt/apt.conf.d/90libnss-libvirt
-lib/${DEB_HOST_MULTIARCH}/libnss_libvirt.so.2
-lib/${DEB_HOST_MULTIARCH}/libnss_libvirt_guest.so.2
+usr/lib/${DEB_HOST_MULTIARCH}/libnss_libvirt.so.2
+usr/lib/${DEB_HOST_MULTIARCH}/libnss_libvirt_guest.so.2
diff -Nru libvirt-10.5.0/debian/libnss-libvirt.install.in libvirt-10.5.0/debian/libnss-libvirt.install.in
--- libvirt-10.5.0/debian/libnss-libvirt.install.in 2024-07-04 00:44:29.000000000 +0200
+++ libvirt-10.5.0/debian/libnss-libvirt.install.in 2024-08-06 21:54:36.000000000 +0200
@@ -1,3 +1,3 @@
etc/apt/apt.conf.d/90libnss-libvirt
-lib/${DEB_HOST_MULTIARCH}/libnss_libvirt.so.2
-lib/${DEB_HOST_MULTIARCH}/libnss_libvirt_guest.so.2
+usr/lib/${DEB_HOST_MULTIARCH}/libnss_libvirt.so.2
+usr/lib/${DEB_HOST_MULTIARCH}/libnss_libvirt_guest.so.2
diff -Nru libvirt-10.5.0/debian/libvirt-daemon-system.install libvirt-10.5.0/debian/libvirt-daemon-system.install
--- libvirt-10.5.0/debian/libvirt-daemon-system.install 2024-07-04 00:44:29.000000000 +0200
+++ libvirt-10.5.0/debian/libvirt-daemon-system.install 2024-08-06 21:54:36.000000000 +0200
@@ -20,20 +20,20 @@
etc/logrotate.d/libvirtd.lxc
etc/logrotate.d/libvirtd.qemu
etc/sasl2/libvirt.conf
-lib/systemd/system/libvirt-guests.service
-lib/systemd/system/libvirtd-admin.socket
-lib/systemd/system/libvirtd-ro.socket
-lib/systemd/system/libvirtd-tcp.socket
-lib/systemd/system/libvirtd-tls.socket
-lib/systemd/system/libvirtd.service
-lib/systemd/system/libvirtd.socket
-lib/systemd/system/virt-guest-shutdown.target
-lib/systemd/system/virtlockd-admin.socket
-lib/systemd/system/virtlockd.service
-lib/systemd/system/virtlockd.socket
-lib/systemd/system/virtlogd-admin.socket
-lib/systemd/system/virtlogd.service
-lib/systemd/system/virtlogd.socket
+usr/lib/systemd/system/libvirt-guests.service
+usr/lib/systemd/system/libvirtd-admin.socket
+usr/lib/systemd/system/libvirtd-ro.socket
+usr/lib/systemd/system/libvirtd-tcp.socket
+usr/lib/systemd/system/libvirtd-tls.socket
+usr/lib/systemd/system/libvirtd.service
+usr/lib/systemd/system/libvirtd.socket
+usr/lib/systemd/system/virt-guest-shutdown.target
+usr/lib/systemd/system/virtlockd-admin.socket
+usr/lib/systemd/system/virtlockd.service
+usr/lib/systemd/system/virtlockd.socket
+usr/lib/systemd/system/virtlogd-admin.socket
+usr/lib/systemd/system/virtlogd.service
+usr/lib/systemd/system/virtlogd.socket
usr/lib/firewalld/policies/libvirt-routed-in.xml
usr/lib/firewalld/policies/libvirt-routed-out.xml
usr/lib/firewalld/policies/libvirt-to-host.xml
diff -Nru libvirt-10.5.0/debian/libvirt-daemon-system.install.in libvirt-10.5.0/debian/libvirt-daemon-system.install.in
--- libvirt-10.5.0/debian/libvirt-daemon-system.install.in 2024-07-04 00:44:29.000000000 +0200
+++ libvirt-10.5.0/debian/libvirt-daemon-system.install.in 2024-08-06 21:54:36.000000000 +0200
@@ -20,20 +20,20 @@
etc/logrotate.d/libvirtd.lxc
etc/logrotate.d/libvirtd.qemu
etc/sasl2/libvirt.conf
-lib/systemd/system/libvirt-guests.service
-lib/systemd/system/libvirtd-admin.socket
-lib/systemd/system/libvirtd-ro.socket
-lib/systemd/system/libvirtd-tcp.socket
-lib/systemd/system/libvirtd-tls.socket
-lib/systemd/system/libvirtd.service
-lib/systemd/system/libvirtd.socket
-lib/systemd/system/virt-guest-shutdown.target
-lib/systemd/system/virtlockd-admin.socket
-lib/systemd/system/virtlockd.service
-lib/systemd/system/virtlockd.socket
-lib/systemd/system/virtlogd-admin.socket
-lib/systemd/system/virtlogd.service
-lib/systemd/system/virtlogd.socket
+usr/lib/systemd/system/libvirt-guests.service
+usr/lib/systemd/system/libvirtd-admin.socket
+usr/lib/systemd/system/libvirtd-ro.socket
+usr/lib/systemd/system/libvirtd-tcp.socket
+usr/lib/systemd/system/libvirtd-tls.socket
+usr/lib/systemd/system/libvirtd.service
+usr/lib/systemd/system/libvirtd.socket
+usr/lib/systemd/system/virt-guest-shutdown.target
+usr/lib/systemd/system/virtlockd-admin.socket
+usr/lib/systemd/system/virtlockd.service
+usr/lib/systemd/system/virtlockd.socket
+usr/lib/systemd/system/virtlogd-admin.socket
+usr/lib/systemd/system/virtlogd.service
+usr/lib/systemd/system/virtlogd.socket
usr/lib/firewalld/policies/libvirt-routed-in.xml
usr/lib/firewalld/policies/libvirt-routed-out.xml
usr/lib/firewalld/policies/libvirt-to-host.xml
diff -Nru libvirt-10.5.0/debian/not-installed libvirt-10.5.0/debian/not-installed
--- libvirt-10.5.0/debian/not-installed 2024-07-04 00:44:29.000000000 +0200
+++ libvirt-10.5.0/debian/not-installed 2024-08-06 21:54:36.000000000 +0200
@@ -24,52 +24,52 @@
etc/libvirt/virtstoraged.conf
etc/libvirt/virtvboxd.conf
etc/libvirt/virtxend.conf
-lib/systemd/system/virtinterfaced-admin.socket
-lib/systemd/system/virtinterfaced-ro.socket
-lib/systemd/system/virtinterfaced.service
-lib/systemd/system/virtinterfaced.socket
-lib/systemd/system/virtlxcd-admin.socket
-lib/systemd/system/virtlxcd-ro.socket
-lib/systemd/system/virtlxcd.service
-lib/systemd/system/virtlxcd.socket
-lib/systemd/system/virtnetworkd-admin.socket
-lib/systemd/system/virtnetworkd-ro.socket
-lib/systemd/system/virtnetworkd.service
-lib/systemd/system/virtnetworkd.socket
-lib/systemd/system/virtnodedevd-admin.socket
-lib/systemd/system/virtnodedevd-ro.socket
-lib/systemd/system/virtnodedevd.service
-lib/systemd/system/virtnodedevd.socket
-lib/systemd/system/virtnwfilterd-admin.socket
-lib/systemd/system/virtnwfilterd-ro.socket
-lib/systemd/system/virtnwfilterd.service
-lib/systemd/system/virtnwfilterd.socket
-lib/systemd/system/virtproxyd-admin.socket
-lib/systemd/system/virtproxyd-ro.socket
-lib/systemd/system/virtproxyd-tcp.socket
-lib/systemd/system/virtproxyd-tls.socket
-lib/systemd/system/virtproxyd.service
-lib/systemd/system/virtproxyd.socket
-lib/systemd/system/virtqemud-admin.socket
-lib/systemd/system/virtqemud-ro.socket
-lib/systemd/system/virtqemud.service
-lib/systemd/system/virtqemud.socket
-lib/systemd/system/virtsecretd-admin.socket
-lib/systemd/system/virtsecretd-ro.socket
-lib/systemd/system/virtsecretd.service
-lib/systemd/system/virtsecretd.socket
-lib/systemd/system/virtstoraged-admin.socket
-lib/systemd/system/virtstoraged-ro.socket
-lib/systemd/system/virtstoraged.service
-lib/systemd/system/virtstoraged.socket
-lib/systemd/system/virtvboxd-admin.socket
-lib/systemd/system/virtvboxd-ro.socket
-lib/systemd/system/virtvboxd.service
-lib/systemd/system/virtvboxd.socket
-lib/systemd/system/virtxend-admin.socket
-lib/systemd/system/virtxend-ro.socket
-lib/systemd/system/virtxend.service
-lib/systemd/system/virtxend.socket
+usr/lib/systemd/system/virtinterfaced-admin.socket
+usr/lib/systemd/system/virtinterfaced-ro.socket
+usr/lib/systemd/system/virtinterfaced.service
+usr/lib/systemd/system/virtinterfaced.socket
+usr/lib/systemd/system/virtlxcd-admin.socket
+usr/lib/systemd/system/virtlxcd-ro.socket
+usr/lib/systemd/system/virtlxcd.service
+usr/lib/systemd/system/virtlxcd.socket
+usr/lib/systemd/system/virtnetworkd-admin.socket
+usr/lib/systemd/system/virtnetworkd-ro.socket
+usr/lib/systemd/system/virtnetworkd.service
+usr/lib/systemd/system/virtnetworkd.socket
+usr/lib/systemd/system/virtnodedevd-admin.socket
+usr/lib/systemd/system/virtnodedevd-ro.socket
+usr/lib/systemd/system/virtnodedevd.service
+usr/lib/systemd/system/virtnodedevd.socket
+usr/lib/systemd/system/virtnwfilterd-admin.socket
+usr/lib/systemd/system/virtnwfilterd-ro.socket
+usr/lib/systemd/system/virtnwfilterd.service
+usr/lib/systemd/system/virtnwfilterd.socket
+usr/lib/systemd/system/virtproxyd-admin.socket
+usr/lib/systemd/system/virtproxyd-ro.socket
+usr/lib/systemd/system/virtproxyd-tcp.socket
+usr/lib/systemd/system/virtproxyd-tls.socket
+usr/lib/systemd/system/virtproxyd.service
+usr/lib/systemd/system/virtproxyd.socket
+usr/lib/systemd/system/virtqemud-admin.socket
+usr/lib/systemd/system/virtqemud-ro.socket
+usr/lib/systemd/system/virtqemud.service
+usr/lib/systemd/system/virtqemud.socket
+usr/lib/systemd/system/virtsecretd-admin.socket
+usr/lib/systemd/system/virtsecretd-ro.socket
+usr/lib/systemd/system/virtsecretd.service
+usr/lib/systemd/system/virtsecretd.socket
+usr/lib/systemd/system/virtstoraged-admin.socket
+usr/lib/systemd/system/virtstoraged-ro.socket
+usr/lib/systemd/system/virtstoraged.service
+usr/lib/systemd/system/virtstoraged.socket
+usr/lib/systemd/system/virtvboxd-admin.socket
+usr/lib/systemd/system/virtvboxd-ro.socket
+usr/lib/systemd/system/virtvboxd.service
+usr/lib/systemd/system/virtvboxd.socket
+usr/lib/systemd/system/virtxend-admin.socket
+usr/lib/systemd/system/virtxend-ro.socket
+usr/lib/systemd/system/virtxend.service
+usr/lib/systemd/system/virtxend.socket
usr/lib/sysusers.d/libvirt-qemu.conf
usr/sbin/virtinterfaced
usr/sbin/virtlxcd
diff -Nru libvirt-10.5.0/debian/rules libvirt-10.5.0/debian/rules
--- libvirt-10.5.0/debian/rules 2024-07-04 00:44:29.000000000 +0200
+++ libvirt-10.5.0/debian/rules 2024-08-06 21:53:01.000000000 +0200
@@ -267,11 +267,6 @@
# Disable network autostart
rm -rf $(DEB_DESTDIR)/etc/libvirt/qemu/networks/autostart/
- # Move systemd units
- mkdir -p $(DEB_DESTDIR)/lib/systemd/system/
- mv $(DEB_DESTDIR)/usr/lib/systemd/system/* \
- $(DEB_DESTDIR)/lib/systemd/system/
-
# Move systcl files (we consider them examples)
mkdir -p $(DEB_DESTDIR)/usr/share/doc/libvirt/examples/sysctl/
mv $(DEB_DESTDIR)/usr/lib/sysctl.d/* \
@@ -287,11 +282,6 @@
mv $(DEB_DESTDIR)/etc/libvirt/nwfilter/* \
$(DEB_DESTDIR)/usr/share/libvirt/nwfilter/
- # Move NSS modules
- mkdir -p $(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH)/
- mv $(DEB_DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/libnss_* \
- $(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH)/
-
# Rename the upstream polkit rule so that it matches the name used
# historically in Debian
mv $(DEB_DESTDIR)/usr/share/polkit-1/rules.d/50-libvirt.rules \
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature.asc
Type: application/pgp-signature
Size: 840 bytes
Desc: OpenPGP digital signature
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-maintainers/attachments/20240806/14f7e18d/attachment.sig>
More information about the Pkg-libvirt-maintainers
mailing list