Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/releng:master commit in: tools/
Date: Mon, 02 Sep 2019 02:06:25
Message-Id: 1567389899.492aacba77160895edd9e275c485b88b34b54fa9.mattst88@gentoo
1 commit: 492aacba77160895edd9e275c485b88b34b54fa9
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 2 02:04:59 2019 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 2 02:04:59 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=492aacba
7
8 catalyst-auto: Combine common functions
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 tools/catalyst-auto | 19 +++++++++++++++++++
13 tools/catalyst-auto-alpha.conf | 19 -------------------
14 tools/catalyst-auto-amd64-experimental.conf | 10 ----------
15 tools/catalyst-auto-amd64.conf | 10 ----------
16 tools/catalyst-auto-arm64.conf | 19 -------------------
17 tools/catalyst-auto-armv4tl.conf | 11 -----------
18 tools/catalyst-auto-armv5tel.conf | 11 -----------
19 tools/catalyst-auto-armv6j.conf | 11 -----------
20 tools/catalyst-auto-armv6j_hardfp.conf | 11 -----------
21 tools/catalyst-auto-armv7a.conf | 11 -----------
22 tools/catalyst-auto-armv7a_hardfp.conf | 11 -----------
23 tools/catalyst-auto-hppa.conf | 19 -------------------
24 tools/catalyst-auto-ia64.conf | 19 -------------------
25 tools/catalyst-auto-ppc.conf | 19 -------------------
26 tools/catalyst-auto-ppc64le.conf | 19 -------------------
27 tools/catalyst-auto-s390.conf | 19 -------------------
28 tools/catalyst-auto-s390x.conf | 19 -------------------
29 tools/catalyst-auto-sparc64.conf | 19 -------------------
30 tools/catalyst-auto-x86-experimental.conf | 10 ----------
31 tools/catalyst-auto-x86.conf | 10 ----------
32 20 files changed, 19 insertions(+), 277 deletions(-)
33
34 diff --git a/tools/catalyst-auto b/tools/catalyst-auto
35 index 6aac1cc4..de0afd69 100755
36 --- a/tools/catalyst-auto
37 +++ b/tools/catalyst-auto
38 @@ -165,6 +165,25 @@ parse_args() {
39 done
40 }
41
42 +give_latest_from_dates() {
43 + sed 's,-20,~20,g' | \
44 + sort -k +1 -n -t '~' |\
45 + awk -F\~ \
46 + 'BEGIN{i=$1; o=$0};
47 + { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
48 + END { print o; };' | \
49 + tr '~' '-'
50 +}
51 +
52 +# Replace the date/time stamp in the filename to "latest".
53 +# Forms we handle:
54 +# stage3-xxx-2018.0.tar.bz2
55 +# stage3-xxx-20180116.tar.bz2
56 +# stage3-xxx-20180116T015819Z.tar.bz2
57 +convert_filename() {
58 + sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
59 +}
60 +
61 # Let's get our own namespaces/etc... to avoid leaking crap.
62 containerize() {
63 # If we've already relaunched, nothing to do.
64
65 diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
66 index 525c2a26..b218fa0e 100644
67 --- a/tools/catalyst-auto-alpha.conf
68 +++ b/tools/catalyst-auto-alpha.conf
69 @@ -17,25 +17,6 @@ SET_default_SPECS="stage1.spec stage3.spec"
70 SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
71
72 KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/alpha
73 -
74 -give_latest_from_dates() {
75 - sed 's,-20,~20,g' | \
76 - sort -k +1 -n -t '~' |\
77 - awk -F\~ \
78 - 'BEGIN{i=$1; o=$0};
79 - { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
80 - END { print o; };' | \
81 - tr '~' '-'
82 -}
83 -
84 -# Replace the date/time stamp in the filename to "latest".
85 -# Forms we handle:
86 -# stage3-xxx-2018.0.tar.bz2
87 -# stage3-xxx-20180116.tar.bz2
88 -# stage3-xxx-20180116T015819Z.tar.bz2
89 -convert_filename() {
90 - sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
91 -}
92
93 update_symlinks() {
94 # Symlink the latest stages3 to build from
95
96 diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf
97 index 70963a0a..37e01bd1 100644
98 --- a/tools/catalyst-auto-amd64-experimental.conf
99 +++ b/tools/catalyst-auto-amd64-experimental.conf
100 @@ -40,16 +40,6 @@ KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
101
102 EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
103
104 -give_latest_from_dates() {
105 - sed 's,-20,~20,g' | \
106 - sort -k +1 -n -t '~' | \
107 - awk -F\~ \
108 - 'BEGIN{i=$1; o=$0};
109 - { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
110 - END { print o; };' | \
111 - tr '~' '-'
112 -}
113 -
114 update_symlinks() {
115 # Symlink the latest stages3 to build from
116 for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
117
118 diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
119 index 9b799645..c2e0c8b1 100644
120 --- a/tools/catalyst-auto-amd64.conf
121 +++ b/tools/catalyst-auto-amd64.conf
122 @@ -41,16 +41,6 @@ KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
123
124 EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
125
126 -give_latest_from_dates() {
127 - sed 's,-20,~20,g' | \
128 - sort -k +1 -n -t '~' | \
129 - awk -F\~ \
130 - 'BEGIN{i=$1; o=$0};
131 - { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
132 - END { print o; };' | \
133 - tr '~' '-'
134 -}
135 -
136 update_symlinks() {
137 # Symlink the latest stages3 to build from
138 for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
139
140 diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
141 index c1320a96..0d1506a4 100644
142 --- a/tools/catalyst-auto-arm64.conf
143 +++ b/tools/catalyst-auto-arm64.conf
144 @@ -15,25 +15,6 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
145
146 EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
147
148 -give_latest_from_dates() {
149 - sed 's,-20,~20,g' | \
150 - sort -k +1 -n -t '~' |\
151 - awk -F\~ \
152 - 'BEGIN{i=$1; o=$0};
153 - { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
154 - END { print o; };' | \
155 - tr '~' '-'
156 -}
157 -
158 -# Replace the date/time stamp in the filename to "latest".
159 -# Forms we handle:
160 -# stage3-xxx-2018.0.tar.bz2
161 -# stage3-xxx-20180116.tar.bz2
162 -# stage3-xxx-20180116T015819Z.tar.bz2
163 -convert_filename() {
164 - sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
165 -}
166 -
167 update_symlinks() {
168 # Symlink the latest stages3 to build from
169 local d f
170
171 diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf
172 index 9ae84d5e..fa20b5ca 100644
173 --- a/tools/catalyst-auto-armv4tl.conf
174 +++ b/tools/catalyst-auto-armv4tl.conf
175 @@ -15,17 +15,6 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
176
177 EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
178
179 -give_latest_from_dates() {
180 - sed 's,-20,~20,g' | \
181 - sort -k +1 -n -t '~' |\
182 - awk -F\~ \
183 - 'BEGIN{i=$1; o=$0};
184 - { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
185 - END { print o; };' | \
186 - tr '~' '-'
187 -}
188 -
189 -
190 update_symlinks() {
191 # Symlink the latest stages3 to build from
192 for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
193
194 diff --git a/tools/catalyst-auto-armv5tel.conf b/tools/catalyst-auto-armv5tel.conf
195 index 072b8d8a..79975984 100644
196 --- a/tools/catalyst-auto-armv5tel.conf
197 +++ b/tools/catalyst-auto-armv5tel.conf
198 @@ -15,17 +15,6 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
199
200 EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
201
202 -give_latest_from_dates() {
203 - sed 's,-20,~20,g' | \
204 - sort -k +1 -n -t '~' |\
205 - awk -F\~ \
206 - 'BEGIN{i=$1; o=$0};
207 - { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
208 - END { print o; };' | \
209 - tr '~' '-'
210 -}
211 -
212 -
213 update_symlinks() {
214 # Symlink the latest stages3 to build from
215 for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
216
217 diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf
218 index 9a14ddf9..0db433fa 100644
219 --- a/tools/catalyst-auto-armv6j.conf
220 +++ b/tools/catalyst-auto-armv6j.conf
221 @@ -15,17 +15,6 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
222
223 EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
224
225 -give_latest_from_dates() {
226 - sed 's,-20,~20,g' | \
227 - sort -k +1 -n -t '~' |\
228 - awk -F\~ \
229 - 'BEGIN{i=$1; o=$0};
230 - { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
231 - END { print o; };' | \
232 - tr '~' '-'
233 -}
234 -
235 -
236 update_symlinks() {
237 # Symlink the latest stages3 to build from
238 for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
239
240 diff --git a/tools/catalyst-auto-armv6j_hardfp.conf b/tools/catalyst-auto-armv6j_hardfp.conf
241 index f3295b22..ca12d89d 100644
242 --- a/tools/catalyst-auto-armv6j_hardfp.conf
243 +++ b/tools/catalyst-auto-armv6j_hardfp.conf
244 @@ -15,17 +15,6 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
245
246 EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
247
248 -give_latest_from_dates() {
249 - sed 's,-20,~20,g' | \
250 - sort -k +1 -n -t '~' |\
251 - awk -F\~ \
252 - 'BEGIN{i=$1; o=$0};
253 - { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
254 - END { print o; };' | \
255 - tr '~' '-'
256 -}
257 -
258 -
259 update_symlinks() {
260 # Symlink the latest stages3 to build from
261 for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
262
263 diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf
264 index 66911204..1b13c6b5 100644
265 --- a/tools/catalyst-auto-armv7a.conf
266 +++ b/tools/catalyst-auto-armv7a.conf
267 @@ -15,17 +15,6 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
268
269 EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
270
271 -give_latest_from_dates() {
272 - sed 's,-20,~20,g' | \
273 - sort -k +1 -n -t '~' |\
274 - awk -F\~ \
275 - 'BEGIN{i=$1; o=$0};
276 - { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
277 - END { print o; };' | \
278 - tr '~' '-'
279 -}
280 -
281 -
282 update_symlinks() {
283 # Symlink the latest stages3 to build from
284 for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
285
286 diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf
287 index 4dd146f5..c3037712 100644
288 --- a/tools/catalyst-auto-armv7a_hardfp.conf
289 +++ b/tools/catalyst-auto-armv7a_hardfp.conf
290 @@ -15,17 +15,6 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
291
292 EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
293
294 -give_latest_from_dates() {
295 - sed 's,-20,~20,g' | \
296 - sort -k +1 -n -t '~' |\
297 - awk -F\~ \
298 - 'BEGIN{i=$1; o=$0};
299 - { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
300 - END { print o; };' | \
301 - tr '~' '-'
302 -}
303 -
304 -
305 update_symlinks() {
306 # Symlink the latest stages3 to build from
307 for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
308
309 diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
310 index f838c940..5444cc4e 100644
311 --- a/tools/catalyst-auto-hppa.conf
312 +++ b/tools/catalyst-auto-hppa.conf
313 @@ -17,25 +17,6 @@ KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/hppa
314
315 EMAIL_SUBJECT_PREPEND="[hppa-auto]"
316
317 -give_latest_from_dates() {
318 - sed 's,-20,~20,g' | \
319 - sort -k +1 -n -t '~' |\
320 - awk -F\~ \
321 - 'BEGIN{i=$1; o=$0};
322 - { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
323 - END { print o; };' | \
324 - tr '~' '-'
325 -}
326 -
327 -# Replace the date/time stamp in the filename to "latest".
328 -# Forms we handle:
329 -# stage3-xxx-2018.0.tar.bz2
330 -# stage3-xxx-20180116.tar.bz2
331 -# stage3-xxx-20180116T015819Z.tar.bz2
332 -convert_filename() {
333 - sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
334 -}
335 -
336 update_symlinks() {
337 # Symlink the latest stages3 to build from
338 local d f t
339
340 diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
341 index 950a9b48..438a5757 100644
342 --- a/tools/catalyst-auto-ia64.conf
343 +++ b/tools/catalyst-auto-ia64.conf
344 @@ -12,25 +12,6 @@ OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
345
346 KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/ia64
347
348 -give_latest_from_dates() {
349 - sed 's,-20,~20,g' | \
350 - sort -k +1 -n -t '~' |\
351 - awk -F\~ \
352 - 'BEGIN{i=$1; o=$0};
353 - { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
354 - END { print o; };' | \
355 - tr '~' '-'
356 -}
357 -
358 -# Replace the date/time stamp in the filename to "latest".
359 -# Forms we handle:
360 -# stage3-xxx-2018.0.tar.bz2
361 -# stage3-xxx-20180116.tar.bz2
362 -# stage3-xxx-20180116T015819Z.tar.bz2
363 -convert_filename() {
364 - sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
365 -}
366 -
367 update_symlinks() {
368 # Symlink the latest stages3 to build from
369 local d f
370
371 diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
372 index f88c5ce0..59572644 100644
373 --- a/tools/catalyst-auto-ppc.conf
374 +++ b/tools/catalyst-auto-ppc.conf
375 @@ -13,25 +13,6 @@ OPTIONAL_SPECS="ppc32/installcd-stage1.spec ppc32/installcd-stage2-minimal.spec"
376 KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/powerpc
377
378 EMAIL_SUBJECT_PREPEND="[ppc-auto]"
379 -
380 -give_latest_from_dates() {
381 - sed 's,-20,~20,g' | \
382 - sort -k +1 -n -t '~' |\
383 - awk -F\~ \
384 - 'BEGIN{i=$1; o=$0};
385 - { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
386 - END { print o; };' | \
387 - tr '~' '-'
388 -}
389 -
390 -# Replace the date/time stamp in the filename to "latest".
391 -# Forms we handle:
392 -# stage3-xxx-2018.0.tar.xz
393 -# stage3-xxx-20180116.tar.xz
394 -# stage3-xxx-20180116T015819Z.tar.xz
395 -convert_filename() {
396 - sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
397 -}
398
399 update_symlinks() {
400 # Symlink the latest stages3 to build from
401
402 diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
403 index 1b353864..76e1bdf5 100644
404 --- a/tools/catalyst-auto-ppc64le.conf
405 +++ b/tools/catalyst-auto-ppc64le.conf
406 @@ -14,25 +14,6 @@ SPECS="stage1.spec stage3.spec"
407 KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/powerpc
408
409 EMAIL_SUBJECT_PREPEND="[ppc64le-auto]"
410 -
411 -give_latest_from_dates() {
412 - sed 's,-20,~20,g' | \
413 - sort -k +1 -n -t '~' |\
414 - awk -F\~ \
415 - 'BEGIN{i=$1; o=$0};
416 - { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
417 - END { print o; };' | \
418 - tr '~' '-'
419 -}
420 -
421 -# Replace the date/time stamp in the filename to "latest".
422 -# Forms we handle:
423 -# stage3-xxx-2018.0.tar.xz
424 -# stage3-xxx-20180116.tar.xz
425 -# stage3-xxx-20180116T015819Z.tar.xz
426 -convert_filename() {
427 - sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
428 -}
429
430 update_symlinks() {
431 # Symlink the latest stages3 to build from
432
433 diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
434 index 30d78e76..b48c7536 100644
435 --- a/tools/catalyst-auto-s390.conf
436 +++ b/tools/catalyst-auto-s390.conf
437 @@ -12,25 +12,6 @@ SET_netboot_SPECS="netboot/netboot.spec"
438
439 KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/s390
440
441 -give_latest_from_dates() {
442 - sed 's,-20,~20,g' | \
443 - sort -k +1 -n -t '~' |\
444 - awk -F\~ \
445 - 'BEGIN{i=$1; o=$0};
446 - { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
447 - END { print o; };' | \
448 - tr '~' '-'
449 -}
450 -
451 -# Replace the date/time stamp in the filename to "latest".
452 -# Forms we handle:
453 -# stage3-xxx-2018.0.tar.xz
454 -# stage3-xxx-20180116.tar.xz
455 -# stage3-xxx-20180116T015819Z.tar.xz
456 -convert_filename() {
457 - sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
458 -}
459 -
460 update_symlinks() {
461 # Symlink the latest stages3 to build from
462 local d f
463
464 diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
465 index e56b4c81..c9f3f7e9 100644
466 --- a/tools/catalyst-auto-s390x.conf
467 +++ b/tools/catalyst-auto-s390x.conf
468 @@ -12,25 +12,6 @@ SET_netboot_SPECS="netboot/netboot.spec"
469
470 KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/s390
471
472 -give_latest_from_dates() {
473 - sed 's,-20,~20,g' | \
474 - sort -k +1 -n -t '~' |\
475 - awk -F\~ \
476 - 'BEGIN{i=$1; o=$0};
477 - { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
478 - END { print o; };' | \
479 - tr '~' '-'
480 -}
481 -
482 -# Replace the date/time stamp in the filename to "latest".
483 -# Forms we handle:
484 -# stage3-xxx-2018.0.tar.xz
485 -# stage3-xxx-20180116.tar.xz
486 -# stage3-xxx-20180116T015819Z.tar.xz
487 -convert_filename() {
488 - sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
489 -}
490 -
491 update_symlinks() {
492 # Symlink the latest stages3 to build from
493 local d f
494
495 diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
496 index 056218dd..32d23b65 100644
497 --- a/tools/catalyst-auto-sparc64.conf
498 +++ b/tools/catalyst-auto-sparc64.conf
499 @@ -10,25 +10,6 @@ KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/sparc
500
501 EMAIL_SUBJECT_PREPEND="[sparc-auto]"
502
503 -give_latest_from_dates() {
504 - sed 's,-20,~20,g' | \
505 - sort -k +1 -n -t '~' |\
506 - awk -F\~ \
507 - 'BEGIN{i=$1; o=$0};
508 - { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
509 - END { print o; };' | \
510 - tr '~' '-'
511 -}
512 -
513 -# Replace the date/time stamp in the filename to "latest".
514 -# Forms we handle:
515 -# stage3-xxx-2018.0.tar.xz
516 -# stage3-xxx-20180116.tar.xz
517 -# stage3-xxx-20180116T015819Z.tar.xz
518 -convert_filename() {
519 - sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
520 -}
521 -
522 update_symlinks() {
523 # Symlink the latest stages3 to build from
524 local d f
525
526 diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf
527 index 9092e577..2373041e 100644
528 --- a/tools/catalyst-auto-x86-experimental.conf
529 +++ b/tools/catalyst-auto-x86-experimental.conf
530 @@ -27,16 +27,6 @@ KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
531
532 EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
533
534 -give_latest_from_dates() {
535 - sed 's,-20,~20,g' | \
536 - sort -k +1 -n -t '~' |\
537 - awk -F\~ \
538 - 'BEGIN{i=$1; o=$0};
539 - { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
540 - END { print o; };' | \
541 - tr '~' '-'
542 -}
543 -
544 update_symlinks() {
545 # Symlink the latest stages3 to build from
546 for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
547
548 diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
549 index d2042559..064881d4 100644
550 --- a/tools/catalyst-auto-x86.conf
551 +++ b/tools/catalyst-auto-x86.conf
552 @@ -27,16 +27,6 @@ KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
553
554 EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
555
556 -give_latest_from_dates() {
557 - sed 's,-20,~20,g' | \
558 - sort -k +1 -n -t '~' |\
559 - awk -F\~ \
560 - 'BEGIN{i=$1; o=$0};
561 - { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
562 - END { print o; };' | \
563 - tr '~' '-'
564 -}
565 -
566 update_symlinks() {
567 # Symlink the latest stages3 to build from
568 for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do