diff options
| author | fanquake <fanquake@gmail.com> | 2021-07-29 11:02:16 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-07-29 11:03:18 +0800 |
| commit | be92dc5876969da29a44e1360255f171734901d7 (patch) | |
| tree | de9b22410c565e5819bd2e2bbbf44490b224bf31 | |
| parent | 4b1fb50def0dea0cd320bc43c12d9a12edde0390 (diff) | |
| parent | 198ceb82f91bfdeac6e143ca7433f4a524f6f36f (diff) | |
Merge bitcoin/bitcoin#22538: doc: fix command typo in guix README
198ceb82f91bfdeac6e143ca7433f4a524f6f36f script, doc: guix touchups (jonatack)
d7b7f610a53aa62bd82f6704a9c518a93c896963 Updated Readme, Corrected the codesign typo (h)
Pull request description:
ACKs for top commit:
jamesob:
ACK https://github.com/bitcoin/bitcoin/pull/22538/commits/198ceb82f91bfdeac6e143ca7433f4a524f6f36f
jonatack:
ACK 198ceb82f91bfdeac6e143ca7433f4a524f6f36f
Tree-SHA512: 408360cebb51cff330fdd5d5d8ae91a168cdc99fb1377913fd9119e6eba536e58f87ff5c5b479e21a21fa3403323b137c338005bbd67e6fd24314929cdff9325
| -rw-r--r-- | contrib/guix/README.md | 9 | ||||
| -rw-r--r-- | doc/build-openbsd.md | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/contrib/guix/README.md b/contrib/guix/README.md index 4680368a6f..2bb464a40d 100644 --- a/contrib/guix/README.md +++ b/contrib/guix/README.md @@ -11,7 +11,7 @@ We achieve bootstrappability by using Guix as a functional package manager. # Requirements -Conservatively, a x86_64 machine with: +Conservatively, you will need an x86_64 machine with: - 16GB of free disk space on the partition that /gnu/store will reside in - 8GB of free disk space **per platform triple** you're planning on building @@ -87,7 +87,7 @@ crucial differences: An invocation with all default options would look like: ``` -env DETACHED_SIGS_REPO=<path/to/bitcoin-detached-sigs> ./contrib/guix-codesign +env DETACHED_SIGS_REPO=<path/to/bitcoin-detached-sigs> ./contrib/guix/guix-codesign ``` ## Cleaning intermediate work directories @@ -437,9 +437,8 @@ In the extraordinarily rare case where you messed up your Guix installation in an irreversible way, you may want to completely purge Guix from your system and start over. -1. Uninstall Guix itself according to the way you installed it. (e.g. `sudo apt - purge guix` for Ubuntu packaging, `sudo make uninstall` for - built-from-source). +1. Uninstall Guix itself according to the way you installed it (e.g. `sudo apt + purge guix` for Ubuntu packaging, `sudo make uninstall` for a build from source). 2. Remove all build users and groups You may check for relevant users and groups using: diff --git a/doc/build-openbsd.md b/doc/build-openbsd.md index 89fd506f13..6e54f67edc 100644 --- a/doc/build-openbsd.md +++ b/doc/build-openbsd.md @@ -68,7 +68,7 @@ export AUTOMAKE_VERSION=1.16 Make sure `BDB_PREFIX` is set to the appropriate path from the above steps. Note that building with external signer support currently fails on OpenBSD, -hence you have to explicitely disable it by passing the parameter +hence you have to explicitly disable it by passing the parameter `--disable-external-signer` to the configure script. (Background: the feature requires the header-only library boost::process, which is available on OpenBSD 6.9 via Boost 1.72.0, but contains certain system calls |