[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/latest] 2 commits: rules: Fix handling of ARCHES_{QEMU, LXC}

[Andrea Bolognani (@abologna)]

Andrea Bolognani pushed to branch debian/latest at Libvirt Packaging Team / libvirt


Commits:
e380ddb9 by Andrea Bolognani at 2023-08-21T21:48:37+02:00
rules: Fix handling of ARCHES_{QEMU,LXC}

Some contents, notably configuration files, are only installed
by the upstream build system when the corresponding driver has
been enabled.

Most of these changes are quite self-explanatory, but the
test_libvirt_lockd and test_libvirt_sanlock augeas lenses
stand out. Despite the name not suggesting that, they're
actually testing the qemu-lockd.conf and qemu-sanlock.conf
files, so they are only installed if the QEMU driver has been
enabled.

- - - - -
ac7854e6 by Andrea Bolognani at 2023-08-21T22:07:29+02:00
Document changes and release 9.6.0-3

- - - - -


4 changed files:

- debian/changelog
- debian/libvirt-daemon-system.install
- debian/libvirt-daemon.install
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+libvirt (9.6.0-3) experimental; urgency=medium
+
+  * [e380ddb] rules: Fix handling of ARCHES_{QEMU,LXC}
+    - Deal correctly with contents, such as configuration files,
+      that are specific to some hypervisor driver
+
+ -- Andrea Bolognani <eof at kiyuko.org>  Mon, 21 Aug 2023 21:49:04 +0200
+
 libvirt (9.6.0-2) experimental; urgency=medium
 
   * [6456ab6] control: Drop Build-Depends on qemu-system-common


=====================================
debian/libvirt-daemon-system.install
=====================================
@@ -1,6 +1,4 @@
 etc/libvirt/libvirtd.conf
-etc/libvirt/qemu-lockd.conf
-etc/libvirt/qemu.conf
 etc/libvirt/virtlockd.conf
 etc/libvirt/virtlogd.conf
 etc/logrotate.d/libvirtd


=====================================
debian/libvirt-daemon.install
=====================================
@@ -23,8 +23,6 @@ usr/sbin/virtlogd
 usr/share/augeas/lenses/libvirt_lockd.aug
 usr/share/augeas/lenses/libvirt_sanlock.aug
 usr/share/augeas/lenses/libvirtd.aug
-usr/share/augeas/lenses/tests/test_libvirt_lockd.aug
-usr/share/augeas/lenses/tests/test_libvirt_sanlock.aug
 usr/share/augeas/lenses/tests/test_libvirtd.aug
 usr/share/augeas/lenses/tests/test_virtlockd.aug
 usr/share/augeas/lenses/tests/test_virtlogd.aug


=====================================
debian/rules
=====================================
@@ -200,9 +200,14 @@ NSS_PLUGINS = \
 SYSTEMTAP_TAPSETS = \
     libvirt_functions \
     libvirt_probes \
-    libvirt_qemu_probes \
     $(NULL)
 
+ifneq (,$(filter $(DEB_HOST_ARCH), $(ARCHES_QEMU)))
+    SYSTEMTAP_TAPSETS += \
+        libvirt_qemu_probes \
+        $(NULL)
+endif
+
 
 DEB_BUILDDIR := $(CURDIR)/debian/build
 DEB_DESTDIR := $(CURDIR)/debian/tmp
@@ -284,14 +289,22 @@ ifeq ($(DEB_HOST_ARCH_OS), linux)
 	                   usr/share/systemtap/tapset/$${f}.stp; \
 	    done; \
 	fi
-	dh_install -p libvirt-daemon-system etc/libvirt/lxc.conf
-	dh_install -p libvirt-daemon-system etc/libvirt/qemu-sanlock.conf
 	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
 endif
+ifneq (,$(filter $(DEB_HOST_ARCH), $(ARCHES_QEMU)))
+	dh_install -p libvirt-daemon-system etc/libvirt/qemu.conf
+	dh_install -p libvirt-daemon-system etc/libvirt/qemu-lockd.conf
+	dh_install -p libvirt-daemon-system etc/libvirt/qemu-sanlock.conf
+	dh_install -p libvirt-daemon usr/share/augeas/lenses/tests/test_libvirt_lockd.aug
+	dh_install -p libvirt-daemon usr/share/augeas/lenses/tests/test_libvirt_sanlock.aug
+endif
+ifneq (,$(filter $(DEB_HOST_ARCH), $(ARCHES_LXC)))
+	dh_install -p libvirt-daemon-system etc/libvirt/lxc.conf
+endif
 ifneq (,$(filter $(DEB_HOST_ARCH), $(ARCHES_XEN)))
 	dh_install -p libvirt-daemon-system etc/libvirt/libxl.conf
 	dh_install -p libvirt-daemon-system etc/libvirt/libxl-lockd.conf



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/bc8348e63672f892fe17f4612ab372d31c4367d1...ac7854e63915828dfe2562de318e30f67d842e3c

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/bc8348e63672f892fe17f4612ab372d31c4367d1...ac7854e63915828dfe2562de318e30f67d842e3c
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/20230823/a14ebc78/attachment-0001.htm>