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 71B671382C5 for ; Wed, 20 May 2020 03:43:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8EBE0E0929; Wed, 20 May 2020 03:43:25 +0000 (UTC) Received: from mail-pj1-f67.google.com (mail-pj1-f67.google.com [209.85.216.67]) (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 890B6E0929 for ; Wed, 20 May 2020 03:43:25 +0000 (UTC) Received: by mail-pj1-f67.google.com with SMTP id nu7so628381pjb.0 for ; Tue, 19 May 2020 20:43:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=G3ntN4+mGgf5fOEr7JmPgjh1YHtB8bv2vax7hhUv01g=; b=sI4twx4IcVPAB6Hl8fxosnhzkOPHT9xPXvyRNpyRTjl4Qvg20vHRdC4lw/G10W1d8F PEJaqVGCwtM/Clt6fL1CFourR9WGrg2ZG5OCpVMo/kekogs2kw5aY9NV0C0wkQkJPPK7 92+xqTaY2FPgFuuWkDPU68ixy0lp7cBISysws+koKBhisvmoITy7f/Na0F71kr8dnZQI C/hold6mJ/A1IfGzCIyB2nNNH3+dEhSdk1t4M1HFOCrF9jYPLH5Cies4v0GWarqTpGoJ 7Cq2GT9ffrWhIvaiRAUvMXnVJVnGUekYaeAzpTTO6YG2lVnKcY4HxkjHdcIKUur0TJ7N TGwA== X-Gm-Message-State: AOAM532Bms9zJ5rObpg4yf/wOk+lBZVGS/WkFR4SH6t2pIMoCXN6DAyR OimTtUsGtbuOH3Ta7rZnIikvFuHn X-Google-Smtp-Source: ABdhPJzeaCEqiA/8lrpjBGmkLwF7DnFJw+eVFKYHpxMDzthzGll3qLOzgV9TjIlftIBHOTZ/U6hHiA== X-Received: by 2002:a17:90b:1082:: with SMTP id gj2mr3085162pjb.225.1589946204039; Tue, 19 May 2020 20:43:24 -0700 (PDT) Received: from localhost ([134.134.137.77]) by smtp.gmail.com with ESMTPSA id m3sm731610pjs.17.2020.05.19.20.43.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 20:43:23 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 20/21] catalyst: Configure distcc_hosts in the config file Date: Tue, 19 May 2020 20:42:25 -0700 Message-Id: <20200520034226.2870937-20-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200520034226.2870937-1-mattst88@gentoo.org> References: <20200520034226.2870937-1-mattst88@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 7a3a1834-f9e7-4cff-adb8-eff31f5b4a2d X-Archives-Hash: e7a81138651941217f36c95fc8cd1d39 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 --- 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 bc721ad4..00efd252 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -50,7 +50,6 @@ class StageBase(TargetBase, ClearBase, GenBase): "compression_mode", "cxxflags", "decompressor_search_order", - "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 cbef6092..570d42c2 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*:: Integral value passed to *emerge(1)* as the parameter to --jobs and is used to define *MAKEOPTS* during the target build. 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 81693c25..b0b284fa 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. -- 2.26.2