| 1 |
commit: f9ec6eb347542d35208a94a07af155dcd473e4e1 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 19 00:59:10 2020 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 21 01:07:32 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f9ec6eb3 |
| 7 |
|
| 8 |
catalyst: Configure distcc_hosts in the config file |
| 9 |
|
| 10 |
distcc_hosts are independent of the build itself, and therefore should |
| 11 |
be configured system-wide in catalyst.conf and not in each spec file. |
| 12 |
|
| 13 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 14 |
|
| 15 |
catalyst/base/stagebase.py | 1 - |
| 16 |
catalyst/defaults.py | 1 + |
| 17 |
doc/catalyst-config.5.txt | 7 ++++++- |
| 18 |
doc/catalyst-spec.5.txt | 6 ------ |
| 19 |
etc/catalyst.conf | 3 +-- |
| 20 |
examples/generic_stage_template.spec | 7 ------- |
| 21 |
examples/livecd-stage1_template.spec | 7 ------- |
| 22 |
examples/livecd-stage2_template.spec | 7 ------- |
| 23 |
examples/stage4_template.spec | 7 ------- |
| 24 |
9 files changed, 8 insertions(+), 38 deletions(-) |
| 25 |
|
| 26 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
| 27 |
index afea5776..be7b96c8 100644 |
| 28 |
--- a/catalyst/base/stagebase.py |
| 29 |
+++ b/catalyst/base/stagebase.py |
| 30 |
@@ -51,7 +51,6 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 31 |
"compression_mode", |
| 32 |
"cxxflags", |
| 33 |
"decompressor_search_order", |
| 34 |
- "distcc_hosts", |
| 35 |
"fcflags", |
| 36 |
"fflags", |
| 37 |
"hostuse", |
| 38 |
|
| 39 |
diff --git a/catalyst/defaults.py b/catalyst/defaults.py |
| 40 |
index 7a2fe3f3..0f399b56 100644 |
| 41 |
--- a/catalyst/defaults.py |
| 42 |
+++ b/catalyst/defaults.py |
| 43 |
@@ -11,6 +11,7 @@ from DeComp.definitions import DECOMPRESSOR_PROGRAM_OPTIONS, LIST_XATTRS_OPTIONS |
| 44 |
valid_config_file_values = frozenset([ |
| 45 |
"compression_mode", |
| 46 |
"digests", |
| 47 |
+ "distcc_hosts", |
| 48 |
"distdir", |
| 49 |
"envscript", |
| 50 |
"jobs", |
| 51 |
|
| 52 |
diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt |
| 53 |
index cbef6092..570d42c2 100644 |
| 54 |
--- a/doc/catalyst-config.5.txt |
| 55 |
+++ b/doc/catalyst-config.5.txt |
| 56 |
@@ -78,7 +78,7 @@ be closed invalid. |
| 57 |
|
| 58 |
distcc:: |
| 59 |
Enable distcc support for building. You have to set distcc_hosts in |
| 60 |
-your spec file. |
| 61 |
+your config file. |
| 62 |
|
| 63 |
icecream:: |
| 64 |
Enable icecream compiler cluster support for building. |
| 65 |
@@ -136,6 +136,11 @@ written to the target's make.conf if it is not the default value of |
| 66 |
Other settings |
| 67 |
~~~~~~~~~~~~~~ |
| 68 |
|
| 69 |
+*distcc_hosts*:: |
| 70 |
+These are the hosts used as distcc slaves when distcc is enabled in |
| 71 |
+your `catalyst.conf` (example: `127.0.0.1 192.168.0.1`). It follows |
| 72 |
+the same syntax as `distcc-config --set-hosts`. |
| 73 |
+ |
| 74 |
*jobs*:: |
| 75 |
Integral value passed to *emerge(1)* as the parameter to --jobs and is |
| 76 |
used to define *MAKEOPTS* during the target build. |
| 77 |
|
| 78 |
diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt |
| 79 |
index 43cd5d2f..31e69820 100644 |
| 80 |
--- a/doc/catalyst-spec.5.txt |
| 81 |
+++ b/doc/catalyst-spec.5.txt |
| 82 |
@@ -74,12 +74,6 @@ This specifies where the seed stage for this target comes from |
| 83 |
`$storedir/builds`. The `rel_type` is also used as a path prefix for |
| 84 |
the seed. |
| 85 |
|
| 86 |
-*distcc_hosts*:: |
| 87 |
-These are the hosts used as distcc slaves when distcc is enabled in |
| 88 |
-your `catalyst.conf` (example: `127.0.0.1 192.168.0.1`). It follows |
| 89 |
-the same syntax as `distcc-config --set-hosts` and is entirely |
| 90 |
-optional. |
| 91 |
- |
| 92 |
*portage_confdir*:: |
| 93 |
This is an optional directory containing portage configuration files |
| 94 |
(example: `/etc/portage`). It follows the same syntax as |
| 95 |
|
| 96 |
diff --git a/etc/catalyst.conf b/etc/catalyst.conf |
| 97 |
index 81693c25..b0b284fa 100644 |
| 98 |
--- a/etc/catalyst.conf |
| 99 |
+++ b/etc/catalyst.conf |
| 100 |
@@ -35,8 +35,7 @@ options = [ |
| 101 |
# Enable FEATURES=ccache |
| 102 |
# "ccache", |
| 103 |
|
| 104 |
- # Enable FEATURES=distcc. You have to set distcc_hosts in your spec |
| 105 |
- # file. |
| 106 |
+ # Enable FEATURES=distcc. Make sure to set distcc_hosts too. |
| 107 |
# "distcc", |
| 108 |
|
| 109 |
# Enable FEATURES=icecream |
| 110 |
|
| 111 |
diff --git a/examples/generic_stage_template.spec b/examples/generic_stage_template.spec |
| 112 |
index 01c37789..8f0375c4 100644 |
| 113 |
--- a/examples/generic_stage_template.spec |
| 114 |
+++ b/examples/generic_stage_template.spec |
| 115 |
@@ -82,13 +82,6 @@ compressor_arch": |
| 116 |
# |
| 117 |
decompressor_search_order: lbzip2 bzip2 tar pixz xz gzip squashfs |
| 118 |
|
| 119 |
-# These are the hosts used as distcc slaves when distcc is enabled in your |
| 120 |
-# catalyst.conf. It follows the same syntax as distcc-config --set-hosts and |
| 121 |
-# is entirely optional. |
| 122 |
-# example: |
| 123 |
-# distcc_hosts: 127.0.0.1 192.168.0.1 |
| 124 |
-distcc_hosts: |
| 125 |
- |
| 126 |
# This is an optional directory containing portage configuration files. It |
| 127 |
# follows the same syntax as /etc/portage and should be consistent across all |
| 128 |
# targets to minimize problems. |
| 129 |
|
| 130 |
diff --git a/examples/livecd-stage1_template.spec b/examples/livecd-stage1_template.spec |
| 131 |
index c7086c91..b921372a 100644 |
| 132 |
--- a/examples/livecd-stage1_template.spec |
| 133 |
+++ b/examples/livecd-stage1_template.spec |
| 134 |
@@ -45,13 +45,6 @@ snapshot: |
| 135 |
# default/stage3-x86-2006.1 |
| 136 |
source_subpath: |
| 137 |
|
| 138 |
-# These are the hosts used as distcc slaves when distcc is enabled in your |
| 139 |
-# catalyst.conf. It follows the same syntax as distcc-config --set-hosts and |
| 140 |
-# is entirely optional. |
| 141 |
-# example: |
| 142 |
-# distcc_hosts: 127.0.0.1 192.168.0.1 |
| 143 |
-distcc_hosts: |
| 144 |
- |
| 145 |
# This is an optional directory containing portage configuration files. It |
| 146 |
# follows the same syntax as /etc/portage and should be consistent across all |
| 147 |
# targets to minimize problems. |
| 148 |
|
| 149 |
diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec |
| 150 |
index 56bda84a..ac1cd3e4 100644 |
| 151 |
--- a/examples/livecd-stage2_template.spec |
| 152 |
+++ b/examples/livecd-stage2_template.spec |
| 153 |
@@ -45,13 +45,6 @@ snapshot: |
| 154 |
# default/livecd-stage1-x86-2006.1 |
| 155 |
source_subpath: |
| 156 |
|
| 157 |
-# These are the hosts used as distcc slaves when distcc is enabled in your |
| 158 |
-# catalyst.conf. It follows the same syntax as distcc-config --set-hosts and |
| 159 |
-# is entirely optional. |
| 160 |
-# example: |
| 161 |
-# distcc_hosts: 127.0.0.1 192.168.0.1 |
| 162 |
-distcc_hosts: |
| 163 |
- |
| 164 |
# This is an optional directory containing portage configuration files. It |
| 165 |
# follows the same syntax as /etc/portage and should be consistent across all |
| 166 |
# targets to minimize problems. |
| 167 |
|
| 168 |
diff --git a/examples/stage4_template.spec b/examples/stage4_template.spec |
| 169 |
index 562bfaac..c901eabc 100644 |
| 170 |
--- a/examples/stage4_template.spec |
| 171 |
+++ b/examples/stage4_template.spec |
| 172 |
@@ -45,13 +45,6 @@ snapshot: |
| 173 |
# default/stage3-x86-2006.1 |
| 174 |
source_subpath: |
| 175 |
|
| 176 |
-# These are the hosts used as distcc slaves when distcc is enabled in your |
| 177 |
-# catalyst.conf. It follows the same syntax as distcc-config --set-hosts and |
| 178 |
-# is entirely optional. |
| 179 |
-# example: |
| 180 |
-# distcc_hosts: 127.0.0.1 192.168.0.1 |
| 181 |
-distcc_hosts: |
| 182 |
- |
| 183 |
# This is an optional directory containing portage configuration files. It |
| 184 |
# follows the same syntax as /etc/portage and should be consistent across all |
| 185 |
# targets to minimize problems. |
Archives