Skip to content

Commit 79aecbe

Browse files
committed
READMEs updates
1 parent 916c620 commit 79aecbe

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

README-BUILD.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ file.
143143

144144
### Build
145145

146-
The builds currently run on 3 dedicated machines (Intel GNU/Linux,
147-
Arm GNU/Linux and Intel macOS). A fourth machine for Arm macOS is planned.
146+
The builds currently run on 5 dedicated machines (Intel GNU/Linux,
147+
Arm 32 GNU/Linux, Arm 64 GNU/Linux, Intel macOS and Arm macOS.
148148

149149
#### Build the Intel GNU/Linux and Windows binaries
150150

@@ -201,7 +201,7 @@ network connection or a computer entering sleep.
201201
screen -S qemu
202202

203203
sudo rm -rf ~/Work/qemu-riscv-*-*
204-
bash ${HOME}/Work/qemu-riscv-xpack.git/scripts/helper/build.sh --develop --all
204+
bash ${HOME}/Work/qemu-riscv-xpack.git/scripts/helper/build.sh --develop --linux64 --win64
205205
```
206206

207207
or, for development builds:
@@ -260,8 +260,9 @@ The result should look similar to:
260260
```console
261261
$ docker images
262262
REPOSITORY TAG IMAGE ID CREATED SIZE
263-
ilegeul/ubuntu arm32v7-16.04-xbb-v3.3 a0ceaa6dad05 57 minutes ago 3.34GB
264-
ilegeul/ubuntu arm64v8-16.04-xbb-v3.3 1b0b4a94de6d 13 hours ago 3.6GB
263+
hello-world latest 46331d942d63 6 weeks ago 9.14kB
264+
ilegeul/ubuntu arm64v8-18.04-xbb-v3.4 4e7f14f6c886 4 months ago 3.29GB
265+
ilegeul/ubuntu arm32v7-18.04-xbb-v3.4 a3718a8e6d0f 4 months ago 2.92GB
265266
```
266267

267268
Since the build takes a while, use `screen` to isolate the build session
@@ -272,14 +273,14 @@ network connection or a computer entering sleep.
272273
screen -S qemu
273274

274275
sudo rm -rf ~/Work/qemu-riscv-*-*
275-
bash ${HOME}/Work/qemu-riscv-xpack.git/scripts/helper/build.sh --develop --all
276+
bash ${HOME}/Work/qemu-riscv-xpack.git/scripts/helper/build.sh --develop --arm64 --arm32
276277
```
277278

278279
or, for development builds:
279280

280281
```sh
281282
sudo rm -rf ~/Work/qemu-riscv-*-*
282-
bash ${HOME}/Work/qemu-riscv-xpack.git/scripts/helper/build.sh --develop --without-pdf --without-html --disable-tests --arm32 --arm64
283+
bash ${HOME}/Work/qemu-riscv-xpack.git/scripts/helper/build.sh --develop --without-html --disable-tests --arm64 --arm32
283284
```
284285

285286
To detach from the session, use `Ctrl-a` `Ctrl-d`; to reattach use
@@ -308,7 +309,6 @@ The current platforms for macOS production builds are:
308309

309310
```sh
310311
caffeinate ssh xbbmi
311-
312312
caffeinate ssh xbbma
313313
```
314314

@@ -327,7 +327,7 @@ or, for development builds:
327327

328328
```sh
329329
rm -rf ~/Work/qemu-riscv-*-*
330-
caffeinate bash ${HOME}/Work/qemu-riscv-xpack.git/scripts/helper/build.sh --develop --without-pdf --without-html --disable-tests --macos
330+
caffeinate bash ${HOME}/Work/qemu-riscv-xpack.git/scripts/helper/build.sh --develop --without-html --disable-tests --macos
331331
```
332332

333333
To detach from the session, use `Ctrl-a` `Ctrl-d`; to reattach use
@@ -357,7 +357,7 @@ Instead of `--all`, you can use any combination of:
357357
On Arm, instead of `--all`, you can use any combination of:
358358

359359
```console
360-
--arm32 --arm64
360+
--arm64 --arm32
361361
```
362362

363363
#### clean

README-RELEASE.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ With a git client, go to the helper repo and update to the latest master commit.
8484

8585
### Development run the build scripts
8686

87-
Before the real build, run a test build on the development machine (`wks`)
87+
Before the real build, run a test build on the development machine (`wksi`)
8888
or the production machines (`xbbma`, `xbbmi`):
8989

9090
```sh
@@ -131,12 +131,12 @@ The automation is provided by GitHub Actions and three self-hosted runners.
131131
Run the `generate-workflows` to re-generate the
132132
GitHub workflow files; commit and push if necessary.
133133

134-
- on the macOS machine (`xbbmi`) open ssh sessions to the Linux
135-
machines (`xbbli`, `xbbla64` and `xbbla32`):
134+
- on the macOS machine (`xbbmi`) open ssh sessions to the build
135+
machines (`xbbma`, `xbbli`, `xbbla64` and `xbbla32`):
136136

137137
```sh
138+
caffeinate ssh xbbma
138139
caffeinate ssh xbbli
139-
140140
caffeinate ssh xbbla64
141141
caffeinate ssh xbbla32
142142
```
@@ -312,7 +312,7 @@ watching this project.
312312
possibly adjust `.npmignore`
313313
- `npm version 6.2.0-1.1`; the first 5 numbers are the same as the
314314
GitHub release; the sixth number is the npm specific version
315-
- the commits and the tag should have beed pushed by the `postversion` script;
315+
- the commits and the tag should have been pushed by the `postversion` script;
316316
if not, push them with `git push origin --tags`
317317
- `npm publish --tag next` (use `--access public` when publishing for
318318
the first time)

0 commit comments

Comments
 (0)