retitle 1064126 libvirt: install NSS modules and systemd units into /usr thanks
I noticed that you manually move the systemd units to /lib/systemd via debian/rules. Those should be installed in /usr/lib/systemd as well.
I've updated the patch accordingly. Regards, Michael
diff -Nru libvirt-10.0.0/debian/changelog libvirt-10.0.0/debian/changelog
--- libvirt-10.0.0/debian/changelog 2024-02-04 10:54:58.000000000 +0100
+++ libvirt-10.0.0/debian/changelog 2024-02-17 13:54:36.000000000 +0100
@@ -1,3 +1,10 @@
+libvirt (10.0.0-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Install NSS modules and systemd units into /usr. (Closes: #-1)
+
+ -- Michael Biebl <bi...@debian.org> Sat, 17 Feb 2024 13:54:36 +0100
+
libvirt (10.0.0-2) unstable; urgency=medium
* [9a4ad47] patches: Add backport/scripts-Make-check-symfile[...]
diff -Nru libvirt-10.0.0/debian/libnss-libvirt.install
libvirt-10.0.0/debian/libnss-libvirt.install
--- libvirt-10.0.0/debian/libnss-libvirt.install 2024-02-04
10:54:58.000000000 +0100
+++ libvirt-10.0.0/debian/libnss-libvirt.install 2024-02-17
13:54:36.000000000 +0100
@@ -1,2 +1,4 @@
# the nss module (once enabled) will make apt call getdents (LP: #1732030)
debian/apt/90libnss-libvirt etc/apt/apt.conf.d
+usr/lib/${DEB_HOST_MULTIARCH}/libnss_libvirt.so.2
+usr/lib/${DEB_HOST_MULTIARCH}/libnss_libvirt_guest.so.2
diff -Nru libvirt-10.0.0/debian/libvirt-daemon-system.install
libvirt-10.0.0/debian/libvirt-daemon-system.install
--- libvirt-10.0.0/debian/libvirt-daemon-system.install 2024-02-04
10:54:58.000000000 +0100
+++ libvirt-10.0.0/debian/libvirt-daemon-system.install 2024-02-17
13:54:36.000000000 +0100
@@ -11,6 +11,20 @@
usr/lib/firewalld/policies/libvirt-to-host.xml
usr/lib/firewalld/zones/libvirt-routed.xml
usr/lib/firewalld/zones/libvirt.xml
+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/share/polkit-1/actions/org.libvirt.api.policy
usr/share/polkit-1/actions/org.libvirt.unix.policy
usr/share/polkit-1/rules.d/60-libvirt.rules
diff -Nru libvirt-10.0.0/debian/rules libvirt-10.0.0/debian/rules
--- libvirt-10.0.0/debian/rules 2024-02-04 10:54:58.000000000 +0100
+++ libvirt-10.0.0/debian/rules 2024-02-17 13:54:36.000000000 +0100
@@ -249,11 +249,6 @@
usr.sbin.libvirtd \
$(NULL)
-NSS_PLUGINS = \
- libvirt \
- libvirt_guest \
- $(NULL)
-
SYSTEMTAP_TAPSETS = \
libvirt_functions \
libvirt_probes \
@@ -268,7 +263,6 @@
DEB_BUILDDIR := $(CURDIR)/debian/build
DEB_DESTDIR := $(CURDIR)/debian/tmp
-SRV_MONOLITHIC = libvirt-guests virtlogd virtlockd libvirtd libvirtd-tcp
libvirtd-tls virt-guest-shutdown
# For split daemons later, as of 6.0 the remaining elments are
#SRV_SPLIT = virtnwfilterd virtinterfaced virtlxcd virtnetworkd virtnodedevd
virtproxyd virtqemud virtsecretd virtstoraged virtvboxd virtxend virtproxyd-tcp
virtproxyd-tls
@@ -331,11 +325,6 @@
execute_after_dh_install:
ifeq ($(DEB_HOST_ARCH_OS), linux)
# Linux supports more nice things:
- set -e; for f in $(SRV_MONOLITHIC); do \
- dh_install -p libvirt-daemon-system \
- usr/lib/systemd/system/$${f}* \
- lib/systemd/system/; \
- done
dh_install -p libvirt-daemon usr/lib/libvirt/virt-aa-helper
set -e; for f in $(APPARMOR_ABSTRACTIONS); do \
dh_install -p libvirt-daemon-system
etc/apparmor.d/abstractions/$${f}; \
@@ -354,11 +343,6 @@
usr/share/systemtap/tapset/$${f}.stp; \
done; \
fi
- set -e; for f in $(NSS_PLUGINS); do \
- dh_install -p libnss-libvirt \
- usr/lib/$(DEB_HOST_MULTIARCH)/libnss_$${f}.so.2 \
- lib/$(DEB_HOST_MULTIARCH)/; \
- done
dh_install -p libvirt-clients usr/bin/virt-host-validate
dh_install -p libvirt-clients usr/share/man/man1/virt-host-validate.1
endif
OpenPGP_signature.asc
Description: OpenPGP digital signature
