Merge lp:~doanac/linaro-android-build-tools/clickthrough-bugs into lp:linaro-android-build-tools

[Andy Doan]

fixes click through issues for snowball/origen with pinned manifests and kernel configs

[Paul Sokolovsky (pfalcon)]

Well, I heard we're closing in towards solving manifest and other meta-data access for click-thru builds. In this regard these changes are somewhat large, but as you did them already, let's stop waiting and have some kind of solution now ;-)

review: Approve

=== modified file 'build-scripts/create-user-build-script'
--- build-scripts/create-user-build-script	2012-03-13 17:49:12 +0000
+++ build-scripts/create-user-build-script	2012-04-10 03:31:18 +0000
@@ -5,15 +5,6 @@
 source "${BUILD_SCRIPT_ROOT}"/helpers
 setup-repo-vars
 
-if [ -n "$SOURCE_OVERLAY" ]; then
-	USAGE_SUM="'Usage: \$0 -o <overlay.tar> [ -t -d directory ]'"
-	USAGE_OVERLAY="'\\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="o:"
-	USAGE_OPTHANDLER="o   ) SOURCE_OVERLAY=\$OPTARG;;"
-else
-	USAGE_SUM="'Usage: \$0 [ -t -d directory ]'"
-fi
-
 #Translate
 #  https://android-build.linaro.org/jenkins/job/doanac_build-script-generation/6/
 # into
@@ -22,6 +13,15 @@
 # change the dash in doanac_build... to doanac/build...
 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_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 ]'"
+fi
+
 header()
 {
 	cat <<EOF
@@ -66,8 +66,12 @@
 EOF
 	if [ -n "$SOURCE_OVERLAY" ]; then
 		cat <<EOF
+if [ "a\$MANIFEST" == "a" -a \$EXACT -eq 1 ]; then
+	echo "ERROR: no pinned manifest provided. Please download from $PINNED_MANIFEST_URL. This must be done from a browser that accepts cookies."
+	exit 1
+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.
+	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
 fi
 EOF
@@ -127,6 +131,11 @@
 
 sync_commands()
 {
+	if [ -n "$SOURCE_OVERLAY" ]; then
+		CP_CMD="cp \$MANIFEST .repo/manifest.xml"
+	else
+		CP_CMD="curl -k ${PINNED_MANIFEST_URL}/pinned-manifest.xml > .repo/manifest.xml"
+	fi
 	cat <<EOF
 # download the repo tool for android
 curl "http://android.git.linaro.org/gitweb?p=tools/repo.git;a=blob_plain;f=repo;hb=refs/heads/stable" > repo
@@ -136,7 +145,7 @@
 ./repo init -u \${MANIFEST_REPO} -b \${MANIFEST_BRANCH} -m \${MANIFEST_FILENAME} ${REPO_MIRROR}
 if [ \${EXACT} -eq 1 ] ; then
 	rm .repo/manifest.xml
-	curl -k ${PINNED_MANIFEST_URL}/pinned-manifest.xml > .repo/manifest.xml
+	$CP_CMD
 fi
 ./repo sync
 

=== modified file 'build-scripts/create-user-kernel-script'
--- build-scripts/create-user-kernel-script	2012-03-23 20:45:55 +0000
+++ build-scripts/create-user-kernel-script	2012-04-10 03:31:18 +0000
@@ -13,6 +13,17 @@
 # change the dash in doanac_build... to doanac/build...
 SNAPSHOT_URL=${SNAPSHOT_URL/_/\/}
 
+CLICKTHROUGH=0
+[ ${TARGET_PRODUCT} == 'snowball' ] && CLICKTHROUGH=1
+[ ${TARGET_PRODUCT} == 'origen' ] && CLICKTHROUGH=1
+
+OPTS="d:ht"
+
+[ $CLICKTHROUGH ] && OPTS="c:d:ht"
+[ $CLICKTHROUGH ] && CLICKTHROUGH_OPT="-c .config"
+[ $CLICKTHROUGH ] && CLICKTHROUGH_OPT_CASE="c   ) CFG=\$OPTARG;;"
+[ $CLICKTHROUGH ] && CLICKTHROUGH_MSG="\" -c .config file   The kernel config file from the build. Download from:\n        ${SNAPSHOT_URL}/kernel_config\n                   from a browser with cookies enabled.\""
+
 header()
 {
 	cat <<EOF
@@ -27,7 +38,8 @@
 
 usage()
 {
-	echo 'Usage: \$0 [ -t -d directory ]'
+	echo 'Usage: \$0 ${CLICKTHROUGH_OPT}[ -t -d directory ]'
+	echo -e ${CLICKTHROUGH_MSG}
 	echo " -t                Reproduce the 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"
@@ -35,15 +47,20 @@
 	exit 1
 }
 
-while getopts   "d:ht" optn; do
+while getopts   "${OPTS}" optn; do
 	case    \$optn   in
 		d   ) DIR=\$OPTARG;;
 		t   ) EXACT=0;;
+		${CLICKTHROUGH_OPT_CASE}
 		h   ) usage; exit 1;;
         esac
 done
 
 EOF
+if [ $CLICKTHROUGH -eq 1 ] ; then
+	echo "[ \$CFG ] || usage"
+	echo
+fi
 }
 
 sync_commands()
@@ -64,19 +81,26 @@
 cd \$DIR
 git checkout $GITREV
 
-# download the kernel config
-curl -q $SNAPSHOT_URL/kernel_config > linaro_kernel_config
-
 EOF
+if [ $CLICKTHROUGH -eq 0 ] ; then
+	echo "# download the kernel config"
+	echo "curl -q $SNAPSHOT_URL/kernel_config> linaro_kernel_config"
+	echo
+fi
 }
 
 build_commands()
 {
+if [ $CLICKTHROUGH -eq 1 ] ; then
+	CP_CMD="cp \$CFG out/.config"
+else
+	CP_CMD="cp linaro_kernel_config out/.config"
+fi
 	cat <<EOF
 # build the code
 CROSS_COMPILE=\`which arm-linux-gnueabi-gcc |sed -e 's,gcc,,'\`
 [ -d out ] || mkdir out
-[ -f out/.config ] || cp linaro_kernel_config out/.config
+[ -f out/.config ] || $CP_CMD
 make -j\${CPUS} O=out ARCH=arm CROSS_COMPILE=\$CROSS_COMPILE uImage modules
 mkdir out/modules_for_android
 make O=out ARCH=arm modules_install INSTALL_MOD_PATH=modules_for_android