Merge lp:~pundiramit/linaro-android-build-tools/labt into lp:linaro-android-build-tools

[Amit Pundir]

linaro_android_build_cmds: Support Ubuntu 12.04.01 and 10.04.1 sub-version builds as well and make Overlay component optional.

[Paul Sokolovsky (pfalcon)]

Looks good.

review: Approve

[lp:~pundiramit/linaro-android-build-tools/labt]

551. By Paul Sokolovsky on 2013-01-17

[merge] Support Ubuntu 10.04* and 12.*, allow to continue w/o overlay.

=== modified file 'build-scripts/create-user-build-script'
--- build-scripts/create-user-build-script	2012-12-28 09:29:09 +0000
+++ build-scripts/create-user-build-script	2013-01-17 12:31:20 +0000
@@ -66,15 +66,13 @@
 	echo "ERROR: Only 64bit Host(Build) machines are supported at the moment."
 	exit 1
 fi
-if [ \${UBUNTU} == "12.10" ]; then
-	PKGS+=' lib32readline-gplv2-dev'
-elif [ \${UBUNTU} == "12.04" ] ; then
-	PKGS+=' lib32readline-gplv2-dev'
-elif [ \${UBUNTU} == "10.04" ] ; then
+if [[ \${UBUNTU} =~ "12." ]]; then
+	PKGS+=' lib32readline-gplv2-dev'
+elif [[ \${UBUNTU} =~ "10.04" ]] ; then
 	PKGS+=' ia32-libs lib32readline5-dev'
 else
 	echo
-	echo "ERROR: Only Ubuntu 10.04, 12.04 and 12.10 versiona are supported."
+	echo "ERROR: Only Ubuntu 10.04, 12.04 and 12.10 versions are supported."
 	exit 1
 fi
 
@@ -100,7 +98,9 @@
 fi
 if [ "a\$SOURCE_OVERLAY" == "a" ]; then
 	echo "ERROR: no source overlay provided. Please download from http://snapshots.linaro.org/android/binaries/$SOURCE_OVERLAY. This must be done from a browser that accepts cookies."
-	exit 1
+	echo "Do you want to continue without overlay (which may result in broken build)? (y/n) "
+	read OVERLAY
+	[ \${OVERLAY} == y ] || exit 1
 fi
 EOF
 	fi