highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-14 19:02:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#22538: doc: fix command typo in guix README

Browse Source 
198ceb82f91bfdeac6e143ca7433f4a524f6f36f script, doc: guix touchups (jonatack)
d7b7f610a53aa62bd82f6704a9c518a93c896963 Updated Readme, Corrected the codesign typo (h)

Pull request description:

ACKs for top commit:
  jamesob:
    ACK 198ceb82f9
  jonatack:
    ACK 198ceb82f91bfdeac6e143ca7433f4a524f6f36f

Tree-SHA512: 408360cebb51cff330fdd5d5d8ae91a168cdc99fb1377913fd9119e6eba536e58f87ff5c5b479e21a21fa3403323b137c338005bbd67e6fd24314929cdff9325
This commit is contained in:
fanquake 2021-07-29 11:02:16 +08:00
commit be92dc5876
No known key found for this signature in database
GPG Key ID: 2EEB9F5CC09526C1
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/guix/README.md
View File

@ -11,7 +11,7 @@ We achieve bootstrappability by using Guix as a functional package manager.
# Requirements # 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 - 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 - 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: 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 ## 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 an irreversible way, you may want to completely purge Guix from your system and
start over. start over.
1. Uninstall Guix itself according to the way you installed it. (e.g. `sudo apt 1. Uninstall Guix itself according to the way you installed it (e.g. `sudo apt
purge guix` for Ubuntu packaging, `sudo make uninstall` for purge guix` for Ubuntu packaging, `sudo make uninstall` for a build from source).
built-from-source).
2. Remove all build users and groups 2. Remove all build users and groups
You may check for relevant users and groups using: You may check for relevant users and groups using:

2
doc/build-openbsd.md
View File

@ -68,7 +68,7 @@ export AUTOMAKE_VERSION=1.16
Make sure `BDB_PREFIX` is set to the appropriate path from the above steps. 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, 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. `--disable-external-signer` to the configure script.
(Background: the feature requires the header-only library boost::process, which (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 is available on OpenBSD 6.9 via Boost 1.72.0, but contains certain system calls