Merge lp:~fagerstedt-axel/linaro-android-build-tools/repo-groups-support into lp:linaro-android-build-tools

[Axel Fagerstedt]

Adds support for specifying REPO_GROUPS in build parameters.

If set the specified will be used in repo inits, and when generating the linaro_android_build_commands.sh script.

This is done as a step towards unifying the linaro android manifests (https://blueprints.launchpad.net/linaro-android/+spec/move-kernel-out-of-android-manifest). A unified manifest may contain several kernels (for instance), we will use repo groups to avoid syncing device specific projects we are not interested in.

[Milo Casagrande (milo)]

Hello,

thanks for working on this!
Overall it looks good to go for me.

One thing:
+ if [ "$REPO_GROUPS" != "all,-notdefault,-eclipse" ]; then

what if the REPO_GROUPS is just "all,-eclipse", the "-g" option is always necessary?
I have no idea how that is handled or what should be the values...

review: Approve

[Axel Fagerstedt (fagerstedt-axel)]

Hi Milo,

What I was trying to do was to have the scripts behave exactly as they have
always done if repo groups is not defined for the build.
Earlier it would always do < repo init -g "all,-notdefault,-eclipse" > in
the sync operations, but generate a linaro_android_build_commands.sh which
used repo init with no -g option.

A repo init with no -g option specified is actually afaik equivalent to -g
"all,-notdefault". We could generate linaro_android_build_commands.sh with
" -g $REPO_GROUPS " always, I think it would be equally valid, in fact if
the goal is for the generated linaro_android_build_commands.sh to map 100%
to what the server built it would probably be more correct.

[Milo Casagrande (milo)]

Hello Axel,

apologies for replying so late.
Thanks also for the explanation, it has now been merged.

=== modified file 'build-scripts/create-user-build-script'
--- build-scripts/create-user-build-script	2012-12-17 09:46:00 +0000
+++ build-scripts/create-user-build-script	2012-12-20 09:55:27 +0000
@@ -165,13 +165,18 @@
 	else
 		CP_CMD="curl -k ${PINNED_MANIFEST_URL}/pinned-manifest.xml > .repo/manifest.xml"
 	fi
+	if [ "$REPO_GROUPS" != "all,-notdefault,-eclipse" ]; then
+		REPO_GROUPS_OPTION="-g $REPO_GROUPS"
+	else
+		REPO_GROUPS_OPTION=""
+	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
 chmod +x repo
 
 # download the android code
-./repo init -u \${MANIFEST_REPO} -b \${MANIFEST_BRANCH} -m \${MANIFEST_FILENAME} ${REPO_MIRROR}
+./repo init -u \${MANIFEST_REPO} -b \${MANIFEST_BRANCH} -m \${MANIFEST_FILENAME} ${REPO_MIRROR} $REPO_GROUPS_OPTION
 if [ \${EXACT} -eq 1 ] ; then
 	rm .repo/manifest.xml
 	$CP_CMD

=== modified file 'build-scripts/helpers'
--- build-scripts/helpers	2012-12-06 15:02:32 +0000
+++ build-scripts/helpers	2012-12-20 09:55:27 +0000
@@ -6,6 +6,7 @@
     MANIFEST_REPO="${MANIFEST_REPO-git://android.git.kernel.org/platform/manifest.git}"
     MANIFEST_BRANCH="${MANIFEST_BRANCH-master}"
     MANIFEST_FILENAME="${MANIFEST_FILENAME-default.xml}"
+    REPO_GROUPS=${REPO_GROUPS-"all,-notdefault,-eclipse"}
     if [ -n "$REPO_QUIET" ]; then
         REPO_QUIET="--quiet"
     fi
@@ -19,11 +20,12 @@
         #SYNC_JOBS=${SYNC_JOBS-3}
         SYNC_JOBS=3
     fi
+
 }
 
 repo-sync-from-mirror () {
     setup-repo-vars
-    repo init $REPO_QUIET -u "${MANIFEST_REPO}" -b "${MANIFEST_BRANCH}" -m "${MANIFEST_FILENAME}" $REPO_MIRROR  -g all,-notdefault,-eclipse
+    repo init $REPO_QUIET -u "${MANIFEST_REPO}" -b "${MANIFEST_BRANCH}" -m "${MANIFEST_FILENAME}" $REPO_MIRROR  -g $REPO_GROUPS
     # Save input manifest as build artifact for reference
     mkdir -p out
     cp .repo/manifest.xml out/source-manifest.xml
@@ -57,7 +59,7 @@
 #    fi
 
     repo init $REPO_QUIET -u "${MANIFEST_REPO}" -b "${MANIFEST_BRANCH}" -m "${MANIFEST_FILENAME}" \
-    $REPO_MIRROR --reference=$PWD/$seed_name -g all,-notdefault,-eclipse
+    $REPO_MIRROR --reference=$PWD/$seed_name -g $REPO_GROUPS
     mkdir -p out
     cp .repo/manifest.xml out/source-manifest.xml