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

Proposed by Amit Pundir
Status: Needs review
Proposed branch: lp:~pundiramit/linaro-android-build-tools/labt
Merge into: lp:linaro-android-build-tools
Diff against target: 42 lines (+22/-3)
1 file modified
build-scripts/create-user-build-script (+22/-3)
To merge this branch: bzr merge lp:~pundiramit/linaro-android-build-tools/labt
Reviewer Review Type Date Requested Status
Данило Шеган (community) Needs Fixing
Review via email:

Description of the change

Fix build error when Source_Overlay is not set.

To post a comment you must log in.
554. By Amit Pundir

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

Revision history for this message
Данило Шеган (danilo) wrote :

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
Revision history for this message
Amit Pundir (pundiramit) wrote :

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.

Revision history for this message
Данило Шеган (danilo) wrote :

Ok, I've discussed this with Vishal: the goal of this is to enable produced 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

review: Needs Fixing

Unmerged revisions

554. By Amit Pundir

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

553. By Amit Pundir

fix build error when overlay is not set

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
122 cat <<EOF122 cat <<EOF
123export MANIFEST_REPO=${MANIFEST_REPO}123# check for linaro private manifests
124MNF=\`echo ${MANIFEST_REPO} | grep -i "linaro-private" | wc -l\`
125if [ \${MNF} -gt 0 ] ; then
126 if [ "\${ID}" == "default-bot" ] ; then
127 echo "You must specify valid login/access-id to clone from linaro-private manifest repositories."
128 echo "Press "y" to continue (which may result in incomplete build or failure), OR"
129 echo "Press "n" to enter login details, OR"
130 echo "Press "h" for help."
131 read NEXT
132 if [ \${NEXT} == n ] ; then
133 echo "Enter login/access-id:"
134 read ID
135 elif [ \${NEXT} == h ] ; then
136 usage
137 fi
138 fi
140export MANIFEST_REPO=`echo ${MANIFEST_REPO} | sed 's/\/\/.*-bot@/\/\/'"\${ID}"'@/'`
@@ -215,8 +232,10 @@
215 if [ -n "$SOURCE_OVERLAY" ]; then232 if [ -n "$SOURCE_OVERLAY" ]; then
216 cat <<EOF233 cat <<EOF
218# extract the vendor's source overlay235if [ "a\$SOURCE_OVERLAY" != "a" ]; then
219tar -x -a -f "\$SOURCE_OVERLAY" -C .236 # extract the vendor's source overlay
237 tar -x -a -f "\$SOURCE_OVERLAY" -C .
221 fi240 fi
222 echo241 echo


People subscribed via source and target branches