diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2020-05-13 19:37:11 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2020-10-20 18:07:29 -0700 |
| commit | 3269cfc50ec2eeccbb1c5aebc89fd4b38ce1b3e8 (patch) | |
| tree | 2cc79f8e5e7970b8ab4583c6558b36552ace40a9 /doc | |
| parent | targets: Use double-brackets in kmerge.sh (diff) | |
| download | catalyst-3269cfc50ec2eeccbb1c5aebc89fd4b38ce1b3e8.tar.gz catalyst-3269cfc50ec2eeccbb1c5aebc89fd4b38ce1b3e8.tar.bz2 catalyst-3269cfc50ec2eeccbb1c5aebc89fd4b38ce1b3e8.zip | |
catalyst: Set jobs/load-average via catalyst.conf
We currently have two mechanisms of setting MAKEOPTS: in spec files and
in catalystrc.
Setting makeopts in spec files doesn't make sense. The spec should
describe the thing that's being built and not contain options that are
specific to the build system.
Setting makeopts via catalystrc is better, but it only applies to the
actual build system invocations, leaving emerge to run jobs serially or
again requiring configuration specific to the build machine to be put
into the spec file. For example:
update_seed_command: ... --jobs 5 --load-average 5
With jobs and load-average specified in catalyst.conf, catalyst has the
information required to configure both emerge and the build systems
emerge executes.
This removes the undocumented makeopts spec file option and replaces it
with jobs and load-average settings in catalyst.conf.
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/catalyst-config.5.txt | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt index 7ac9a2a3..cbef6092 100644 --- a/doc/catalyst-config.5.txt +++ b/doc/catalyst-config.5.txt @@ -48,9 +48,9 @@ $ python3 -c 'import hashlib; print(hashlib.algorithms_available)' *envscript*:: Environment script location, which allows users to set options such as -HTTP proxies, `MAKEOPTS`, `GENTOO_MIRRORS`, or any other environment -variables needed for building. The envscript file sets environment -variables using POSIX shell notation: +HTTP proxies, `GENTOO_MIRRORS`, or any other environment variables +needed for building. The envscript file sets environment variables +using POSIX shell notation: + --------------------------------- export FOO="bar" @@ -136,6 +136,15 @@ written to the target's make.conf if it is not the default value of Other settings ~~~~~~~~~~~~~~ +*jobs*:: +Integral value passed to *emerge(1)* as the parameter to --jobs and is +used to define *MAKEOPTS* during the target build. + +*load-average*:: +Floating-point value passed to *emerge(1)* as the parameter to +--load-average and is used to define *MAKEOPTS* during the target +build. + *sharedir*:: Catalyst runtime script location. `/usr/share/catalyst` should work for most default installations. If you are running catalyst from a Git |