aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbuildos20
-rw-r--r--doc/manual.cli8
2 files changed, 14 insertions, 14 deletions
diff --git a/buildos b/buildos
index 2e484a2..2dce5b6 100755
--- a/buildos
+++ b/buildos
@@ -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
diff --git a/doc/manual.cli b/doc/manual.cli
index 7284c6a..cc55115 100644
--- a/doc/manual.cli
+++ b/doc/manual.cli
@@ -68,7 +68,7 @@ the following subdirectories:
sub-directories inside this directory temporarily write-accessible to build
machines by running custom instances of the TFTP server on other ports.|
-\li|\n\c{/build/toolchain/}\n
+\li|\n\c{/build/toolchains/}\n
Contains \c{build2} toolchain installations after bootstrap. Each version
is installed into a subdirectory named as the toolchain name. See
@@ -77,7 +77,7 @@ the following subdirectories:
\li|\n\c{/build/bbot/}\n
Contains \c{bbot} installations. Each version is installed into a
- subdirectory names as the toolchain name. See \l{#config-toolchains
+ subdirectory named as the toolchain name. See \l{#config-toolchains
Toolchains} for details.|
\li|\n\c{/build/machines/}\n
@@ -339,7 +339,7 @@ e723[...]c305 *0.4.0/build2-mingw-0.4.0-x86_64-windows.tar.xz
\
Based on the checksums file the monitor downloads each file into
-\c{/build/tftp/toolchain/<name>/} (the file path is taken as relative to
+\c{/build/tftp/toolchains/<name>/} (the file path is taken as relative to
\c{toolchain_url}), verifies their checksums, and creates \i{predictable name}
symlinks (names without the version). It also creates the \c{version} which
contains the toolchain version and the \c{trust} file which contains the
@@ -347,7 +347,7 @@ value of the \c{buildos.toolchain_trust} parameter or the special \c{\"no\"}
value if none were specified.
Continuing with the above example, the contents of
-\c{/build/tftp/toolchain/default/} would be:
+\c{/build/tftp/toolchains/default/} would be:
\
version