From: Ian Jackson Date: Mon, 27 Jun 2016 11:25:14 +0000 (+0100) Subject: ts-xen-build-prep: Do not install Ocaml on squeeze or wheezy X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4e9b0c65b9bcc733bd6bf0c711523284db2da3b0;p=people%2Fiwj%2Fosstest.git ts-xen-build-prep: Do not install Ocaml on squeeze or wheezy 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 CC: Andrew Cooper CC: Wei Liu CC: David Scott CC: Jan Beulich --- diff --git a/ts-xen-build-prep b/ts-xen-build-prep index c8cebf40..0450811b 100755 --- a/ts-xen-build-prep +++ b/ts-xen-build-prep @@ -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 {