[OSSTEST PATCH v3] ts-xen-build-prep: install libgnutls28-dev for libvirt build

[OSSTEST PATCH v3] ts-xen-build-prep: install libgnutls28-dev for libvirt build

[Wei Liu]

d54ecf31b2 placed the build dependency in a wrong file. This patch
adds the dependency to the right file. Add a runtime dependency in
libvirt.pm.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Jim Fehlig <jfehlig@suse.com>
---
 Osstest/Toolstack/libvirt.pm | 6 +++++-
 ts-xen-build-prep            | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Osstest/Toolstack/libvirt.pm b/Osstest/Toolstack/libvirt.pm
index d5cda77e..7ebeaf66 100644
--- a/Osstest/Toolstack/libvirt.pm
+++ b/Osstest/Toolstack/libvirt.pm
@@ -26,10 +26,14 @@ use XML::LibXML;
 
 sub new {
     my ($class, $ho, $methname,$asset) = @_;
-    my @extra_packages = qw(libavahi-client3 libgnutls28-dev);
+    my @extra_packages = qw(libavahi-client3);
     my $nl_lib = "libnl-3-200";
+    my $libgnutls = "libgnutls30";
+
     $nl_lib = "libnl1" if ($ho->{Suite} =~ m/wheezy/);
+    $libgnutls = "libgnutls-deb0-28" if ($ho->{Suite} =~ m/jessie/);
     push(@extra_packages, $nl_lib);
+    push(@extra_packages, $libgnutls);
     return bless { Name => "libvirt",
 		   Host => $ho,
 		   NewDaemons => [qw(libvirtd)],
diff --git a/ts-xen-build-prep b/ts-xen-build-prep
index 77a2d284..23bbbeb9 100755
--- a/ts-xen-build-prep
+++ b/ts-xen-build-prep
@@ -208,7 +208,8 @@ sub prep () {
                       libxml2-utils libxml2-dev
                       libdevmapper-dev w3c-dtd-xhtml libxml-xpath-perl
                       libelf-dev
-                      ccache nasm checkpolicy ebtables);
+                      ccache nasm checkpolicy ebtables
+                      libgnutls28-dev);
 
     if ($ho->{Suite} !~ m/squeeze|wheezy/) {
 	push(@packages, qw(ocaml-nox ocaml-findlib));
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [OSSTEST PATCH v3] ts-xen-build-prep: install libgnutls28-dev for libvirt build

[Ian Jackson]

Wei Liu writes ("[OSSTEST PATCH v3] ts-xen-build-prep: install libgnutls28-dev for libvirt build"):
> d54ecf31b2 placed the build dependency in a wrong file. This patch
> adds the dependency to the right file. Add a runtime dependency in
> libvirt.pm.

Thanks, acked again and pushed.  Let's see how it goes this time...
Also, I did a tiny style change (as a separate
commit).

Ian.

From ad7f0784d0cc057e0826ff6a6a1142067f8e3da5 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Thu, 27 Sep 2018 11:29:23 +0100
Subject: [OSSTEST PATCH] libvirt.pm: Drop some unneeded parens (no functional
 change0

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 Osstest/Toolstack/libvirt.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Osstest/Toolstack/libvirt.pm b/Osstest/Toolstack/libvirt.pm
index 7ebeaf66..e817f5b4 100644
--- a/Osstest/Toolstack/libvirt.pm
+++ b/Osstest/Toolstack/libvirt.pm
@@ -30,8 +30,8 @@ sub new {
     my $nl_lib = "libnl-3-200";
     my $libgnutls = "libgnutls30";
 
-    $nl_lib = "libnl1" if ($ho->{Suite} =~ m/wheezy/);
-    $libgnutls = "libgnutls-deb0-28" if ($ho->{Suite} =~ m/jessie/);
+    $nl_lib = "libnl1" if $ho->{Suite} =~ m/wheezy/;
+    $libgnutls = "libgnutls-deb0-28" if $ho->{Suite} =~ m/jessie/;
     push(@extra_packages, $nl_lib);
     push(@extra_packages, $libgnutls);
     return bless { Name => "libvirt",
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel