Rebase on 15.04

Update to build image based on 15.04
FuturePilot · May 2, 2015 · 63b84da · 63b84da
1 parent 1c8583d
commit 63b84da
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/configs/etc/apt/sources.list b/configs/etc/apt/sources.list
@@ -1,11 +1,11 @@
-deb http://ports.ubuntu.com/ utopic main restricted universe multiverse
-# deb-src http://ports.ubuntu.com/ utopic main restricted universe multiverse
+deb http://ports.ubuntu.com/ vivid main restricted universe multiverse
+# deb-src http://ports.ubuntu.com/ vivid main restricted universe multiverse
 
-deb http://ports.ubuntu.com/ utopic-updates main restricted universe multiverse
-# deb-src http://ports.ubuntu.com/ utopic-updates main restricted universe multiverse
+deb http://ports.ubuntu.com/ vivid-updates main restricted universe multiverse
+# deb-src http://ports.ubuntu.com/ vivid-updates main restricted universe multiverse
 
-deb http://ports.ubuntu.com/ utopic-security main restricted universe multiverse
-# deb-src http://ports.ubuntu.com/ utopic-security main restricted universe multiverse
+deb http://ports.ubuntu.com/ vivid-security main restricted universe multiverse
+# deb-src http://ports.ubuntu.com/ vivid-security main restricted universe multiverse
 
-deb http://ports.ubuntu.com/ utopic-backports main restricted universe multiverse
-# deb-src http://ports.ubuntu.com/ utopic-backports main restricted universe multiverse
+deb http://ports.ubuntu.com/ vivid-backports main restricted universe multiverse
+# deb-src http://ports.ubuntu.com/ vivid-backports main restricted universe multiverse
diff --git a/rpi2-build-image.sh b/rpi2-build-image.sh
@@ -22,7 +22,7 @@
 set -e
 set -x
 
-RELEASE=utopic
+RELEASE=vivid
 BASEDIR=/srv/rpi2/${RELEASE}
 BUILDDIR=${BASEDIR}/build
 SHELL=/bin/bash
@@ -59,6 +59,8 @@ chmod +x $R/usr/sbin/policy-rc.d
 
 # Update, upgrade, and set up PPAs
 chroot $R $SHELL -c "apt-get update"
+# I do not know why the hell python 3.4 is failing to install in debootstrap but this will work around the problem until I figure out why
+chroot $R $SHELL -c "apt-get install -y -f"
 chroot $R $SHELL -c "apt-get -y install software-properties-common ubuntu-keyring"
 chroot $R $SHELL -c "apt-add-repository -y ppa:futurepilot/raspberry-pi-2"
 cat ./configs/etc/apt/preferences.d/rpi2-ppa > $R/etc/apt/preferences.d/rpi2-ppa