diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2021-08-08 09:04:18 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2021-08-08 09:16:36 +0000 |
| commit | 0b55ca0d89d49696e9e68b35fc4ccfd97eb16397 (patch) | |
| tree | 59864c2d2b460304b9286463e003c1b88d945992 | |
| parent | 01a014bc5476978c79b8964108480dde103a0e38 (diff) | |
round-robin.sh: Don't special-case linux sources
... now that we track linux as component in CI loops
that install linux headers (tcwg_gnu_* and tcwg_bmk_* loops).
Change-Id: If06bebe3c381b1dd538a24bf6c686e9405e4203e
| -rw-r--r-- | round-robin.sh | 4 | ||||
| -rwxr-xr-x | tcwg_bmk-build.sh | 5 | ||||
| -rwxr-xr-x | tcwg_gnu-build.sh | 5 |
3 files changed, 8 insertions, 6 deletions
diff --git a/round-robin.sh b/round-robin.sh index a9113bc0..60e28cf1 100644 --- a/round-robin.sh +++ b/round-robin.sh @@ -326,8 +326,8 @@ build_abe () local git_dir="$project" local n_patches=0 case "$component" in - # Use our custom sources for everything, but kernel headers and dejagnu. - linux|dejagnu) ;; + # Use our custom sources for everything, but dejagnu. + dejagnu) ;; *) git_dir="$git_dir.git" custom_abe_src_opt="$project=http://git.l.o/$git_dir~master --disable update" diff --git a/tcwg_bmk-build.sh b/tcwg_bmk-build.sh index 16d2665c..b5b6baaf 100755 --- a/tcwg_bmk-build.sh +++ b/tcwg_bmk-build.sh @@ -118,9 +118,9 @@ esac case "${rr[toolchain]}" in llvm) # shellcheck disable=SC2154 - rr[components]="binutils gcc glibc llvm" ;; + rr[components]="binutils gcc linux glibc llvm" ;; gnu) - rr[components]="binutils gcc glibc" ;; + rr[components]="binutils gcc linux glibc" ;; gnu_eabi) rr[components]="binutils gcc newlib" ;; *) assert_with_msg "Unknown toolchain \"${rr[toolchain]}\"" false ;; @@ -152,6 +152,7 @@ case "${rr[mode]}" in case $single_updated_component in binutils) default_start_at="build_abe-binutils" ;; gcc) default_start_at="build_abe-stage1" ;; + linux) default_start_at="build_abe-linux" ;; glibc) default_start_at="clean_sysroot" ;; llvm) default_start_at="build_llvm-true" ;; newlib) default_start_at="build_abe-newlib" ;; diff --git a/tcwg_gnu-build.sh b/tcwg_gnu-build.sh index 00b2dfef..a850d8d5 100755 --- a/tcwg_gnu-build.sh +++ b/tcwg_gnu-build.sh @@ -40,7 +40,7 @@ type_of_test=${type_of_test-${ci_config[2]-}} case "${rr[ci_project]}" in tcwg_gnu_native_*) rr[target]="${rr[target]-native}" - rr[components]="${rr[components]-binutils gcc glibc gdb}" + rr[components]="${rr[components]-binutils gcc linux glibc gdb}" ;; tcwg_gcc_*) rr[target]="${rr[target]-native}" @@ -48,7 +48,7 @@ case "${rr[ci_project]}" in ;; tcwg_gnu_cross_*) rr[target]="${rr[target]-${ci_config[1]}}" - rr[components]="${rr[components]-binutils gcc glibc qemu}" + rr[components]="${rr[components]-binutils gcc linux glibc qemu}" ;; *) assert_with_msg "Unknown ci_project: ${rr[ci_project]}" false ;; esac @@ -89,6 +89,7 @@ case "${rr[mode]}" in gcc:tcwg_gnu_native_*) default_start_at="build_abe-stage1" ;; gcc:tcwg_gcc_check) default_start_at="build_abe-gcc" ;; gcc:tcwg_gcc_*bootstrap) default_start_at="build_abe-${type_of_test#check_}" ;; + linux:*) default_start_at="build_abe-linux" ;; glibc:*) default_start_at="build_abe-glibc" ;; gdb:*) default_start_at="build_abe-gdb" ;; qemu:*) default_start_at="build_abe-qemu" ;; |