From 1c67356dbbc22dfcac1b7dc7ae1edc58da998c09 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Fri, 24 Apr 2015 08:59:26 -0500
Subject: [PATCH] distro: Ubuntu Vivid (15.04) is now released

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 README          |  4 ++--
 lib/distro.conf |  7 ++-----
 mk_mmc.sh       | 14 ++++++++------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/README b/README
index 1dff2bd..53dacfb 100644
--- a/README
+++ b/README
@@ -45,8 +45,8 @@ Optional:
                 jessie (Debian 8)
         Ubuntu:
                 trusty (14.04) (EOL: April 2019)
-                utopic (14.10) (EOL: April 2015)
-                vivid (14.10) (beta)
+                utopic (14.10) (EOL: July 2015)
+                vivid (15.04) (EOL: January 2016)
 
 --firmware
         <include all firmwares from linux-firmware git repo>
diff --git a/lib/distro.conf b/lib/distro.conf
index cfbcf73..6e24f67 100755
--- a/lib/distro.conf
+++ b/lib/distro.conf
@@ -23,11 +23,8 @@ utopic-armhf-netboot)
 vivid-armhf-netboot)
 	#22-Oct-2014
 	#http://ports.ubuntu.com/dists/vivid/main/installer-armhf/
-#FIXME: add dir/date/md5sum when vivid is released..
-#	NETIMAGE="20101020ubuntu352"
-	NETIMAGE="current"
-#	TEST_MD5SUM="555817254340b610e7b947526b1dc315"
-	TEST_MD5SUM="x"
+	NETIMAGE="20101020ubuntu376"
+	TEST_MD5SUM="261032f71ad0e7706efe72e0c7ae7054"
 	HTTP_IMAGE="http://ports.ubuntu.com/ubuntu-ports/dists"
 	BASE_IMAGE="generic/netboot"
 	NETINSTALL="initrd.gz"
diff --git a/mk_mmc.sh b/mk_mmc.sh
index b7a451d..c88ecd6 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -1381,10 +1381,12 @@ check_distro () {
 			-----------------------------
 			--distro <distro>
 			        Debian:
-			                wheezy-armhf <default> (armv7-a)
-			                jessie-armhf (armv7-a) (alpha)
+			                wheezy-armhf (Debian 7) <default>
+			                jessie (Debian 8)
 			        Ubuntu:
-			                trusty (14.04) (armv7-a)
+			                trusty (14.04) (EOL: April 2019)
+			                utopic (14.10) (EOL: July 2015)
+			                vivid (15.04) (EOL: January 2016)
 			-----------------------------
 		__EOF__
 		exit
@@ -1438,9 +1440,9 @@ usage () {
 			                wheezy-armhf (Debian 7) <default>
 			                jessie (Debian 8)
 			        Ubuntu:
-			                trusty (14.04) (EOL: April 2015)
-			                utopic (14.10) (EOL: April 2015)
-			                vivid (15.04) (beta)
+			                trusty (14.04) (EOL: April 2019)
+			                utopic (14.10) (EOL: July 2015)
+			                vivid (15.04) (EOL: January 2016)
 
 			--firmware
 			        <include all firmwares from linux-firmware git repo>