From 7bf87af343688036fc5701a5b3f3da413d2c5dae Mon Sep 17 00:00:00 2001
From: Renuka Apte <renuka.apte@citrix.com>
Date: Thu, 2 Feb 2012 18:25:35 -0800
Subject: [PATCH] Fix troubles with git cloning https

Some xenservers get errors because git is not configured with
curl and expat, and because of invalid SSL certs.

Change-Id: Ibe7062255b90559b0d6ca5f52e33ec56451505df
---
 tools/xen/build_domU.sh   | 4 ++--
 tools/xen/prepare_dom0.sh | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/xen/build_domU.sh b/tools/xen/build_domU.sh
index ce11b0a853..455ad2644d 100755
--- a/tools/xen/build_domU.sh
+++ b/tools/xen/build_domU.sh
@@ -31,7 +31,7 @@ if ! which git; then
     wget http://git-core.googlecode.com/files/git-1.7.7.tar.gz
     tar xfv git-1.7.7.tar.gz
     cd $GITDIR
-    ./configure
+    ./configure --with-curl --with-expat
     make install
     cd $TOP_DIR
 fi
@@ -141,7 +141,7 @@ fi
 
 # Checkout nova
 if [ ! -d $TOP_DIR/nova ]; then
-    git clone $NOVA_REPO
+    env GIT_SSL_NO_VERIFY=true git clone $NOVA_REPO
     cd $TOP_DIR/nova
     git checkout $NOVA_BRANCH
 fi 
diff --git a/tools/xen/prepare_dom0.sh b/tools/xen/prepare_dom0.sh
index a8381aba80..d28a07f191 100755
--- a/tools/xen/prepare_dom0.sh
+++ b/tools/xen/prepare_dom0.sh
@@ -1,9 +1,9 @@
-#!/bin/sh
+#i!/bin/sh
 set -o xtrace
 set -o errexit
 
 # Install basics for vi and git
-yum -y  --enablerepo=base install gcc make vim-enhanced zlib-devel openssl-devel
+yum -y  --enablerepo=base install gcc make vim-enhanced zlib-devel openssl-devel curl-devel.i386
 
 # Simple but usable vimrc
 if [ ! -e /root/.vimrc ]; then
@@ -30,7 +30,7 @@ if ! which git; then
     wget http://git-core.googlecode.com/files/git-1.7.7.tar.gz
     tar xfv git-1.7.7.tar.gz
     cd $GITDIR
-    ./configure
+    ./configure --with-curl --with-expat
     make install
 fi