diff options
Diffstat (limited to 'buildos')
| -rwxr-xr-x | buildos | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -153,7 +153,7 @@ for tn in "${!toolchains[@]}"; do declare "${tp}toolchain_file=$tf" declare "${tp}toolchain_csum=$(sed -n -re 's%^.+\.([^.]+)$%\1%p' <<<"$tf")" - declare "${tp}toolchain_root=/build/tftp/toolchain/$tn" + declare "${tp}toolchain_root=/build/tftp/toolchains/$tn" declare "${tp}toolchain_ver=" # If buildos.toolchain_trust was not specified, set it to "no" so that @@ -566,10 +566,10 @@ function toolchain_bootstrap () # <toolchain-name> # echo "$tt" >"$tr/trust" - # Bootstrap in /tmp/toolchain/$tn/, install to /build/toolchain/$tn/. + # Bootstrap in /tmp/toolchains/$tn/, install to /build/toolchains/$tn/. # - local wd="/tmp/toolchain/$tn" - local id="/build/toolchain/$tn" + local wd="/tmp/toolchains/$tn" + local id="/build/toolchains/$tn" mkdir -p "$wd" mkdir -p "$id" @@ -614,9 +614,9 @@ function bbot_check () # <toolchain-name> { local tn="$1" - export PATH="/build/toolchain/$tn/bin:$PATH" # Running in subshell. + export PATH="/build/toolchains/$tn/bin:$PATH" # Running in subshell. - cd "/tmp/toolchain/$tn/build2-toolchain" + cd "/tmp/toolchains/$tn/build2-toolchain" local r=3 @@ -674,9 +674,9 @@ function bbot_start () # <toolchain-name> <toolchain-index> # local vars=(config.install.root="$id" config.bin.rpath="$id/lib") - export PATH="/build/toolchain/$tn/bin:$PATH" # Running in subshell. + export PATH="/build/toolchains/$tn/bin:$PATH" # Running in subshell. - cd "/tmp/toolchain/$tn/build2-toolchain" + cd "/tmp/toolchains/$tn/build2-toolchain" local r=1 @@ -864,7 +864,7 @@ EOF info "$s" email "$s" <<EOF -$tn.toolchain_log: tftp://$hname/toolchain/$tn/toolchain-$count.log +$tn.toolchain_log: tftp://$hname/toolchains/$tn/toolchain-$count.log EOF fi else @@ -977,7 +977,7 @@ EOF info "$s" email "$s" <<EOF -$tn.bbot_log: tftp://$hname/toolchain/$tn/bbot-$count.log +$tn.bbot_log: tftp://$hname/toolchains/$tn/bbot-$count.log EOF done fi |