Skip to content

Commit e7441a6

Browse files
committed
Merge bitcoin#21711: guix: Add full installation and usage documentation
fac4814 doc/release-process: Add torrent creation details (Carl Dong) 5d24cc3 guix/INSTALL: Guix installs init scripts in libdir (Carl Dong) 5da2ee4 guix/INSTALL: Add coreutils/inotify-dir-recreate troubleshooting (Carl Dong) 318c607 guix: Adapt release-process.md to new Guix process (Carl Dong) fcab35b guix-attest: Produce and sign normalized documents (Carl Dong) c2541fd guix: Overhaul README (Carl Dong) 46ce6ce tree-wide: Rename gitian-keys to builder-keys (Carl Dong) fc4f844 guix: Update various check_tools lists (Carl Dong) 263220a guix: Check for a sane services database (Carl Dong) Pull request description: Based on: bitcoin#21462 Keeping the README in one file so that it's easy to search through. Will add more jumping links later so navigation is easier. Current TODOs: - [x] Shell installer option: prompt user to re-login for `/etc/profile.d` entry to be picked up - [x] Binary tarball option: prompt user to create `/etc/profile.d` entry and re-login - [x] Fanquake docker option: complete section - [x] Arch Linux AUR option: prompt to start `guix-daemon-latest` unit after finishing "optional setup" section - [x] Building from source option: Insert dependency tree diagram that I made - [x] Building from source option: redo sectioning, kind of a mess right now - [x] Optional setup: make clear which parts are only needed if building from source - [x] Workaround 1 for GnuTLS: perhaps mention how to remove Guix build farm's key - [x] Overall (after everything): Make the links work. Note to self: wherever possible, tell user how to check that something is true rather than branching by installation option. ACKs for top commit: fanquake: ACK fac4814 - going to go ahead and merge this now. It's a lot of documentation, and could probably be nit-picked / improved further, however, that can continue over the next few weeks. I'm sure more (backportable) improvements / clarifications will be made while we progress through RCs towards a new release. Tree-SHA512: dc46c0ecdfc67c7c7743ca26e4a603eb3f54adbf81be2f4c1f4c20577ebb84b5250b9c9ec89c0e9860337ab1c7cff94d7963c603287267deecfe1cd987fa070a
2 parents d542603 + fac4814 commit e7441a6

File tree

9 files changed

+1250
-319
lines changed

9 files changed

+1250
-319
lines changed

contrib/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ All other packaging related files can be found in the [bitcoin-core/packaging](h
2929
### [Gitian-descriptors](/contrib/gitian-descriptors) ###
3030
Files used during the gitian build process. For more information about gitian, see the [the Bitcoin Core documentation repository](https://github.com/bitcoin-core/docs).
3131

32-
### [Gitian-keys](/contrib/gitian-keys)
33-
PGP keys used for signing Bitcoin Core [Gitian release](/doc/release-process.md) results.
32+
### [Builder keys](/contrib/builder-keys)
33+
PGP keys used for signing Bitcoin Core [release](/doc/release-process.md) results.
3434

3535
### [MacDeploy](/contrib/macdeploy) ###
3636
Scripts and notes for Mac builds.
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
## PGP keys of Gitian builders and Developers
1+
## PGP keys of builders and Developers
22

3-
The file `keys.txt` contains fingerprints of the public keys of Gitian builders
4-
and active developers.
3+
The file `keys.txt` contains fingerprints of the public keys of builders and
4+
active developers.
55

66
The associated keys are mainly used to sign git commits or the build results
7-
of Gitian builds.
7+
of Guix builds.
88

99
The most recent version of each pgp key can be found on most pgp key servers.
1010

@@ -16,12 +16,12 @@ To fetch the latest version of all pgp keys in your gpg homedir,
1616
gpg --refresh-keys
1717
```
1818

19-
To fetch keys of Gitian builders and active developers, feed the list of
20-
fingerprints of the primary keys into gpg:
19+
To fetch keys of builders and active developers, feed the list of fingerprints
20+
of the primary keys into gpg:
2121

2222
```sh
2323
while read fingerprint keyholder_name; do gpg --keyserver hkp://subset.pool.sks-keyservers.net --recv-keys ${fingerprint}; done < ./keys.txt
2424
```
2525

26-
Add your key to the list if you provided Gitian signatures for two major or
26+
Add your key to the list if you provided Guix attestations for two major or
2727
minor releases of Bitcoin Core.
File renamed without changes.

0 commit comments

Comments
 (0)