Merge pull request #547 from swift-nav/pip-linux

Ensure setup.sh has pip on Linux
swift-nav · Aug 28, 2015 · 564784e · 564784e
2 parents 3716103 + 5125143
commit 564784e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/setup.sh b/setup.sh
@@ -150,7 +150,7 @@ function run_all_platforms () {
         log_info "Please enter your password for apt-get..."
         log_info "Updating..."
         sudo apt-get update
-        sudo apt-get install -y curl
+        sudo apt-get install -y curl python-pip
         sudo pip install ansible
     elif [[ "$OSTYPE" == "darwin"* ]]; then
         piksi_splash_osx

diff --git a/setup/ansible/roles/common_ubuntu/tasks/arm.yml b/setup/ansible/roles/common_ubuntu/tasks/arm.yml
@@ -11,7 +11,7 @@
 
 - name: Install ARM GCC toolchain (Trusty)
   sudo: True
-  shell: apt-get install gcc-arm-none-eabi=4.9.3.2014q4-0trusty12
+  shell: apt-get install gcc-arm-none-eabi=4.9.3.2015q2-1trusty1
   when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '14.04'
 
 - name: Install ARM GCC toolchain (Utopic)