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