Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/releng:master commit in: tools/
Date: Tue, 16 Jan 2018 07:27:58
Message-Id: 1516067071.cb652173f6d910bcad4eb9be2ac0781d983b2ae2.vapier@gentoo
1 commit: cb652173f6d910bcad4eb9be2ac0781d983b2ae2
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 16 01:44:31 2018 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 16 01:44:31 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=cb652173
7
8 catalyst-auto: move remaining configs from pre_build to update_symlinks
9
10 All the configs running symlink updates in pre_build can do it in the
11 update_symlinks callback instead. Convert them over.
12
13 tools/catalyst-auto-alpha.conf | 3 +--
14 tools/catalyst-auto-arm64.conf | 3 +--
15 tools/catalyst-auto-armv4tl.conf | 2 +-
16 tools/catalyst-auto-armv5tel.conf | 2 +-
17 tools/catalyst-auto-armv6j.conf | 2 +-
18 tools/catalyst-auto-armv6j_hardfp.conf | 2 +-
19 tools/catalyst-auto-armv7a.conf | 2 +-
20 tools/catalyst-auto-armv7a_hardfp.conf | 2 +-
21 tools/catalyst-auto-hppa.conf | 3 +--
22 tools/catalyst-auto-ia64.conf | 3 +--
23 tools/catalyst-auto-ppc.conf | 2 +-
24 tools/catalyst-auto-ppc64.conf | 3 +--
25 tools/catalyst-auto-s390.conf | 3 +--
26 tools/catalyst-auto-s390x.conf | 3 +--
27 tools/catalyst-auto-sparc64.conf | 2 +-
28 tools/catalyst-auto-x86-experimental.conf | 2 +-
29 tools/catalyst-auto-x86.conf | 2 +-
30 17 files changed, 17 insertions(+), 24 deletions(-)
31
32 diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
33 index f72747ab..5b2bd2ed 100644
34 --- a/tools/catalyst-auto-alpha.conf
35 +++ b/tools/catalyst-auto-alpha.conf
36 @@ -22,8 +22,7 @@ give_latest_from_dates() {
37 tr '~' '-'
38 }
39
40 -
41 -pre_build() {
42 +update_symlinks() {
43 # Symlink the latest stages3 to build from
44 for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
45 pushd $d >/dev/null
46
47 diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
48 index f987eb9f..e9744337 100644
49 --- a/tools/catalyst-auto-arm64.conf
50 +++ b/tools/catalyst-auto-arm64.conf
51 @@ -25,8 +25,7 @@ give_latest_from_dates() {
52 tr '~' '-'
53 }
54
55 -
56 -pre_build() {
57 +update_symlinks() {
58 # Symlink the latest stages3 to build from
59 for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
60 pushd $d
61
62 diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf
63 index dfa65886..9ae84d5e 100644
64 --- a/tools/catalyst-auto-armv4tl.conf
65 +++ b/tools/catalyst-auto-armv4tl.conf
66 @@ -26,7 +26,7 @@ give_latest_from_dates() {
67 }
68
69
70 -pre_build() {
71 +update_symlinks() {
72 # Symlink the latest stages3 to build from
73 for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
74 pushd $d >/dev/null
75
76 diff --git a/tools/catalyst-auto-armv5tel.conf b/tools/catalyst-auto-armv5tel.conf
77 index 7ae17c0e..072b8d8a 100644
78 --- a/tools/catalyst-auto-armv5tel.conf
79 +++ b/tools/catalyst-auto-armv5tel.conf
80 @@ -26,7 +26,7 @@ give_latest_from_dates() {
81 }
82
83
84 -pre_build() {
85 +update_symlinks() {
86 # Symlink the latest stages3 to build from
87 for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
88 pushd $d >/dev/null
89
90 diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf
91 index 950b7f03..9a14ddf9 100644
92 --- a/tools/catalyst-auto-armv6j.conf
93 +++ b/tools/catalyst-auto-armv6j.conf
94 @@ -26,7 +26,7 @@ give_latest_from_dates() {
95 }
96
97
98 -pre_build() {
99 +update_symlinks() {
100 # Symlink the latest stages3 to build from
101 for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
102 pushd $d >/dev/null
103
104 diff --git a/tools/catalyst-auto-armv6j_hardfp.conf b/tools/catalyst-auto-armv6j_hardfp.conf
105 index 86ae9ddb..f3295b22 100644
106 --- a/tools/catalyst-auto-armv6j_hardfp.conf
107 +++ b/tools/catalyst-auto-armv6j_hardfp.conf
108 @@ -26,7 +26,7 @@ give_latest_from_dates() {
109 }
110
111
112 -pre_build() {
113 +update_symlinks() {
114 # Symlink the latest stages3 to build from
115 for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
116 pushd $d >/dev/null
117
118 diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf
119 index 33138ce6..66911204 100644
120 --- a/tools/catalyst-auto-armv7a.conf
121 +++ b/tools/catalyst-auto-armv7a.conf
122 @@ -26,7 +26,7 @@ give_latest_from_dates() {
123 }
124
125
126 -pre_build() {
127 +update_symlinks() {
128 # Symlink the latest stages3 to build from
129 for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
130 pushd $d >/dev/null
131
132 diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf
133 index 55dae2e1..4dd146f5 100644
134 --- a/tools/catalyst-auto-armv7a_hardfp.conf
135 +++ b/tools/catalyst-auto-armv7a_hardfp.conf
136 @@ -26,7 +26,7 @@ give_latest_from_dates() {
137 }
138
139
140 -pre_build() {
141 +update_symlinks() {
142 # Symlink the latest stages3 to build from
143 for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
144 pushd $d >/dev/null
145
146 diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
147 index 18ca85ff..9899e7da 100644
148 --- a/tools/catalyst-auto-hppa.conf
149 +++ b/tools/catalyst-auto-hppa.conf
150 @@ -27,8 +27,7 @@ give_latest_from_dates() {
151 tr '~' '-'
152 }
153
154 -
155 -pre_build() {
156 +update_symlinks() {
157 # Symlink the latest stages3 to build from
158 for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
159 pushd $d >/dev/null
160
161 diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
162 index 9f059ee3..dc91c4c4 100644
163 --- a/tools/catalyst-auto-ia64.conf
164 +++ b/tools/catalyst-auto-ia64.conf
165 @@ -22,8 +22,7 @@ give_latest_from_dates() {
166 tr '~' '-'
167 }
168
169 -
170 -pre_build() {
171 +update_symlinks() {
172 # Symlink the latest stages3 to build from
173 for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
174 pushd $d >/dev/null
175
176 diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
177 index 43d9809f..139f1a1a 100644
178 --- a/tools/catalyst-auto-ppc.conf
179 +++ b/tools/catalyst-auto-ppc.conf
180 @@ -24,7 +24,7 @@ give_latest_from_dates() {
181 tr '~' '-'
182 }
183
184 -pre_build() {
185 +update_symlinks() {
186 # Symlink the latest stages3 to build from
187 for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
188 pushd $d >/dev/null
189
190 diff --git a/tools/catalyst-auto-ppc64.conf b/tools/catalyst-auto-ppc64.conf
191 index 1dfe64a9..d9c45856 100644
192 --- a/tools/catalyst-auto-ppc64.conf
193 +++ b/tools/catalyst-auto-ppc64.conf
194 @@ -25,8 +25,7 @@ give_latest_from_dates() {
195 tr '~' '-'
196 }
197
198 -
199 -pre_build() {
200 +update_symlinks() {
201 # Symlink the latest stages3 to build from
202 for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
203 pushd $d >/dev/null
204
205 diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
206 index e580032a..44b47a93 100644
207 --- a/tools/catalyst-auto-s390.conf
208 +++ b/tools/catalyst-auto-s390.conf
209 @@ -22,8 +22,7 @@ give_latest_from_dates() {
210 tr '~' '-'
211 }
212
213 -
214 -pre_build() {
215 +update_symlinks() {
216 # Symlink the latest stages3 to build from
217 for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
218 pushd $d >/dev/null
219
220 diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
221 index 37e543f5..c12a959e 100644
222 --- a/tools/catalyst-auto-s390x.conf
223 +++ b/tools/catalyst-auto-s390x.conf
224 @@ -22,8 +22,7 @@ give_latest_from_dates() {
225 tr '~' '-'
226 }
227
228 -
229 -pre_build() {
230 +update_symlinks() {
231 # Symlink the latest stages3 to build from
232 for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
233 pushd $d >/dev/null
234
235 diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
236 index cca8dd58..b3364f8f 100644
237 --- a/tools/catalyst-auto-sparc64.conf
238 +++ b/tools/catalyst-auto-sparc64.conf
239 @@ -23,7 +23,7 @@ give_latest_from_dates() {
240 }
241
242
243 -pre_build() {
244 +update_symlinks() {
245 # Symlink the latest stages3 to build from
246 for d in ${BUILD_SRCDIR_BASE}/builds/{default,multilib} ; do
247 pushd $d >/dev/null
248
249 diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf
250 index e2c19761..9092e577 100644
251 --- a/tools/catalyst-auto-x86-experimental.conf
252 +++ b/tools/catalyst-auto-x86-experimental.conf
253 @@ -37,7 +37,7 @@ give_latest_from_dates() {
254 tr '~' '-'
255 }
256
257 -pre_build() {
258 +update_symlinks() {
259 # Symlink the latest stages3 to build from
260 for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
261 pushd $d >/dev/null
262
263 diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
264 index 286a9304..d2042559 100644
265 --- a/tools/catalyst-auto-x86.conf
266 +++ b/tools/catalyst-auto-x86.conf
267 @@ -37,7 +37,7 @@ give_latest_from_dates() {
268 tr '~' '-'
269 }
270
271 -pre_build() {
272 +update_symlinks() {
273 # Symlink the latest stages3 to build from
274 for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
275 pushd $d >/dev/null