Merge branch 'stable-2.8' into master

[ganeti-local] / devel / build_chroot

diff --git a/devel/build_chroot b/devel/build_chroot
index 0d04afd..b54c21b 100755 (executable)
--- a/devel/build_chroot
+++ b/devel/build_chroot
@@ -1,6 +1,6 @@
 #!/bin/bash
 #Configuration
-: ${DATA_DIR=data}
+: ${DATA_DIR=`dirname $0`/data}
 : ${ARCH=amd64}
 : ${DIST_RELEASE=squeeze}
 : ${CONF_DIR:=/etc/schroot/chroot.d}
@@ -34,6 +34,16 @@ then
   exit
 fi
 
+if [ ! -d $DATA_DIR ]
+then
+  echo "The data directory"
+  echo "  $DATA_DIR"
+  echo "does not exist."
+  echo "Please, set the DATA_DIR environment variable so that it points to the"
+  echo "data directory."
+  exit
+fi
+
 set -e
 
 #Cleanup
@@ -116,17 +126,25 @@ in_chroot -- \
 
 in_chroot -- \
   cabal install --global \
-    QuickCheck==2.5.1.1 \
-    network==2.3 hslogger Crypto text regex-pcre \
-    attoparsec vector \
-    json==0.4.4 \
-    MonadCatchIO-transformers==0.2.2.0 mtl==2.0.1.0 \
-    hashable==1.1.2.0 case-insensitive==0.3 parsec==3.0.1 \
-    network==2.3 snap-server==0.8.1 \
+    network==2.3 \
+    regex-pcre==0.94.2 \
     hinotify==0.3.2 \
+    hslogger==1.1.4 \
+    attoparsec==0.10.1.1\
+    quickcheck==2.5.1.1 \
+    crypto==4.2.4 \
+    monadcatchio-transformers==0.2.2.0 \
+    mtl==2.0.1.0 \
+    hashable==1.1.2.0 \
+    case-insensitive==0.3 \
+    parsec==3.0.1 \
+    network==2.3 \
+    snap-server==0.8.1 \
+    text==0.11.3.0 \
+    vector==0.9.1 \
+    json==0.4.4 \
     process==1.0.1.2
 
-
 #Python development tools
 in_chroot -- \
   $APT_INSTALL pandoc python-epydoc graphviz
@@ -142,11 +160,11 @@ in_chroot -- \
 #Haskell development tools
 in_chroot -- \
   cabal install --global \
-    HUnit \
-    happy \
+    hunit==1.2.5.2 \
+    happy==1.18.10 \
     hlint==1.8.34 \
     hscolour==1.20.3 \
-    temporary \
+    temporary==1.1.2.3 \
     test-framework==0.6.1 \
     test-framework-hunit==0.2.7 \
     test-framework-quickcheck2==0.2.12.3