Skip to content

Commit

Permalink
Sync README.md with upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
KF-Art committed Nov 12, 2023
1 parent 5508261 commit 2749e98
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ And then make a signature per package:
If the RSA key was protected with a passphrase you'll have to type it, or alternatively set
it via the `XBPS_PASSPHRASE` environment variable.

Once the binary packages have been signed, check the repository contains the appropriate `hex fingerprint`:
Once the binary packages have been signed, check if the repository contains the appropriate `hex fingerprint`:

$ xbps-query --repository=hostdir/binpkgs -vL
...
Expand All @@ -344,7 +344,7 @@ Each time a binary package is created, a package signature must be created with
### Rebuilding and overwriting existing local packages

Packages are overwritten on every build to make getting package with changed build options easy.
To make xbps-src skip build and preserve first package build with with given version and revision,
To make xbps-src skip build and preserve first package build with given version and revision,
same as in official void repository, set `XBPS_PRESERVE_PKGS=yes` in `etc/conf` file.

Reinstalling a package in your target `rootdir` can be easily done too:
Expand All @@ -359,7 +359,7 @@ the package from the desired repository.
<a name="distcc"></a>
### Enabling distcc for distributed compilation

Setup the slaves (machines that will compile the code):
Setup the workers (machines that will compile the code):

# xbps-install -Sy distcc

Expand All @@ -372,7 +372,7 @@ Enable and start the `distccd` service:
# ln -s /etc/sv/distccd /var/service

Install distcc on the host (machine that executes xbps-src) as well.
Unless you want to use the host as slave from other machines, there is no need
Unless you want to use the host as worker from other machines, there is no need
to modify the configuration.

On the host you can now enable distcc in the `void-packages/etc/conf` file:
Expand All @@ -383,8 +383,8 @@ On the host you can now enable distcc in the `void-packages/etc/conf` file:

The example values assume a localhost CPU with 4 cores of which at most 2 are used for compiler jobs.
The number of slots for preprocessor jobs is set to 24 in order to have enough preprocessed data for other CPUs to compile.
The slave 192.168.2.101 has a CPU with 8 cores and the /9 for the number of jobs is a saturating choice.
The slave 192.168.2.102 is set to run at most 2 compile jobs to keep its load low, even if its CPU has 4 cores.
The worker 192.168.2.101 has a CPU with 8 cores and the /9 for the number of jobs is a saturating choice.
The worker 192.168.2.102 is set to run at most 2 compile jobs to keep its load low, even if its CPU has 4 cores.
The XBPS_MAKEJOBS setting is increased to 16 to account for the possible parallelism (2 + 9 + 2 + some slack).

<a name="distfiles-mirrors"></a>
Expand Down Expand Up @@ -431,7 +431,7 @@ xbps-src can be used in any recent Linux distribution matching the CPU architect

To use xbps-src in your Linux distribution use the following instructions. Let's start downloading the xbps static binaries:

$ wget http://alpha.de.repo.voidlinux.org/static/xbps-static-latest.<arch>-musl.tar.xz
$ wget http://repo-default.voidlinux.org/static/xbps-static-latest.<arch>-musl.tar.xz
$ mkdir ~/XBPS
$ tar xvf xbps-static-latest.<arch>-musl.tar.xz -C ~/XBPS
$ export PATH=~/XBPS/usr/bin:$PATH
Expand Down

0 comments on commit 2749e98

Please sign in to comment.