Revert "ocaml: install ocaml-nox (build, test) and ocaml-findlib (build only)"

This reverts commit bbc714a1a1c4ec046acc6f93a2877fe3253fa185.

diff --git a/ts-xen-build-prep b/ts-xen-build-prep
index 6e3dbe209564af11779a8a2683538c8ce1960907..61823516ec37da5d5bae36aef2747be7f3e3b7e5 100755 (executable)
--- a/ts-xen-build-prep
+++ b/ts-xen-build-prep
@@ -125,7 +125,7 @@ sub lvextend1 ($$$) {
 
 sub prep () {
     target_install_packages($ho,
-                            qw(mercurial ocaml-nox ocaml-findlib
+                            qw(mercurial
                                build-essential bin86 bcc iasl
                                flex bison cmake
                                libpci-dev libncurses5-dev libssl-dev python-dev

diff --git a/ts-xen-install b/ts-xen-install
index b3ce80e6df3e3f476047017e3bf3c847084ccabe..31e16bf69a5178513b87973d0a769eb9d6d471a0 100755 (executable)
--- a/ts-xen-install
+++ b/ts-xen-install
@@ -33,8 +33,7 @@ my %distpath;
 
 sub packages () {
     target_install_packages($ho,
-                            qw(ocaml-nox
-                               bridge-utils vncsnapshot libaio1 libpixman-1-0
+                            qw(bridge-utils vncsnapshot libaio1 libpixman-1-0
                                libsdl1.2debian libyajl1 libglib2.0-0));
     if ($r{arch} eq 'i386') {
        target_install_packages($ho, 'libc6-xen');