tcwg_kernel*: Rename git_repo and git_branch

This is a mechanical change to rename:
git_repo[X] -> rr[X_url]
git_branch[X] -> rr[X_rev]

Change-Id: Idda39b49950b414fa6bacdb0094d5cb125d1867d

10 files changed, 27 insertions, 43 deletions

diff --git a/tcwg_kernel-bisect.sh b/tcwg_kernel-bisect.sh
index bb29013d..410429da 100755
--- a/tcwg_kernel-bisect.sh
+++ b/tcwg_kernel-bisect.sh
@@ -16,7 +16,7 @@ confirm_failure="${confirm_failure:-false}"
 # Process build args and record them in build-manifest.sh
 convert_args_to_variables %% build-manifest.sh "$@"
 
-obligatory_variables config current_project git_repo git_branch toolchain
+obligatory_variables config current_project toolchain
 
 linux_config="${linux_config:-defconfig}"
 target="${target:-native}"
diff --git a/tcwg_kernel-build.sh b/tcwg_kernel-build.sh
index 750e66fa..2b05af76 100755
--- a/tcwg_kernel-build.sh
+++ b/tcwg_kernel-build.sh
@@ -11,7 +11,7 @@ convert_args_to_variables "$@"
 mode="${mode-baseline}"
 
 # Toolchain to use: gnu or llvm
-obligatory_variables rr git_repo git_branch toolchain
+obligatory_variables rr toolchain
 
 case "$mode" in
     "jenkins-full")
@@ -147,7 +147,7 @@ clone_repo ()
     # uses baseline branch.
     if [ x"$project" = x"$current_project" ]; then
 	if [ x"$current_rev" = x"default" ]; then
-	    branch=${git_branch[$current_project]}
+	    branch=${rr[${current_project}_rev]}
 	elif [ x"$current_rev" = x"baseline" ]; then
 	    branch="refs/remotes/baseline/$baseline"
 	else
@@ -167,11 +167,11 @@ clone_repo ()
     fi
 
     # Clone origin remote
-    clone_or_update_repo_no_checkout $project ${git_repo[$project]} auto > /dev/null
+    clone_or_update_repo_no_checkout $project ${rr[${project}_url]} auto > /dev/null
     # Add baseline remote
     git_init_linaro_local_remote $project baseline $read_only
     # Checkout, now that we have both origin and baseline remotes ready.
-    clone_or_update_repo $project $branch ${git_repo[$project]} > /dev/null
+    clone_or_update_repo $project $branch ${rr[${project}_url]} > /dev/null
 
     cd $project
 
@@ -253,7 +253,7 @@ build_abe_1 ()
     # Don't use ABE's repo clone functions and setup abe/snapshots/ directory
     # to have the right entries.
     local git_dir git_path
-    git_dir="$(basename ${git_repo[$project]})"
+    git_dir="$(basename ${rr[${project}_url]})"
     git_path="abe/snapshots/$git_dir"
     rm -rf $git_path $git_path~master
     ln -s $(pwd)/$project $git_path
@@ -286,7 +286,7 @@ build_abe_1 ()
 	--target $gnu_target \
 	--extraconfigdir config/master \
 	--disable update \
-	$project=${git_repo[$project]}~master \
+	$project=${rr[${project}_url]}~master \
 	$stage
     ccache -s
     )
diff --git a/tcwg_kernel/gnu-master.sh b/tcwg_kernel/gnu-master.sh
index 77e05966..1621a04c 100644
--- a/tcwg_kernel/gnu-master.sh
+++ b/tcwg_kernel/gnu-master.sh
@@ -1,11 +1,9 @@
 #!/bin/bash
 
 declare -gA rr
-declare -gA git_repo
-declare -gA git_branch
 
 rr[gnu_version]=master
-git_repo[binutils]=git://sourceware.org/git/binutils-gdb.git
-git_branch[binutils]=master
-git_repo[gcc]=git://gcc.gnu.org/git/gcc.git
-git_branch[gcc]=master
+rr[binutils_url]=git://sourceware.org/git/binutils-gdb.git
+rr[binutils_rev]=master
+rr[gcc_url]=git://gcc.gnu.org/git/gcc.git
+rr[gcc_rev]=master
diff --git a/tcwg_kernel/gnu-release.sh b/tcwg_kernel/gnu-release.sh
index 9379bcbe..3c8728fa 100644
--- a/tcwg_kernel/gnu-release.sh
+++ b/tcwg_kernel/gnu-release.sh
@@ -1,11 +1,9 @@
 #!/bin/bash
 
 declare -gA rr
-declare -gA git_repo
-declare -gA git_branch
 
 rr[gnu_version]=release
-git_repo[binutils]=git://sourceware.org/git/binutils-gdb.git
-git_branch[binutils]=binutils-2_31-branch
-git_repo[gcc]=git://gcc.gnu.org/git/gcc.git
-git_branch[gcc]=gcc-8-branch
+rr[binutils_url]=git://sourceware.org/git/binutils-gdb.git
+rr[binutils_rev]=binutils-2_31-branch
+rr[gcc_url]=git://gcc.gnu.org/git/gcc.git
+rr[gcc_rev]=gcc-8-branch
diff --git a/tcwg_kernel/linux-lts.sh b/tcwg_kernel/linux-lts.sh
index 465c1e98..b849f02c 100644
--- a/tcwg_kernel/linux-lts.sh
+++ b/tcwg_kernel/linux-lts.sh
@@ -1,9 +1,7 @@
 #!/bin/bash
 
 declare -gA rr
-declare -gA git_repo
-declare -gA git_branch
 
 rr[linux_version]=lts
-git_repo[linux]=git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
-git_branch[linux]=linux-4.14.y
+rr[linux_url]=git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
+rr[linux_rev]=linux-4.14.y
diff --git a/tcwg_kernel/linux-mainline.sh b/tcwg_kernel/linux-mainline.sh
index 6fe6ca6c..983d69e9 100644
--- a/tcwg_kernel/linux-mainline.sh
+++ b/tcwg_kernel/linux-mainline.sh
@@ -1,9 +1,7 @@
 #!/bin/bash
 
 declare -gA rr
-declare -gA git_repo
-declare -gA git_branch
 
 rr[linux_version]=mainline
-git_repo[linux]=git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
-git_branch[linux]=master
+rr[linux_url]=git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
+rr[linux_rev]=master
diff --git a/tcwg_kernel/linux-next.sh b/tcwg_kernel/linux-next.sh
index a87d83bc..585e9c1b 100644
--- a/tcwg_kernel/linux-next.sh
+++ b/tcwg_kernel/linux-next.sh
@@ -1,9 +1,7 @@
 #!/bin/bash
 
 declare -gA rr
-declare -gA git_repo
-declare -gA git_branch
 
 rr[linux_version]=next
-git_repo[linux]=git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
-git_branch[linux]=master
+rr[linux_url]=git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
+rr[linux_rev]=master
diff --git a/tcwg_kernel/linux-stable.sh b/tcwg_kernel/linux-stable.sh
index d6ca2647..48cc61f7 100644
--- a/tcwg_kernel/linux-stable.sh
+++ b/tcwg_kernel/linux-stable.sh
@@ -1,9 +1,7 @@
 #!/bin/bash
 
 declare -gA rr
-declare -gA git_repo
-declare -gA git_branch
 
 rr[linux_version]=stable
-git_repo[linux]=git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
-git_branch[linux]=linux-4.18.y
+rr[linux_url]=git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
+rr[linux_rev]=linux-4.18.y
diff --git a/tcwg_kernel/llvm-master.sh b/tcwg_kernel/llvm-master.sh
index 0daa911f..70f1a0c4 100644
--- a/tcwg_kernel/llvm-master.sh
+++ b/tcwg_kernel/llvm-master.sh
@@ -1,9 +1,7 @@
 #!/bin/bash
 
 declare -gA rr
-declare -gA git_repo
-declare -gA git_branch
 
 rr[llvm_version]=master
-git_repo[llvm]=https://github.com/llvm-project/llvm-project-20170507.git
-git_branch[llvm]=master
+rr[llvm_url]=https://github.com/llvm-project/llvm-project-20170507.git
+rr[llvm_rev]=master
diff --git a/tcwg_kernel/llvm-release.sh b/tcwg_kernel/llvm-release.sh
index f632e978..8653e670 100644
--- a/tcwg_kernel/llvm-release.sh
+++ b/tcwg_kernel/llvm-release.sh
@@ -1,9 +1,7 @@
 #!/bin/bash
 
 declare -gA rr
-declare -gA git_repo
-declare -gA git_branch
 
 rr[llvm_version]=release
-git_repo[llvm]=https://github.com/llvm-project/llvm-project-20170507.git
-git_branch[llvm]=release_70
+rr[llvm_url]=https://github.com/llvm-project/llvm-project-20170507.git
+rr[llvm_rev]=release_70