diff options
| -rw-r--r-- | doc/tutorial/cross-compiling.md | 18 | ||||
| -rw-r--r-- | doc/tutorial/just-execute.org | 12 |
2 files changed, 15 insertions, 15 deletions
diff --git a/doc/tutorial/cross-compiling.md b/doc/tutorial/cross-compiling.md index 88f93021..4bdeadbb 100644 --- a/doc/tutorial/cross-compiling.md +++ b/doc/tutorial/cross-compiling.md @@ -1,4 +1,4 @@ -Cros compiling and testing cross-compiled targets +Cross compiling and testing cross-compiled targets ================================================== So far, we were always building for the platform on which we were @@ -31,7 +31,7 @@ Let's start a new project. $ touch ROOT ``` -We create a file `reposs.template.json` specifying the one local repository. +We create a file `repos.template.json` specifying the one local repository. ``` {.jsonc srcname="repos.template.json"} { "repositories": { "": @@ -90,7 +90,7 @@ To cross compile, we simply add `TARGET_ARCH`. $ just-mr build -D '{"COMPILER_FAMILY": "gnu", "OS": "linux", "ARCH": "x86_64", "TARGET_ARCH": "arm64"}' INFO: Performing repositories setup INFO: Found 21 repositories to set up -INFO: Setup finished, exec ["just","build","-C","/home/aehlig/.cache/just/protocol-dependent/generation-0/git-sha1/casf/8c/c5d925c6d230e233f0e89107c8edb22d699063","-D","{\"COMPILER_FAMILY\": \"gnu\", \"OS\": \"linux\", \"ARCH\": \"x86_64\", \"TARGET_ARCH\": \"arm64\"}"] +INFO: Setup finished, exec ["just","build","-C","...","-D","{\"COMPILER_FAMILY\": \"gnu\", \"OS\": \"linux\", \"ARCH\": \"x86_64\", \"TARGET_ARCH\": \"arm64\"}"] INFO: Requested target is [["@","","","helloworld"],{"ARCH":"x86_64","COMPILER_FAMILY":"gnu","OS":"linux","TARGET_ARCH":"arm64"}] INFO: Analysed target [["@","","","helloworld"],{"ARCH":"x86_64","COMPILER_FAMILY":"gnu","OS":"linux","TARGET_ARCH":"arm64"}] INFO: Discovered 2 actions, 1 trees, 0 blobs @@ -185,14 +185,14 @@ $ ``` The reason is that a test actually has to run the created binary -and that requires a build enviroment of the target architecture. -So, if not being told how to obtain such an environemt, they carry -out the test in the best mannor they can, i.e., by transitioning +and that requires a build environment of the target architecture. +So, if not being told how to obtain such an environment, they carry +out the test in the best manner they can, i.e., by transitioning everything to host. So, in order to properly test the cross-compiled binary, we need to do two things. - We need to setup remote execution on the correct architecture, - either by buying the apropriate hardware, or by running an emulator. + either by buying the appropriate hardware, or by running an emulator. - We need to tell `justbuild` on how to reach that endpoint. To continue the example, let's say we set up an `arm64` machine, @@ -220,7 +220,7 @@ map have the same value in the remote-execution properties of the action (in particular, `{}` matches everything); so more specific dispatches have to be specified earlier in the list. In our case, we have a single endpoint in our private network that we should -use whenever the propterty `"runnner"` has value `"arm64-worker"`. +use whenever the property `"runner"` has value `"arm64-worker"`. The IP/port specification might differ in your setup. The path to this file is passed by the `--endpoint-configuration` option. @@ -267,7 +267,7 @@ $ The resulting command line might look complicated, but the authentication-related options, as well as the dispatch-related -otpions (including setting `ARGUMENTS_DISPATCH` via `-D`) can simply +options (including setting `ARGUMENTS_DISPATCH` via `-D`) can simply be set in the `"just args"` entry of the `.just-mrrc` file. When inspecting the result, we can use `just install-cas` as usual, diff --git a/doc/tutorial/just-execute.org b/doc/tutorial/just-execute.org index c92c5108..6afac092 100644 --- a/doc/tutorial/just-execute.org +++ b/doc/tutorial/just-execute.org @@ -77,7 +77,7 @@ Hello from \LaTeX! In this first example, we simply call ~just execute~ and the environment of the caller is made available. We therefore recommend to -have a dedicated non-priviledged ~build~ user to run the execution +have a dedicated non-privileged ~build~ user to run the execution service. In the following, we will use ~%~ to indicate the prompt of the ~build~ user, ~$~ for a /normal/ user. @@ -98,7 +98,7 @@ to a different build tool. To use it, as a /normal/ user, on a different shell type #+BEGIN_SRC bash -$ just [...] -r localhost:<N> +$ just [...] -r localhost:<N> #+END_SRC Let's run these commands to understand the output. @@ -155,7 +155,7 @@ INFO: execution service started: {"interface":"127.0.0.1","pid":7680,"port":4411 #+END_SRC #+BEGIN_SRC bash -$ cat /tmp/foo.json +$ cat /tmp/foo.json {"interface":"127.0.0.1","pid":7680,"port":44115} #+END_SRC @@ -210,7 +210,7 @@ On the other hand, if the clients will connect from a different machine, and ~just execute~ will use a different interface (see [[Expose a particular interface]] below), the steps are a bit more involved. We need an additional configuration file where we state the ip address of -the used interface. For example, if the interface ip address is +the used interface. For example, if the interface ip address is ~192.168.1.14~, we will write #+BEGIN_SRC bash % cat << EOF > ssl-ext-x509.cnf @@ -275,7 +275,7 @@ scenarios. This short tutorial will use ~debootstrap~ and ~schroot~ to create and enter the chroot environment. Of course, different strategies/programs -can be used. +can be used. ***** Prepare the root file system Install debian bullseye in directory ~/chroot/bullseye-latex~ @@ -343,7 +343,7 @@ which should report #+BEGIN_SRC bash INFO: Performing repositories setup INFO: Found 2 repositories to set up -INFO: Setup finished, exec ["just","install","-C","/home/alberto/.cache/just/protocol-dependent/generation-0/git-sha1/casf/c0/086f5dc35e084224781becfedb11baee8e9e24","-o",".","-r","localhost:8080"] +INFO: Setup finished, exec ["just","install","-C","...","-o",".","-r","localhost:8080"] INFO: Requested target is [["@","tutorial","doc/just-execute/latex-hello-world","tutorial"],{}] INFO: Analysed target [["@","tutorial","doc/just-execute/latex-hello-world","tutorial"],{}] INFO: Export targets found: 0 cached, 0 uncached, 0 not eligible for caching |