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

[Amit Pundir]

Fix build error when Source_Overlay is not set.

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

554. By Amit Pundir on 2013-01-23

linaro_android_build_cmds: prompt for access-id when syncing from private manifests

[Данило Шеган (danilo)]

This is a bit confusing. We require SOURCE_OVERLAY to be set (this was a recent change, so that's perhaps why it feels like a regression), for BUILD-INFO.txt file to be generated. Otherwise, someone can circum-vent our protection mechanisms (and more likely, build results will simply be inaccessible).

Then, this branch also deals with access to private repositories, but I am not sure I understand exactly what's going on. Can you please clarify the rationale for the changes?

review: Needs Information

[Amit Pundir (pundiramit)]

Making SOURCE_OVERLAY optional is a requirement from Android platform team and yes we may have overlooked certain things which you pointed out. I'll get back to you on this in a while.

Meanwhile I'll upload "access to private manifest repositories" changes to a new branch.

[Данило Шеган (danilo)]

Ok, I've discussed this with Vishal: the goal of this is to enable produced linaro_android_build_cmds.sh to work without the SOURCE_OVERLAY when not really needed. Since we do not use this script for actually building Android on jenkins, it's ok if this script has an override for SOURCE_OVERLAY (eg. perhaps set it to SOURCE_OVERLAY=ignore; if you want to do it any other way, that's fine as well).

However, the actual jenkins build should not allow that to be set in the build config (on android-build.linaro.org).

review: Needs Fixing

Unmerged revisions

554. By Amit Pundir on 2013-01-23

linaro_android_build_cmds: prompt for access-id when syncing from private manifests

553. By Amit Pundir on 2013-01-22

fix build error when overlay is not set

=== modified file 'build-scripts/create-user-build-script'
--- build-scripts/create-user-build-script	2013-01-17 12:26:38 +0000
+++ build-scripts/create-user-build-script	2013-01-23 05:52:27 +0000
@@ -120,7 +120,24 @@
 jenkins_configs_method()
 {
 	cat <<EOF
-export MANIFEST_REPO=${MANIFEST_REPO}
+# check for linaro private manifests
+MNF=\`echo ${MANIFEST_REPO} | grep -i "linaro-private" | wc -l\`
+if [ \${MNF} -gt 0 ] ; then
+	if [ "\${ID}" == "default-bot" ] ; then
+		echo "You must specify valid login/access-id to clone from linaro-private manifest repositories."
+		echo "Press "y" to continue (which may result in incomplete build or failure), 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
+fi
+export MANIFEST_REPO=`echo ${MANIFEST_REPO} | sed 's/\/\/.*-bot@/\/\/'"\${ID}"'@/'`
 export MANIFEST_BRANCH=${MANIFEST_BRANCH}
 export MANIFEST_FILENAME=${MANIFEST_FILENAME}
 export TARGET_PRODUCT=${TARGET_PRODUCT}
@@ -215,8 +232,10 @@
 	if [ -n "$SOURCE_OVERLAY" ]; then
 		cat <<EOF
 
-# extract the vendor's source overlay
-tar -x -a -f "\$SOURCE_OVERLAY" -C .
+if [ "a\$SOURCE_OVERLAY" != "a" ]; then
+	# extract the vendor's source overlay
+	tar -x -a -f "\$SOURCE_OVERLAY" -C .
+fi
 EOF
 	fi
 	echo