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.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/Osstest/Toolstack/libvirt.pm b/Osstest/Toolstack/libvirt.pm
index d5cda77eea2efe19b7ef5e7e240afddc69118aed..7ebeaf661cc15b5619bed436247c026ad6e4892b 100644 (file)
--- 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 77a2d284558c2b764ea6668c7024abae144521c2..23bbbeb92237c83ec6f7b0de0a8fa5849b5c2889 100755 (executable)
--- 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));