1 |
commit: f80a68d359b8230b48a9973fb00405750ae38ed9 |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 9 17:32:06 2020 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 9 17:33:25 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=f80a68d3 |
7 |
|
8 |
tools-{musl,systemd,uclibc}: switch to nightheron |
9 |
|
10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
11 |
|
12 |
tools-musl/catalyst.conf.local | 31 +++++++++++++++++++++++++++++++ |
13 |
tools-musl/common.sh | 5 +++-- |
14 |
tools-musl/run.sh | 2 +- |
15 |
tools-systemd/.gitignore | 3 +++ |
16 |
tools-systemd/catalyst.conf.local | 31 +++++++++++++++++++++++++++++++ |
17 |
tools-systemd/common.sh | 5 +++-- |
18 |
tools-systemd/run.sh | 2 +- |
19 |
tools-uclibc/.gitignore | 1 + |
20 |
tools-uclibc/catalyst.conf.local | 31 +++++++++++++++++++++++++++++++ |
21 |
tools-uclibc/common.sh | 5 +++-- |
22 |
tools-uclibc/run.sh | 2 +- |
23 |
11 files changed, 109 insertions(+), 9 deletions(-) |
24 |
|
25 |
diff --git a/tools-musl/catalyst.conf.local b/tools-musl/catalyst.conf.local |
26 |
new file mode 100644 |
27 |
index 00000000..f561a17b |
28 |
--- /dev/null |
29 |
+++ b/tools-musl/catalyst.conf.local |
30 |
@@ -0,0 +1,31 @@ |
31 |
+# Custom catalyst.conf file |
32 |
+ |
33 |
+digests="sha512 whirlpool" |
34 |
+ |
35 |
+contents="auto" |
36 |
+ |
37 |
+distdir="/release/tmp/distfiles" |
38 |
+ |
39 |
+envscript="/etc/catalyst/catalystrc" |
40 |
+ |
41 |
+hash_function="crc32" |
42 |
+ |
43 |
+#options="autoresume bindist kerncache pkgcache seedcache snapcache" |
44 |
+options="autoresume bindist kerncache pkgcache seedcache" |
45 |
+ |
46 |
+portdir="/usr/portage" |
47 |
+ |
48 |
+repo_basedir="/usr" |
49 |
+repo_name="portage" |
50 |
+target_distdir="/usr/portage/distfiles" |
51 |
+target_pkgdir="/usr/portage/packages" |
52 |
+ |
53 |
+sharedir="/usr/share/catalyst" |
54 |
+ |
55 |
+shdir="%(sharedir)s/targets" |
56 |
+ |
57 |
+snapshot_cache="/release/buildroot/alt-dev/snapshot_cache" |
58 |
+ |
59 |
+storedir="/release/buildroot/alt-dev" |
60 |
+ |
61 |
+source_matching="strict" |
62 |
|
63 |
diff --git a/tools-musl/common.sh b/tools-musl/common.sh |
64 |
index 2420b85d..67481bbd 100644 |
65 |
--- a/tools-musl/common.sh |
66 |
+++ b/tools-musl/common.sh |
67 |
@@ -1,6 +1,6 @@ |
68 |
#!/bin/bash |
69 |
|
70 |
-source /etc/catalyst/catalyst.conf |
71 |
+source $(pwd)/catalyst.conf.local |
72 |
|
73 |
mydate=`date +%Y%m%d` |
74 |
|
75 |
@@ -42,7 +42,8 @@ do_stages() { |
76 |
fi |
77 |
|
78 |
banner ${s} ${arch} ${flavor} |
79 |
- catalyst -f stage${s}-${arch}-musl-${flavor}.conf \ |
80 |
+ catalyst -c $(pwd)/catalyst.conf.local \ |
81 |
+ -f stage${s}-${arch}-musl-${flavor}.conf \ |
82 |
| tee -a zzz.log \ |
83 |
> stage${s}-${arch}-musl-${flavor}.log \ |
84 |
2> stage${s}-${arch}-musl-${flavor}.err |
85 |
|
86 |
diff --git a/tools-musl/run.sh b/tools-musl/run.sh |
87 |
index c3065958..f5e56f5a 100755 |
88 |
--- a/tools-musl/run.sh |
89 |
+++ b/tools-musl/run.sh |
90 |
@@ -49,7 +49,7 @@ main() { |
91 |
|
92 |
undo_grsec |
93 |
|
94 |
- catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err |
95 |
+ catalyst -c $(pwd)/catalyst.conf.local -s current | tee -a zzz.log >snapshot.log 2>snapshot.err |
96 |
|
97 |
for arch in amd64 i686; do |
98 |
for flavor in hardened vanilla; do |
99 |
|
100 |
diff --git a/tools-systemd/.gitignore b/tools-systemd/.gitignore |
101 |
new file mode 100644 |
102 |
index 00000000..2315a4e4 |
103 |
--- /dev/null |
104 |
+++ b/tools-systemd/.gitignore |
105 |
@@ -0,0 +1,3 @@ |
106 |
+*log |
107 |
+*err |
108 |
+stage*.conf |
109 |
|
110 |
diff --git a/tools-systemd/catalyst.conf.local b/tools-systemd/catalyst.conf.local |
111 |
new file mode 100644 |
112 |
index 00000000..f561a17b |
113 |
--- /dev/null |
114 |
+++ b/tools-systemd/catalyst.conf.local |
115 |
@@ -0,0 +1,31 @@ |
116 |
+# Custom catalyst.conf file |
117 |
+ |
118 |
+digests="sha512 whirlpool" |
119 |
+ |
120 |
+contents="auto" |
121 |
+ |
122 |
+distdir="/release/tmp/distfiles" |
123 |
+ |
124 |
+envscript="/etc/catalyst/catalystrc" |
125 |
+ |
126 |
+hash_function="crc32" |
127 |
+ |
128 |
+#options="autoresume bindist kerncache pkgcache seedcache snapcache" |
129 |
+options="autoresume bindist kerncache pkgcache seedcache" |
130 |
+ |
131 |
+portdir="/usr/portage" |
132 |
+ |
133 |
+repo_basedir="/usr" |
134 |
+repo_name="portage" |
135 |
+target_distdir="/usr/portage/distfiles" |
136 |
+target_pkgdir="/usr/portage/packages" |
137 |
+ |
138 |
+sharedir="/usr/share/catalyst" |
139 |
+ |
140 |
+shdir="%(sharedir)s/targets" |
141 |
+ |
142 |
+snapshot_cache="/release/buildroot/alt-dev/snapshot_cache" |
143 |
+ |
144 |
+storedir="/release/buildroot/alt-dev" |
145 |
+ |
146 |
+source_matching="strict" |
147 |
|
148 |
diff --git a/tools-systemd/common.sh b/tools-systemd/common.sh |
149 |
index bf52cd62..60aac2a2 100644 |
150 |
--- a/tools-systemd/common.sh |
151 |
+++ b/tools-systemd/common.sh |
152 |
@@ -1,6 +1,6 @@ |
153 |
#!/bin/bash |
154 |
|
155 |
-source /etc/catalyst/catalyst.conf |
156 |
+source $(pwd)/catalyst.conf.local |
157 |
|
158 |
mydate=$(date +%Y%m%d) |
159 |
|
160 |
@@ -40,7 +40,8 @@ do_stages() { |
161 |
fi |
162 |
|
163 |
banner ${s} ${arch} |
164 |
- catalyst -f stage${s}-${arch}-systemd.conf \ |
165 |
+ catalyst -c $(pwd)/catalyst.conf.local \ |
166 |
+ -f stage${s}-${arch}-systemd.conf \ |
167 |
| tee -a zzz.log \ |
168 |
> stage${s}-${arch}-systemd.log \ |
169 |
2> stage${s}-${arch}-systemd.err |
170 |
|
171 |
diff --git a/tools-systemd/run.sh b/tools-systemd/run.sh |
172 |
index 057a06f4..1a1a9200 100755 |
173 |
--- a/tools-systemd/run.sh |
174 |
+++ b/tools-systemd/run.sh |
175 |
@@ -42,7 +42,7 @@ main() { |
176 |
|
177 |
undo_grsec |
178 |
|
179 |
- catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err |
180 |
+ catalyst -c $(pwd)/catalyst.conf.local -s current | tee -a zzz.log >snapshot.log 2>snapshot.err |
181 |
|
182 |
for arch in amd64 i686; do |
183 |
prepare_confs ${arch} |
184 |
|
185 |
diff --git a/tools-uclibc/.gitignore b/tools-uclibc/.gitignore |
186 |
index dedc27df..2315a4e4 100644 |
187 |
--- a/tools-uclibc/.gitignore |
188 |
+++ b/tools-uclibc/.gitignore |
189 |
@@ -1,2 +1,3 @@ |
190 |
*log |
191 |
*err |
192 |
+stage*.conf |
193 |
|
194 |
diff --git a/tools-uclibc/catalyst.conf.local b/tools-uclibc/catalyst.conf.local |
195 |
new file mode 100644 |
196 |
index 00000000..f561a17b |
197 |
--- /dev/null |
198 |
+++ b/tools-uclibc/catalyst.conf.local |
199 |
@@ -0,0 +1,31 @@ |
200 |
+# Custom catalyst.conf file |
201 |
+ |
202 |
+digests="sha512 whirlpool" |
203 |
+ |
204 |
+contents="auto" |
205 |
+ |
206 |
+distdir="/release/tmp/distfiles" |
207 |
+ |
208 |
+envscript="/etc/catalyst/catalystrc" |
209 |
+ |
210 |
+hash_function="crc32" |
211 |
+ |
212 |
+#options="autoresume bindist kerncache pkgcache seedcache snapcache" |
213 |
+options="autoresume bindist kerncache pkgcache seedcache" |
214 |
+ |
215 |
+portdir="/usr/portage" |
216 |
+ |
217 |
+repo_basedir="/usr" |
218 |
+repo_name="portage" |
219 |
+target_distdir="/usr/portage/distfiles" |
220 |
+target_pkgdir="/usr/portage/packages" |
221 |
+ |
222 |
+sharedir="/usr/share/catalyst" |
223 |
+ |
224 |
+shdir="%(sharedir)s/targets" |
225 |
+ |
226 |
+snapshot_cache="/release/buildroot/alt-dev/snapshot_cache" |
227 |
+ |
228 |
+storedir="/release/buildroot/alt-dev" |
229 |
+ |
230 |
+source_matching="strict" |
231 |
|
232 |
diff --git a/tools-uclibc/common.sh b/tools-uclibc/common.sh |
233 |
index d1350d25..b95b0643 100644 |
234 |
--- a/tools-uclibc/common.sh |
235 |
+++ b/tools-uclibc/common.sh |
236 |
@@ -1,6 +1,6 @@ |
237 |
#!/bin/bash |
238 |
|
239 |
-source /etc/catalyst/catalyst.conf |
240 |
+source $(pwd)/catalyst.conf.local |
241 |
|
242 |
mydate=`date +%Y%m%d` |
243 |
|
244 |
@@ -42,7 +42,8 @@ do_stages() { |
245 |
fi |
246 |
|
247 |
banner ${s} ${arch} ${flavor} |
248 |
- catalyst -f stage${s}-${arch}-uclibc-${flavor}.conf \ |
249 |
+ catalyst -c $(pwd)/catalyst.conf.local \ |
250 |
+ -f stage${s}-${arch}-uclibc-${flavor}.conf \ |
251 |
| tee -a zzz.log \ |
252 |
> stage${s}-${arch}-uclibc-${flavor}.log \ |
253 |
2> stage${s}-${arch}-uclibc-${flavor}.err |
254 |
|
255 |
diff --git a/tools-uclibc/run.sh b/tools-uclibc/run.sh |
256 |
index cdc0def9..cb4221e2 100755 |
257 |
--- a/tools-uclibc/run.sh |
258 |
+++ b/tools-uclibc/run.sh |
259 |
@@ -45,7 +45,7 @@ main() { |
260 |
|
261 |
# undo_grsec |
262 |
|
263 |
- catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err |
264 |
+ catalyst -c $(pwd)/catalyst.conf.local -s current | tee -a zzz.log >snapshot.log 2>snapshot.err |
265 |
|
266 |
for arch in amd64 i686; do |
267 |
for flavor in hardened vanilla; do |