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

[Amit Pundir]

This Merge Proposal update user build script to support linaro-android builds on 64 bit Ubuntu 10.04, 12.04 and 12.10 versions.

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

542. By Amit Pundir on 2012-12-14

Update user build script to clone from linaro-private git repos

543. By Amit Pundir on 2012-12-17

Update user build script to prompt for login-id

[Paul Sokolovsky (pfalcon)]

Having updated list of packages required for build as well as check for x86_64 is definitely good. But I'm not sure about supporting access to linaro-private. The original idea of user build script was to simplify build process for outside/3rd-party users. But outside users are not supposed to have access to private Linaro repos at all, so I'm not sure if conveniencing access for them makes sense. So, I'd like to know what are the requirements/user stories behind this change.

review: Needs Information

[Amit Pundir (pundiramit)]

Right now outside/3rd party users can decode http:// link of git projects from manifest files anyways, though they can not access it. How to protect manifest files is a different task all together, which is currently been worked on.

3rd party developers can clone only public projects from linaro Git manifests and they will get public-key denied error for private projects.

Idea behind this change is to facilitate authorized linaro assignees to get access to private-repos and simplify their build experience.

[Paul Sokolovsky (pfalcon)]

I see, sounds good, and sorry for delay.

review: Approve

=== modified file 'build-scripts/create-user-build-script'
--- build-scripts/create-user-build-script	2012-10-03 12:25:43 +0000
+++ build-scripts/create-user-build-script	2012-12-17 09:50:25 +0000
@@ -14,45 +14,73 @@
 PINNED_MANIFEST_URL=${PINNED_MANIFEST_URL/_/\/}
 
 if [ -n "$SOURCE_OVERLAY" ]; then
-	USAGE_SUM="'Usage: \$0 -m <manifest.xml> -o <overlay.tar> [ -t -d directory ]'"
+	USAGE_SUM="'Usage: \$0 -m <manifest.xml> -o <overlay.tar> [ -t -d directory -l login ]'"
 	USAGE_OVERLAY="'\\n -m <manifest>    If -t is not used, then using a browser with cookies you\\n                  must download the pinned manifest from:\\n             $PINNED_MANIFEST_URL\\n -o               The path to the vendor required overlay.\\n                  Can be downloaded from http://snapshots.linaro.org/android/binaries/$SOURCE_OVERLAY\\n'"
 	USAGE_OPTOVERLAY="m:o:"
 	USAGE_OPTHANDLER="o   ) SOURCE_OVERLAY=\$OPTARG;;  m   ) MANIFEST=\$OPTARG;;"
 else
-	USAGE_SUM="'Usage: \$0 [ -t -d directory ]'"
+	USAGE_SUM="'Usage: \$0 [ -t -d directory -l login ]'"
 fi
 
 header()
 {
 	cat <<EOF
 #!/bin/bash
+# Author+=[e-mail]
 
 set -e
 
 EXACT=1
 DIR=android
+ID=default-bot
 
 usage()
 {
 	echo $USAGE_SUM
 	echo -e $USAGE_OVERLAY
-	echo " -t                Reproduce the from the tip of the branch rather than doing"
+	echo " -t                Reproduce the build from the tip of the branch rather than doing"
 	echo "                   an exact replica build"
 	echo " -d <directory>    The directory to download code and build from"
 	echo "                   Default: \${DIR}"
+	echo " -l <login-id>     login-id to clone from linaro-private git repositories"
+	echo "                   If in doubt, kindly raise access request to [e-mail]"
+	echo "                   Default: \${ID}"
 	exit 1
 }
 
-while getopts   "${USAGE_OPTOVERLAY}d:ht" optn; do
+while getopts   "${USAGE_OPTOVERLAY}d:l:ht" optn; do
 	case    \$optn   in
 		$USAGE_OPTHANDLER
 		d   ) DIR=\$OPTARG;;
+		l   ) ID=\$OPTARG;;
 		t   ) EXACT=0;;
 		h   ) usage; exit 1;;
         esac
 done
 
-PKGS='zip curl flex bison build-essential git-core gnupg gperf zlib1g-dev libx11-dev x11proto-core-dev gcc-multilib g++-multilib libc6-dev-i386 ia32-libs lib32z-dev uboot-mkimage uuid-dev openjdk-6-jdk ant lib32ncurses5-dev'
+UBUNTU=`cat /etc/issue.net | cut -d' ' -f2`
+HOST_ARCH=`uname -m`
+if [ $HOST_ARCH == "x86_64" ] ; then
+	PKGS='git-core gnupg flex bison gperf build-essential zip curl zlib1g-dev libc6-dev lib32ncurses5-dev x11proto-core-dev libx11-dev lib32z1-dev libgl1-mesa-dev g++-multilib mingw32 tofrodos python-markdown libxml2-utils xsltproc uboot-mkimage openjdk-6-jdk openjdk-6-jre vim-common'
+else
+	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
+	PKGS+=' ia32-libs lib32readline5-dev'
+else
+	echo
+	echo "ERROR: Only Ubuntu 10.04, 12.04 and 12.10 versiona are supported."
+	exit 1
+fi
+
+echo "Checking and installing missing dependencies if any .. .."
+sudo apt-get install $PKGS
+
 MISSING=\`dpkg-query -W -f='\${Status}\n' \${PKGS} 2>&1 | grep 'No packages found matching' | cut -d' ' -f5\`
 if [ -n "\$MISSING" ] ; then
 	echo "Missing required packages:"
@@ -148,6 +176,24 @@
 	rm .repo/manifest.xml
 	$CP_CMD
 fi
+# check for linaro private git repositories
+PRI=`grep -i "linaro-private" .repo/manifests/${MANIFEST_FILENAME} | wc -l`
+if [ $PRI -gt 0 ] ; then
+	if [ "$ID" == "default-bot" ] ; then
+		echo "You must specify valid login/access-id to clone from linaro-private git repositories."
+		echo "Press "y" to continue (which may result in incomplete build), OR"
+		echo "Press "n" to enter login details, OR"
+		echo "Press "h" for help."
+		read NEXT
+		if [ ${NEXT} == n ] ; then
+			echo "Enter login/access-id:"
+			read ID
+		elif [ ${NEXT} == h ] ; then
+			usage
+		fi
+	fi
+	sed -i 's/\/\/.*-bot@/\/\/'"$ID"'@/' .repo/manifests/${MANIFEST_FILENAME}
+fi
 ./repo sync
 
 EOF