]> xenbits.xensource.com Git - people/iwj/osstest.git/commitdiff
ts-xen-build-prep: Do not install Ocaml on squeeze or wheezy
authorIan Jackson <ian.jackson@eu.citrix.com>
Mon, 27 Jun 2016 11:25:14 +0000 (12:25 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Mon, 27 Jun 2016 16:56:14 +0000 (17:56 +0100)
squeeze doesn't (didn't) have it at all.  wheezy doesn't have ocamlopt
on armhf, and the Xen build system (in the old branches where this is
relevant) seems not to be able to test this.

In any case we use these old Debian suites when testing old Xen
branches, which were (when they were current) built without ocaml.

This partially reverts "ts-xen-build-prep: Install Ocaml" bbe1a9b2a6c0.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
CC: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Wei Liu <wei.liu2@citrix.com>
CC: David Scott <dave@recoil.org>
CC: Jan Beulich <JBeulich@suse.com>
ts-xen-build-prep

index c8cebf408746d45df159c38c53015735206dc510..0450811b523c22fd350fb63b277702919917bf25 100755 (executable)
@@ -206,9 +206,11 @@ sub prep () {
                       autoconf automake libtool xsltproc
                       libxml2-utils libxml2-dev
                       libdevmapper-dev w3c-dtd-xhtml libxml-xpath-perl
-                      ocaml-nox ocaml-findlib
                       ccache nasm checkpolicy ebtables);
 
+    if ($ho->{Suite} !~ m/squeeze|wheezy/) {
+       push(@packages, qw(ocaml-nox ocaml-findlib));
+    }
     if ($ho->{Suite} =~ m/wheezy|squeeze|lenny/) {
        push(@packages, "libnl-dev");
     } else {