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

Proposed by Amit Pundir on 2013-01-22
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) 2013-01-22 Needs Fixing on 2013-01-23
Review via email: mp+144239@code.launchpad.net

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 on 2013-01-23

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

Данило Шеган (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
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.

Данило Шеган (danilo) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'build-scripts/create-user-build-script'
2--- build-scripts/create-user-build-script 2013-01-17 12:26:38 +0000
3+++ build-scripts/create-user-build-script 2013-01-23 05:52:27 +0000
4@@ -120,7 +120,24 @@
5 jenkins_configs_method()
6 {
7 cat <<EOF
8-export MANIFEST_REPO=${MANIFEST_REPO}
9+# check for linaro private manifests
10+MNF=\`echo ${MANIFEST_REPO} | grep -i "linaro-private" | wc -l\`
11+if [ \${MNF} -gt 0 ] ; then
12+ if [ "\${ID}" == "default-bot" ] ; then
13+ echo "You must specify valid login/access-id to clone from linaro-private manifest repositories."
14+ echo "Press "y" to continue (which may result in incomplete build or failure), OR"
15+ echo "Press "n" to enter login details, OR"
16+ echo "Press "h" for help."
17+ read NEXT
18+ if [ \${NEXT} == n ] ; then
19+ echo "Enter login/access-id:"
20+ read ID
21+ elif [ \${NEXT} == h ] ; then
22+ usage
23+ fi
24+ fi
25+fi
26+export MANIFEST_REPO=`echo ${MANIFEST_REPO} | sed 's/\/\/.*-bot@/\/\/'"\${ID}"'@/'`
27 export MANIFEST_BRANCH=${MANIFEST_BRANCH}
28 export MANIFEST_FILENAME=${MANIFEST_FILENAME}
29 export TARGET_PRODUCT=${TARGET_PRODUCT}
30@@ -215,8 +232,10 @@
31 if [ -n "$SOURCE_OVERLAY" ]; then
32 cat <<EOF
33
34-# extract the vendor's source overlay
35-tar -x -a -f "\$SOURCE_OVERLAY" -C .
36+if [ "a\$SOURCE_OVERLAY" != "a" ]; then
37+ # extract the vendor's source overlay
38+ tar -x -a -f "\$SOURCE_OVERLAY" -C .
39+fi
40 EOF
41 fi
42 echo

Subscribers

People subscribed via source and target branches