Merge lp:~le-chi-thu/lava-deployment-tool/add-linaro-image-tools into lp:~linaro-validation/lava-deployment-tool/trunk

[Le Chi Thu]

Add installation of linaro image tools.

[Spring Zhang (qzhang)]

26 sudo apt-get update
27 +
28 + echo "Add Linaro tools ppa"
29 + sudo apt-get install --yes python-software-properties
30 + sudo add-apt-repository --yes ppa:linaro-maintainers/tools
31 + sudo apt-get update
Can we arrange the two 'apt-get update' to one? by putting line 30 before 26.

[Zygmunt Krynicki (zyga)]

+1

review: Approve

=== modified file 'lava-deployment-tool'
--- lava-deployment-tool	2012-04-25 08:02:22 +0000
+++ lava-deployment-tool	2012-04-26 13:01:32 +0000
@@ -39,12 +39,12 @@
                     # FIXME: Lucid is not supported
                     export LAVA_SUPPORTED=0
                     # Required system packages
-                    LAVA_PKG_LIST="whiptail python-virtualenv python-pip git-core build-essential $LAVA_PYTHON-dev libxml2-dev apache2 apache2-dev postgresql rabbitmq-server mercurial"
+                    LAVA_PKG_LIST="whiptail python-virtualenv python-pip git-core build-essential $LAVA_PYTHON-dev libxml2-dev apache2 apache2-dev postgresql rabbitmq-server mercurial conmux linaro-image-tools"
                     ;;
                 oneiric|precise)
                     export LAVA_PYTHON=python2.7
                     export LAVA_SUPPORTED=1
-                    LAVA_PKG_LIST="whiptail python-virtualenv python-pip git build-essential $LAVA_PYTHON-dev libxml2-dev apache2 apache2-dev postgresql rabbitmq-server mercurial"
+                    LAVA_PKG_LIST="whiptail python-virtualenv python-pip git build-essential $LAVA_PYTHON-dev libxml2-dev apache2 apache2-dev postgresql rabbitmq-server mercurial conmux linaro-image-tools"
                     ;;
             esac
             ;;
@@ -1056,9 +1056,14 @@
         echo
         read -p "Type YES to continue: " RESPONSE
         test "$RESPONSE" = 'YES' || return
-    
+
         echo "Updating apt cache..."
         sudo apt-get update
+                                       
+	echo "Add Linaro tools ppa"
+	sudo apt-get install --yes python-software-properties
+	sudo add-apt-repository --yes ppa:linaro-maintainers/tools
+	sudo apt-get update
 
         echo "Installing english language pack, if needed"
         # XXX: I'm not 100% sure this is needed