diff options
author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-12-06 19:31:51 +0000 |
---|---|---|
committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-12-11 15:49:51 +0000 |
commit | 56d01ad026a1bf0628cfdd1b0b664a75a2d437ed (patch) | |
tree | c4a684b6429ebd2d95f317379cbaf8c699c94bbd /tcwg_kernel-build.sh | |
parent | 850e23e5166fe2f0de481b3e1704317a33bb468a (diff) |
tcwg_kernel-build.sh: Remove unnecessary indirection via ${git_dirs[]}
Change-Id: I0a7c32c871d33044be172855d037f152b2f5f82f
Diffstat (limited to 'tcwg_kernel-build.sh')
-rwxr-xr-x | tcwg_kernel-build.sh | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/tcwg_kernel-build.sh b/tcwg_kernel-build.sh index 5c232521..93ebb8aa 100755 --- a/tcwg_kernel-build.sh +++ b/tcwg_kernel-build.sh @@ -46,13 +46,6 @@ if $verbose2; then set -x; fi trap "eval \"echo ERROR at \${FUNCNAME[0]}:\${BASH_LINENO[0]}\" > $top_artifacts/failures" EXIT -# Directory structure for git repos -declare -A git_dirs -git_dirs[binutils]=binutils -git_dirs[gcc]=gcc -git_dirs[llvm]=llvm -git_dirs[linux]=linux - if [ x"$target" = x"native" ]; then config[target]=$(uname -m) else @@ -171,8 +164,6 @@ clone_repo () branch="refs/remotes/baseline/$baseline" fi - local dir=${git_dirs[$project]} - # Decide on whether to use read-only or read-write mode for # refs/remotes/baseline. We use read-only wherever possible to allow # developers without ssh keys on Linaro git servers to reproduce builds @@ -183,13 +174,13 @@ clone_repo () fi # Clone origin remote - clone_or_update_repo_no_checkout $dir ${git_repo[$project]} auto > /dev/null + clone_or_update_repo_no_checkout $project ${git_repo[$project]} auto > /dev/null # Add baseline remote - git_init_linaro_local_remote $dir baseline $read_only + git_init_linaro_local_remote $project baseline $read_only # Checkout, now that we have both origin and baseline remotes ready. - clone_or_update_repo $dir $branch ${git_repo[$project]} > /dev/null + clone_or_update_repo $project $branch ${git_repo[$project]} > /dev/null - cd $dir + cd $project git rev-parse HEAD > $run_step_artifacts/revision if [ x"$project" = x"$current_project" ]; then @@ -351,8 +342,8 @@ build_llvm_1 () clone_repo llvm # Copy only components from the monorepo that are required for kernel build - rsync -a --del --exclude /tools/clang ${git_dirs[llvm]}/llvm/ llvm-src/ - rsync -a --del ${git_dirs[llvm]}/clang/ llvm-src/tools/clang/ + rsync -a --del --exclude /tools/clang llvm/llvm/ llvm-src/ + rsync -a --del llvm/clang/ llvm-src/tools/clang/ # Setup ccache and ninja wrappers. rm -rf $(pwd)/bin @@ -457,7 +448,7 @@ EOF opts="$opts HOSTCC=gcc" fi - cd ${git_dirs[linux]} + cd linux make $opts distclean @@ -486,7 +477,7 @@ count_linux_objs () echo "linux_n_obj:" >> $top_artifacts/results if [ $res != 0 ]; then local linux_n_obj - linux_n_obj=$(find ${git_dirs[linux]} -name "*.o" | wc -l) + linux_n_obj=$(find linux -name "*.o" | wc -l) echo "$linux_n_obj" >> $top_artifacts/results else echo "all" >> $top_artifacts/results @@ -589,7 +580,7 @@ update_baseline () # in base-artifacts.git repo. rsync -a --del --exclude /.git $top_artifacts/ base-artifacts/ - build_rev=$(git -C ${git_dirs[$current_project]} rev-parse HEAD) + build_rev=$(git -C $current_project rev-parse HEAD) cd base-artifacts git add . @@ -609,7 +600,7 @@ push_baseline () git_init_linaro_local_remote base-artifacts baseline false git_push base-artifacts baseline $baseline - git_push ${git_dirs[$current_project]} baseline $baseline + git_push $current_project baseline $baseline ) } |