[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/master] 4 commits: patches: Add backport/[...]gluster-module-dep.patch

[Guido Günther]

Guido Günther pushed to branch debian/master at Libvirt Packaging Team / libvirt


Commits:
7b7ff736 by Andrea Bolognani at 2020-09-10T18:27:35+02:00
patches: Add backport/[...]gluster-module-dep.patch

This fixes a linking issue with the gluster storage driver that
can prevent startup even for VMs that don't use gluster.

- - - - -
a9cc391d by Andrea Bolognani at 2020-09-10T18:28:15+02:00
debhelper: Use compat level 13

This is the current recommended mode of operation for debhelper.

More specifically, we're interested in the fact that dh_auto_test
will now invoke 'meson test' instead of 'ninja test', which is
something we need in order to use a longer timeout for tests.

- - - - -
b327f9a3 by Andrea Bolognani at 2020-09-10T18:28:15+02:00
rules: Increase timeout for tests to 15m

The recent 6.7.0-1 upload has FTBFS on a few architectures (namely
armel, mips64el, mipsel and riscv64) not due to compiler errors or
anything like that, but because of test suite failures which were
caused by the fact that Meson automatically aborts any test
program that takes longer than 30s to complete.

Since some buildds are known to be quite slow, bump the limit to
15m in order to give them a chance to complete.

Note that this is likely an excessively generous time allocation,
but I currently have no idea what a reasonable one would be: once
builds have completed successfully and we see how long running the
tests actually takes, we can reduce it accordingly.

- - - - -
d21edffd by Andrea Bolognani at 2020-09-10T18:29:49+02:00
Document changes and release 6.7.0-2

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/backport/src-storage-meson-fix-vir_storage_file_gluster-module-dep.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+libvirt (6.7.0-2) experimental; urgency=medium
+
+  * [7b7ff73] patches: Add backport/[...]gluster-module-dep.patch
+  * [a9cc391] debhelper: Use compat level 13
+  * [b327f9a] rules: Increase timeout for tests to 15m
+
+ -- Andrea Bolognani <eof at kiyuko.org>  Thu, 10 Sep 2020 18:29:25 +0200
+
 libvirt (6.7.0-1) experimental; urgency=medium
 
   * Team upload


=====================================
debian/control
=====================================
@@ -8,7 +8,7 @@ Uploaders:
 Build-Depends:
  augeas-tools,
  bash-completion,
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
  dh-apparmor [linux-any],
  dnsmasq-base,
  iptables (>= 1.8.1) [linux-any],


=====================================
debian/patches/backport/src-storage-meson-fix-vir_storage_file_gluster-module-dep.patch
=====================================
@@ -0,0 +1,26 @@
+From: Pavel Hrdina <phrdina at redhat.com>
+Date: Tue, 8 Sep 2020 15:45:11 +0200
+Subject: src/storage/meson: fix vir_storage_file_gluster module dependencies
+
+The correct key for dependencies for virt_modules hash is `deps`.
+
+Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
+Reviewed-by: Peter Krempa <pkrempa at redhat.com>
+(cherry picked from commit a490693367ea903542a5200214b87430772b27db)
+---
+ src/storage/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/storage/meson.build b/src/storage/meson.build
+index 18ea0f3..b4cefe9 100644
+--- a/src/storage/meson.build
++++ b/src/storage/meson.build
+@@ -187,7 +187,7 @@ if conf.has('WITH_STORAGE_GLUSTER')
+     'sources': [
+       files(storage_file_gluster_sources),
+     ],
+-    'dependenciec': [
++    'deps': [
+       glusterfs_dep,
+     ],
+     'install_dir': storage_file_install_dir,


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
+backport/src-storage-meson-fix-vir_storage_file_gluster-module-dep.patch
 forward/Skip-vircgrouptest.patch
 forward/Reduce-udevadm-settle-timeout-to-10-seconds.patch
 forward/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch


=====================================
debian/rules
=====================================
@@ -155,10 +155,13 @@ SRV_MONOLITHIC = libvirt-guests virtlogd virtlockd libvirtd libvirtd-tcp libvirt
 override_dh_auto_configure:
 	dh_auto_configure -- $(DEB_CONFIGURE_EXTRA_ARGS)
 
+# The default timeout for tests in Meson is 30s, which is not enough
+# for architectures with slow buildds: make the timeout 30 times
+# larger (15m) to account for those
 override_dh_auto_test:
 	export LD_PRELOAD=""; \
 	export VIR_TEST_DEBUG=1; \
-	if ! dh_auto_test; then \
+	if ! dh_auto_test -- --timeout-multiplier 30; then \
 	    cat $(DEB_BUILDDIR)/meson-logs/testlog.txt; \
 	    exit 1; \
 	fi



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/d596289c87323bf8ea8c3a7457f6a3ba5f9cf612...d21edffd747c1da1fdea54821037d79d8d4275f4

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/d596289c87323bf8ea8c3a7457f6a3ba5f9cf612...d21edffd747c1da1fdea54821037d79d8d4275f4
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/20200915/6b386a45/attachment-0001.html>