From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4F11913835A for ; Tue, 19 May 2020 23:04:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37554E0849; Tue, 19 May 2020 23:04:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 09EC2E0849 for ; Tue, 19 May 2020 23:04:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6E88934F1CE for ; Tue, 19 May 2020 23:04:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DD035254 for ; Tue, 19 May 2020 23:04:36 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1589929459.b2709575a3e97f76c4c176f7e552d820626ea232.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/base/, examples/, doc/, etc/, catalyst/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py catalyst/defaults.py doc/catalyst-config.5.txt doc/catalyst-spec.5.txt etc/catalyst.conf examples/generic_stage_template.spec examples/livecd-stage1_template.spec examples/livecd-stage2_template.spec examples/stage4_template.spec X-VCS-Directories: catalyst/base/ doc/ examples/ etc/ catalyst/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: b2709575a3e97f76c4c176f7e552d820626ea232 X-VCS-Branch: wip/mattst88 Date: Tue, 19 May 2020 23:04:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6473be00-e417-44b3-a8c9-4df9f3c22fd5 X-Archives-Hash: c235a5e15e5a1f9578091e572597998a commit: b2709575a3e97f76c4c176f7e552d820626ea232 Author: Matt Turner gentoo org> AuthorDate: Tue May 19 00:59:10 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue May 19 23:04:19 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b2709575 catalyst: Configure distcc_hosts in the config file 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 gentoo.org> catalyst/base/stagebase.py | 1 - catalyst/defaults.py | 1 + doc/catalyst-config.5.txt | 7 ++++++- doc/catalyst-spec.5.txt | 6 ------ etc/catalyst.conf | 3 +-- examples/generic_stage_template.spec | 7 ------- examples/livecd-stage1_template.spec | 7 ------- examples/livecd-stage2_template.spec | 7 ------- examples/stage4_template.spec | 7 ------- 9 files changed, 8 insertions(+), 38 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 2e6b349a..a8c8a4b4 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -50,7 +50,6 @@ class StageBase(TargetBase, ClearBase, GenBase): "compression_mode", "cxxflags", "decompression_mode", - "distcc_hosts", "fcflags", "fflags", "hostuse", diff --git a/catalyst/defaults.py b/catalyst/defaults.py index b31d5b50..27c3d9fa 100644 --- a/catalyst/defaults.py +++ b/catalyst/defaults.py @@ -10,6 +10,7 @@ from DeComp.definitions import DECOMPRESSOR_PROGRAM_OPTIONS, LIST_XATTRS_OPTIONS valid_config_file_values = frozenset([ "digests", + "distcc_hosts", "distdir", "envscript", "jobs", diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt index 4ea4690f..efa707c7 100644 --- a/doc/catalyst-config.5.txt +++ b/doc/catalyst-config.5.txt @@ -78,7 +78,7 @@ be closed invalid. distcc:: Enable distcc support for building. You have to set distcc_hosts in -your spec file. +your config file. icecream:: Enable icecream compiler cluster support for building. @@ -136,6 +136,11 @@ written to the target's make.conf if it is not the default value of Other settings ~~~~~~~~~~~~~~ +*distcc_hosts*:: +These are the hosts used as distcc slaves when distcc is enabled in +your `catalyst.conf` (example: `127.0.0.1 192.168.0.1`). It follows +the same syntax as `distcc-config --set-hosts`. + *jobs*:: Number of jobs to execute simultaneously. diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt index cf6b9cd7..682f4621 100644 --- a/doc/catalyst-spec.5.txt +++ b/doc/catalyst-spec.5.txt @@ -74,12 +74,6 @@ This specifies where the seed stage for this target comes from `$storedir/builds`. The `rel_type` is also used as a path prefix for the seed. -*distcc_hosts*:: -These are the hosts used as distcc slaves when distcc is enabled in -your `catalyst.conf` (example: `127.0.0.1 192.168.0.1`). It follows -the same syntax as `distcc-config --set-hosts` and is entirely -optional. - *portage_confdir*:: This is an optional directory containing portage configuration files (example: `/etc/portage`). It follows the same syntax as diff --git a/etc/catalyst.conf b/etc/catalyst.conf index 2272cb86..61ea1d4a 100644 --- a/etc/catalyst.conf +++ b/etc/catalyst.conf @@ -35,8 +35,7 @@ options = [ # Enable FEATURES=ccache # "ccache", - # Enable FEATURES=distcc. You have to set distcc_hosts in your spec - # file. + # Enable FEATURES=distcc. Make sure to set distcc_hosts too. # "distcc", # Enable FEATURES=icecream diff --git a/examples/generic_stage_template.spec b/examples/generic_stage_template.spec index 01c37789..8f0375c4 100644 --- a/examples/generic_stage_template.spec +++ b/examples/generic_stage_template.spec @@ -82,13 +82,6 @@ compressor_arch": # decompressor_search_order: lbzip2 bzip2 tar pixz xz gzip squashfs -# These are the hosts used as distcc slaves when distcc is enabled in your -# catalyst.conf. It follows the same syntax as distcc-config --set-hosts and -# is entirely optional. -# example: -# distcc_hosts: 127.0.0.1 192.168.0.1 -distcc_hosts: - # This is an optional directory containing portage configuration files. It # follows the same syntax as /etc/portage and should be consistent across all # targets to minimize problems. diff --git a/examples/livecd-stage1_template.spec b/examples/livecd-stage1_template.spec index c7086c91..b921372a 100644 --- a/examples/livecd-stage1_template.spec +++ b/examples/livecd-stage1_template.spec @@ -45,13 +45,6 @@ snapshot: # default/stage3-x86-2006.1 source_subpath: -# These are the hosts used as distcc slaves when distcc is enabled in your -# catalyst.conf. It follows the same syntax as distcc-config --set-hosts and -# is entirely optional. -# example: -# distcc_hosts: 127.0.0.1 192.168.0.1 -distcc_hosts: - # This is an optional directory containing portage configuration files. It # follows the same syntax as /etc/portage and should be consistent across all # targets to minimize problems. diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec index a296cfa1..6cfd33d3 100644 --- a/examples/livecd-stage2_template.spec +++ b/examples/livecd-stage2_template.spec @@ -45,13 +45,6 @@ snapshot: # default/livecd-stage1-x86-2006.1 source_subpath: -# These are the hosts used as distcc slaves when distcc is enabled in your -# catalyst.conf. It follows the same syntax as distcc-config --set-hosts and -# is entirely optional. -# example: -# distcc_hosts: 127.0.0.1 192.168.0.1 -distcc_hosts: - # This is an optional directory containing portage configuration files. It # follows the same syntax as /etc/portage and should be consistent across all # targets to minimize problems. diff --git a/examples/stage4_template.spec b/examples/stage4_template.spec index 562bfaac..c901eabc 100644 --- a/examples/stage4_template.spec +++ b/examples/stage4_template.spec @@ -45,13 +45,6 @@ snapshot: # default/stage3-x86-2006.1 source_subpath: -# These are the hosts used as distcc slaves when distcc is enabled in your -# catalyst.conf. It follows the same syntax as distcc-config --set-hosts and -# is entirely optional. -# example: -# distcc_hosts: 127.0.0.1 192.168.0.1 -distcc_hosts: - # This is an optional directory containing portage configuration files. It # follows the same syntax as /etc/portage and should be consistent across all # targets to minimize problems.