From 2d32f4e769ab6fc429c6776f44f68953adc85554 Mon Sep 17 00:00:00 2001 From: Daniel Ebdrup Jensen Date: Thu, 1 Oct 2020 13:29:19 +0200 Subject: [PATCH] Fix a few typos and rework sentences to improve flow. --- 2020q3/crossbuilding.md | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/2020q3/crossbuilding.md b/2020q3/crossbuilding.md index 91756a87..de9ba02f 100644 --- a/2020q3/crossbuilding.md +++ b/2020q3/crossbuilding.md @@ -12,21 +12,20 @@ even if the build machine is not running FreeBSD. The goal of this project is to allow building the base system on Linux and macOS hosts. -I started this project in 2017 to allow building -[CheriBSD](https://github.com/CTSRD-CHERI/cheribsd) on the Linux servers and -desktops that many of us working on the [CHERI project](http://www.cheri-cpu.org) -use. The first few patches were upstreamed in 2018 (see the 2018q3 report) and +I started this project in 2017 to allow building [CheriBSD](https://github.com/CTSRD-CHERI/cheribsd) on the Linux servers +and desktops that many of us working on the [CHERI project](http://www.cheri-cpu.org) use. +The first few patches were upstreamed in 2018 (see the 2018q3 report) and I merged the full set of patches to CheriBSD shortly after. Over the past two -years I have slowly been upstreaming the remaining patches and finally comitted +years I have slowly been upstreaming the remaining patches and finally committed the last required change in time for this report. As of September 2020 it should be possible to use the `buildworld` and `buildkernel` make targets to build a fully-functional FreeBSD installation -on macOS and Linux hosts. We use this in our continuos integration system to +on macOS and Linux hosts. We use this in our continuous integration system to build and test CheriBSD disk images for multiple architectures. -I have also committed a [GitHub Actions](https://github.com/features/actions) -configuration upstream that takes approximately 10 minutes to build an amd64 -kernel. This will ensure that changes that break crossbuilding from Linux/macOS +I have also committed a [GitHub Actions](https://github.com/features/actions) configuration upstream +that takes approximately 10 minutes to build an amd64 kernel. +This will ensure that changes that break crossbuilding from Linux/macOS can be detected easily. Upstreaming the crossbuilding changes has resulted in various build system