aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* catalyst.conf: change dangerous port_logdir exampleBen Kohler2023-11-101-2/+2
| | | | | | | | If this existing example was uncommented, it would trigger a cleanup of any files older than 7d in the currently running stage build dir, causing catastrophic failure. Signed-off-by: Ben Kohler <bkohler@gentoo.org>
* Add configuration options and code to write out binrepos.confAndreas K. Hüttel2023-08-111-0/+5
| | | | Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
* catalyst: Configure distcc_hosts in the config fileMatt Turner2020-10-201-2/+1
| | | | | | | distcc_hosts are independent of the build itself, and therefore should be configured system-wide in catalyst.conf and not in each spec file. Signed-off-by: Matt Turner <mattst88@gentoo.org>
* catalyst: Set jobs/load-average via catalyst.confMatt Turner2020-10-201-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | 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>
* catalyst: Convert catalyst.conf to TOMLMatt Turner2020-05-191-36/+52
| | | | Signed-off-by: Matt Turner <mattst88@gentoo.org>
* catalyst: Remove support for source_matching="loose"Matt Turner2020-05-191-12/+0
| | | | | | This does not seem like a useful feature to me. Signed-off-by: Matt Turner <mattst88@gentoo.org>
* catalyst: Remove remnants of options="preserve_libs"Matt Turner2020-05-151-2/+0
| | | | | | | | | | | | This option has been broken since commit e3114e65ffda (Some options cleanup, unifying their use, reducing redundancy.) in 2013 which was first in catalyst 3.0.0. I think the feature was a kludge, and that if or when we find the need for something similar that we instead just run emerge @preserved-rebuild instead. Signed-off-by: Matt Turner <mattst88@gentoo.org>
* catalyst: Rename 'portdir' -> 'target_portdir'Matt Turner2020-04-301-3/+0
| | | | | | | With sqfs snapshots, there's now no dependence on the build system's portdir. Signed-off-by: Matt Turner <mattst88@gentoo.org>
* catalyst: Remove snapcache supportMatt Turner2020-04-231-4/+1
| | | | | | | | Among the problems with snapcache were broken locking, and still needing to pack and unpack snapshot tarballs. In a few commits, I'm going to replace it with something significantly better. Signed-off-by: Matt Turner <mattst88@gentoo.org>
* catalyst: Remove some defaults from configuration fileMatt Turner2020-04-211-27/+0
| | | | | | | | Leave the machinery in place, but remove the default settings from the configuration file, since basically no one is going to need to change these and in practice they just cover up mistakes in defaults.py. Signed-off-by: Matt Turner <mattst88@gentoo.org>
* catalyst: Make distdir default to host's DISTDIRMatt Turner2020-04-211-4/+0
| | | | Signed-off-by: Matt Turner <mattst88@gentoo.org>
* catalyst: Use hashlib instead of external toolsMatt Turner2020-04-171-10/+8
| | | | Signed-off-by: Matt Turner <mattst88@gentoo.org>
* catalyst: Remove the 'hash_function' config optionMatt Turner2020-04-171-10/+0
| | | | | | | | | Switch to SHA1, which is plenty fast. The next commit switches from the external shash/b2sum tools to Python's hashlib, and the removal of this config option will simplify that since the crc32 hash is in a different python module (zlib). Signed-off-by: Matt Turner <mattst88@gentoo.org>
* catalyst: Remove 'contents' config optionMatt Turner2020-04-171-12/+0
| | | | | | | | | | | | | This option seems completely absurd and on top of that has been completely broken, since contents() has been passed 'j', which is the mode, as the positional argument 'destination'. This only worked because destination is not used in the contents generation and the actual mode parameter has a default argument of 'auto'. So the config option has not worked in a long time and no one has noticed. Signed-off-by: Matt Turner <mattst88@gentoo.org>
* add blake2 supportRick Farina (Zero_Chaos)2020-02-131-3/+3
| | | | | | | | | support blake2 for hash and digest functions. per jmbsvicetto, adjusting default digest from "sha512 whirlpool" to "blake2 sha512" for now additionally add blake2 sums for iso verification Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos@gentoo.org>
* New default PORTDIR, PKGDIR, and DISTDIR settings approved by councilZac Medico2019-05-241-7/+7
| | | | | | | | | | | The locations approved by the council: DISTDIR="/var/cache/distfiles" PKGDIR="/var/cache/binpkgs" PORTDIR="/var/db/repos/gentoo" Bug: https://bugs.gentoo.org/684908 Signed-off-by: Zac Medico <zmedico@gentoo.org>
* Fix minor doc typosBen Kohler2019-03-281-1/+1
| | | | | | | | Thanks to simonvanderveldt. Closes: https://github.com/gentoo/catalyst/pull/3/ Signed-off-by: Ben Kohler <bkohler@gentoo.org>
* Unify all make.conf settings and writingBrian Dolbec2017-11-211-0/+9
| | | | This excludes stage1 builds which needs to modify the seed stage's make.conf for initial stage building.
* base/stagebase.py: Seperate out the writing of the make.conf fileBrian Dolbec2017-11-211-0/+2
| | | | | | | | | | | | | By sepaerating out the writing of the make.conf file, it keeps all code to do so in one place. I also fixed the code to correctly set the target chroot directories for PORTDIR, DISTDIR, PKGDIR and PORTDIR_OVERLAY. The same code also re-writes make.conf toggling any PORTDIR_OVERLAY setting during the clean() run. Add target_distdir and target_pkgdir settings to defaults and catalyst.conf. This allows for more flexibility between host and target settings. They can be individually configured this way. Update target an source mounts from the configured settings.
* etc/catalyst.conf: Set default digests to sha512 whirlpoolBrian Dolbec2016-02-011-1/+1
| | | | Setting digests="auto" by default can cause up to 27 different hashes, not to mention the amount of time it could take.
* Create a file extension search order system for source pathsBrian Dolbec2015-12-281-0/+12
| | | | | Adds a new source_matching setting to the config, defaults to "strict". Allows for the possibility of multiple compression types to be present in teh same directory and allow for a prefered matching system.
* catalyst: add support for digests=autoMike Frysinger2015-10-061-2/+4
| | | | | | | | Rather than require people to list all possible hashes, add support for an "auto" keyword. This serves two purposes: - any digest that is missing system support (e.g. missing prog), then that digest will be silently skipped - if it's the only value, then all available digests will be added
* catalyst.conf: minor tweaks to commentsMike Frysinger2015-10-051-3/+3
| | | | Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
* Apply new compress code, normalize pathsBrian Dolbec2015-09-061-1/+10
| | | | Fix the target_filename ending in a slash
* Update sharedir location from /usr/lib/catalyst to /usr/share/catalyst.Jorge Manuel B. S. Vicetto (jmbsvicetto)2015-08-301-1/+1
| | | | Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>
* Add keepwork option to catalyst.conf.Brian Dolbec2015-02-261-0/+2
|
* Make shdir a complete path to ease it's use.Brian Dolbec2014-12-311-2/+6
| | | | | | | Add a "shdir" setting to config. This is to make moving the bash code around easier. It also reduces more hardcoded paths in the bash scripts. Migrate all target shell scripts to use the new shdir setting
* files/catalyst.conf: Whitespace cleanupBrian Dolbec2014-04-021-6/+6
|
* Move catalyst.conf and catalystrc to an etc/ directoryBrian Dolbec2014-02-221-0/+97